Commit 52a0444f authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Refactoring pipeline concept #5: Moved Pipeline registration to modules module...

Refactoring pipeline concept #5: Moved Pipeline registration to modules module and gen_pipelineregistration.h which will soon be generated by CMake.
parent 12f141e4
......@@ -28,24 +28,6 @@
// ================================================================================================
#include "application/campvisapplication.h"
#include "modules/advancedusvis/pipelines/advancedusvis.h"
#include "modules/advancedusvis/pipelines/cmbatchgeneration.h"
#include "modules/vis/pipelines/ixpvdemo.h"
#include "modules/vis/pipelines/dvrvis.h"
#include "modules/vis/pipelines/volumerendererdemo.h"
#include "modules/vis/pipelines/volumeexplorerdemo.h"
#include "modules/vis/pipelines/slicevis.h"
#ifdef HAS_KISSCL
#include "modules/opencl/pipelines/openclpipeline.h"
#endif
#ifdef CAMPVIS_HAS_MODULE_SCR_MSK
#include "modules/scr_msk/pipelines/uscompounding.h"
#endif
#ifdef CAMPVIS_HAS_MODULE_COLUMBIA
#include "modules/columbia/pipelines/columbia1.h"
#endif
#ifdef Q_WS_X11
#include <X11/Xlib.h>
......
......@@ -49,7 +49,7 @@
#include "core/tools/simplejobprocessor.h"
#include "core/tools/quadrenderer.h"
#include "core/pipeline/abstractpipeline.h"
#include "core/pipeline/pipelinefactory.h"
#include "modules/pipelinefactory.h"
namespace campvis {
......
......@@ -4,6 +4,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
MESSAGE(STATUS "Configuring Campvis Modules")
LIST(APPEND CampvisModulesHeaders
pipelinefactory.h
)
LIST(APPEND CampvisModulesSources
pipelinefactory.cpp
)
LINK_DIRECTORIES(${CampvisGlobalLinkDirectories} ${CampvisModulesLinkDirectories})
ADD_LIBRARY(campvis-modules
${CampvisModulesSources} ${CampvisModulesHeaders}
......
......@@ -35,7 +35,6 @@
#include "core/eventhandlers/transfuncwindowingeventlistener.h"
#include "core/eventhandlers/trackballnavigationeventlistener.h"
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/pipeline/pipelinefactory.h"
#include "modules/devil/processors/devilimagereader.h"
#include "modules/io/processors/mhdimagereader.h"
#include "modules/io/processors/csvdimagereader.h"
......@@ -115,9 +114,6 @@ namespace campvis {
TrackballNavigationEventListener* _trackballEH;
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<AdvancedUsVis>;
}
#endif // ADVANCEDUSVIS_H__
......@@ -32,7 +32,6 @@
#include "core/datastructures/imagerepresentationlocal.h"
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/pipeline/pipelinefactory.h"
#include "modules/devil/processors/devilimagereader.h"
#include "modules/io/processors/mhdimagereader.h"
#include "modules/io/processors/csvdimagereader.h"
......@@ -103,9 +102,6 @@ namespace campvis {
ButtonProperty p_execute;
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<CmBatchGeneration>;
}
#endif // CMBATCHGENERATION_H__
......@@ -32,7 +32,6 @@
#include "core/eventhandlers/trackballnavigationeventlistener.h"
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/pipeline/pipelinefactory.h"
#include "core/properties/cameraproperty.h"
......@@ -104,9 +103,6 @@ namespace campvis {
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<Columbia1>;
}
#endif // COLUMBIA1_H__
#ifdef CAMPVIS_HAS_MODULE_ADVANCEDUSVIS
#include "modules/advancedusvis/pipelines/advancedusvis.h"
#include "modules/advancedusvis/pipelines/cmbatchgeneration.h"
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class campvis::PipelineRegistrar<campvis::AdvancedUsVis>;
template class campvis::PipelineRegistrar<campvis::CmBatchGeneration>;
#endif
#ifdef CAMPVIS_HAS_MODULE_VIS
#include "modules/vis/pipelines/ixpvdemo.h"
#include "modules/vis/pipelines/dvrvis.h"
#include "modules/vis/pipelines/volumerendererdemo.h"
#include "modules/vis/pipelines/volumeexplorerdemo.h"
#include "modules/vis/pipelines/slicevis.h"
template class campvis::PipelineRegistrar<campvis::DVRVis>;
template class campvis::PipelineRegistrar<campvis::IxpvDemo>;
template class campvis::PipelineRegistrar<campvis::SliceVis>;
template class campvis::PipelineRegistrar<campvis::VolumeExplorerDemo>;
template class campvis::PipelineRegistrar<campvis::VolumeRendererDemo>;
#endif
#ifdef HAS_KISSCL
#include "modules/opencl/pipelines/openclpipeline.h"
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class campvis::PipelineRegistrar<campvis::OpenCLPipeline>;
#endif
#ifdef CAMPVIS_HAS_MODULE_SCR_MSK
#include "modules/scr_msk/pipelines/uscompounding.h"
template class campvis::PipelineRegistrar<campvis::UsCompounding>;
#endif
#ifdef CAMPVIS_HAS_MODULE_COLUMBIA
#include "modules/columbia/pipelines/columbia1.h"
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class campvis::PipelineRegistrar<campvis::Columbia1>;
#endif
......@@ -33,7 +33,6 @@
#include "core/datastructures/imagerepresentationlocal.h"
#include "core/eventhandlers/trackballnavigationeventlistener.h"
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/pipeline/pipelinefactory.h"
#include "core/properties/cameraproperty.h"
#include "modules/io/processors/mhdimagereader.h"
#include "modules/vis/processors/proxygeometrygenerator.h"
......@@ -80,8 +79,6 @@ namespace campvis {
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<OpenCLPipeline>;
}
......
......@@ -28,6 +28,7 @@
// ================================================================================================
#include "pipelinefactory.h"
#include "gen_pipelineregistration.h"
#include <sstream>
......
......@@ -33,7 +33,6 @@
#include "core/datastructures/imagerepresentationlocal.h"
#include "core/eventhandlers/trackballnavigationeventlistener.h"
#include "core/pipeline/pipelinefactory.h"
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/properties/cameraproperty.h"
......@@ -74,9 +73,6 @@ namespace campvis {
TrackballNavigationEventListener* _trackballEH;
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<UsCompounding>;
}
#endif // USCOMPOUNDING_H__
......@@ -32,7 +32,6 @@
#include "core/datastructures/imagerepresentationlocal.h"
#include "core/eventhandlers/trackballnavigationeventlistener.h"
#include "core/pipeline/pipelinefactory.h"
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/properties/cameraproperty.h"
#include "modules/io/processors/mhdimagereader.h"
......@@ -92,9 +91,6 @@ namespace campvis {
TrackballNavigationEventListener* _trackballEH;
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<DVRVis>;
}
#endif // DVRVIS_H__
......@@ -34,7 +34,6 @@
#include "core/eventhandlers/trackballnavigationeventlistener.h"
#include "core/eventhandlers/mwheeltonumericpropertyeventlistener.h"
#include "core/properties/cameraproperty.h"
#include "core/pipeline/pipelinefactory.h"
#include "core/pipeline/autoevaluationpipeline.h"
#include "modules/io/processors/mhdimagereader.h"
......@@ -102,9 +101,6 @@ namespace campvis {
MWheelToNumericPropertyEventListener _wheelHandler;
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<IxpvDemo>;
}
#endif // IXPVDEMO_H__
......
......@@ -30,7 +30,6 @@
#ifndef SLICEVIS_H__
#define SLICEVIS_H__
#include "core/pipeline/pipelinefactory.h"
#include "core/datastructures/imagerepresentationlocal.h"
#include "core/eventhandlers/mwheeltonumericpropertyeventlistener.h"
#include "core/eventhandlers/transfuncwindowingeventlistener.h"
......@@ -81,9 +80,6 @@ namespace campvis {
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<SliceVis>;
}
#endif // SLICEVIS_H__
......
......@@ -31,7 +31,6 @@
#define VolumeExplorerDemo_H__
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/pipeline/pipelinefactory.h"
#include "core/properties/cameraproperty.h"
#include "modules/io/processors/mhdimagereader.h"
#include "modules/vis/processors/volumeexplorer.h"
......@@ -74,8 +73,6 @@ namespace campvis {
VolumeExplorer _ve;
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<VolumeExplorerDemo>;
}
#endif // VolumeExplorerDemo_H__
......@@ -30,7 +30,6 @@
#ifndef VOLUMERENDERERDEMO_H__
#define VOLUMERENDERERDEMO_H__
#include "core/pipeline/pipelinefactory.h"
#include "core/eventhandlers/trackballnavigationeventlistener.h"
#include "core/pipeline/autoevaluationpipeline.h"
#include "core/properties/cameraproperty.h"
......@@ -77,9 +76,6 @@ namespace campvis {
};
/// Instantiate templated PipelineRegistrar to automatically register this pipeline.
template class PipelineRegistrar<VolumeRendererDemo>;
}
#endif // VOLUMERENDERERDEMO_H__
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