Skip to content

Commit 3ea863e

Browse files
committed
VTK < 8 doesn't use the qt naming style.
Fixes manual_registration.
1 parent 0e642e3 commit 3ea863e

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

apps/src/manual_registration/manual_registration.cpp

+14-4
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,17 @@ ManualRegistration::ManualRegistration()
7272
renderWindow_src->AddRenderer(renderer_src);
7373
vis_src_.reset(new pcl::visualization::PCLVisualizer(renderer_src, renderWindow_src, "", false));
7474
qvtk_widget_src = new QVTKOpenGLNativeWidget(this);
75+
qvtk_widget_src->setRenderWindow(vis_src_->getRenderWindow());
76+
vis_src_->setupInteractor(qvtk_widget_src->interactor(),
77+
qvtk_widget_src->renderWindow());
7578
#else
7679
vis_src_.reset(new pcl::visualization::PCLVisualizer("", false));
7780
qvtk_widget_src = new QVTKWidget(this);
81+
qvtk_widget_src->SetRenderWindow(vis_src_->GetRenderWindow());
82+
vis_src_->setupInteractor(qvtk_widget_src->GetInteractor(),
83+
qvtk_widget_src->GetRenderWindow());
7884
#endif
79-
qvtk_widget_src->setRenderWindow(vis_src_->getRenderWindow());
85+
8086
vis_src_->setupInteractor(qvtk_widget_src->interactor(),
8187
qvtk_widget_src->renderWindow());
8288
vis_src_->getInteractorStyle()->setKeyboardModifier(
@@ -100,13 +106,17 @@ ManualRegistration::ManualRegistration()
100106
renderWindow_dst->AddRenderer(renderer_dst);
101107
vis_dst_.reset(new pcl::visualization::PCLVisualizer(renderer_dst, renderWindow_dst, "", false));
102108
qvtk_widget_dst = new QVTKOpenGLNativeWidget(this);
109+
qvtk_widget_dst->setRenderWindow(vis_dst_->getRenderWindow());
110+
vis_dst_->setupInteractor(qvtk_widget_dst->interactor(),
111+
qvtk_widget_dst->renderWindow());
103112
#else
104113
vis_dst_.reset(new pcl::visualization::PCLVisualizer("", false));
105114
qvtk_widget_dst = new QVTKWidget(this);
115+
qvtk_widget_dst->SetRenderWindow(vis_dst_->GetRenderWindow());
116+
vis_dst_->setupInteractor(qvtk_widget_dst->GetInteractor(),
117+
qvtk_widget_dst->GetRenderWindow());
106118
#endif
107-
qvtk_widget_dst->setRenderWindow(vis_dst_->getRenderWindow());
108-
vis_dst_->setupInteractor(qvtk_widget_dst->interactor(),
109-
qvtk_widget_dst->renderWindow());
119+
110120
vis_dst_->getInteractorStyle()->setKeyboardModifier(
111121
pcl::visualization::INTERACTOR_KB_MOD_SHIFT);
112122

0 commit comments

Comments
 (0)