Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

Commit 01fa8683 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Fixed workflowdemo module, fixed CampVisApplication not (de)initializing QtJobProcessor.

parent 8f35d2c6
......@@ -80,6 +80,8 @@ namespace campvis {
void CampVisApplication::init() {
cgtAssert(_initialized == false, "Tried to initialize CampVisApplication twice.");
QtJobProcessor::init();
std::vector<std::string> searchPaths;
if (_argc > 0) {
// ugly hack
......@@ -207,7 +209,7 @@ namespace campvis {
campvis::deinit();
PropertyWidgetFactory::deinit();
PipelineFactory::deinit();
QtJobProcessor::deinit();
_initialized = false;
}
......
......@@ -24,23 +24,20 @@
#include "core/pipeline/pipelinefactory.h"
#include "modules/vis/pipelines/advdvrvis.h"
#include "modules/vis/pipelines/dvrvis.h"
#include "modules/vis/pipelines/geometryrendererdemo.h"
#include "modules/vis/pipelines/mprdemo.h"
#include "modules/vis/pipelines/slicevis.h"
#include "modules/vis/pipelines/volumeexplorerdemo.h"
#include "modules/vis/pipelines/volumerendererdemo.h"
#include "modules/workflowdemo/pipelines/imagefiltering.h"
#include "modules/workflowdemo/pipelines/imageloading.h"
#include "modules/workflowdemo/pipelines/imagevis.h"
#include "modules/workflowdemo/workflows/demoworkflow.h"
namespace campvis {
// explicitly instantiate templates to register the pipelines
template class PipelineRegistrar<AdvDVRVis>;
template class PipelineRegistrar<DVRVis>;
template class PipelineRegistrar<GeometryRendererDemo>;
template class PipelineRegistrar<MprDemo>;
template class PipelineRegistrar<SliceVis>;
template class PipelineRegistrar<VolumeRendererDemo>;
template class PipelineRegistrar<VolumeExplorerDemo>;
template class PipelineRegistrar<workflowdemo::ImageFiltering>;
template class PipelineRegistrar<workflowdemo::ImageLoading>;
template class PipelineRegistrar<workflowdemo::ImageVis>;
template class WorkflowRegistrar<workflowdemo::DemoWorkflow>;
}
\ No newline at end of file
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