|
33 | 33 | // QtUtils includes |
34 | 34 | #include <QtUtils/Utils/QtRenderResources.h> |
35 | 35 |
|
| 36 | +#include <vtkGenericOpenGLRenderWindow.h> |
| 37 | +#include <vtkNew.h> |
| 38 | + |
36 | 39 | namespace QtUtils |
37 | 40 | { |
38 | 41 |
|
@@ -146,16 +149,26 @@ bool QtRenderResourcesContext::create_render_context( Core::RenderContextHandle& |
146 | 149 | return context->is_valid(); |
147 | 150 | } |
148 | 151 |
|
149 | | -QtRenderWidget* QtRenderResourcesContext::create_qt_render_widget( QWidget* parent, |
| 152 | +QtRenderWidget* QtRenderResourcesContext::create_qt_render_widget( QWidget* parent, |
150 | 153 | Core::AbstractViewerHandle viewer ) |
151 | 154 | { |
152 | 155 | CORE_LOG_DEBUG( "Create an OpenGL widget" ); |
153 | 156 |
|
154 | | - return new QtRenderWidget( this->private_->format_, parent, |
| 157 | + return new QtRenderWidget( this->private_->format_, parent, |
155 | 158 | this->private_->shared_widget_, viewer ); |
156 | 159 | } |
157 | 160 |
|
158 | | -QtTransferFunctionWidget* QtRenderResourcesContext::create_qt_transfer_function_widget( |
| 161 | +QVTKRenderWidget* QtRenderResourcesContext::create_qvtk_render_widget( QWidget* parent, Core::AbstractViewerHandle viewer) |
| 162 | +{ |
| 163 | + CORE_LOG_DEBUG( "Create a QVTK widget" ); |
| 164 | + |
| 165 | + QVTKRenderWidget* w = new QVTKRenderWidget(parent); |
| 166 | + vtkNew<vtkGenericOpenGLRenderWindow> renWin; |
| 167 | + w->setRenderWindow(renWin); |
| 168 | + return w; |
| 169 | +} |
| 170 | + |
| 171 | +QtTransferFunctionWidget* QtRenderResourcesContext::create_qt_transfer_function_widget( |
159 | 172 | QWidget* parent, Core::TransferFunctionHandle tf ) |
160 | 173 | { |
161 | 174 | return new QtTransferFunctionWidget( this->private_->format_, parent, |
@@ -183,10 +196,10 @@ Core::RenderContextHandle QtRenderResourcesContext::get_current_context() |
183 | 196 | { |
184 | 197 | // NOTE: We don't want to delete the context after the handle goes out of scope, |
185 | 198 | // so we pass a NOP deleter to shared_ptr |
186 | | - return Core::RenderContextHandle( new QtRenderContext( QGLContextHandle( |
| 199 | + return Core::RenderContextHandle( new QtRenderContext( QGLContextHandle( |
187 | 200 | const_cast< QGLContext* >( current_context ), SharedPtrNopDeleter() ) ) ); |
188 | 201 | } |
189 | | - |
| 202 | + |
190 | 203 | return Core::RenderContextHandle(); |
191 | 204 | } |
192 | 205 |
|
|
0 commit comments