From d0dd4303bb010c60b8955179716b883666c57032 Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Mon, 21 Nov 2022 13:28:59 +0800
Subject: [PATCH] Update VTK to v9.2.2, fix some lib update error.

---
 CMakeLists.txt                                     | 3 ++-
 src/src/Rendering/Core/MarginCornerAnnotation.cpp  | 2 +-
 src/src/Rendering/Core/MarginCornerAnnotation.h    | 2 +-
 src/src/Rendering/Viewer/VolumeRenderingViewer.cpp | 2 +-
 src/src/UI/Widget/ImageView/dicomimageview.cpp     | 2 +-
 src/src/UI/Window/QVTKOpenGLNativeWidget2.h        | 2 +-
 src/src/UI/Window/VolumeRenderingWindow.cpp        | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc5d30a..65a4486 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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")
 
diff --git a/src/src/Rendering/Core/MarginCornerAnnotation.cpp b/src/src/Rendering/Core/MarginCornerAnnotation.cpp
index 845616a..ce667ad 100644
--- a/src/src/Rendering/Core/MarginCornerAnnotation.cpp
+++ b/src/src/Rendering/Core/MarginCornerAnnotation.cpp
@@ -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]  );
diff --git a/src/src/Rendering/Core/MarginCornerAnnotation.h b/src/src/Rendering/Core/MarginCornerAnnotation.h
index 0441eba..65147f3 100644
--- a/src/src/Rendering/Core/MarginCornerAnnotation.h
+++ b/src/src/Rendering/Core/MarginCornerAnnotation.h
@@ -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);
diff --git a/src/src/Rendering/Viewer/VolumeRenderingViewer.cpp b/src/src/Rendering/Viewer/VolumeRenderingViewer.cpp
index 298f93a..7c56518 100644
--- a/src/src/Rendering/Viewer/VolumeRenderingViewer.cpp
+++ b/src/src/Rendering/Viewer/VolumeRenderingViewer.cpp
@@ -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() {
diff --git a/src/src/UI/Widget/ImageView/dicomimageview.cpp b/src/src/UI/Widget/ImageView/dicomimageview.cpp
index a5e4149..c7b3d06 100644
--- a/src/src/UI/Widget/ImageView/dicomimageview.cpp
+++ b/src/src/UI/Widget/ImageView/dicomimageview.cpp
@@ -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
diff --git a/src/src/UI/Window/QVTKOpenGLNativeWidget2.h b/src/src/UI/Window/QVTKOpenGLNativeWidget2.h
index cdd5477..7f99b3a 100644
--- a/src/src/UI/Window/QVTKOpenGLNativeWidget2.h
+++ b/src/src/UI/Window/QVTKOpenGLNativeWidget2.h
@@ -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;
diff --git a/src/src/UI/Window/VolumeRenderingWindow.cpp b/src/src/UI/Window/VolumeRenderingWindow.cpp
index cc82fb9..b8145ea 100644
--- a/src/src/UI/Window/VolumeRenderingWindow.cpp
+++ b/src/src/UI/Window/VolumeRenderingWindow.cpp
@@ -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);