Added smallHeart.mhd sample volume to repository, all demo pipelines in vis...

Added smallHeart.mhd sample volume to repository, all demo pipelines in vis module refer to this file. Hence, all vis pipelines should work out of the box from now.

application/CMakeLists.txt

@@ -63,8 +63,6 @@ SET(CampvisApplicationToBeMocced
     tools/bufferinglog.h
 )
 
-LIST(APPEND CampvisApplicationDefinitions "-DCAMPVIS_SOURCE_DIR=\"${CampvisHome}\"")
-
 #
 # Qt related stuff:
 #

cmake/commonconf.cmake

@@ -63,6 +63,8 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 LIST(APPEND CampvisGlobalIncludeDirs "${CampvisHome}/ext")
 LIST(APPEND CampvisGlobalIncludeDirs ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) 
 
+LIST(APPEND CampvisGlobalDefinitions "-DCAMPVIS_SOURCE_DIR=\"${CampvisHome}\"")
+
 # platform-dependent configuration
 IF(WIN32)
     LIST(APPEND CampvisGlobalDefinitions "-DNOMINMAX" "-D_CRT_SECURE_NO_DEPRECATE")

modules/vis/pipelines/dvrvis.cpp

@@ -83,8 +83,7 @@ namespace campvis {
         _camera.addSharedProperty(&_dvrNormal.p_camera);
         _camera.addSharedProperty(&_dvrVM.p_camera);
 
-        //_imageReader.p_url.setValue("D:\\Medical Data\\Dentalscan\\dental.mhd");
-        _imageReader.p_url.setValue("D:\\Medical Data\\smallHeart.mhd");
+        _imageReader.p_url.setValue(CAMPVIS_SOURCE_DIR "/modules/vis/sampledata/smallHeart.mhd");
         _imageReader.p_targetImageID.setValue("reader.output");
         _imageReader.p_targetImageID.addSharedProperty(&_eepGenerator.p_sourceImageID);
         _imageReader.p_targetImageID.addSharedProperty(&_vmEepGenerator.p_sourceImageID);

modules/vis/pipelines/resamplingdemo.cpp

@@ -56,7 +56,7 @@ namespace campvis {
         _ve.p_outputImage.setValue("result");
         _renderTargetID.setValue("result");
 
-        _imageReader.p_url.setValue("D:\\Medical Data\\smallHeart.mhd");
+        _imageReader.p_url.setValue(CAMPVIS_SOURCE_DIR "/modules/vis/sampledata/smallHeart.mhd");
         _imageReader.p_targetImageID.setValue("reader.output");
         _imageReader.p_targetImageID.addSharedProperty(&_resampler.p_inputImage);
 

modules/vis/pipelines/slicevis.cpp

@@ -50,7 +50,7 @@ namespace campvis {
     void SliceVis::init() {
         AutoEvaluationPipeline::init();
 
-        _imageReader.p_url.setValue("D:\\Medical Data\\Dentalscan\\dental.mhd");
+        _imageReader.p_url.setValue(CAMPVIS_SOURCE_DIR "/modules/vis/sampledata/smallHeart.mhd");
         _imageReader.p_targetImageID.setValue("reader.output");
         _imageReader.p_targetImageID.addSharedProperty(&_sliceExtractor.p_sourceImageID);
         _imageReader.s_validated.connect(this, &SliceVis::onProcessorValidated);

modules/vis/pipelines/volumeexplorerdemo.cpp

@@ -54,7 +54,7 @@ namespace campvis {
         _ve.p_outputImage.setValue("combine");
         _renderTargetID.setValue("combine");
 
-        _imageReader.p_url.setValue("D:\\Medical Data\\smallHeart.mhd");
+        _imageReader.p_url.setValue(CAMPVIS_SOURCE_DIR "/modules/vis/sampledata/smallHeart.mhd");
         _imageReader.p_targetImageID.setValue("reader.output");
         _imageReader.p_targetImageID.addSharedProperty(&_ve.p_inputVolume);
 

modules/vis/pipelines/volumerendererdemo.cpp

@@ -62,7 +62,7 @@ namespace campvis {
         _vr.p_outputImage.setValue("combine");
         _renderTargetID.setValue("combine");
 
-        _imageReader.p_url.setValue("D:\\Medical Data\\smallHeart.mhd");
+        _imageReader.p_url.setValue(CAMPVIS_SOURCE_DIR "/modules/vis/sampledata/smallHeart.mhd");
         _imageReader.p_targetImageID.setValue("reader.output");
         _imageReader.p_targetImageID.addSharedProperty(&_vr.p_inputVolume);
 

modules/vis/sampledata/smallHeart.mhd

+ObjectType = Image
+NDims = 3
+DimSize = 128 128 114
+ElementSpacing = 1.421876 1.421876 1.400024
+Position = 0 0 0
+ElementByteOrderMSB = False
+ElementType = MET_USHORT
+ElementDataFile = smallHeart.raw