sunwen/DCMV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update VTK to v9.2.2, fix some lib update error.

Browse Source
This commit is contained in:
Krad
2022-11-21 13:28:59 +08:00
parent fccf7e2176
commit d0dd4303bb
7 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -18,7 +18,8 @@ include_directories(
./src/src/view/subview ./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(Qt5_DIR "D:/Qt/Qt5.12.0/5.12.0/msvc2017_64/lib/cmake/Qt5")
set(DCMTK_DIR "D:/Libs/binary/DCMTK/cmake") set(DCMTK_DIR "D:/Libs/binary/DCMTK/cmake")

2
src/src/Rendering/Core/MarginCornerAnnotation.cpp
View File

@@ -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[LowerLeft]->SetPosition ( margins[0], margins[3] );
this->TextActor[LowerRight]->SetPosition ( vsize[0] - margins[3], margins[2] ); this->TextActor[LowerRight]->SetPosition ( vsize[0] - margins[3], margins[2] );
this->TextActor[UpperLeft]->SetPosition ( margins[1], vsize[1] - margins[0] ); this->TextActor[UpperLeft]->SetPosition ( margins[1], vsize[1] - margins[0] );

2
src/src/Rendering/Core/MarginCornerAnnotation.h
View File

@@ -14,7 +14,7 @@ public:
protected: protected:
MarginCornerAnnotation(); MarginCornerAnnotation();
~MarginCornerAnnotation() override; ~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 left, int top, int right, int bottom);
void SetMargin(int v){ void SetMargin(int v){
SetMargin(v, v, v, v); SetMargin(v, v, v, v);

2
src/src/Rendering/Viewer/VolumeRenderingViewer.cpp
View File

@@ -326,7 +326,7 @@ void VolumeRenderingViewer::SetInputData(vtkImageData *in) {
} }
vtkImageData *VolumeRenderingViewer::GetInput() { vtkImageData *VolumeRenderingViewer::GetInput() {
return this->VolumeMapper->GetInput(); return vtkImageData::SafeDownCast(this->VolumeMapper->GetInput());
} }
void VolumeRenderingViewer::renderAnnotation() { void VolumeRenderingViewer::renderAnnotation() {

2
src/src/UI/Widget/ImageView/dicomimageview.cpp
View File

@@ -42,7 +42,7 @@ DicomImageView::DicomImageView(QWidget *parent)
// create layout for main container // create layout for main container
QGridLayout *controlLayout = new QGridLayout(wrapper); QGridLayout *controlLayout = new QGridLayout(wrapper);
mGLWidget->setParent(wrapper); mGLWidget->setParent(wrapper);
mGLWidget->SetRenderWindow(mGLRenWin); mGLWidget->setRenderWindow(mGLRenWin.Get());
controlLayout->addWidget(mGLWidget, 0, 0); controlLayout->addWidget(mGLWidget, 0, 0);
//add scrollbar to container //add scrollbar to container

2
src/src/UI/Window/QVTKOpenGLNativeWidget2.h
View File

@@ -9,7 +9,7 @@
class QVTKOpenGLNativeWidget2 :public QVTKOpenGLNativeWidget { class QVTKOpenGLNativeWidget2 :public QVTKOpenGLNativeWidget {
Q_OBJECT Q_OBJECT
typedef QOpenGLWidget Superclass; typedef QVTKOpenGLNativeWidget Superclass;
public: public:
QVTKOpenGLNativeWidget2(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); QVTKOpenGLNativeWidget2(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
~QVTKOpenGLNativeWidget2() override; ~QVTKOpenGLNativeWidget2() override;

2
src/src/UI/Window/VolumeRenderingWindow.cpp
View File

@@ -32,7 +32,7 @@ VolumeRenderingWindow::VolumeRenderingWindow(QWidget *parent , Qt::WindowFlags f
mViewer->SetRenderWindow(mRenderWin); mViewer->SetRenderWindow(mRenderWin);
mViewer->SetRenderer(renderer); mViewer->SetRenderer(renderer);
widget->SetRenderWindow(mRenderWin); widget->setRenderWindow(mRenderWin.Get());
layout->addWidget(widget); layout->addWidget(widget);
setMinimumSize(680,500); setMinimumSize(680,500);