diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 957751fe99..e14eb0f581 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -1,53 +1,52 @@ set(MITK_DEFAULT_SUBPROJECTS MITK-Examples) #----------------------------------------------------------------------------- # Set-up example plugins #----------------------------------------------------------------------------- if(MITK_USE_BLUEBERRY) # Specify which plug-ins belong to this project macro(GetMyTargetLibraries all_target_libraries varname) set(re_ctkplugin_mitk "^org_mitk_example_[a-zA-Z0-9_]+$") set(_tmp_list) list(APPEND _tmp_list ${all_target_libraries}) ctkMacroListFilter(_tmp_list re_ctkplugin_mitk OUTPUT_VARIABLE ${varname}) endmacro() set(MITK_EXAMPLE_PLUGIN_TARGETS ) foreach(mitk_example_plugin ${MITK_EXAMPLE_PLUGINS}) ctkFunctionExtractOptionNameAndValue(${mitk_example_plugin} plugin_name plugin_value) string(REPLACE "." "_" _plugin_target ${plugin_name}) list(APPEND MITK_EXAMPLE_PLUGIN_TARGETS ${_plugin_target}) mark_as_advanced(${${_plugin_target}_option_name}) endforeach() endif() #----------------------------------------------------------------------------- # Add example executables #----------------------------------------------------------------------------- set(MITK_DIR ${PROJECT_BINARY_DIR}) set(MITK_EXPORTS_FILE_INCLUDED 1) set(_example_dirs Dump MbiLog QtFreeRender Tutorial FirstSteps - QuickRender Annotation ) if(MITK_USE_BLUEBERRY) list(APPEND _example_dirs BlueBerryExampleLauncher ) endif() foreach(_example_dir ${_example_dirs}) add_subdirectory(${_example_dir}) endforeach() diff --git a/Examples/QuickRender/CMakeLists.txt b/Examples/QuickRender/CMakeLists.txt deleted file mode 100644 index 1b2d0a0699..0000000000 --- a/Examples/QuickRender/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -project(QuickRender) - -set(PROJECT_NAME QuickRender) -set(APP_NAME MitkQuickRender) - -# Plug-ins listed below will not be -# - added as a build-time dependency to the executable -# - listed in the provisioning file for the executable -# - installed if they are external plug-ins - -set(_exclude_plugins - org.mitk.diffusionimaging - org.mitk.simulation - org.mitk.gui.qt.cmdlinemodules - org.mitk.gui.qt.diffusionimagingapp - org.mitk.gui.qt.datamanager - org.mitk.gui.qt.datamanagerlight - org.mitk.gui.qt.properties - org.mitk.gui.qt.basicimageprocessing - org.mitk.gui.qt.dicom - org.mitk.gui.qt.diffusionimaging - org.mitk.gui.qt.dosevisualization - org.mitk.gui.qt.geometrytools - org.mitk.gui.qt.igtexamples - org.mitk.gui.qt.igttracking - org.mitk.gui.qt.igtlplugin - org.mitk.gui.qt.imagecropper - org.mitk.gui.qt.imagenavigator - org.mitk.gui.qt.viewnavigator - org.mitk.gui.qt.materialeditor - org.mitk.gui.qt.measurementtoolbox - org.mitk.gui.qt.moviemaker - org.mitk.gui.qt.pointsetinteraction - org.mitk.gui.qt.pointsetinteractionmultispectrum - org.mitk.gui.qt.python - org.mitk.gui.qt.registration - org.mitk.gui.qt.remeshing - org.mitk.gui.qt.segmentation - org.mitk.gui.qt.simulation - org.mitk.gui.qt.aicpregistration - org.mitk.gui.qt.toftutorial - org.mitk.gui.qt.tofutil - org.mitk.gui.qt.tubegraph - org.mitk.gui.qt.ugvisualization - org.mitk.gui.qt.ultrasound - org.mitk.gui.qt.volumevisualization - org.mitk.gui.qt.eventrecorder - org.mitk.gui.qt.xnat - org.mitk.gui.qt.spectrocamrecorder - org.mitk.gui.qt.classificationsegmentation -) - -mitkFunctionCreateBlueBerryApplication( - NAME ${APP_NAME} - DESCRIPTION "MITK - ${APP_NAME} Application" - EXCLUDE_PLUGINS ${_exclude_plugins} - NO_INSTALL -) - -mitk_use_modules(TARGET ${APP_NAME} - MODULES MitkAppUtil MitkQmlItems - PACKAGES Qt5|Core+Quick -) diff --git a/Examples/QuickRender/MitkQuickRender.cpp b/Examples/QuickRender/MitkQuickRender.cpp deleted file mode 100644 index b8e934ad9c..0000000000 --- a/Examples/QuickRender/MitkQuickRender.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/*=================================================================== - -The Medical Imaging Interaction Toolkit (MITK) - -Copyright (c) German Cancer Research Center, -Division of Medical and Biological Informatics. -All rights reserved. - -This software is distributed WITHOUT ANY WARRANTY; without -even the implied warranty of MERCHANTABILITY or FITNESS FOR -A PARTICULAR PURPOSE. - -See LICENSE.txt or http://www.mitk.org for details. - -===================================================================*/ - -#include -#include -#include -#include - -int main(int argc, char **argv) -{ - mitk::BaseApplication myApp(argc, argv); - myApp.setApplicationName("MITK QuickRender"); - myApp.setOrganizationName("DKFZ"); - - QStringList preloadLibs; - preloadLibs << "liborg_mitk_example_gui_qmlapplication"; - myApp.setPreloadLibraries(preloadLibs); - myApp.setProperty(mitk::BaseApplication::PROP_APPLICATION, "org.mitk.example.gui.qmlapplication"); - - QByteArray on("1"); - - qputenv("QML_BAD_GUI_RENDER_LOOP", on); - - return myApp.run(); -} diff --git a/Examples/QuickRender/MitkQuickRender.ini b/Examples/QuickRender/MitkQuickRender.ini deleted file mode 100644 index b73d1ab9b2..0000000000 --- a/Examples/QuickRender/MitkQuickRender.ini +++ /dev/null @@ -1,4 +0,0 @@ -BlueBerry.home=@BLUEBERRY_BINARY_DIR@ -BlueBerry.plugin_dirs=@MITK_MODULES_PLUGIN_OUTPUT_DIRS@ -BlueBerry.provisioning=@MITK_EXTAPP_PROVISIONING_FILE@ -BlueBerry.qtplugin_path=@BLUEBERRY_QTPLUGIN_PATH@ diff --git a/Examples/QuickRender/README.md b/Examples/QuickRender/README.md deleted file mode 100644 index 194010ce0b..0000000000 --- a/Examples/QuickRender/README.md +++ /dev/null @@ -1,51 +0,0 @@ -MITK Rendering with QML prototype -================================================= - -Summary ------------------- - -This mini-application "QuickRender" demonstrates how to build a Qt5 QML based -application that integrates MITK render windows. - -The `QuickRender` application is located in `Examples/QuickRender. -The following plugins are showcased in a QtQuick environment: - - DataManager - - Level/Window - - Transfer Function - - Image Navigator - -Interaction: - - mouse clicks place the cross-hair - - mouse scroll wheel moves to neighboring slice - - holding the right mouse button and moving up/down changes the zoom level - - holding the middle mouse button and mosing pans the scene (only when zoomed in) - - ![Screenshot](Screenshot.png=640x) - -Code Changes ------------------- - -- added class `QmlMitkStdMultiItem`, which replaces the `QmlMitkFourRenderWindowWidget` - - different approach to register QmlMitkRenderWindowItems - - resembles more the QmitkStdMultiWidget (e.g. storing planes...) - - added the respective qml file: MitkStdMultiItem.qml -- update class `QmlMitkRenderWindowItem`: - - removed interaction legacy - - updated interactions -- `QVTKQuickItem` now uses framebuffer objects to render external OpenGL context - -Build Instructions ------------------- - - - - install Qt 5.6 or 5.7.1 - - build MITK superbuild with - - `MITK_BUILD_EXAMPLES` variable switched to `ON` - - `MITK_USE_Qt5` switched to `ON` - - `MITK_USE_CTK` switched to `ON` - - `MITK_USE_BLUEBERRY` switched to `ON` - -Open Issues ------------------- - - - threading issue, since QtQuick's scene graph rendering will happen on a dedicated render thread - - cleaner, fuller interfaces for the two new widgets diff --git a/Examples/QuickRender/Screenshot.png b/Examples/QuickRender/Screenshot.png deleted file mode 100644 index 7b65b1596d..0000000000 Binary files a/Examples/QuickRender/Screenshot.png and /dev/null differ diff --git a/Examples/QuickRender/icons/icon.icns b/Examples/QuickRender/icons/icon.icns deleted file mode 100644 index 5afc942282..0000000000 Binary files a/Examples/QuickRender/icons/icon.icns and /dev/null differ diff --git a/Examples/QuickRender/icons/icon.ico b/Examples/QuickRender/icons/icon.ico deleted file mode 100644 index 27d4c9d1b9..0000000000 Binary files a/Examples/QuickRender/icons/icon.ico and /dev/null differ diff --git a/Examples/QuickRender/icons/icon.png b/Examples/QuickRender/icons/icon.png deleted file mode 100644 index 857e61aef3..0000000000 Binary files a/Examples/QuickRender/icons/icon.png and /dev/null differ diff --git a/Examples/QuickRender/icons/mitkWorkbench.rc b/Examples/QuickRender/icons/mitkWorkbench.rc deleted file mode 100644 index bb10963fb3..0000000000 --- a/Examples/QuickRender/icons/mitkWorkbench.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "icon.ico" \ No newline at end of file diff --git a/Examples/QuickRender/startMitkQuickRender.bat.in b/Examples/QuickRender/startMitkQuickRender.bat.in deleted file mode 100644 index d99fd1615f..0000000000 --- a/Examples/QuickRender/startMitkQuickRender.bat.in +++ /dev/null @@ -1,2 +0,0 @@ -PATH=@MITK_RUNTIME_PATH@;%PATH% -@VS_BUILD_TYPE@\MitkQuickRender.exe diff --git a/Examples/QuickRender/target_libraries.cmake b/Examples/QuickRender/target_libraries.cmake deleted file mode 100644 index b46eb8d577..0000000000 --- a/Examples/QuickRender/target_libraries.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# A list of plug-in targets which should be automatically enabled -# (or be available in external projects) for this application. - -set(target_libraries - org_mitk_gui_qml_extapplication -)