Commit 70f14e1a authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

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

Removed ITK dependency from CmBatchGeneration pipeline and replaced Gaussian computation with GlGaussianFilter processor.
parent 792e2d52
...@@ -98,7 +98,8 @@ IF(WIN32) ...@@ -98,7 +98,8 @@ IF(WIN32)
# C4503: The decorated name was longer than the compiler limit (4096), and was truncated. # 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 # Occurs in AutoEvaluatePipeline due to some nested nested map-iterator-map. Could
# not be deactivated locally... # 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 # enable parallel builds in Visual Studio
LIST(APPEND CampvisGlobalDefinitions /MP) LIST(APPEND CampvisGlobalDefinitions /MP)
......
...@@ -16,7 +16,8 @@ IF(ModuleEnabled) ...@@ -16,7 +16,8 @@ IF(ModuleEnabled)
) )
SET(ThisModShaderDirectories "modules/advancedusvis/glsl") SET(ThisModShaderDirectories "modules/advancedusvis/glsl")
SET(ThisModDependencies vis io preprocessing)
ENDIF(ModuleEnabled) ENDIF(ModuleEnabled)
SET(ThisModStatus EXPERIMENTAL) SET(ThisModStatus TESTING)
SET(ThisModExternalDependencies FALSE) SET(ThisModExternalDependencies FALSE)
...@@ -49,7 +49,7 @@ namespace campvis { ...@@ -49,7 +49,7 @@ namespace campvis {
: AutoEvaluationPipeline(dc) : AutoEvaluationPipeline(dc)
, _usReader(&_canvasSize) , _usReader(&_canvasSize)
, _confidenceGenerator() , _confidenceGenerator()
, _usBlurFilter() , _usBlurFilter(&_canvasSize)
, _usFusion(&_canvasSize) , _usFusion(&_canvasSize)
, p_autoExecution("AutoExecution", "Automatic Execution", false) , p_autoExecution("AutoExecution", "Automatic Execution", false)
, p_sourcePath("SourcePath", "Source Files Path", "") , p_sourcePath("SourcePath", "Source Files Path", "")
...@@ -88,7 +88,7 @@ namespace campvis { ...@@ -88,7 +88,7 @@ namespace campvis {
_usReader.p_importType.selectById("localIntensity"); _usReader.p_importType.selectById("localIntensity");
_usReader.p_targetImageID.addSharedProperty(&_confidenceGenerator.p_sourceImageID); _usReader.p_targetImageID.addSharedProperty(&_confidenceGenerator.p_sourceImageID);
_usReader.p_targetImageID.addSharedProperty(&_usFusion.p_usImageId); _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.setValue("confidence.image.generated");
_confidenceGenerator.p_targetImageID.addSharedProperty(&_usFusion.p_confidenceImageID); _confidenceGenerator.p_targetImageID.addSharedProperty(&_usFusion.p_confidenceImageID);
...@@ -104,10 +104,9 @@ namespace campvis { ...@@ -104,10 +104,9 @@ namespace campvis {
_usFusion.p_view.selectById("mappingSharpness"); _usFusion.p_view.selectById("mappingSharpness");
_usFusion.p_sliceNumber.setValue(0); _usFusion.p_sliceNumber.setValue(0);
_usBlurFilter.p_targetImageID.setValue("us.blurred"); _usBlurFilter.p_outputImage.setValue("us.blurred");
_usBlurFilter.p_targetImageID.addSharedProperty(&_usFusion.p_blurredImageId); _usBlurFilter.p_outputImage.addSharedProperty(&_usFusion.p_blurredImageId);
_usBlurFilter.p_filterMode.selectById("gauss"); _usBlurFilter.p_sigma.setValue(2.f);
_usBlurFilter.p_sigma.setValue(4.f);
// TODO: replace this hardcoded domain by automatically determined from image min/max values // TODO: replace this hardcoded domain by automatically determined from image min/max values
......
...@@ -28,16 +28,8 @@ ...@@ -28,16 +28,8 @@
#include "core/datastructures/imagerepresentationlocal.h" #include "core/datastructures/imagerepresentationlocal.h"
#include "core/pipeline/autoevaluationpipeline.h" #include "core/pipeline/autoevaluationpipeline.h"
#include "modules/devil/processors/devilimagereader.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/advancedusvis/processors/advancedusfusion.h"
#include "modules/preprocessing/processors/gradientvolumegenerator.h" #include "modules/preprocessing/processors/glgaussianfilter.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/randomwalk/processors/confidencemapgenerator.h" #include "modules/randomwalk/processors/confidencemapgenerator.h"
#include "core/properties/buttonproperty.h" #include "core/properties/buttonproperty.h"
...@@ -84,7 +76,7 @@ namespace campvis { ...@@ -84,7 +76,7 @@ namespace campvis {
DevilImageReader _usReader; DevilImageReader _usReader;
ConfidenceMapGenerator _confidenceGenerator; ConfidenceMapGenerator _confidenceGenerator;
ItkImageFilter _usBlurFilter; GlGaussianFilter _usBlurFilter;
AdvancedUsFusion _usFusion; AdvancedUsFusion _usFusion;
BoolProperty p_autoExecution; BoolProperty p_autoExecution;
......
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