Skip to content
Snippets Groups Projects
Commit b04c08f1 authored by Andrew Maclean's avatar Andrew Maclean
Browse files

Completing transition to QVTKOpenGLNativeWidget

Former-commit-id: dfc1c576
parent c2072856
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>SimpleView</string>
<string>BorderWidgetQt</string>
</property>
<property name="windowIcon">
<iconset resource="Icons/icons.qrc">
......@@ -87,9 +87,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QVTKOpenGLWidget</class>
<class>QVTKOpenGLNativeWidget</class>
<extends>QWidget</extends>
<header>QVTKOpenGLWidget.h</header>
<header>QVTKOpenGLNativeWidget.h</header>
</customwidget>
</customwidgets>
<resources>
......
......@@ -16,7 +16,7 @@
<widget class="QWidget" name="centralwidget">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QVTKOpenGLWidget" name="qvtkWidget">
<widget class="QVTKOpenGLNativeWidget" name="qvtkWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
......@@ -58,9 +58,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QVTKOpenGLWidget</class>
<class>QVTKOpenGLNativeWidget</class>
<extends>QWidget</extends>
<header>QVTKOpenGLWidget.h</header>
<header>QVTKOpenGLNativeWidget.h</header>
</customwidget>
</customwidgets>
<resources/>
......
......@@ -5,7 +5,7 @@
int main(int argc, char** argv)
{
// needed to ensure appropriate OpenGL context is created for VTK rendering.
QSurfaceFormat::setDefaultFormat(QVTKOpenGLWidget::defaultFormat());
QSurfaceFormat::setDefaultFormat(QVTKOpenGLNativeWidget::defaultFormat());
QApplication app(argc, argv);
......
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>RenderWindowUIMultipleInheritance</class>
<widget class="QMainWindow" name="SimpleView">
<widget class="QMainWindow" name="RenderWindowUIMultipleInheritance">
<property name="geometry">
<rect>
<x>0</x>
......@@ -14,7 +14,7 @@
<string>RenderWindowUIMultipleInheritance</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QVTKOpenGLWidget" name="qvtkWidget">
<widget class="QVTKOpenGLNativeWidget" name="qvtkWidget">
<property name="geometry">
<rect>
<x>10</x>
......@@ -56,9 +56,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QVTKOpenGLWidget</class>
<class>QVTKOpenGLNativeWidget</class>
<extends>QWidget</extends>
<header>QVTKOpenGLWidget.h</header>
<header>QVTKOpenGLNativeWidget.h</header>
</customwidget>
</customwidgets>
<resources>
......
### Description
Using a QVTKOpenGLWidget with the Qt Multiple Inheritance model. In contrast to the single inheritance example the main widget is here derived from QMainWindow as well as the class defining the form (Ui::RenderWindowUIMultipleInheritance).
Using a QVTKOpenGLNativeWidget with the Qt Multiple Inheritance model. In contrast to the single inheritance example the main widget is here derived from QMainWindow as well as the class defining the form (Ui::RenderWindowUIMultipleInheritance).
......@@ -14,7 +14,7 @@
<string>RenderWindowUISingleInheritance</string>
</property>
<widget class="QWidget" name="centralwidget">
<widget class="QVTKOpenGLWidget" name="qvtkWidget">
<widget class="QVTKOpenGLNativeWidget" name="qvtkWidget">
<property name="geometry">
<rect>
<x>10</x>
......@@ -56,9 +56,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QVTKOpenGLWidget</class>
<class>QVTKOpenGLNativeWidget</class>
<extends>QWidget</extends>
<header>QVTKOpenGLWidget.h</header>
<header>QVTKOpenGLNativeWidget.h</header>
</customwidget>
</customwidgets>
<resources>
......
#include <QApplication>
#include <QSurfaceFormat>
#include <QVTKOpenGLWidget.h>
#include <QVTKOpenGLNativeWidget.h>
#include "RenderWindowUISingleInheritance.h"
int main( int argc, char** argv )
{
// needed to ensure appropriate OpenGL context is created for VTK rendering.
QSurfaceFormat::setDefaultFormat(QVTKOpenGLWidget::defaultFormat());
QSurfaceFormat::setDefaultFormat(QVTKOpenGLNativeWidget::defaultFormat());
// QT Stuff
QApplication app( argc, argv );
......
### Description
Using a QVTKOpenGLWidget with the Qt Single Inheritance model
Using a QVTKOpenGLNativeWidget with the Qt Single Inheritance model
......@@ -97,9 +97,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QVTKOpenGLWidget</class>
<class>QVTKOpenGLNativeWidget</class>
<extends>QWidget</extends>
<header>QVTKOpenGLWidget.h</header>
<header>QVTKOpenGLNativeWidget.h</header>
</customwidget>
</customwidgets>
<resources>
......
......@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>SimpleView</string>
<string>SideBySideRenderWindowsQt</string>
</property>
<property name="windowIcon">
<iconset resource="Icons/icons.qrc">
......@@ -97,9 +97,9 @@
</widget>
<customwidgets>
<customwidget>
<class>QVTKOpenGLWidget</class>
<class>QVTKOpenGLNativeWidget</class>
<extends>QWidget</extends>
<header>QVTKOpenGLWidget.h</header>
<header>QVTKOpenGLNativeWidget.h</header>
</customwidget>
</customwidgets>
<resources>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment