Merge branch 'campvis-nx' into 'campvis-nx'

Campvis nx

See merge request !7

.editorconfig

+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Windows-style newlines with a newline ending every file
+[*]
+end_of_line = crlf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4

.gitignore

 # Files generated by CMake
 CMakeCache.txt
+CMakeLists.txt.user
 CMakeFiles
 cmake_install.cmake
 Makefile
 /core/gen_converterregistration.h
 /modules/gen_pipelineregistration.h
+FailedShader.vert
+FailedShader.geom
+FailedShader.frag
+FailedShader.comp
 
 # Files generated by Qt's moc and uic
 moc_*.cxx
@@ -48,3 +53,12 @@ ext/tbb
 
 # SWIG wrapper code
 *LUA_wrap.cxx
+
+# CMake build folders and IDE folders
+build*/
+.vs/
+.vscode/
+
+# Mac specific
+.DS_Store
+

CMakeLists.txt

 # = CAMPVis - Yet another medical visualization framework =====================
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2 FATAL_ERROR)
+cmake_policy(SET CMP0020 NEW)
+
 PROJECT(CAMPVis)
-CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)
 
 SET(CAMPVIS_VERSION 1.0.0)
 
 # = Global Build Options ======================================================
 OPTION(BUILD_SHARED_LIBS            "Build shared libraries (strongly recommended!)"                ON)
 OPTION(CAMPVIS_DEBUG                "Activate debug code?"                                          ON)
+OPTION(CAMPVIS_BUILD_LIB_CGT        "Build CGT Library"                                             ON)
 OPTION(CAMPVIS_BUILD_APPLICATION    "Build CAMPVis Application"                                     ON)
 OPTION(CAMPVIS_BUILD_MODULES        "Build CAMPVis Modules"                                         ON)
 OPTION(CAMPVIS_ENABLE_SCRIPTING     "Add support for scripting CAMPVis using Lua"                   OFF)
@@ -27,6 +30,10 @@ ENDIF()
 SET(CAMPVIS_DEFAULT_ENABLED_MODULES "STABLE_NO_DEPENDENCIES" CACHE STRING "Default CAMPVis modules to activate")
 SET_PROPERTY(CACHE CAMPVIS_DEFAULT_ENABLED_MODULES PROPERTY STRINGS "NONE" "STABLE_NO_DEPENDENCIES" "STABLE_WITH_EXTERNAL_DEPENDENCIES" "TESTING" "ALL")
 
+IF(NOT BUILD_SHARED_LIBS)
+    MESSAGE(WARNING "Building shared libraries is turned off. Thus, CAMPVis will most probably not work as intended!\nPlease turn BUILD_SHARED_LIBS on unless you know what you're doing!")
+ENDIF(NOT BUILD_SHARED_LIBS)
+
 # propagate CAMPVIS_ENABLE_SCRIPTING to CAMPVIS_BUILD_LIB_LUA to support deprecated code
 IF (CAMPVIS_ENABLE_SCRIPTING)
     SET(CAMPVIS_BUILD_LIB_LUA ON)
@@ -68,7 +75,7 @@ ENDIF()
 
 # build campvis-test when enabled
 IF(CAMPVIS_ENABLE_TESTING)
-    ADD_SUBDIRECTORY(ext/gtest-1.7.0)
+    ADD_SUBDIRECTORY(ext/googletest-release-1.8.0)
     ADD_SUBDIRECTORY(test)
 ENDIF()
 
@@ -105,15 +112,9 @@ EXPORT(PACKAGE CAMPVis)
 
 # = Copy Windows DLLs to binary dir for improved development experience =======
 IF(WIN32)
-    # gather Qt4 DLLs - TODO: remove redundant naming of required components 
-    FIND_PACKAGE(Qt4DLLs COMPONENTS QtCore QtGui QtOpenGL QtNetwork QtXmlPatterns)
-    LIST(APPEND CampvisExternalDllsDebug ${QT_DEBUG_DLLS})
-    LIST(APPEND CampvisExternalDllsRelease ${QT_RELEASE_DLLS})
-
+    IF(CAMPVIS_COPY_EXTERNAL_DLLS)
         LIST(REMOVE_DUPLICATES CampvisExternalDllsDebug)
         LIST(REMOVE_DUPLICATES CampvisExternalDllsRelease)
-
-    IF(CAMPVIS_COPY_EXTERNAL_DLLS)
         COPY_EXTERNAL_DLLS(CampvisExternalDllsDebug CampvisExternalDllsRelease false)
     ENDIF()
 ENDIF()

application/CMakeLists.txt

 PROJECT(campvis-application)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
 INCLUDE(../cmake/commonconf.cmake)
 
 MESSAGE(STATUS "Configuring CAMPVis-Application")
@@ -106,13 +105,7 @@ FOREACH(ModFile ${CampvisModulesApplicationToBeMocced})
     LIST(APPEND CampvisApplicationToBeMocced ${ModFileRelative})
 ENDFOREACH()
 
-#
-# Qt related stuff:
-#
-QT4_WRAP_CPP(CampvisApplicationMoc ${CampvisApplicationToBeMocced})
-LIST(APPEND CampvisApplicationSources ${CampvisApplicationMoc})
-
-QT4_WRAP_UI(CampvisApplicationFormsHeaders ${CampvisApplicationForms})
+QT5_WRAP_UI(CampvisApplicationFormsHeaders ${CampvisApplicationForms})
 LIST(APPEND CampvisApplicationSources ${CampvisApplicationFormsHeaders})
 
 LINK_DIRECTORIES(${CampvisGlobalLinkDirectories} ${CampvisModulesLinkDirectories})
@@ -127,14 +120,15 @@ ADD_LIBRARY(campvis-application-lib
     ${CampvisApplicationSources} ${CampvisApplicationHeaders}
     ${CampvisApplicationMoc}
 )
-ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions} ${CampvisApplicationDefinitions} ${QT_DEFINITIONS})
+ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions} ${CampvisApplicationDefinitions})
 INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs} ${CampvisModulesIncludeDirs})
-TARGET_LINK_LIBRARIES(campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs} ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs} Qt5::Widgets Qt5::OpenGL)
 
 # if campvis-core is built as a shared library, CMake will define the following flag to instruct
 # the code to export DLL symbols
 SET_TARGET_PROPERTIES(campvis-application-lib PROPERTIES DEFINE_SYMBOL "CAMPVIS_APPLICATION_BUILD_DLL")
 
+
 IF(CAMPVIS_GROUP_SOURCE_FILES)
     DEFINE_SOURCE_GROUPS_FROM_SUBDIR(CampvisApplicationSources ${CampvisHome} "")
     DEFINE_SOURCE_GROUPS_FROM_SUBDIR(CampvisApplicationHeaders ${CampvisHome} "")
@@ -144,9 +138,7 @@ INSTALL(TARGETS campvis-application-lib DESTINATION exports EXPORT campvis-targe
 
 
 ADD_EXECUTABLE(campvis-application "campvis.cpp")
-TARGET_LINK_LIBRARIES(campvis-application campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs} ${QT_LIBRARIES})
-
-
+TARGET_LINK_LIBRARIES(campvis-application campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs} Qt5::Widgets Qt5::OpenGL)
 
 IF(CAMPVIS_DEPLOY_SHADERS)
     LIST(APPEND CampvisShaderDirectories "application/data")

application/campvisapplication.cpp

@@ -46,12 +46,15 @@
 #include "core/pipeline/abstractworkflow.h"
 #include "core/pipeline/pipelinefactory.h"
 #include "core/pipeline/pipelinepainter.h"
+#include "core/pipeline/visualizationprocessor.h"
 #include "core/datastructures/imagerepresentationconverter.h"
 #include "core/pipeline/visualizationprocessor.h"
 
 #include "tools/qtjobprocessor.h"
 
 #include <QApplication>
+#include <QThread>
+#include <QStyleFactory>
 
 #ifdef CAMPVIS_HAS_SCRIPTING
 #include "scripting/glue/luavmstate.h"
@@ -93,12 +96,11 @@ namespace campvis {
 #endif
         }
 
-        _localContext = new QtThreadedCanvas("", cgt::ivec2(16, 16));
+        _localContext = new cgt::QtThreadedCanvas("", cgt::ivec2(16, 16));
         campvis::init(_localContext, searchPaths);
 
         _mainWindow = new MainWindow(this);
-        cgt::GLContextScopedLock lock(_localContext);
-        {
+        GLJobProc.enqueueJobBlocking([&]() {
             _mainWindow->init();
 
             // load textureData from file
@@ -133,7 +135,7 @@ namespace campvis {
             if (! _luaVmState->injectGlobalObjectPointer(this, "campvis::CampVisApplication *", "application"))
                 LERROR("Could not inject the pipeline into the Lua VM.");
 #endif
-        }
+        });
 
         // parse argument list and create pipelines
         QStringList pipelinesToAdd = this->arguments();
@@ -171,6 +173,27 @@ namespace campvis {
             }
         }
 
+        // Set Qt color palette to dark - adapted from https://gist.github.com/QuantumCD/6245215
+        QApplication::setStyle(QStyleFactory::create("Fusion"));
+        QPalette darkPalette;
+        darkPalette.setColor(QPalette::Window, QColor(53, 53, 53));
+        darkPalette.setColor(QPalette::WindowText, Qt::white);
+        darkPalette.setColor(QPalette::Base, QColor(25, 25, 25));
+        darkPalette.setColor(QPalette::AlternateBase, QColor(53, 53, 53));
+        darkPalette.setColor(QPalette::ToolTipBase, Qt::white);
+        darkPalette.setColor(QPalette::ToolTipText, Qt::white);
+        darkPalette.setColor(QPalette::Text, Qt::white);
+        darkPalette.setColor(QPalette::Button, QColor(53, 53, 53));
+        darkPalette.setColor(QPalette::ButtonText, Qt::white);
+        darkPalette.setColor(QPalette::BrightText, Qt::red);
+        darkPalette.setColor(QPalette::Link, QColor(42, 130, 218));
+        darkPalette.setColor(QPalette::Highlight, QColor(42, 130, 218));
+        darkPalette.setColor(QPalette::HighlightedText, Qt::black);
+
+        setPalette(darkPalette);
+        setStyleSheet("QMainWindow * {font: 12pt;} QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }");
+
+
         _initialized = true;
     }
 
@@ -185,10 +208,7 @@ namespace campvis {
         for (auto it = _workflows.begin(); it != _workflows.end(); ++it)
             (*it)->deinit();
 
-        {
-            // Deinit everything OpenGL related using the local context.
-            cgt::GLContextScopedLock lock(_localContext);
-
+        GLJobProc.enqueueJobBlocking([&]() {
             delete _errorTexture;
 
             // Deinit pipeline and painter first
@@ -197,7 +217,9 @@ namespace campvis {
             }
 
             _mainWindow->deinit();
-        }
+        });
+
+        delete _mainWindow;
 
         // now delete everything in the right order:
         for (auto it = _pipelines.begin(); it != _pipelines.end(); ++it) {
@@ -254,8 +276,10 @@ namespace campvis {
 #endif
 
         GLCtxtMgr.releaseContext(canvas, false);
+
         s_PipelinesChanged.emitSignal();
-        pipeline->start();
+
+        startOpenGlThreadAndMoveQtThreadAffinity(pipeline, canvas);
     }
 
     void CampVisApplication::initGlContextAndPipeline(cgt::GLCanvas* canvas, AbstractPipeline* pipeline) {
@@ -286,7 +310,7 @@ namespace campvis {
 
     void CampVisApplication::rebuildAllShadersFromFiles() {
         // rebuilding all shaders has to be done from OpenGL context, use the local one.
-        GLJobProc.enqueueJob(makeJobOnHeap(this, &CampVisApplication::triggerShaderRebuild));
+        GLJobProc.enqueueJob(cgt::makeJobOnHeap(this, &CampVisApplication::triggerShaderRebuild));
     }
 
     void CampVisApplication::triggerShaderRebuild() {

application/campvisapplication.h

@@ -38,6 +38,7 @@
 
 namespace cgt {
     class GLCanvas;
+    class QtCanvas;
     class QtThreadedCanvas;
     class Texture;
 }
@@ -170,7 +171,7 @@ namespace campvis {
         void triggerShaderRebuild();
 
         /// A local OpenGL context used for initialization
-        cgt::GLCanvas* _localContext;
+        cgt::QtCanvas* _localContext;
         /// Main window hosting GUI stuff
         MainWindow* _mainWindow;
 

application/glsl/datacontainerinspector.frag

@@ -101,12 +101,17 @@ void main() {
 
     if (! _renderRChannel)
         out_Color.r = 0.0;
+
     if (! _renderGChannel)
         out_Color.g = 0.0;
+
     if (! _renderBChannel)
         out_Color.b = 0.0;
+
     if (! _renderAChannel)
         out_Color.a = 1.0;
+    else if(! _renderRChannel && ! _renderGChannel && ! _renderBChannel)
+        out_Color = vec4(vec3((abs(out_Color.a) - vec3(_transferFunctionParams._intensityDomain.x)) / (_transferFunctionParams._intensityDomain.y - _transferFunctionParams._intensityDomain.x)), 1);
 
     // mix with fancy checkerboard pattern:
     if ((mod(ex_TexCoord.x * 10.0, 2.0) > 1.0) ^^ (mod(ex_TexCoord.y * 10.0, 2.0) > 1.0))

application/gui/datacontainerfileloaderwidget.cpp

@@ -45,6 +45,9 @@ namespace campvis {
     }
 
     DataContainerFileLoaderWidget::~DataContainerFileLoaderWidget() {
+        delete _imgReader;
+        _imgReader = nullptr;
+
         if (_dataContainer != 0) {
             _dataContainer->s_dataAdded.disconnect(this);
         }
@@ -97,14 +100,6 @@ namespace campvis {
         return false;
     }
 
-    void DataContainerFileLoaderWidget::init() {
-    }
-
-    void DataContainerFileLoaderWidget::deinit() {
-        delete _imgReader;
-        _imgReader = nullptr;
-    }
-
     void DataContainerFileLoaderWidget::onBtnCancelClicked() {
         delete _imgReader;
         _imgReader = nullptr;

application/gui/datacontainerfileloaderwidget.h

@@ -67,17 +67,6 @@ namespace campvis {
          */
         QSize sizeHint() const;
 
-        /**
-         * Initializes the OpenGL stuff (e.g. shaders).
-         * Must be called with a valid and locked OpenGL context.
-         */
-        virtual void init();
-
-        /**
-         * Deinitializes the OpenGL stuff (e.g. shaders).
-         * Must be called with a valid and locked OpenGL context.
-         */
-        void deinit();
 
     private slots:
         /**

application/gui/datacontainerinspectorcanvas.cpp

@@ -43,6 +43,7 @@
 
 #include "ext/cgt/navigation/trackball.h"
 
+#include <QWindow>
 
 namespace campvis {
 
@@ -70,7 +71,6 @@ namespace campvis {
         static_cast<Geometry1DTransferFunction*>(p_transferFunction.getTF())->addGeometry(TFGeometry1D::createQuad(cgt::vec2(0.f, 1.f), cgt::col4(0, 0, 0, 255), cgt::col4(255, 255, 255, 255)));
 
         GLCtxtMgr.registerContextAndInitGlew(this, "DataContainerInspector");
-        GLCtxtMgr.releaseContext(this, false);
         
         addProperty(p_currentSlice);
         addProperty(p_transferFunction);
@@ -103,10 +103,13 @@ namespace campvis {
         p_renderGChannel.setVisible(false);
         p_renderBChannel.setVisible(false);
         p_renderAChannel.setVisible(false);
+
+		connect(this, &DataContainerInspectorCanvas::s_invalidated, this, &DataContainerInspectorCanvas::onInvalidated);
+
+        init();
     }
 
     DataContainerInspectorCanvas::~DataContainerInspectorCanvas() {
-
     }
 
     void DataContainerInspectorCanvas::init() {
@@ -120,6 +123,7 @@ namespace campvis {
         getEventHandler()->addEventListenerToFront(this);
 
         _geometryRenderer.init();
+        _tcp.init();
     }
 
     void DataContainerInspectorCanvas::deinit() {
@@ -130,6 +134,7 @@ namespace campvis {
         }
 
         _geometryRenderer.deinit();
+        _tcp.deinit();
 
         _handles.clear();
         _localDataContainer.clear();
@@ -157,16 +162,17 @@ namespace campvis {
             _geometriesDirty = false;
         }
 
-        if (_textures.empty()) {
-            return;
-        }
-
         glPushAttrib(GL_ALL_ATTRIB_BITS);
         glViewport(0, 0, size_.x, size_.y);
         glClearColor(0.7f, 0.7f, 0.7f, 1.f);
         glClear(GL_COLOR_BUFFER_BIT);
         LGL_ERROR;
 
+        if (_textures.empty()) {
+            glPopAttrib();
+            return;
+        }
+
         // update layout dimensions
         _numTiles.x = ceil(sqrt(static_cast<float>(_textures.size())));
         _numTiles.y = ceil(static_cast<float>(_textures.size()) / _numTiles.x);
@@ -194,8 +200,8 @@ namespace campvis {
                     break;
 
                 // gather image
-                cgtAssert(dynamic_cast<const ImageData*>(_textures[index].getData()), "Found sth. else than ImageData in render texture vector. This should not happen!");
-                const ImageData* id = static_cast<const ImageData*>(_textures[index].getData());
+                cgtAssert(_textures[index].getData<ImageData>(), "Found sth. else than ImageData in render texture vector. This should not happen!");
+                auto id = _textures[index].getData<ImageData>();
 
                 // compute transformation matrices
                 float renderTargetRatio = static_cast<float>(_quadSize.x) / static_cast<float>(_quadSize.y);
@@ -249,16 +255,26 @@ namespace campvis {
         LGL_ERROR;
     }
 
-    void DataContainerInspectorCanvas::invalidate() {
+    void DataContainerInspectorCanvas::onInvalidated() {
+
+		// Prevent drawing when the window is not yet exposed to the window manager
+		QWindow* wnd = dynamic_cast<QWindow*>(window()->windowHandle());
+		if (!wnd || !wnd->isExposed()) return;
+
         // only if inited
-        if (_quad != 0 && _paintShader != 0) {
-            // avoid recursive paints.
-            if (! cgt::GlContextManager::getRef().checkWhetherThisThreadHasAcquiredOpenGlContext()) {
-                SimpleJobProc.enqueueJob([this] () {
-                    cgt::GLContextScopedLock lock(this);
+        if (_quad != 0 && _paintShader != 0 && this->isVisible()) {
+			
+            this->makeCurrent();
             paint();
-                });
-            }
+            this->swap();
+            // avoid recursive paints.
+//             if (! cgt::GlContextManager::getRef().checkWhetherThisThreadHasAcquiredOpenGlContext()) {
+//                 SimpleJobProc.enqueueJob(
+//                     [this] () {
+//                     cgt::GLContextScopedLock lock(this);
+//                     paint();
+//                 });
+//             }
         }
     }
 
@@ -267,11 +283,11 @@ namespace campvis {
     }
 
     void DataContainerInspectorCanvas::repaint() {
-        invalidate();
+        emit s_invalidated();
     }
 
     void DataContainerInspectorCanvas::sizeChanged(const cgt::ivec2& size) {
-        invalidate();
+		    emit s_invalidated();
     }
 
     void DataContainerInspectorCanvas::mouseMoveEvent(cgt::MouseEvent* e)
@@ -281,7 +297,7 @@ namespace campvis {
             if (texIndx < 0 || texIndx >= static_cast<int>(_textures.size()))
                 return;
 
-            const ImageData* id = static_cast<const ImageData*>(_textures[texIndx].getData());
+            auto id = _textures[texIndx].getData<ImageData>();
             const cgt::Texture* tex = id->getRepresentation<ImageRepresentationGL>()->getTexture();
             const ImageRepresentationLocal* localRep = id->getRepresentation<ImageRepresentationLocal>();
             cgt::svec2 imageSize = id->getSize().xy();
@@ -297,7 +313,7 @@ namespace campvis {
             lookupTexelFloat /= (ratioRatio > 1) ? cgt::vec2(1.f, 1.f / ratioRatio) : cgt::vec2(ratioRatio, 1.f);
             
             cgt::svec3 lookupTexel(lookupTexelFloat.x, imageSize.y - lookupTexelFloat.y, 0);
-            if (lookupTexel.x >= 0 && lookupTexel.y >= 0 && lookupTexel.x < imageSize.x && lookupTexel.y < imageSize.y) {
+            if (lookupTexel.x < imageSize.x && lookupTexel.y < imageSize.y) {
                 if (tex->isDepthTexture()) {
                     emit s_depthChanged(lookupTexel, localRep->getElementNormalized(lookupTexel, 0));
                 }
@@ -335,7 +351,7 @@ namespace campvis {
             _tcp.process(_localDataContainer);
             e->accept();
             _geometriesDirty = true;
-            invalidate();
+			      emit s_invalidated();
         }
     }
 
@@ -357,7 +373,7 @@ namespace campvis {
         }
 
         if (_texturesDirty)
-            invalidate();
+			    emit s_invalidated();
     }
 
     void DataContainerInspectorCanvas::setDataHandles(const std::vector< std::pair<QString, QtDataHandle> >& handles) {
@@ -384,7 +400,7 @@ namespace campvis {
             _texturesDirty = true;
         }
 
-        invalidate();
+		    emit s_invalidated();
     }
 
     void DataContainerInspectorCanvas::updateTextures() {
@@ -394,13 +410,13 @@ namespace campvis {