Commit fc66bbce authored by Oliver Zettinig's avatar Oliver Zettinig
Browse files

New sample data, no absolute paths

parent 1933f466
......@@ -68,13 +68,13 @@ namespace campvis {
p_sliceNumber.addSharedProperty(&_vectorFieldRenderer.p_sliceNumber);
p_sliceNumber.addSharedProperty(&_sliceRenderer.p_sliceNumber);
_imageReader.p_url.setValue("D:\\data\\carotid_data\\recon_20140205\\oliver_run1_rec1_2D_compounded.mhd");
_imageReader.p_url.setValue(CAMPVIS_SOURCE_DIR "/modules/vectorfield/sampledata/rec1_2D_comp.mhd");
_imageReader.p_targetImageID.setValue("reader.output");
_imageReader.p_targetImageID.addSharedProperty(&_sliceRenderer.p_sourceImageID);
_imageReader.s_validated.connect(this, &VectorFieldDemo::onProcessorValidated);
_vectorFieldReader.p_url.setValue("D:\\data\\carotid_data\\recon_20140205\\result_reg_spacing1\\result_vec.mhd");
_vectorFieldReader.p_url.setValue(CAMPVIS_SOURCE_DIR "/modules/vectorfield/sampledata/result_vec.mhd");
_vectorFieldReader.p_targetImageID.setValue("vectors");
_vectorFieldReader.p_targetImageID.addSharedProperty(&_vectorFieldRenderer.p_inputVectors);
......
......@@ -293,7 +293,7 @@ namespace campvis {
float VectorFieldRenderer::evaluateCubicBSpline(float t)
{
t += 2; // t is given zero-centered => shift peak from 2 to 0
if(t <= 0 || t >= 4)
if(t <= 0 || t >= 4)
return 0;
else if(t <= 1)
return t*t*t / 6.0f;
......
NDims = 3
DimSize = 36 36 36
DimSize = 89 122 100
ElementType = MET_FLOAT
ElementSpacing = 1 1 1
ElementSpacing = 0.250000 0.250000 0.250000
ElementByteOrderMSB = False
ElementDataFile = result_y.raw
ElementDataFile = rec1_2D_comp.raw
NDims = 3
DimSize = 36 36 36
DimSize = 29 37 45
ElementType = MET_FLOAT
ElementNumberOfChannels = 3
ElementSpacing = 1 1 1
Position = -1.03666 -6.69913 -17.9103
ElementByteOrderMSB = False
ElementDataFile = phantom_x.raw
ElementDataFile = result_vec.raw
NDims = 3
DimSize = 36 36 36
ElementType = MET_FLOAT
ElementSpacing = 1 1 1
ElementByteOrderMSB = False
ElementDataFile = result_x.raw
NDims = 3
DimSize = 36 36 36
ElementType = MET_FLOAT
ElementSpacing = 1 1 1
ElementByteOrderMSB = False
ElementDataFile = result_z.raw
Supports Markdown
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