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
a2e9b6e7
Commit
a2e9b6e7
authored
Oct 22, 2014
by
Christian Schulte zu Berge
Browse files
Added more test cases.
parent
412f2e72
Changes
6
Hide whitespace changes
Inline
Side-by-side
modules/vis/pipelines/dvrvis.cpp
View file @
a2e9b6e7
...
...
@@ -34,7 +34,7 @@ namespace campvis {
DVRVis
::
DVRVis
(
DataContainer
*
dc
)
:
AutoEvaluationPipeline
(
dc
)
,
_camera
(
"
c
amera"
,
"Camera"
)
,
_camera
(
"
C
amera"
,
"Camera"
)
,
_lsp
()
,
_imageReader
()
,
_pgGenerator
()
...
...
@@ -96,15 +96,15 @@ namespace campvis {
_dvrNormal
.
p_targetImageID
.
setValue
(
"drr.output"
);
_dvrVM
.
p_targetImageID
.
setValue
(
"dvr.output"
);
Geometry1DTransferFunction
*
dvrTF
=
new
Geometry1DTransferFunction
(
128
,
tgt
::
vec2
(
0.
f
,
.05
f
));
dvrTF
->
addGeometry
(
TFGeometry1D
::
createQuad
(
tgt
::
vec2
(
.4
f
,
.42
f
),
tgt
::
col4
(
255
,
0
,
0
,
255
),
tgt
::
col4
(
255
,
0
,
0
,
255
)));
dvrTF
->
addGeometry
(
TFGeometry1D
::
createQuad
(
tgt
::
vec2
(
.45
f
,
.5
f
),
tgt
::
col4
(
0
,
255
,
0
,
255
),
tgt
::
col4
(
0
,
255
,
0
,
255
)));
_dvrNormal
.
p_transferFunction
.
replaceTF
(
dvrTF
);
Geometry1DTransferFunction
*
dvrTF
=
new
Geometry1DTransferFunction
(
128
,
tgt
::
vec2
(
0.
f
,
.05
f
));
dvrTF
->
addGeometry
(
TFGeometry1D
::
createQuad
(
tgt
::
vec2
(
.12
f
,
.15
f
),
tgt
::
col4
(
85
,
0
,
0
,
128
),
tgt
::
col4
(
255
,
0
,
0
,
128
)));
dvrTF
->
addGeometry
(
TFGeometry1D
::
createQuad
(
tgt
::
vec2
(
.19
f
,
.28
f
),
tgt
::
col4
(
89
,
89
,
89
,
155
),
tgt
::
col4
(
89
,
89
,
89
,
155
)));
dvrTF
->
addGeometry
(
TFGeometry1D
::
createQuad
(
tgt
::
vec2
(
.41
f
,
.51
f
),
tgt
::
col4
(
170
,
170
,
128
,
64
),
tgt
::
col4
(
192
,
192
,
128
,
64
)));
_dvrNormal
.
p_transferFunction
.
replaceTF
(
dvrTF
);
Geometry1DTransferFunction
*
vmTF
=
new
Geometry1DTransferFunction
(
128
,
tgt
::
vec2
(
0.
f
,
.05
f
));
vmTF
->
addGeometry
(
TFGeometry1D
::
createQuad
(
tgt
::
vec2
(
.4
f
,
.42
f
),
tgt
::
col4
(
255
,
0
,
0
,
255
),
tgt
::
col4
(
255
,
0
,
0
,
255
)));
vmTF
->
addGeometry
(
TFGeometry1D
::
createQuad
(
tgt
::
vec2
(
.45
f
,
.5
f
),
tgt
::
col4
(
0
,
255
,
0
,
255
),
tgt
::
col4
(
0
,
255
,
0
,
255
)));
_dvrVM
.
p_transferFunction
.
replaceTF
(
vmTF
);
Geometry1DTransferFunction
*
vmTF
=
new
Geometry1DTransferFunction
(
128
,
tgt
::
vec2
(
0.
f
,
.05
f
));
vmTF
->
addGeometry
(
TFGeometry1D
::
createQuad
(
tgt
::
vec2
(
.41
f
,
.51
f
),
tgt
::
col4
(
170
,
170
,
128
,
64
),
tgt
::
col4
(
192
,
192
,
128
,
64
)));
_dvrVM
.
p_transferFunction
.
replaceTF
(
vmTF
);
_vmRenderer
.
p_renderTargetID
.
addSharedProperty
(
&
_combine
.
p_mirrorRenderID
);
_vmEepGenerator
.
p_entryImageID
.
setValue
(
"vm.eep.entry"
);
...
...
@@ -124,8 +124,8 @@ namespace campvis {
_vmgGenerator
.
p_mirrorID
.
addSharedProperty
(
&
_vmEepGenerator
.
p_mirrorID
);
_vmgGenerator
.
p_mirrorID
.
addSharedProperty
(
&
_vmRenderer
.
p_geometryID
);
_vmgGenerator
.
p_mirrorCenter
.
setValue
(
tgt
::
vec3
(
0.
f
,
0.
f
,
-
20.
f
));
_vmgGenerator
.
p_poi
.
setValue
(
tgt
::
vec3
(
4
0.
f
,
4
0.
f
,
40
.
f
));
_vmgGenerator
.
p_size
.
setValue
(
60
.
f
);
_vmgGenerator
.
p_poi
.
setValue
(
tgt
::
vec3
(
5
0.
f
,
8
0.
f
,
15
.
f
));
_vmgGenerator
.
p_size
.
setValue
(
128
.
f
);
_eepGenerator
.
p_entryImageID
.
addSharedProperty
(
&
_dvrNormal
.
p_entryImageID
);
_vmEepGenerator
.
p_entryImageID
.
addSharedProperty
(
&
_dvrVM
.
p_entryImageID
);
...
...
test/modules/pipelineresultimagetest.cpp
View file @
a2e9b6e7
...
...
@@ -32,6 +32,7 @@
#include
"core/datastructures/datacontainer.h"
#include
"core/datastructures/renderdata.h"
#include
"core/pipeline/abstractpipeline.h"
#include
"core/properties/allproperties.h"
#include
"core/tools/stringutils.h"
#include
"modules/pipelinefactory.h"
...
...
@@ -89,22 +90,23 @@ protected:
_pipeline
->
init
();
_pipeline
->
setEnabled
(
true
);
_pipeline
->
setRenderTargetSize
(
tgt
::
ivec2
(
1024
,
1024
));
}
}
void
execute
()
{
if
(
_pipeline
!=
nullptr
)
{
// invalidate each processor
std
::
vector
<
AbstractProcessor
*>
processors
=
_pipeline
->
getProcessors
();
for
(
size_t
i
=
0
;
i
<
processors
.
size
();
++
i
)
{
processors
[
i
]
->
invalidate
(
AbstractProcessor
::
INVALID_RESULT
);
}
}
}
void
execute
()
{
if
(
_pipeline
!=
nullptr
)
{
_pipeline
->
executePipeline
();
// write result image
_imageWriter
.
p_inputImage
.
setValue
(
_pipeline
->
getRenderTargetID
());
_imageWriter
.
p_url
.
setValue
(
_fileName
);
_imageWriter
.
invalidate
(
AbstractProcessor
::
INVALID_RESULT
);
_imageWriter
.
process
(
_dataContainer
);
_wroteFile
=
tgt
::
FileSystem
::
fileExists
(
_fileName
);
...
...
@@ -127,7 +129,7 @@ int PipelineWriteResultImageTest::_prevNoCases = 0;
TEST_F
(
PipelineWriteResultImageTest
,
VolumeExplorerDemo
)
{
_pipelineName
=
"VolumeExplorerDemo"
;
_fileName
=
_basePath
+
"volumeexplorerdemo.png"
;
_fileName
=
_basePath
+
"volumeexplorerdemo.png"
;
init
();
execute
();
EXPECT_TRUE
(
_wroteFile
);
...
...
@@ -143,9 +145,66 @@ TEST_F(PipelineWriteResultImageTest, GeometryRendererDemo) {
TEST_F
(
PipelineWriteResultImageTest
,
SliceVis
)
{
_pipelineName
=
"SliceVis"
;
_fileName
=
_basePath
+
"slicevis.png"
;
_fileName
=
_basePath
+
"slicevis.png"
;
init
();
execute
();
EXPECT_TRUE
(
_wroteFile
);
}
TEST_F
(
PipelineWriteResultImageTest
,
AdvancedUsVis
)
{
_pipelineName
=
"AdvancedUsVis"
;
_fileName
=
_basePath
+
"advancedusvis.png"
;
init
();
execute
();
EXPECT_TRUE
(
_wroteFile
);
}
TEST_F
(
PipelineWriteResultImageTest
,
VectorFieldDemo
)
{
_pipelineName
=
"VectorFieldDemo"
;
_fileName
=
_basePath
+
"vectorfielddemo.png"
;
init
();
execute
();
AbstractProperty
*
p
=
_pipeline
->
getProperty
(
"SliceNuber"
);
if
(
IntProperty
*
tester
=
dynamic_cast
<
IntProperty
*>
(
p
))
{
tester
->
setValue
(
64
);
}
execute
();
EXPECT_TRUE
(
_wroteFile
);
}
TEST_F
(
PipelineWriteResultImageTest
,
DVRVis
)
{
_pipelineName
=
"DVRVis"
;
_fileName
=
_basePath
+
"dvrvis.png"
;
init
();
execute
();
AbstractProperty
*
p
=
_pipeline
->
getProperty
(
"Camera"
);
if
(
CameraProperty
*
tester
=
dynamic_cast
<
CameraProperty
*>
(
p
))
{
tgt
::
Camera
c
=
tester
->
getValue
();
c
.
setPosition
(
tgt
::
vec3
(
417.
f
,
44.5
f
,
-
112.5
f
));
c
.
setFocus
(
tgt
::
vec3
(
91.
f
,
91.
f
,
80.
f
));
c
.
setUpVector
(
tgt
::
vec3
(
-
0.487
f
,
0.142
f
,
-
0.861
f
));
tester
->
setValue
(
c
);
}
execute
();
EXPECT_TRUE
(
_wroteFile
);
}
TEST_F
(
PipelineWriteResultImageTest
,
TensorDemo
)
{
_pipelineName
=
"TensorDemo"
;
_fileName
=
_basePath
+
"tensordemo.png"
;
init
();
execute
();
AbstractProperty
*
p
=
_pipeline
->
getProperty
(
"SliceNuber"
);
if
(
IntProperty
*
tester
=
dynamic_cast
<
IntProperty
*>
(
p
))
{
tester
->
setValue
(
6
);
}
execute
();
EXPECT_TRUE
(
_wroteFile
);
}
...
...
test/visregtests/reference/1/advancedusvis.png
0 → 100644
View file @
a2e9b6e7
951 KB
test/visregtests/reference/1/dvrvis.png
0 → 100644
View file @
a2e9b6e7
1.13 MB
test/visregtests/reference/1/tensordemo.png
0 → 100644
View file @
a2e9b6e7
412 KB
test/visregtests/reference/1/vectorfielddemo.png
0 → 100644
View file @
a2e9b6e7
198 KB
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