Update VTK to v9.2.2, fix some lib update error.
This commit is contained in:
@@ -18,7 +18,8 @@ include_directories(
|
||||
./src/src/view/subview
|
||||
)
|
||||
|
||||
set(VTK_DIR "D:/Libs/binary/VTK8.1.2/lib/cmake/vtk-8.2")
|
||||
#set(VTK_DIR "D:/Libs/binary/VTK8.1.2/lib/cmake/vtk-8.2")
|
||||
set(VTK_DIR "D:/Libs/binary/VTK9.2.2/lib/cmake/vtk-9.2")
|
||||
set(Qt5_DIR "D:/Qt/Qt5.12.0/5.12.0/msvc2017_64/lib/cmake/Qt5")
|
||||
set(DCMTK_DIR "D:/Libs/binary/DCMTK/cmake")
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ MarginCornerAnnotation::~MarginCornerAnnotation() {
|
||||
|
||||
}
|
||||
|
||||
void MarginCornerAnnotation::SetTextActorsPosition(int *vsize) {
|
||||
void MarginCornerAnnotation::SetTextActorsPosition(const int *vsize) {
|
||||
this->TextActor[LowerLeft]->SetPosition ( margins[0], margins[3] );
|
||||
this->TextActor[LowerRight]->SetPosition ( vsize[0] - margins[3], margins[2] );
|
||||
this->TextActor[UpperLeft]->SetPosition ( margins[1], vsize[1] - margins[0] );
|
||||
|
||||
@@ -14,7 +14,7 @@ public:
|
||||
protected:
|
||||
MarginCornerAnnotation();
|
||||
~MarginCornerAnnotation() override;
|
||||
void SetTextActorsPosition(int vsize[2]) override ;
|
||||
void SetTextActorsPosition(const int vsize[2]) override ;
|
||||
void SetMargin(int left, int top, int right, int bottom);
|
||||
void SetMargin(int v){
|
||||
SetMargin(v, v, v, v);
|
||||
|
||||
@@ -326,7 +326,7 @@ void VolumeRenderingViewer::SetInputData(vtkImageData *in) {
|
||||
}
|
||||
|
||||
vtkImageData *VolumeRenderingViewer::GetInput() {
|
||||
return this->VolumeMapper->GetInput();
|
||||
return vtkImageData::SafeDownCast(this->VolumeMapper->GetInput());
|
||||
}
|
||||
|
||||
void VolumeRenderingViewer::renderAnnotation() {
|
||||
|
||||
@@ -42,7 +42,7 @@ DicomImageView::DicomImageView(QWidget *parent)
|
||||
// create layout for main container
|
||||
QGridLayout *controlLayout = new QGridLayout(wrapper);
|
||||
mGLWidget->setParent(wrapper);
|
||||
mGLWidget->SetRenderWindow(mGLRenWin);
|
||||
mGLWidget->setRenderWindow(mGLRenWin.Get());
|
||||
controlLayout->addWidget(mGLWidget, 0, 0);
|
||||
|
||||
//add scrollbar to container
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
class QVTKOpenGLNativeWidget2 :public QVTKOpenGLNativeWidget {
|
||||
Q_OBJECT
|
||||
typedef QOpenGLWidget Superclass;
|
||||
typedef QVTKOpenGLNativeWidget Superclass;
|
||||
public:
|
||||
QVTKOpenGLNativeWidget2(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
|
||||
~QVTKOpenGLNativeWidget2() override;
|
||||
|
||||
@@ -32,7 +32,7 @@ VolumeRenderingWindow::VolumeRenderingWindow(QWidget *parent , Qt::WindowFlags f
|
||||
mViewer->SetRenderWindow(mRenderWin);
|
||||
mViewer->SetRenderer(renderer);
|
||||
|
||||
widget->SetRenderWindow(mRenderWin);
|
||||
widget->setRenderWindow(mRenderWin.Get());
|
||||
layout->addWidget(widget);
|
||||
setMinimumSize(680,500);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user