Skip to content

Commit ca936f8

Browse files
larshglarshg
committed
Updates to manual_registration.
1 parent 58d2bc6 commit ca936f8

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎apps/include/pcl/apps/manual_registration.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ class ManualRegistration : public QMainWindow {
112112

113113
protected:
114114

115-
PCLQVTKWidget* qvtk_widget_src;
116-
PCLQVTKWidget* qvtk_widget_dst;
115+
PCLQVTKWidget* qvtk_widget_src_;
116+
PCLQVTKWidget* qvtk_widget_dst_;
117117

118118
pcl::visualization::PCLVisualizer::Ptr vis_src_;
119119
pcl::visualization::PCLVisualizer::Ptr vis_dst_;

‎apps/src/manual_registration/manual_registration.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,22 @@ ManualRegistration::ManualRegistration()
7272
auto renderWindow_src = vtkSmartPointer<vtkGenericOpenGLRenderWindow>::New();
7373
renderWindow_src->AddRenderer(renderer_src);
7474
vis_src_.reset(new pcl::visualization::PCLVisualizer(renderer_src, renderWindow_src, "", false));
75-
qvtk_widget_src = new PCLQVTKWidget(this);
76-
qvtk_widget_src->setRenderWindow(vis_src_->getRenderWindow());
77-
vis_src_->setupInteractor(qvtk_widget_src->interactor(),
78-
qvtk_widget_src->renderWindow());
75+
qvtk_widget_src_ = new PCLQVTKWidget(this);
76+
qvtk_widget_src_->setRenderWindow(vis_src_->getRenderWindow());
77+
vis_src_->setupInteractor(qvtk_widget_src_->interactor(),
78+
qvtk_widget_src_->renderWindow());
7979
#else
8080
vis_src_.reset(new pcl::visualization::PCLVisualizer("", false));
81-
qvtk_widget_src = new PCLQVTKWidget(this);
82-
qvtk_widget_src->SetRenderWindow(vis_src_->getRenderWindow());
83-
vis_src_->setupInteractor(qvtk_widget_src->GetInteractor(),
84-
qvtk_widget_src->GetRenderWindow());
81+
qvtk_widget_src_ = new PCLQVTKWidget(this);
82+
qvtk_widget_src_->SetRenderWindow(vis_src_->getRenderWindow());
83+
vis_src_->setupInteractor(qvtk_widget_src_->GetInteractor(),
84+
qvtk_widget_src_->GetRenderWindow());
8585
#endif
8686

8787
vis_src_->getInteractorStyle()->setKeyboardModifier(
8888
pcl::visualization::INTERACTOR_KB_MOD_SHIFT);
8989

90-
ui_->horizontalLayout->insertWidget(0,qvtk_widget_src,2);
90+
ui_->horizontalLayout->insertWidget(0,qvtk_widget_src_,2);
9191

9292
vis_src_->registerPointPickingCallback(&ManualRegistration::SourcePointPickCallback,
9393
*this);
@@ -98,22 +98,22 @@ ManualRegistration::ManualRegistration()
9898
auto renderWindow_dst = vtkSmartPointer<vtkGenericOpenGLRenderWindow>::New();
9999
renderWindow_dst->AddRenderer(renderer_dst);
100100
vis_dst_.reset(new pcl::visualization::PCLVisualizer(renderer_dst, renderWindow_dst, "", false));
101-
qvtk_widget_dst = new PCLQVTKWidget(this);
102-
qvtk_widget_dst->setRenderWindow(vis_dst_->getRenderWindow());
103-
vis_dst_->setupInteractor(qvtk_widget_dst->interactor(),
104-
qvtk_widget_dst->renderWindow());
101+
qvtk_widget_dst_ = new PCLQVTKWidget(this);
102+
qvtk_widget_dst_->setRenderWindow(vis_dst_->getRenderWindow());
103+
vis_dst_->setupInteractor(qvtk_widget_dst_->interactor(),
104+
qvtk_widget_dst_->renderWindow());
105105
#else
106106
vis_dst_.reset(new pcl::visualization::PCLVisualizer("", false));
107-
qvtk_widget_dst = new PCLQVTKWidget(this);
108-
qvtk_widget_dst->SetRenderWindow(vis_dst_->getRenderWindow());
109-
vis_dst_->setupInteractor(qvtk_widget_dst->GetInteractor(),
110-
qvtk_widget_dst->GetRenderWindow());
107+
qvtk_widget_dst_ = new PCLQVTKWidget(this);
108+
qvtk_widget_dst_->SetRenderWindow(vis_dst_->getRenderWindow());
109+
vis_dst_->setupInteractor(qvtk_widget_dst_->GetInteractor(),
110+
qvtk_widget_dst_->GetRenderWindow());
111111
#endif
112112

113113
vis_dst_->getInteractorStyle()->setKeyboardModifier(
114114
pcl::visualization::INTERACTOR_KB_MOD_SHIFT);
115115

116-
ui_->horizontalLayout->addWidget(qvtk_widget_dst,2);
116+
ui_->horizontalLayout->addWidget(qvtk_widget_dst_,2);
117117

118118
vis_dst_->registerPointPickingCallback(&ManualRegistration::DstPointPickCallback,
119119
*this);
@@ -312,11 +312,11 @@ void
312312
ManualRegistration::refreshView()
313313
{
314314
#if VTK_MAJOR_VERSION > 8
315-
qvtk_widget_dst->renderWindow()->Render();
316-
qvtk_widget_src->renderWindow()->Render();
315+
qvtk_widget_dst_->renderWindow()->Render();
316+
qvtk_widget_src_->renderWindow()->Render();
317317
#else
318-
qvtk_widget_dst->update();
319-
qvtk_widget_src->update();
318+
qvtk_widget_dst_->update();
319+
qvtk_widget_src_->update();
320320
#endif
321321
}
322322

0 commit comments

Comments
 (0)