Skip to content

Commit

Permalink
update due to deprecation in VTK 9.0
Browse files Browse the repository at this point in the history 
See https://github.com/Kitware/VTK/blob/285daeedd58eb890cb90d6e907d822eea3d2d092/GUISupport/Qt/QVTKOpenGLStereoWidget.h#L195-L208
  • Loading branch information
@JostMigenda
JostMigenda committed May 10, 2024
1 parent b73122f commit 3a961d9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
24 changes: 12 additions & 12 deletions CemrgApp/Plugins/kcl.cemrgapp.atrialfibres/src/internal/AtrialFibresClipperView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,14 @@ void AtrialFibresClipperView::CreateQtPartControl(QWidget *parent) {

vtkSmartPointer<vtkGenericOpenGLRenderWindow> renderWindow =
vtkSmartPointer<vtkGenericOpenGLRenderWindow>::New();
m_Controls.widget_1->SetRenderWindow(renderWindow);
m_Controls.widget_1->GetRenderWindow()->AddRenderer(renderer);
m_Controls.widget_1->setRenderWindow(renderWindow);
m_Controls.widget_1->renderWindow()->AddRenderer(renderer);

MITK_INFO << "Setup keyboard interactor";
callBack = vtkSmartPointer<vtkCallbackCommand>::New();
callBack->SetCallback(KeyCallBackFunc);
callBack->SetClientData(this);
interactor = m_Controls.widget_1->GetRenderWindow()->GetInteractor();
interactor = m_Controls.widget_1->renderWindow()->GetInteractor();
interactor->SetInteractorStyle(vtkSmartPointer<vtkInteractorStyleTrackballCamera>::New());
interactor->GetInteractorStyle()->KeyPressActivationOff();
interactor->GetInteractorStyle()->AddObserver(vtkCommand::KeyPressEvent, callBack);
Expand Down Expand Up @@ -271,7 +271,7 @@ void AtrialFibresClipperView::CtrLines() {
linesActor->GetProperty()->SetColor(1,0,0);
renderer->AddActor(linesActor);
}//_for
m_Controls.widget_1->GetRenderWindow()->Render();
m_Controls.widget_1->renderWindow()->Render();

//Adjust controllers
m_Controls.button_man1_ctrlines->setEnabled(false);
Expand Down Expand Up @@ -332,7 +332,7 @@ void AtrialFibresClipperView::CtrPlanes() {
comboText = "APPENDAGE";
m_Controls.comboBox->insertItem(i, comboText);
}//_for
m_Controls.widget_1->GetRenderWindow()->Render();
m_Controls.widget_1->renderWindow()->Render();

//Adjust controllers
m_Controls.comboBox->setCurrentIndex(0);
Expand Down Expand Up @@ -432,7 +432,7 @@ void AtrialFibresClipperView::CtrPlanesPlacer() {
clipper->CalcParamsOfPlane(ctrPlane, indexBox, position);

ctrPlane->Update();
m_Controls.widget_1->GetRenderWindow()->Render();
m_Controls.widget_1->renderWindow()->Render();
}

void AtrialFibresClipperView::CtrLinesSelector(int index) {
Expand Down Expand Up @@ -472,7 +472,7 @@ void AtrialFibresClipperView::CtrLinesSelector(int index) {
m_Controls.slider->setValue(position);
m_Controls.spinBox->setValue(adjust);
pickedCutterSeeds->SetPoints(vtkSmartPointer<vtkPoints>::New());
m_Controls.widget_1->GetRenderWindow()->Render();
m_Controls.widget_1->renderWindow()->Render();
}

void AtrialFibresClipperView::PvClipperRadius(){
Expand Down Expand Up @@ -580,7 +580,7 @@ void AtrialFibresClipperView::ShowPvClippers(){
bool showOnRenderer= true;
CreateSphereClipperAndRadiiVectors(showOnRenderer);

m_Controls.widget_1->GetRenderWindow()->Render();
m_Controls.widget_1->renderWindow()->Render();

m_Controls.slider_auto->setEnabled(true);
m_Controls.slider_auto->setRange(4, 30);
Expand Down Expand Up @@ -982,7 +982,7 @@ void AtrialFibresClipperView::PickCallBack(bool pvCorridor) {
corridorLineSeeds->Modified();
}

m_Controls.widget_1->GetRenderWindow()->Render();
m_Controls.widget_1->renderWindow()->Render();
}

void AtrialFibresClipperView::ManualCutterCallBack() {
Expand Down Expand Up @@ -1021,7 +1021,7 @@ void AtrialFibresClipperView::ManualCutterCallBack() {
double* point = surface->GetVtkPolyData()->GetPoint(pickedSeedId);
pickedCutterSeeds->GetPoints()->InsertNextPoint(point);
pickedCutterSeeds->Modified();
m_Controls.widget_1->GetRenderWindow()->Render();
m_Controls.widget_1->renderWindow()->Render();
}

void AtrialFibresClipperView::KeyCallBackFunc(vtkObject*, long unsigned int, void* ClientData, void*) {
Expand Down Expand Up @@ -1074,7 +1074,7 @@ void AtrialFibresClipperView::KeyCallBackFunc(vtkObject*, long unsigned int, voi
self->pickedSeedLabels.pop_back();
}//_if

self->m_Controls.widget_1->GetRenderWindow()->Render();
self->m_Controls.widget_1->renderWindow()->Render();
} else if (key == "X" || key == "x"){
if(self->automaticPipeline){
if(self->corridorCount<self->corridorMax){
Expand Down Expand Up @@ -1211,7 +1211,7 @@ void AtrialFibresClipperView::KeyCallBackFunc(vtkObject*, long unsigned int, voi
for (unsigned int i=0; i<self->clipperActors.size(); i++)
self->clipperActors.at(i)->GetProperty()->SetOpacity(1.0);
}//_if
self->m_Controls.widget_1->GetRenderWindow()->Render();
self->m_Controls.widget_1->renderWindow()->Render();

}//_if_key

Expand Down
12 changes: 6 additions & 6 deletions CemrgApp/Plugins/kcl.cemrgapp.atrialfibres/src/internal/AtrialFibresLandmarksView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,14 @@ void AtrialFibresLandmarksView::CreateQtPartControl(QWidget *parent) {

vtkSmartPointer<vtkGenericOpenGLRenderWindow> renderWindow =
vtkSmartPointer<vtkGenericOpenGLRenderWindow>::New();
m_Controls.widget_1->SetRenderWindow(renderWindow);
m_Controls.widget_1->GetRenderWindow()->AddRenderer(renderer);
m_Controls.widget_1->setRenderWindow(renderWindow);
m_Controls.widget_1->renderWindow()->AddRenderer(renderer);

//Setup keyboard interactor
callBack = vtkSmartPointer<vtkCallbackCommand>::New();
callBack->SetCallback(KeyCallBackFunc);
callBack->SetClientData(this);
interactor = m_Controls.widget_1->GetRenderWindow()->GetInteractor();
interactor = m_Controls.widget_1->renderWindow()->GetInteractor();
interactor->SetInteractorStyle(vtkSmartPointer<vtkInteractorStyleTrackballCamera>::New());
interactor->GetInteractorStyle()->KeyPressActivationOff();
interactor->GetInteractorStyle()->AddObserver(vtkCommand::KeyPressEvent, callBack);
Expand Down Expand Up @@ -414,7 +414,7 @@ void AtrialFibresLandmarksView::PickCallBack(bool refinedLandmarks) {
refinedLineSeeds->Modified();
}

m_Controls.widget_1->GetRenderWindow()->Render();
m_Controls.widget_1->renderWindow()->Render();
}

void AtrialFibresLandmarksView::KeyCallBackFunc(vtkObject*, long unsigned int, void* ClientData, void*) {
Expand Down Expand Up @@ -475,7 +475,7 @@ void AtrialFibresLandmarksView::KeyCallBackFunc(vtkObject*, long unsigned int, v
self->roughSeedLabels.pop_back();
}//_if

self->m_Controls.widget_1->GetRenderWindow()->Render();
self->m_Controls.widget_1->renderWindow()->Render();
} else if (key == "X" || key == "x"){
if(self->m_Controls.button_save2_refined->isEnabled()){
bool refinedLandmarks = true;
Expand Down Expand Up @@ -530,7 +530,7 @@ void AtrialFibresLandmarksView::KeyCallBackFunc(vtkObject*, long unsigned int, v
self->refinedSeedLabels.pop_back();
}//_if

self->m_Controls.widget_1->GetRenderWindow()->Render();
self->m_Controls.widget_1->renderWindow()->Render();
}
} else if (key == "H" || key == "h"){
self->Help();
Expand Down
6 changes: 3 additions & 3 deletions CemrgApp/Plugins/kcl.cemrgapp.atrialfibres/src/internal/AtrialFibresVisualiseView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ void AtrialFibresVisualiseView::CreateQtPartControl(QWidget *parent) {

vtkSmartPointer<vtkGenericOpenGLRenderWindow> renderWindow =
vtkSmartPointer<vtkGenericOpenGLRenderWindow>::New();
m_Controls.widget_1->SetRenderWindow(renderWindow);
m_Controls.widget_1->GetRenderWindow()->AddRenderer(renderer);
m_Controls.widget_1->setRenderWindow(renderWindow);
m_Controls.widget_1->renderWindow()->AddRenderer(renderer);

//Setup keyboard interactor
// callBack = vtkSmartPointer<vtkCallbackCommand>::New();
// callBack->SetCallback(KeyCallBackFunc);
// callBack->SetClientData(this);
interactor = m_Controls.widget_1->GetRenderWindow()->GetInteractor();
interactor = m_Controls.widget_1->renderWindow()->GetInteractor();
interactor->SetInteractorStyle(vtkSmartPointer<vtkInteractorStyleTrackballCamera>::New());
interactor->GetInteractorStyle()->KeyPressActivationOff();
// interactor->GetInteractorStyle()->AddObserver(vtkCommand::KeyPressEvent, callBack);
Expand Down

0 comments on commit 3a961d9

Please sign in to comment.