Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 5992406e authored by Cristina Precup's avatar Cristina Precup
Browse files

Use ItkReader instead of GenericImageReader. Currently, this is more suitable...

Use ItkReader instead of GenericImageReader. Currently, this is more suitable for the SegmentationDemo and RegistrationDemo because of the supported image formats
parent dda7efb7
......@@ -61,12 +61,13 @@ namespace campvis {
_ve.p_outputImage.setValue("result");
_renderTargetID.setValue("result");
//_imageReader.setURL(CAMPVIS_SOURCE_DIR "/modules/vis/sampledata/smallHeart.mhd");
//_imageReader.setURL(CAMPVIS_SOURCE_DIR "/../misc/mha_loader_CAMPVis_volumes/prostate_phantom_US/prostate_phantom_fcal_volume_uncompressed.mhd");
_imageReader.setURL(CAMPVIS_SOURCE_DIR "/../misc/mha_loader_CAMPVis_volumes/prostate_phantom_US/prostate_phantom_fcal_volume_uncompressed.mha");
_imageReader.setTargetImageId("reader.output");
_imageReader.setTargetImageIdSharedProperty(&_ve.p_inputVolume);
// These 2 properties are not needed in the segmentation demo
_imageReader.removeProperty(_imageReader.p_imageSeries);
_imageReader.removeProperty(_imageReader.p_lastUrl);
_imageReader.p_url.setValue(CAMPVIS_SOURCE_DIR "/modules/vis/sampledata/prostatePhantom.mha");
_imageReader.p_targetImageID.setValue("reader.output");
_imageReader.p_targetImageID.addSharedProperty(&_ve.p_inputVolume);
Geometry1DTransferFunction* dvrTF = new Geometry1DTransferFunction(128, tgt::vec2(0.f, .05f));
dvrTF->addGeometry(TFGeometry1D::createQuad(tgt::vec2(.4f, .5f), tgt::col4(32, 192, 0, 128), tgt::col4(32, 192, 0, 128)));
......
......@@ -27,8 +27,8 @@
#include "core/pipeline/autoevaluationpipeline.h"
#include "modules/base/processors/lightsourceprovider.h"
#include "modules/io/processors/genericimagereader.h"
#include "modules/vis/processors/volumeexplorer.h"
#include "modules/itk/processors/itkreader.h"
#include "modules/itk/processors/itkimagefilter.h"
#include "modules/itk/processors/itkregistration.h"
......@@ -58,7 +58,7 @@ namespace campvis {
protected:
LightSourceProvider _lsp;
GenericImageReader _imageReader;
ItkReader _imageReader;
VolumeExplorer _ve;
ItkRegistration _itkRegistration;
};
......
......@@ -61,12 +61,14 @@ namespace campvis {
_itkSegmentation.p_outputImage.setValue("result");
_renderTargetID.setValue("result");
//_imageReader.setURL(CAMPVIS_SOURCE_DIR "/modules/vis/sampledata/smallHeart.mhd");
_imageReader.setURL(CAMPVIS_SOURCE_DIR "/../misc/mha_loader_CAMPVis_volumes/prostate_phantom_US/prostate_phantom_fcal_volume_uncompressed.mha");
_imageReader.setTargetImageId("reader.output");
_imageReader.setTargetImageIdSharedProperty(&_itkSegmentation.p_inputVolume);
// These 2 properties are not needed in the segmentation demo
_imageReader.removeProperty(_imageReader.p_imageSeries);
_imageReader.removeProperty(_imageReader.p_lastUrl);
_imageReader.p_url.setValue(CAMPVIS_SOURCE_DIR "/modules/vis/sampledata/prostatePhantom.mha");
_imageReader.p_targetImageID.setValue("reader.output");
_imageReader.p_targetImageID.addSharedProperty(&_itkSegmentation.p_inputVolume);
Geometry1DTransferFunction* dvrTF = new Geometry1DTransferFunction(128, tgt::vec2(0.f, .05f));
dvrTF->addGeometry(TFGeometry1D::createQuad(tgt::vec2(.4f, .5f), tgt::col4(32, 192, 0, 128), tgt::col4(32, 192, 0, 128)));
dvrTF->addGeometry(TFGeometry1D::createQuad(tgt::vec2(.12f, .15f), tgt::col4(85, 0, 0, 128), tgt::col4(255, 0, 0, 128)));
......
......@@ -27,7 +27,7 @@
#include "core/pipeline/autoevaluationpipeline.h"
#include "modules/base/processors/lightsourceprovider.h"
#include "modules/io/processors/genericimagereader.h"
#include "modules/itk/processors/itkreader.h"
#include "modules/itk/processors/itkimagefilter.h"
#include "modules/itk/processors/itksegmentation.h"
......@@ -57,7 +57,7 @@ namespace campvis {
protected:
LightSourceProvider _lsp;
GenericImageReader _imageReader;
ItkReader _imageReader;
ItkImageFilter _itkFilter;
ItkSegmentation _itkSegmentation;
};
......
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