Skip to content

Commit c588d05

Browse files
committed
Add a vtk viewer widget in each viewer
1 parent c83717f commit c588d05

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

src/Interface/Application/ViewerWidget.cc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
#include <QtUtils/Utils/QtRenderResources.h>
4949
#include <QtUtils/Utils/QtRenderWidget.h>
5050

51+
// vtk includes
52+
#include <QVTKRenderWidget.h>
53+
5154
// Interface includes
5255
#include <Interface/Application/StyleSheet.h>
5356
#include <Interface/Application/ViewerWidget.h>
@@ -69,6 +72,7 @@ class ViewerWidgetPrivate
6972

7073
Ui::ViewerWidget ui_;
7174
QtUtils::QtRenderWidget* render_widget_;
75+
QVTKRenderWidget* vtk_render_widget_;
7276

7377
int minimum_toolbar_width_;
7478
bool initialized_size_;
@@ -161,15 +165,19 @@ ViewerWidget::ViewerWidget( ViewerHandle viewer, QWidget *parent ) :
161165
// --------------------------------------
162166
// Generate the OpenGL part of the widget
163167
this->private_->render_widget_ = QtUtils::QtApplication::Instance()->
164-
qt_renderresources_context()->create_qt_render_widget( this, this->private_->viewer_ );
168+
qt_renderresources_context()->create_qt_render_widget( this->private_->ui_.viewer_slot_, this->private_->viewer_ );
169+
this->private_->vtk_render_widget_ = QtUtils::QtApplication::Instance()->
170+
qt_renderresources_context()->create_qvtk_render_widget( this->private_->ui_.viewer_slot_, this->private_->viewer_ );
165171

166172
if( this->private_->render_widget_ == 0 )
167173
{
168174
CORE_THROW_LOGICERROR("OpenGL was not initialized correctly");
169175
}
170176

177+
this->private_->vtk_render_widget_->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
171178
this->private_->render_widget_->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
172179
this->private_->ui_.viewer_layout_->addWidget( this->private_->render_widget_ );
180+
this->private_->ui_.viewer_layout_->addWidget( this->private_->vtk_render_widget_ );
173181

174182
// Update state of the widget to reflect current state
175183
{

0 commit comments

Comments
 (0)