removed preprocessing dependency from vis module (former dependency was only...

removed preprocessing dependency from vis module (former dependency was only due to some deprecated code)

modules/vis/pipelines/slicevis.cpp

@@ -39,15 +39,11 @@ namespace campvis {
     SliceVis::SliceVis(DataContainer* dc)
         : AutoEvaluationPipeline(dc)
         , _imageReader()
-        , _gvg()
-        , _lhh()
         , _sliceExtractor(&_canvasSize)
         , _wheelHandler(&_sliceExtractor.p_zSliceNumber)
         , _tfWindowingHandler(&_sliceExtractor.p_transferFunction)
     {
         addProcessor(&_imageReader);
-//         addProcessor(&_gvg);
-//         addProcessor(&_lhh);
         addProcessor(&_sliceExtractor);
         addEventListenerToBack(&_wheelHandler);
         addEventListenerToBack(&_tfWindowingHandler);
@@ -61,13 +57,9 @@ namespace campvis {
 
         _imageReader.p_url.setValue("D:\\Medical Data\\Dentalscan\\dental.mhd");
         _imageReader.p_targetImageID.setValue("reader.output");
-        _imageReader.p_targetImageID.addSharedProperty(&_gvg.p_sourceImageID);
-        _imageReader.p_targetImageID.addSharedProperty(&_lhh.p_intensitiesId);
         _imageReader.p_targetImageID.addSharedProperty(&_sliceExtractor.p_sourceImageID);
         _imageReader.s_validated.connect(this, &SliceVis::onProcessorValidated);
 
-//         _gvg._outputGradients.connect(&_lhh._inputGradients);
-
         _sliceExtractor.p_xSliceNumber.setValue(0);
 
         // TODO: replace this hardcoded domain by automatically determined from image min/max values

modules/vis/pipelines/slicevis.h

@@ -36,8 +36,6 @@
 #include "core/pipeline/autoevaluationpipeline.h"
 #include "modules/io/processors/mhdimagereader.h"
 #include "modules/vis/processors/sliceextractor.h"
-#include "modules/preprocessing/processors/gradientvolumegenerator.h"
-#include "modules/preprocessing/processors/lhhistogram.h"
 
 namespace campvis {
     class SliceVis : public AutoEvaluationPipeline {
@@ -71,8 +69,6 @@ namespace campvis {
         virtual void onProcessorValidated(AbstractProcessor* processor);
 
         MhdImageReader _imageReader;
-        GradientVolumeGenerator _gvg;
-        LHHistogram _lhh;
         SliceExtractor _sliceExtractor;
 
         MWheelToNumericPropertyEventListener _wheelHandler;

modules/vis/vis.cmake

@@ -15,4 +15,4 @@ FILE(GLOB ThisModHeaders RELATIVE ${ModulesDir}
 )
 
 SET(ThisModShaderDirectories "modules/vis/glsl")
-SET(ThisModDependencies devil io preprocessing)
+SET(ThisModDependencies devil io)