Commit 949f1397 authored by KLOCZKO Thibaud's avatar KLOCZKO Thibaud

Seems to work.

Needs to be tested a lot.
parent 3fce2560
......@@ -85,7 +85,7 @@ include(GenerateExportHeader)
find_package(VTK REQUIRED)
include(${VTK_USE_FILE})
find_package(Qt5 COMPONENTS Core Widgets OpenGL Xml Multimedia MultimediaWidgets WebSockets REQUIRED)
find_package(Qt5 COMPONENTS Core Widgets Gui Xml Multimedia MultimediaWidgets REQUIRED)
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
......@@ -108,8 +108,8 @@ endif(WIN32)
## ###################################################################
add_subdirectory(src)
#add_subdirectory(app)
#add_subdirectory(exp)
add_subdirectory(app)
add_subdirectory(exp)
## ###################################################################
## Export configuration
......
......@@ -46,11 +46,12 @@ add_executable(${PROJECT_NAME} MACOSX_BUNDLE
${${PROJECT_NAME}_SOURCES}
${${PROJECT_NAME}_HEADERS})
target_link_libraries(${PROJECT_NAME} Qt5::Core)
target_link_libraries(${PROJECT_NAME} Qt5::Widgets)
#target_link_libraries(${PROJECT_NAME} Qt5::Core)
target_link_libraries(${PROJECT_NAME} Qt5::Gui)
target_link_libraries(${PROJECT_NAME} dtkLog)
target_link_libraries(${PROJECT_NAME} dtkFonts)
target_link_libraries(${PROJECT_NAME} dtkCore)
target_link_libraries(${PROJECT_NAME} dtkCoreRuntime)
target_link_libraries(${PROJECT_NAME} dtkThemes)
target_link_libraries(${PROJECT_NAME} dtkVisualization)
target_link_libraries(${PROJECT_NAME} dtkWidgets)
......
......@@ -17,7 +17,9 @@
#include <dtkCore>
#include <dtkVisualization/dtkVisualization>
#include <dtkWidgets>
#include <dtkVisualization>
#include <dtkVisualizationWidgets/dtkVisualizationWidgetsClutEditor>
......@@ -30,18 +32,16 @@
class dtkVisualizationViewerPrivate
{
public:
dtkVisualizationViewerStack *stack = nullptr;
dtkVisualizationViewerStack *stack = nullptr;
};
// ///////////////////////////////////////////////////////////////////
// dtkVisualizationViewer
// ///////////////////////////////////////////////////////////////////
dtkVisualizationViewer::dtkVisualizationViewer(QWidget *parent) : dtkWidgetsMainWindow(parent)
dtkVisualizationViewer::dtkVisualizationViewer(QWidget *parent) : dtkWidgetsMainWindow(parent), d(new dtkVisualizationViewerPrivate)
{
d = new dtkVisualizationViewerPrivate;
QMetaType::registerConverter<vtkUnstructuredGrid *, vtkDataSet *>();
dtk::visualization::initialize();
QWidget *widget = new QWidget(this);
......
......@@ -14,14 +14,14 @@
#pragma once
#include <dtkWidgets>
#include <dtkWidgets/dtkWidgetsMainWindow>
class dtkVisualizationViewer : public dtkWidgetsMainWindow
{
Q_OBJECT
public:
dtkVisualizationViewer(QWidget *parent = Q_NULLPTR);
dtkVisualizationViewer(QWidget *parent = nullptr);
~dtkVisualizationViewer(void);
#if defined(Q_OS_MAC)
......
......@@ -23,10 +23,8 @@ public:
dtkWidgetsLayout *layout;
};
dtkVisualizationViewerStack::dtkVisualizationViewerStack(QWidget *parent) : QStackedWidget(parent)
dtkVisualizationViewerStack::dtkVisualizationViewerStack(QWidget *parent) : QStackedWidget(parent), d(new dtkVisualizationViewerStackPrivate)
{
d = new dtkVisualizationViewerStackPrivate;
d->layout = new dtkWidgetsLayout(this);
d->layout->setCreator(create);
......
......@@ -14,7 +14,7 @@
#pragma once
#include <QtWidgets>
#include <QtWidgets/QStackedWidget>
class dtkWidgetsLayout;
class dtkWidgetsWidget;
......@@ -24,7 +24,7 @@ class dtkVisualizationViewerStack : public QStackedWidget
Q_OBJECT
public:
dtkVisualizationViewerStack(QWidget *parent = Q_NULLPTR);
dtkVisualizationViewerStack(QWidget *parent = nullptr);
~dtkVisualizationViewerStack(void);
public:
......
......@@ -12,13 +12,15 @@
// Code:
#include <QtCore>
#include <QtGui>
#include <QtWidgets>
#include <QVTKOpenGLWidget.h>
#include <dtkFonts>
#include <dtkCore>
#include <dtkCoreRuntime>
#include <dtkThemes/dtkThemesEngine>
#include <dtkWidgets>
#include "dtkVisualizationViewer.h"
......
......@@ -167,6 +167,10 @@ dtkVisualizationWidgetsVideoControls::dtkVisualizationWidgetsVideoControls(QWidg
this->setLayout(vlayout);
}
dtkVisualizationWidgetsVideoControls::~dtkVisualizationWidgetsVideoControls(void)
{
delete d;
}
void dtkVisualizationWidgetsVideoControls::reset(void)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment