Removed ITK dependency from CmBatchGeneration pipeline and replaced Gaussian...

Removed ITK dependency from CmBatchGeneration pipeline and replaced Gaussian computation with GlGaussianFilter processor.

cmake/commonconf.cmake

@@ -98,7 +98,8 @@ IF(WIN32)
     # C4503: The decorated name was longer than the compiler limit (4096), and was truncated.
     #        Occurs in AutoEvaluatePipeline due to some nested nested map-iterator-map. Could
     #        not be deactivated locally...
-    LIST(APPEND CampvisGlobalDefinitions /wd4251 /wd4290 /wd4390 /wd4503)
+    # C4068: Unknown Pragma since we use some GCC pragmas in the code.
+    LIST(APPEND CampvisGlobalDefinitions /wd4251 /wd4290 /wd4390 /wd4503 /wd4068)
     
     # enable parallel builds in Visual Studio
     LIST(APPEND CampvisGlobalDefinitions /MP)

modules/advancedusvis/advancedusvis.cmake

@@ -16,7 +16,8 @@ IF(ModuleEnabled)
 	)
 
 	SET(ThisModShaderDirectories "modules/advancedusvis/glsl")
+	SET(ThisModDependencies vis io preprocessing)
 ENDIF(ModuleEnabled)
 
-SET(ThisModStatus EXPERIMENTAL)
+SET(ThisModStatus TESTING)
 SET(ThisModExternalDependencies FALSE)

modules/advancedusvis/pipelines/cmbatchgeneration.cpp

@@ -49,7 +49,7 @@ namespace campvis {
         : AutoEvaluationPipeline(dc)
         , _usReader(&_canvasSize)
         , _confidenceGenerator()
-        , _usBlurFilter()
+        , _usBlurFilter(&_canvasSize)
         , _usFusion(&_canvasSize)
         , p_autoExecution("AutoExecution", "Automatic Execution", false)
         , p_sourcePath("SourcePath", "Source Files Path", "")
@@ -88,7 +88,7 @@ namespace campvis {
         _usReader.p_importType.selectById("localIntensity");
         _usReader.p_targetImageID.addSharedProperty(&_confidenceGenerator.p_sourceImageID);
         _usReader.p_targetImageID.addSharedProperty(&_usFusion.p_usImageId);
-        _usReader.p_targetImageID.addSharedProperty(&_usBlurFilter.p_sourceImageID);
+        _usReader.p_targetImageID.addSharedProperty(&_usBlurFilter.p_inputImage);
 
         _confidenceGenerator.p_targetImageID.setValue("confidence.image.generated");
         _confidenceGenerator.p_targetImageID.addSharedProperty(&_usFusion.p_confidenceImageID);
@@ -104,10 +104,9 @@ namespace campvis {
         _usFusion.p_view.selectById("mappingSharpness");
         _usFusion.p_sliceNumber.setValue(0);
 
-        _usBlurFilter.p_targetImageID.setValue("us.blurred");
-        _usBlurFilter.p_targetImageID.addSharedProperty(&_usFusion.p_blurredImageId);
-        _usBlurFilter.p_filterMode.selectById("gauss");
-        _usBlurFilter.p_sigma.setValue(4.f);
+        _usBlurFilter.p_outputImage.setValue("us.blurred");
+        _usBlurFilter.p_outputImage.addSharedProperty(&_usFusion.p_blurredImageId);
+        _usBlurFilter.p_sigma.setValue(2.f);
 
 
         // TODO: replace this hardcoded domain by automatically determined from image min/max values

modules/advancedusvis/pipelines/cmbatchgeneration.h

@@ -28,16 +28,8 @@
 #include "core/datastructures/imagerepresentationlocal.h"
 #include "core/pipeline/autoevaluationpipeline.h"
 #include "modules/devil/processors/devilimagereader.h"
-#include "modules/io/processors/mhdimagereader.h"
-#include "modules/io/processors/csvdimagereader.h"
 #include "modules/advancedusvis/processors/advancedusfusion.h"
-#include "modules/preprocessing/processors/gradientvolumegenerator.h"
-#include "modules/preprocessing/processors/lhhistogram.h"
-#include "modules/itk/processors/itkimagefilter.h"
-#include "modules/vis/processors/proxygeometrygenerator.h"
-#include "modules/vis/processors/eepgenerator.h"
-#include "modules/vis/processors/simpleraycaster.h"
-#include "modules/vis/processors/quadview.h"
+#include "modules/preprocessing/processors/glgaussianfilter.h"
 #include "modules/randomwalk/processors/confidencemapgenerator.h"
 
 #include "core/properties/buttonproperty.h"
@@ -84,7 +76,7 @@ namespace campvis {
 
         DevilImageReader _usReader;
         ConfidenceMapGenerator _confidenceGenerator;
-        ItkImageFilter _usBlurFilter;
+        GlGaussianFilter _usBlurFilter;
         AdvancedUsFusion _usFusion;
 
         BoolProperty p_autoExecution;