Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
ad0c85f7
Commit
ad0c85f7
authored
Jun 11, 2014
by
Christian Schulte zu Berge
Browse files
Merge branch 'SliceExtractorScribbeFix' into 'development'
Slice extractor scribbe fix as discussed
parents
b98c84df
f14cc486
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/vis/processors/sliceextractor.cpp
View file @
ad0c85f7
...
...
@@ -348,7 +348,7 @@ namespace campvis {
tgt
::
vec3
imgSize
(
id
->
getSize
());
float
sliceRatio
,
ratioRatio
;
tgt
::
s
vec3
voxel
;
tgt
::
vec3
voxel
;
switch
(
p_sliceOrientation
.
getOptionValue
())
{
case
XY_PLANE
:
...
...
@@ -358,7 +358,7 @@ namespace campvis {
posNormalized
*=
(
ratioRatio
>
1
)
?
tgt
::
vec2
(
1.
f
,
ratioRatio
)
:
tgt
::
vec2
(
1.
f
/
ratioRatio
,
1.
f
);
posNormalized
=
tgt
::
clamp
(
posNormalized
,
0.
f
,
1.
f
);
voxel
=
tgt
::
clamp
(
tgt
::
s
vec3
(
static_cast
<
size_t
>
(
posNormalized
.
x
*
imageSize
.
x
)
,
static_cast
<
size_t
>
(
posNormalized
.
y
*
imageSize
.
y
)
,
p_zSliceNumber
.
getValue
()),
tgt
::
s
vec3
(
0
,
0
,
0
),
imageSize
);
voxel
=
tgt
::
clamp
(
tgt
::
vec3
(
posNormalized
.
x
*
imageSize
.
x
,
posNormalized
.
y
*
imageSize
.
y
,
static_cast
<
float
>
(
p_zSliceNumber
.
getValue
())
)
,
tgt
::
vec3
(
0
.
f
),
tgt
::
vec3
(
imageSize
)
)
;
break
;
case
XZ_PLANE
:
sliceRatio
=
(
imgSize
.
x
*
id
->
getMappingInformation
().
getVoxelSize
().
x
)
/
(
imgSize
.
z
*
id
->
getMappingInformation
().
getVoxelSize
().
z
);
...
...
@@ -367,7 +367,7 @@ namespace campvis {
posNormalized
*=
(
ratioRatio
>
1
)
?
tgt
::
vec2
(
1.
f
,
ratioRatio
)
:
tgt
::
vec2
(
1.
f
/
ratioRatio
,
1.
f
);
posNormalized
=
tgt
::
clamp
(
posNormalized
,
0.
f
,
1.
f
);
voxel
=
tgt
::
clamp
(
tgt
::
s
vec3
(
static_cast
<
size_t
>
(
posNormalized
.
x
*
imageSize
.
x
)
,
p_ySliceNumber
.
getValue
(),
static_cast
<
size_t
>
(
posNormalized
.
y
*
imageSize
.
z
)
)
,
tgt
::
s
vec3
(
0
,
0
,
0
),
imageSize
);
voxel
=
tgt
::
clamp
(
tgt
::
vec3
(
posNormalized
.
x
*
imageSize
.
x
,
static_cast
<
float
>
(
p_ySliceNumber
.
getValue
()
)
,
posNormalized
.
y
*
imageSize
.
z
),
tgt
::
vec3
(
0
.
f
),
tgt
::
vec3
(
imageSize
)
)
;
break
;
case
YZ_PLANE
:
sliceRatio
=
(
imgSize
.
y
*
id
->
getMappingInformation
().
getVoxelSize
().
y
)
/
(
imgSize
.
z
*
id
->
getMappingInformation
().
getVoxelSize
().
z
);
...
...
@@ -376,7 +376,7 @@ namespace campvis {
posNormalized
*=
(
ratioRatio
>
1
)
?
tgt
::
vec2
(
1.
f
,
ratioRatio
)
:
tgt
::
vec2
(
1.
f
/
ratioRatio
,
1.
f
);
posNormalized
=
tgt
::
clamp
(
posNormalized
,
0.
f
,
1.
f
);
voxel
=
tgt
::
clamp
(
tgt
::
s
vec3
(
p_xSliceNumber
.
getValue
(),
static_cast
<
size_t
>
(
posNormalized
.
x
*
imageSize
.
y
)
,
static_cast
<
size_t
>
(
posNormalized
.
y
*
imageSize
.
z
)
)
,
tgt
::
s
vec3
(
0
,
0
,
0
),
imageSize
);
voxel
=
tgt
::
clamp
(
tgt
::
vec3
(
static_cast
<
float
>
(
p_xSliceNumber
.
getValue
()
)
,
posNormalized
.
x
*
imageSize
.
y
,
posNormalized
.
y
*
imageSize
.
z
),
tgt
::
vec3
(
0
.
f
),
tgt
::
vec3
(
imageSize
)
)
;
break
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment