10.12., 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit d89d1152 authored by schultezub's avatar schultezub

renamed TUMVis to CAMPVis

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@326 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent 93349908
# #
# TUMVis - Yet another visualization framework # CAMPVis - Yet another visualization framework
# CMake file inspired by Voreen # CMake file inspired by Voreen
# #
PROJECT(TUMVis) PROJECT(CAMPVis)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
# #
# Global Build Options # Global Build Options
# #
OPTION(TUMVIS_SHARED_LIBS "Build shared libraries?" ON ) OPTION(CAMPVIS_SHARED_LIBS "Build shared libraries?" ON )
#OPTION(TUMVIS_PRECOMPILED_HEADER "Use pre-compiled headers?" ON ) #OPTION(CAMPVIS_PRECOMPILED_HEADER "Use pre-compiled headers?" ON )
OPTION(TUMVIS_DEBUG "Activate debug code?" ON ) OPTION(CAMPVIS_DEBUG "Activate debug code?" ON )
OPTION(TUMVIS_BUILD_APPLICATION "Build TUMVis Application" ON ) OPTION(CAMPVIS_BUILD_APPLICATION "Build CAMPVis Application" ON )
OPTION(TUMVIS_BUILD_CORE "Build TUMVis Core" ON ) OPTION(CAMPVIS_BUILD_CORE "Build CAMPVis Core" ON )
OPTION(TUMVIS_BUILD_MODULES "Build TUMVis Modules" ON ) OPTION(CAMPVIS_BUILD_MODULES "Build CAMPVis Modules" ON )
OPTION(TUMVIS_BUILD_LIB_TGT "Build TGT Library" ON ) OPTION(CAMPVIS_BUILD_LIB_TGT "Build TGT Library" ON )
OPTION(TUMVIS_BUILD_LIB_KISSCL "Build KissCL Library" ON ) OPTION(CAMPVIS_BUILD_LIB_KISSCL "Build KissCL Library" ON )
IF(WIN32) IF(WIN32)
OPTION(TUMVIS_COPY_EXTERNAL_DLLS "Copy external DLLs to bin directory?" ON ) OPTION(CAMPVIS_COPY_EXTERNAL_DLLS "Copy external DLLs to bin directory?" ON )
OPTION(TUMVIS_INCREMENTAL_LINKING "Enable incremental linking in Visual Studio debug builds?" ON ) OPTION(CAMPVIS_INCREMENTAL_LINKING "Enable incremental linking in Visual Studio debug builds?" ON )
OPTION(TUMVIS_GENERATE_MANIFEST "Generate manifest in Visual Studio debug builds (switch on when encountering errors using incremental linking)?" OFF) OPTION(CAMPVIS_GENERATE_MANIFEST "Generate manifest in Visual Studio debug builds (switch on when encountering errors using incremental linking)?" OFF)
ENDIF() ENDIF()
# #
...@@ -31,23 +31,23 @@ ENDIF() ...@@ -31,23 +31,23 @@ ENDIF()
include(cmake/commonconf.cmake) include(cmake/commonconf.cmake)
IF(TUMVIS_BUILD_LIB_TGT) IF(CAMPVIS_BUILD_LIB_TGT)
ADD_SUBDIRECTORY(ext/tgt) ADD_SUBDIRECTORY(ext/tgt)
ENDIF() ENDIF()
IF(TUMVIS_BUILD_LIB_KISSCL) IF(CAMPVIS_BUILD_LIB_KISSCL)
ADD_SUBDIRECTORY(ext/kisscl) ADD_SUBDIRECTORY(ext/kisscl)
ENDIF() ENDIF()
IF(TUMVIS_BUILD_CORE) IF(CAMPVIS_BUILD_CORE)
ADD_SUBDIRECTORY(core) ADD_SUBDIRECTORY(core)
ENDIF() ENDIF()
IF(TUMVIS_BUILD_MODULES) IF(CAMPVIS_BUILD_MODULES)
ADD_SUBDIRECTORY(modules) ADD_SUBDIRECTORY(modules)
ENDIF() ENDIF()
IF(TUMVIS_BUILD_APPLICATION) IF(CAMPVIS_BUILD_APPLICATION)
ADD_SUBDIRECTORY(application) ADD_SUBDIRECTORY(application)
ENDIF() ENDIF()
...@@ -55,19 +55,19 @@ ENDIF() ...@@ -55,19 +55,19 @@ ENDIF()
# Copy External DLLs # Copy External DLLs
# #
IF(WIN32) IF(WIN32)
LIST(REMOVE_DUPLICATES TUMVIS_EXTERNAL_DEBUG_DLLS) LIST(REMOVE_DUPLICATES CAMPVIS_EXTERNAL_DEBUG_DLLS)
LIST(REMOVE_DUPLICATES TUMVIS_EXTERNAL_RELEASE_DLLS) LIST(REMOVE_DUPLICATES CAMPVIS_EXTERNAL_RELEASE_DLLS)
IF(TUMVIS_COPY_EXTERNAL_DLLS) IF(CAMPVIS_COPY_EXTERNAL_DLLS)
COPY_EXTERNAL_DLLS(TUMVIS_EXTERNAL_DEBUG_DLLS TUMVIS_EXTERNAL_RELEASE_DLLS false) COPY_EXTERNAL_DLLS(CAMPVIS_EXTERNAL_DEBUG_DLLS CAMPVIS_EXTERNAL_RELEASE_DLLS false)
ENDIF() ENDIF()
IF(TUMVIS_ADD_INSTALL_TARGET) IF(CAMPVIS_ADD_INSTALL_TARGET)
INSTALL(FILES ${TUMVIS_EXTERNAL_DEBUG_DLLS} INSTALL(FILES ${CAMPVIS_EXTERNAL_DEBUG_DLLS}
DESTINATION . DESTINATION .
CONFIGURATIONS Debug CONFIGURATIONS Debug
) )
INSTALL(FILES ${TUMVIS_EXTERNAL_RELEASE_DLLS} INSTALL(FILES ${CAMPVIS_EXTERNAL_RELEASE_DLLS}
DESTINATION . DESTINATION .
CONFIGURATIONS Release CONFIGURATIONS Release
) )
......
PROJECT(tumvis-application) PROJECT(campvis-application)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
INCLUDE(../cmake/commonconf.cmake) INCLUDE(../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring TUMVis Application") MESSAGE(STATUS "Configuring CAMPVis Application")
FILE(GLOB TUMVIS_APPLICATION_SOURCES FILE(GLOB CAMPVIS_APPLICATION_SOURCES
*.cpp *.cpp
gui/*.cpp gui/*.cpp
gui/properties/*.cpp gui/properties/*.cpp
tools/*.cpp tools/*.cpp
) )
FILE(GLOB TUMVIS_APPLICATION_HEADERS FILE(GLOB CAMPVIS_APPLICATION_HEADERS
*.h *.h
gui/*.h gui/*.h
gui/properties/*.h gui/properties/*.h
tools/*.h tools/*.h
) )
SET(TUMVIS_APPLICATION_TO_BE_MOCCED SET(CAMPVIS_APPLICATION_TO_BE_MOCCED
gui/mainwindow.h gui/mainwindow.h
gui/datacontainerinspectorcanvas.h gui/datacontainerinspectorcanvas.h
gui/datacontainerinspectorwidget.h gui/datacontainerinspectorwidget.h
...@@ -42,15 +42,15 @@ SET(TUMVIS_APPLICATION_TO_BE_MOCCED ...@@ -42,15 +42,15 @@ SET(TUMVIS_APPLICATION_TO_BE_MOCCED
# #
# Qt related stuff: # Qt related stuff:
# #
FIND_PACKAGE(Qt4 ${TUMVIS_REQUIRED_QT_VERSION} REQUIRED QtCore QtGui QtOpenGL) FIND_PACKAGE(Qt4 ${CAMPVIS_REQUIRED_QT_VERSION} REQUIRED QtCore QtGui QtOpenGL)
QT4_WRAP_CPP(TUMVIS_APPLICATION_MOC ${TUMVIS_APPLICATION_TO_BE_MOCCED}) QT4_WRAP_CPP(CAMPVIS_APPLICATION_MOC ${CAMPVIS_APPLICATION_TO_BE_MOCCED})
LIST(APPEND TUMVIS_APPLICATION_SOURCES ${TUMVIS_APPLICATION_MOC}) LIST(APPEND CAMPVIS_APPLICATION_SOURCES ${CAMPVIS_APPLICATION_MOC})
INCLUDE(${QT_USE_FILE}) INCLUDE(${QT_USE_FILE})
ADD_EXECUTABLE(tumvis-application ADD_EXECUTABLE(campvis-application
${TUMVIS_APPLICATION_SOURCES} ${TUMVIS_APPLICATION_HEADERS} ${CAMPVIS_APPLICATION_SOURCES} ${CAMPVIS_APPLICATION_HEADERS}
${TUMVIS_APPLICATION_MOC} ${CAMPVIS_APPLICATION_MOC}
) )
ADD_DEFINITIONS(${TUMVIS_DEFINITIONS} ${QT_DEFINITIONS}) ADD_DEFINITIONS(${CAMPVIS_DEFINITIONS} ${QT_DEFINITIONS})
INCLUDE_DIRECTORIES(${TUMVIS_INCLUDE_DIRECTORIES}) INCLUDE_DIRECTORIES(${CAMPVIS_INCLUDE_DIRECTORIES})
TARGET_LINK_LIBRARIES(tumvis-application tumvis-core tumvis-modules tgt kisscl ${TUMVIS_EXTERNAL_LIBRARIES} ${QT_LIBRARIES}) TARGET_LINK_LIBRARIES(campvis-application campvis-core campvis-modules tgt kisscl ${CAMPVIS_EXTERNAL_LIBRARIES} ${QT_LIBRARIES})
// ================================================================================================ // ================================================================================================
// //
// This file is part of the TUMVis Visualization Framework. // This file is part of the CAMPVis Visualization Framework.
// //
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved, // If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de) // Christian Schulte zu Berge (christian.szb@in.tum.de)
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
// //
// ================================================================================================ // ================================================================================================
#include "application/tumvisapplication.h" #include "application/campvisapplication.h"
#include "modules/pipelines/dvrvis.h" #include "modules/pipelines/dvrvis.h"
#include "modules/pipelines/slicevis.h" #include "modules/pipelines/slicevis.h"
using namespace TUMVis; using namespace campvis;
/** /**
* TUMVis main function, application entry point * CAMPVis main function, application entry point
* *
* \param argc number of passed arguments * \param argc number of passed arguments
* \param argv vector of arguments * \param argv vector of arguments
...@@ -41,7 +41,7 @@ using namespace TUMVis; ...@@ -41,7 +41,7 @@ using namespace TUMVis;
**/ **/
int main(int argc, char** argv) { int main(int argc, char** argv) {
TumVisApplication app(argc, argv); TumVisApplication app(argc, argv);
app.addVisualizationPipeline("SliceVis", new SliceVis()); //app.addVisualizationPipeline("SliceVis", new SliceVis());
app.addVisualizationPipeline("DVRVis", new DVRVis()); app.addVisualizationPipeline("DVRVis", new DVRVis());
app.init(); app.init();
......
// ================================================================================================ // ================================================================================================
// //
// This file is part of the TUMVis Visualization Framework. // This file is part of the CAMPVis Visualization Framework.
// //
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved, // If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de) // Christian Schulte zu Berge (christian.szb@in.tum.de)
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
// //
// ================================================================================================ // ================================================================================================
#include "tumvisapplication.h" #include "campvisapplication.h"
#include "tgt/assert.h" #include "tgt/assert.h"
#include "tgt/exception.h" #include "tgt/exception.h"
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include "kisscl/clruntime.h" #include "kisscl/clruntime.h"
#include "application/tumvispainter.h" #include "application/campvispainter.h"
#include "application/gui/mainwindow.h" #include "application/gui/mainwindow.h"
#include "core/tools/opengljobprocessor.h" #include "core/tools/opengljobprocessor.h"
#include "core/tools/quadrenderer.h" #include "core/tools/quadrenderer.h"
...@@ -48,9 +48,9 @@ ...@@ -48,9 +48,9 @@
#include "core/pipeline/visualizationpipeline.h" #include "core/pipeline/visualizationpipeline.h"
#include "core/pipeline/pipelineevaluator.h" #include "core/pipeline/pipelineevaluator.h"
namespace TUMVis { namespace campvis {
const std::string TumVisApplication::loggerCat_ = "TUMVis.application.TumVisApplication"; const std::string TumVisApplication::loggerCat_ = "CAMPVis.application.TumVisApplication";
TumVisApplication::TumVisApplication(int argc, char** argv, bool useOpenCL) TumVisApplication::TumVisApplication(int argc, char** argv, bool useOpenCL)
: QApplication(argc, argv) : QApplication(argc, argv)
...@@ -104,10 +104,10 @@ namespace TUMVis { ...@@ -104,10 +104,10 @@ namespace TUMVis {
// ensure matching OpenGL specs // ensure matching OpenGL specs
if (GpuCaps.getGlVersion() < tgt::GpuCapabilities::GlVersion::TGT_GL_VERSION_3_3) { if (GpuCaps.getGlVersion() < tgt::GpuCapabilities::GlVersion::TGT_GL_VERSION_3_3) {
LERROR("Your system does not support OpenGL 3.3, which is mandatory. TUMVis will probably not work as intendet."); LERROR("Your system does not support OpenGL 3.3, which is mandatory. CAMPVis will probably not work as intendet.");
} }
if (GpuCaps.getShaderVersion() < tgt::GpuCapabilities::GlVersion::SHADER_VERSION_330) { if (GpuCaps.getShaderVersion() < tgt::GpuCapabilities::GlVersion::SHADER_VERSION_330) {
LERROR("Your system does not support GLSL Shader Version 3.30, which is mandatory. TUMVis will probably not work as intendet."); LERROR("Your system does not support GLSL Shader Version 3.30, which is mandatory. CAMPVis will probably not work as intendet.");
} }
QuadRenderer::init(); QuadRenderer::init();
...@@ -227,7 +227,7 @@ namespace TUMVis { ...@@ -227,7 +227,7 @@ namespace TUMVis {
tgtAssert(vp != 0, "Pipeline must not be 0."); tgtAssert(vp != 0, "Pipeline must not be 0.");
// create canvas and painter for the VisPipeline and connect all together // create canvas and painter for the VisPipeline and connect all together
tgt::QtThreadedCanvas* canvas = CtxtMgr.createContext(name, "TUMVis", tgt::ivec2(512, 512)); tgt::QtThreadedCanvas* canvas = CtxtMgr.createContext(name, "CAMPVis", tgt::ivec2(512, 512));
GLJobProc.registerContext(canvas); GLJobProc.registerContext(canvas);
canvas->init(); canvas->init();
......
// ================================================================================================ // ================================================================================================
// //
// This file is part of the TUMVis Visualization Framework. // This file is part of the CAMPVis Visualization Framework.
// //
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved, // If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de) // Christian Schulte zu Berge (christian.szb@in.tum.de)
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
// //
// ================================================================================================ // ================================================================================================
#ifndef TUMVISAPPLICATION_H__ #ifndef CAMPVISAPPLICATION_H__
#define TUMVISAPPLICATION_H__ #define CAMPVISAPPLICATION_H__
//#include <vld.h> // Uncomment this for using Visual Leak Detector //#include <vld.h> // Uncomment this for using Visual Leak Detector
...@@ -40,7 +40,7 @@ namespace tgt { ...@@ -40,7 +40,7 @@ namespace tgt {
class QtThreadedCanvas; class QtThreadedCanvas;
} }
namespace TUMVis { namespace campvis {
class AbstractPipeline; class AbstractPipeline;
class MainWindow; class MainWindow;
class PipelineEvaluator; class PipelineEvaluator;
...@@ -144,4 +144,4 @@ namespace TUMVis { ...@@ -144,4 +144,4 @@ namespace TUMVis {
}; };
} }
#endif // TUMVISAPPLICATION_H__ #endif // CAMPVISAPPLICATION_H__
// ================================================================================================ // ================================================================================================
// //
// This file is part of the TUMVis Visualization Framework. // This file is part of the CAMPVis Visualization Framework.
// //
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved, // If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de) // Christian Schulte zu Berge (christian.szb@in.tum.de)
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
// //
// ================================================================================================ // ================================================================================================
#include "tumvispainter.h" #include "campvispainter.h"
#include "tgt/assert.h" #include "tgt/assert.h"
#include "tgt/camera.h" #include "tgt/camera.h"
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
#include "core/tools/opengljobprocessor.h" #include "core/tools/opengljobprocessor.h"
#include "core/tools/quadrenderer.h" #include "core/tools/quadrenderer.h"
namespace TUMVis { namespace campvis {
const std::string TumVisPainter::loggerCat_ = "TUMVis.core.TumVisPainter"; const std::string TumVisPainter::loggerCat_ = "CAMPVis.core.TumVisPainter";
TumVisPainter::TumVisPainter(tgt::QtThreadedCanvas* canvas, VisualizationPipeline* pipeline) TumVisPainter::TumVisPainter(tgt::QtThreadedCanvas* canvas, VisualizationPipeline* pipeline)
: Runnable() : Runnable()
......
// ================================================================================================ // ================================================================================================
// //
// This file is part of the TUMVis Visualization Framework. // This file is part of the CAMPVis Visualization Framework.
// //
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved, // If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de) // Christian Schulte zu Berge (christian.szb@in.tum.de)
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
// //
// ================================================================================================ // ================================================================================================
#ifndef TUMVISPAINTER_H__ #ifndef CAMPVISPAINTER_H__
#define TUMVISPAINTER_H__ #define CAMPVISPAINTER_H__
#include "sigslot/sigslot.h" #include "sigslot/sigslot.h"
#include "tbb/include/tbb/atomic.h" #include "tbb/include/tbb/atomic.h"
...@@ -42,11 +42,11 @@ namespace tgt { ...@@ -42,11 +42,11 @@ namespace tgt {
class QtThreadedCanvas; class QtThreadedCanvas;
} }
namespace TUMVis { namespace campvis {
class VisualizationPipeline; class VisualizationPipeline;
/** /**
* Painter class for TUMVis, rendering the render target of a VisualizationPipeline. * Painter class for CAMPVis, rendering the render target of a VisualizationPipeline.
* This painter implements Runnable, hence, it runs in its own thread and the associated canvas * This painter implements Runnable, hence, it runs in its own thread and the associated canvas
* must be of type QtThreadedCanvas. * must be of type QtThreadedCanvas.
* Rendering is implemented using condidional wait - hence the canvas is only updated when * Rendering is implemented using condidional wait - hence the canvas is only updated when
...@@ -123,4 +123,4 @@ namespace TUMVis { ...@@ -123,4 +123,4 @@ namespace TUMVis {
} }
#endif // TUMVISPAINTER_H__ #endif // CAMPVISPAINTER_H__
// ================================================================================================ // ================================================================================================
// //
// This file is part of the TUMVis Visualization Framework. // This file is part of the CAMPVis Visualization Framework.
// //
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved, // If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de) // Christian Schulte zu Berge (christian.szb@in.tum.de)
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#include "application/gui/datacontainertreewidget.h" #include "application/gui/datacontainertreewidget.h"
namespace TUMVis { namespace campvis {
DataContainerInspectorCanvas::DataContainerInspectorCanvas(QWidget* parent /*= 0*/) DataContainerInspectorCanvas::DataContainerInspectorCanvas(QWidget* parent /*= 0*/)
: tgt::QtThreadedCanvas("DataContainer Inspector", tgt::ivec2(640, 480), tgt::GLCanvas::RGBA_BUFFER, parent, true) : tgt::QtThreadedCanvas("DataContainer Inspector", tgt::ivec2(640, 480), tgt::GLCanvas::RGBA_BUFFER, parent, true)
......
// ================================================================================================ // ================================================================================================
// //
// This file is part of the TUMVis Visualization Framework. // This file is part of the CAMPVis Visualization Framework.
// //
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved, // If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de) // Christian Schulte zu Berge (christian.szb@in.tum.de)
...@@ -43,7 +43,7 @@ namespace tgt { ...@@ -43,7 +43,7 @@ namespace tgt {
class TextureUnit; class TextureUnit;
} }
namespace TUMVis { namespace campvis {
class AbstractPipeline; class AbstractPipeline;
class DataContainer; class DataContainer;
class DataContainerTreeWidget; class DataContainerTreeWidget;
......
// ================================================================================================ // ================================================================================================
// //
// This file is part of the TUMVis Visualization Framework. // This file is part of the CAMPVis Visualization Framework.
// //
// If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved, // If not explicitly stated otherwise: Copyright (C) 2012, all rights reserved,
// Christian Schulte zu Berge (christian.szb@in.tum.de) // Christian Schulte zu Berge (christian.szb@in.tum.de)
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "application/gui/datacontainertreewidget.h" #include "application/gui/datacontainertreewidget.h"
#include "application/gui/qtdatahandle.h" #include "application/gui/qtdatahandle.h"
namespace TUMVis { namespace campvis {