diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt index b4a949e20e..7c4b4fef20 100644 --- a/Modules/CMakeLists.txt +++ b/Modules/CMakeLists.txt @@ -1,66 +1,66 @@ set(LIBPOSTFIX "Ext") # Modules must be listed according to their dependencies set(module_dirs SceneSerializationBase PlanarFigure ImageExtraction ImageStatistics LegacyAdaptors IpPicSupport MitkExt SceneSerialization GraphAlgorithms ContourModel SurfaceInterpolation Segmentation PlanarFigureSegmentation - OpenView + OpenViewCore QmlMitk Qmitk QmitkExt SegmentationUI DiffusionImaging GPGPU IGT CameraCalibration IGTUI RigidRegistration RigidRegistrationUI DeformableRegistration DeformableRegistrationUI OpenCL OpenCVVideoSupport Overlays InputDevices ToFHardware ToFProcessing ToFUI US ClippingTools USUI DicomUI Simulation Remeshing Python ) set(MITK_DEFAULT_SUBPROJECTS MITK-Modules) foreach(module_dir ${module_dirs}) add_subdirectory(${module_dir}) endforeach() if(MITK_PRIVATE_MODULES) file(GLOB all_subdirs RELATIVE ${MITK_PRIVATE_MODULES} ${MITK_PRIVATE_MODULES}/*) foreach(subdir ${all_subdirs}) string(FIND ${subdir} "." _result) if(_result EQUAL -1) if(EXISTS ${MITK_PRIVATE_MODULES}/${subdir}/CMakeLists.txt) message(STATUS "Found private module ${subdir}") add_subdirectory(${MITK_PRIVATE_MODULES}/${subdir} private_modules/${subdir}) endif() endif() endforeach() endif(MITK_PRIVATE_MODULES) diff --git a/Modules/OpenView/CMakeLists.txt b/Modules/OpenViewCore/CMakeLists.txt similarity index 74% rename from Modules/OpenView/CMakeLists.txt rename to Modules/OpenViewCore/CMakeLists.txt index 07e359a20c..efa8afa031 100644 --- a/Modules/OpenView/CMakeLists.txt +++ b/Modules/OpenViewCore/CMakeLists.txt @@ -1,6 +1,6 @@ -MITK_CREATE_MODULE(OpenView +MITK_CREATE_MODULE(OpenViewCore PACKAGE_DEPENDS VTK OpenGL EXPORT_DEFINE OVCORE_EXPORT QT_MODULES Qt5Core Qt5Quick ) diff --git a/Modules/OpenViewCore/LICENSE b/Modules/OpenViewCore/LICENSE new file mode 100644 index 0000000000..d984dbbb61 --- /dev/null +++ b/Modules/OpenViewCore/LICENSE @@ -0,0 +1,34 @@ +Copyright (c) 2012 Kitware Inc. + +Kitware Inc. +28 Corporate Drive +Clifton Park, NY 12065 +USA + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the + distribution. + + * Neither the name of Kitware nor the names of any contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR +CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Modules/OpenView/QVTKInteractor.cxx b/Modules/OpenViewCore/QVTKInteractor.cxx similarity index 100% rename from Modules/OpenView/QVTKInteractor.cxx rename to Modules/OpenViewCore/QVTKInteractor.cxx diff --git a/Modules/OpenView/QVTKInteractor.h b/Modules/OpenViewCore/QVTKInteractor.h similarity index 99% rename from Modules/OpenView/QVTKInteractor.h rename to Modules/OpenViewCore/QVTKInteractor.h index 9a5b52c440..5bc6baca41 100644 --- a/Modules/OpenView/QVTKInteractor.h +++ b/Modules/OpenViewCore/QVTKInteractor.h @@ -1,140 +1,140 @@ /*========================================================================= Program: Visualization Toolkit Module: QVTKInteractor.h Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen All rights reserved. See Copyright.txt or http://www.kitware.com/Copyright.htm for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notice for more information. =========================================================================*/ /*========================================================================= Copyright 2004 Sandia Corporation. Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive license for use of this work by or on behalf of the U.S. Government. Redistribution and use in source and binary forms, with or without modification, are permitted provided that this Notice and any statement of authorship are reproduced on all copies. =========================================================================*/ /*======================================================================== For general information about using VTK and Qt, see: http://www.trolltech.com/products/3rdparty/vtksupport.html =========================================================================*/ // .NAME QVTKInteractor - Handle Qt events. // .SECTION Description // QVTKInteractor handles relaying Qt events to VTK. #ifndef Q_VTK_INTERACTOR_H #define Q_VTK_INTERACTOR_H #include #include #include #include "vtkTDxConfigure.h" // defines VTK_USE_TDX #if defined(VTK_USE_TDX) && defined(Q_WS_WIN) class vtkTDxWinDevice; #endif #if defined(VTK_USE_TDX) && defined(Q_WS_MAC) class vtkTDxMacDevice; #endif #if defined(VTK_USE_TDX) && defined(Q_WS_X11) class vtkTDxDevice; class vtkTDxUnixDevice; #endif -#include "OpenViewExports.h" +#include "OpenViewCoreExports.h" class QVTKInteractorInternal; // .NAME QVTKInteractor - An interactor for the QVTKWidget. // .SECTION Description // QVTKInteractor is an interactor for a QVTKWiget. class OVCORE_EXPORT QVTKInteractor : public vtkRenderWindowInteractor { public: static QVTKInteractor* New(); vtkTypeMacro(QVTKInteractor,vtkRenderWindowInteractor); // Description: // Enum for additional event types supported. // These events can be picked up by command observers on the interactor enum vtkCustomEvents { ContextMenuEvent = vtkCommand::UserEvent + 100, DragEnterEvent, DragMoveEvent, DragLeaveEvent, DropEvent }; // Description: // Overloaded terminiate app, which does nothing in Qt. // Use qApp->exit() instead. virtual void TerminateApp(); // Description: // Overloaded start method does nothing. // Use qApp->exec() instead. virtual void Start(); virtual void Initialize(); // Description: // Start listening events on 3DConnexion device. virtual void StartListening(); // Description: // Stop listening events on 3DConnexion device. virtual void StopListening(); // timer event slot virtual void TimerEvent(int timerId); #if defined(VTK_USE_TDX) && defined(Q_WS_X11) virtual vtkTDxUnixDevice *GetDevice(); virtual void SetDevice(vtkTDxDevice *device); #endif protected: // constructor QVTKInteractor(); // destructor ~QVTKInteractor(); // create a Qt Timer virtual int InternalCreateTimer(int timerId, int timerType, unsigned long duration); // destroy a Qt Timer virtual int InternalDestroyTimer(int platformTimerId); #if defined(VTK_USE_TDX) && defined(Q_WS_WIN) vtkTDxWinDevice *Device; #endif #if defined(VTK_USE_TDX) && defined(Q_WS_MAC) vtkTDxMacDevice *Device; #endif #if defined(VTK_USE_TDX) && defined(Q_WS_X11) vtkTDxUnixDevice *Device; #endif private: QVTKInteractorInternal* Internal; // unimplemented copy QVTKInteractor(const QVTKInteractor&); // unimplemented operator= void operator=(const QVTKInteractor&); }; #endif diff --git a/Modules/OpenView/QVTKInteractorAdapter.cxx b/Modules/OpenViewCore/QVTKInteractorAdapter.cxx similarity index 100% rename from Modules/OpenView/QVTKInteractorAdapter.cxx rename to Modules/OpenViewCore/QVTKInteractorAdapter.cxx diff --git a/Modules/OpenView/QVTKInteractorAdapter.h b/Modules/OpenViewCore/QVTKInteractorAdapter.h similarity index 98% rename from Modules/OpenView/QVTKInteractorAdapter.h rename to Modules/OpenViewCore/QVTKInteractorAdapter.h index bed52745f4..0c0156f9a1 100644 --- a/Modules/OpenView/QVTKInteractorAdapter.h +++ b/Modules/OpenViewCore/QVTKInteractorAdapter.h @@ -1,68 +1,68 @@ /*========================================================================= Program: Visualization Toolkit Module: QVTKInteractorAdapter.h Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen All rights reserved. See Copyright.txt or http://www.kitware.com/Copyright.htm for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the above copyright notice for more information. =========================================================================*/ /*========================================================================= Copyright 2004 Sandia Corporation. Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive license for use of this work by or on behalf of the U.S. Government. Redistribution and use in source and binary forms, with or without modification, are permitted provided that this Notice and any statement of authorship are reproduced on all copies. =========================================================================*/ /*======================================================================== For general information about using VTK and Qt, see: http://www.trolltech.com/products/3rdparty/vtksupport.html =========================================================================*/ // .NAME QVTKInteractorAdapter - Handle Qt events. // .SECTION Description // QVTKInteractor handles relaying Qt events to VTK. #ifndef Q_VTK_INTERACTOR_ADAPTER_H #define Q_VTK_INTERACTOR_ADAPTER_H #include -#include "OpenViewExports.h" +#include "OpenViewCoreExports.h" class vtkRenderWindowInteractor; class QEvent; // .NAME QVTKInteractorAdapter - A QEvent translator. // .SECTION Description // QVTKInteractorAdapter translates QEvents and send them to a // vtkRenderWindowInteractor. class OVCORE_EXPORT QVTKInteractorAdapter : public QObject { Q_OBJECT public: // Description: // Constructor: takes QObject parent QVTKInteractorAdapter(QObject* parent); // Description: // Destructor ~QVTKInteractorAdapter(); // Description: // Process a QEvent and send it to the interactor // returns whether the event was recognized and processed bool ProcessEvent(QEvent* e, vtkRenderWindowInteractor* iren); }; #endif diff --git a/Modules/OpenView/QVTKInteractorInternal.h b/Modules/OpenViewCore/QVTKInteractorInternal.h similarity index 100% rename from Modules/OpenView/QVTKInteractorInternal.h rename to Modules/OpenViewCore/QVTKInteractorInternal.h diff --git a/Modules/OpenView/QVTKQuickItem.cxx b/Modules/OpenViewCore/QVTKQuickItem.cxx similarity index 100% rename from Modules/OpenView/QVTKQuickItem.cxx rename to Modules/OpenViewCore/QVTKQuickItem.cxx diff --git a/Modules/OpenView/QVTKQuickItem.h b/Modules/OpenViewCore/QVTKQuickItem.h similarity index 98% rename from Modules/OpenView/QVTKQuickItem.h rename to Modules/OpenViewCore/QVTKQuickItem.h index 925209fa50..f080b3d0db 100644 --- a/Modules/OpenView/QVTKQuickItem.h +++ b/Modules/OpenViewCore/QVTKQuickItem.h @@ -1,108 +1,108 @@ /*======================================================================== OpenView -- http://openview.kitware.com Copyright 2012 Kitware, Inc. Licensed under the BSD license. See LICENSE file for details. ========================================================================*/ #ifndef QVTKQuickItem_h #define QVTKQuickItem_h #include #include #include "vtkSmartPointer.h" #include "vtkNew.h" #include -#include "OpenViewExports.h" +#include "OpenViewCoreExports.h" class QOpenGLContext; class QOpenGLFramebufferObject; class QVTKInteractorAdapter; class QVTKInteractor; class vtkEventQtSlotConnect; class vtkGenericOpenGLRenderWindow; class vtkObject; class vtkContextView; class OVCORE_EXPORT QVTKQuickItem : public QQuickItem { Q_OBJECT public: QVTKQuickItem(QQuickItem* parent = 0); // Description: // destructor ~QVTKQuickItem(); void itemChange(ItemChange change, const ItemChangeData &); // Description: // set the render window to use with this item void SetRenderWindow(vtkGenericOpenGLRenderWindow* win); // Description: // get the render window used with this item vtkGenericOpenGLRenderWindow* GetRenderWindow() const; // Description: // get the render window interactor used with this item // this item enforces its own interactor QVTKInteractor* GetInteractor() const; public slots: virtual void paint(); protected slots: // slot to make this vtk render window current virtual void MakeCurrent(); // slot called when vtk render window starts to draw virtual void Start(); // slot called when vtk render window is done drawing virtual void End(); // slot called when vtk wants to know if the context is current virtual void IsCurrent(vtkObject* caller, unsigned long vtk_event, void* client_data, void* call_data); // slot called when vtk wants to know if a window is direct virtual void IsDirect(vtkObject* caller, unsigned long vtk_event, void* client_data, void* call_data); // slot called when vtk wants to know if a window supports OpenGL virtual void SupportsOpenGL(vtkObject* caller, unsigned long vtk_event, void* client_data, void* call_data); protected: virtual void init(); virtual void prepareForRender(); virtual void cleanupAfterRender(); // handle item key events virtual void keyPressEvent(QKeyEvent* e); virtual void keyReleaseEvent(QKeyEvent* e); // handle item mouse events virtual void mousePressEvent(QMouseEvent* e); virtual void mouseReleaseEvent(QMouseEvent* e); virtual void mouseDoubleClickEvent(QMouseEvent* e); virtual void mouseMoveEvent(QMouseEvent* e); virtual void geometryChanged(const QRectF & newGeometry, const QRectF & oldGeometry); virtual void wheelEvent(QWheelEvent* e); virtual void hoverEnterEvent(QHoverEvent* e); virtual void hoverLeaveEvent(QHoverEvent* e); virtual void hoverMoveEvent(QHoverEvent* e); virtual QSGNode* updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData* updatePaintNodeData); QMutex m_viewLock; private: QOpenGLContext* m_context; vtkSmartPointer m_win; vtkSmartPointer m_interactor; QVTKInteractorAdapter* m_interactorAdapter; vtkSmartPointer m_connect; bool m_InitCalledOnce; }; #endif diff --git a/Modules/OpenViewCore/README b/Modules/OpenViewCore/README new file mode 100644 index 0000000000..ff10a2aeb4 --- /dev/null +++ b/Modules/OpenViewCore/README @@ -0,0 +1,15 @@ +This code is a snapshot of the OpenView project at openview.kitware.org + +Code was + - originally taken from + https://github.com/Kitware/openview/tree/74fdaf2ac84b79d56a4ca6e370e55e7fe339a10b/core + - minor modifications were made to the QVTKQuickItem class in order to fix issues and integrate it easier with MITK + https://github.com/maleike/openview/tree/1296a52f4aa3227526bb467671aaacb54a6931fc/core + - a pull request has been filed to contribute code back + +In this MITK snapshot, only the "core" of Openview is built as an MITK module + + - the CMakeLists.txt has been replaced by a minimum MITK module definition + - some #include statements have been changed to + #include "OpenViewExports.h" + which is generated by the MITK module system diff --git a/Modules/OpenView/files.cmake b/Modules/OpenViewCore/files.cmake similarity index 100% rename from Modules/OpenView/files.cmake rename to Modules/OpenViewCore/files.cmake diff --git a/Modules/OpenView/original.CMakeLists.txt b/Modules/OpenViewCore/original.CMakeLists.txt similarity index 100% rename from Modules/OpenView/original.CMakeLists.txt rename to Modules/OpenViewCore/original.CMakeLists.txt diff --git a/Modules/OpenView/vtkEventQtSlotConnect.cxx b/Modules/OpenViewCore/vtkEventQtSlotConnect.cxx similarity index 100% rename from Modules/OpenView/vtkEventQtSlotConnect.cxx rename to Modules/OpenViewCore/vtkEventQtSlotConnect.cxx diff --git a/Modules/OpenView/vtkEventQtSlotConnect.h b/Modules/OpenViewCore/vtkEventQtSlotConnect.h similarity index 99% rename from Modules/OpenView/vtkEventQtSlotConnect.h rename to Modules/OpenViewCore/vtkEventQtSlotConnect.h index c76de435dc..f283964978 100644 --- a/Modules/OpenView/vtkEventQtSlotConnect.h +++ b/Modules/OpenViewCore/vtkEventQtSlotConnect.h @@ -1,103 +1,103 @@ /*========================================================================= Copyright 2004 Sandia Corporation. Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive license for use of this work by or on behalf of the U.S. Government. Redistribution and use in source and binary forms, with or without modification, are permitted provided that this Notice and any statement of authorship are reproduced on all copies. =========================================================================*/ /*======================================================================== For general information about using VTK and Qt, see: http://www.trolltech.com/products/3rdparty/vtksupport.html =========================================================================*/ /*======================================================================== !!! WARNING for those who want to contribute code to this file. !!! If you use a commercial edition of Qt, you can modify this code. !!! If you use an open source version of Qt, you are free to modify !!! and use this code within the guidelines of the GPL license. !!! Unfortunately, you cannot contribute the changes back into this !!! file. Doing so creates a conflict between the GPL and BSD-like VTK !!! license. =========================================================================*/ // .NAME vtkEventQtSlotConnect - Manage connections between VTK events and Qt slots. // .SECTION Description // vtkEventQtSlotConnect provides a way to manage connections between VTK events // and Qt slots. // Qt slots to connect with must have one of the following signatures: // - MySlot() // - MySlot(vtkObject* caller) // - MySlot(vtkObject* caller, unsigned long vtk_event) // - MySlot(vtkObject* caller, unsigned long vtk_event, void* client_data) // - MySlot(vtkObject* caller, unsigned long vtk_event, void* client_data, void* call_data) // - MySlot(vtkObject* caller, unsigned long vtk_event, void* client_data, void* call_data, vtkCommand*) #ifndef VTK_EVENT_QT_SLOT_CONNECT #define VTK_EVENT_QT_SLOT_CONNECT #include "vtkObject.h" #include "vtkCommand.h" // for event defines #include // for version info -#include "OpenViewExports.h" +#include "OpenViewCoreExports.h" class QObject; class vtkQtConnections; class vtkQtConnection; // manage connections between VTK object events and Qt slots class OVCORE_EXPORT vtkEventQtSlotConnect : public vtkObject { public: static vtkEventQtSlotConnect* New(); vtkTypeMacro(vtkEventQtSlotConnect, vtkObject) // Description: // Print the current connections between VTK and Qt void PrintSelf(ostream& os, vtkIndent indent); // Description: // Connect a vtk object's event with a Qt object's slot. Multiple // connections which are identical are treated as separate connections. virtual void Connect(vtkObject* vtk_obj, unsigned long event, const QObject* qt_obj, const char* slot, void* client_data=NULL, float priority=0.0 ,Qt::ConnectionType type = Qt::AutoConnection); // Description: // Disconnect a vtk object from a qt object. // Passing no arguments will disconnect all slots maintained by this object. // Passing in only a vtk object will disconnect all slots from it. // Passing only a vtk object and event, will disconnect all slots matching // the vtk object and event. // Passing all information in will match all information. virtual void Disconnect( vtkObject* vtk_obj=NULL, unsigned long event=vtkCommand::NoEvent, const QObject* qt_obj=NULL, const char* slot = 0, void* client_data=NULL); // Description: // Allow to query vtkEventQtSlotConnect to know if some Connect() have been // setup and how many. virtual int GetNumberOfConnections() const; protected: vtkQtConnections* Connections; friend class vtkQtConnection; void RemoveConnection(vtkQtConnection*); vtkEventQtSlotConnect(); ~vtkEventQtSlotConnect(); private: // unimplemented vtkEventQtSlotConnect(const vtkEventQtSlotConnect&); void operator=(const vtkEventQtSlotConnect&); }; #endif diff --git a/Modules/OpenView/vtkQtConnection.cxx b/Modules/OpenViewCore/vtkQtConnection.cxx similarity index 100% rename from Modules/OpenView/vtkQtConnection.cxx rename to Modules/OpenViewCore/vtkQtConnection.cxx diff --git a/Modules/OpenView/vtkQtConnection.h b/Modules/OpenViewCore/vtkQtConnection.h similarity index 99% rename from Modules/OpenView/vtkQtConnection.h rename to Modules/OpenViewCore/vtkQtConnection.h index f9a90fa005..3b72568878 100644 --- a/Modules/OpenView/vtkQtConnection.h +++ b/Modules/OpenViewCore/vtkQtConnection.h @@ -1,104 +1,104 @@ /*========================================================================= Copyright 2004 Sandia Corporation. Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive license for use of this work by or on behalf of the U.S. Government. Redistribution and use in source and binary forms, with or without modification, are permitted provided that this Notice and any statement of authorship are reproduced on all copies. =========================================================================*/ /*======================================================================== For general information about using VTK and Qt, see: http://www.trolltech.com/products/3rdparty/vtksupport.html =========================================================================*/ /*======================================================================== !!! WARNING for those who want to contribute code to this file. !!! If you use a commercial edition of Qt, you can modify this code. !!! If you use an open source version of Qt, you are free to modify !!! and use this code within the guidelines of the GPL license. !!! Unfortunately, you cannot contribute the changes back into this !!! file. Doing so creates a conflict between the GPL and BSD-like VTK !!! license. =========================================================================*/ // .SECTION Description // vtkQtConnection is an internal class. #ifndef VTK_QT_CONNECTION #define VTK_QT_CONNECTION #include "vtkObject.h" #include "vtkCommand.h" // for event defines #include "qobject.h" -#include "OpenViewExports.h" +#include "OpenViewCoreExports.h" class QObject; class vtkCallbackCommand; class vtkEventQtSlotConnect; // class for managing a single VTK/Qt connection // not to be included in other projects // only here for moc to process for vtkEventQtSlotConnect class OVCORE_EXPORT vtkQtConnection : public QObject { Q_OBJECT public: // constructor vtkQtConnection(vtkEventQtSlotConnect* owner); // destructor, disconnect if necessary ~vtkQtConnection(); // print function void PrintSelf(ostream& os, vtkIndent indent); // callback from VTK to emit signal void Execute(vtkObject* caller, unsigned long event, void* client_data); // set the connection void SetConnection(vtkObject* vtk_obj, unsigned long event, const QObject* qt_obj, const char* slot, void* client_data, float priority=0.0 ,Qt::ConnectionType type = Qt::AutoConnection); // check if a connection matches input parameters bool IsConnection(vtkObject* vtk_obj, unsigned long event, const QObject* qt_obj, const char* slot, void* client_data); static void DoCallback(vtkObject* vtk_obj, unsigned long event, void* client_data, void* call_data); signals: // the qt signal for moc to take care of void EmitExecute(vtkObject*, unsigned long, void* client_data, void* call_data, vtkCommand*); protected slots: void deleteConnection(); protected: // the connection information vtkObject* VTKObject; vtkCallbackCommand* Callback; const QObject* QtObject; void* ClientData; unsigned long VTKEvent; QString QtSlot; vtkEventQtSlotConnect* Owner; private: vtkQtConnection(const vtkQtConnection&); void operator=(const vtkQtConnection&); }; #endif diff --git a/Modules/QmlMitk/CMakeLists.txt b/Modules/QmlMitk/CMakeLists.txt index 30a861a524..f0cc76b17a 100644 --- a/Modules/QmlMitk/CMakeLists.txt +++ b/Modules/QmlMitk/CMakeLists.txt @@ -1,5 +1,5 @@ MITK_CREATE_MODULE(QmlMitk INCLUDE_DIRS InteractionLegacy - DEPENDS Mitk OpenView + DEPENDS Mitk OpenViewCore QT_MODULES Qt5Quick )