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
779ab835
Commit
779ab835
authored
Aug 16, 2013
by
Christian Schulte zu Berge
Browse files
fixed include
parent
97a051c5
Changes
5
Hide whitespace changes
Inline
Side-by-side
application/campvis.cpp
View file @
779ab835
...
...
@@ -46,6 +46,10 @@
#include
"modules/columbia/pipelines/columbia1.h"
#endif
#ifdef Q_WS_X11
#include
<X11/Xlib.h>
#endif
using
namespace
campvis
;
/**
...
...
@@ -56,13 +60,18 @@ using namespace campvis;
* \return 0 if program exited successfully
**/
int
main
(
int
argc
,
char
**
argv
)
{
#ifdef Q_WS_X11
std
::
cout
<<
"XInitThreads()
\n
"
;
XInitThreads
();
#endif
CampVisApplication
app
(
argc
,
argv
);
//app.addVisualizationPipeline("Advanced Ultrasound Visualization", new AdvancedUsVis());
//app.addVisualizationPipeline("Confidence Map Generation", new CmBatchGeneration());
// app.addVisualizationPipeline("IXPV", new IxpvDemo());
//app.addVisualizationPipeline("SliceVis", new SliceVis());
//app.addVisualizationPipeline("DVRVis", new DVRVis());
//
app.addVisualizationPipeline("VolumeRendererDemo", new VolumeRendererDemo());
app
.
addVisualizationPipeline
(
"VolumeRendererDemo"
,
new
VolumeRendererDemo
());
#ifdef HAS_KISSCL
//app.addVisualizationPipeline("DVR with OpenCL", new OpenCLPipeline());
#endif
...
...
@@ -72,7 +81,7 @@ int main(int argc, char** argv) {
#endif
#ifdef CAMPVIS_HAS_MODULE_COLUMBIA
app
.
addVisualizationPipeline
(
"Columbia"
,
new
Columbia1
());
//
app.addVisualizationPipeline("Columbia", new Columbia1());
#endif
...
...
application/campvisapplication.h
View file @
779ab835
...
...
@@ -60,7 +60,7 @@ namespace campvis {
* 5. call deinit()
* 6. You can now safely destroy your CampVisApplication
*/
class
CampVisApplication
:
QApplication
{
class
CampVisApplication
:
public
QApplication
{
friend
class
MainWindow
;
public:
...
...
core/properties/numericproperty.h
View file @
779ab835
...
...
@@ -243,32 +243,32 @@ namespace campvis {
template
<
typename
T
>
void
campvis
::
NumericProperty
<
T
>::
setMinValue
(
const
T
&
value
)
{
_minValue
=
value
;
this
->
_minValue
=
value
;
this
->
setValue
(
validateValue
(
this
->
_value
));
for
(
std
::
set
<
AbstractProperty
*>::
iterator
it
=
_sharedProperties
.
begin
();
it
!=
_sharedProperties
.
end
();
++
it
)
{
for
(
std
::
set
<
AbstractProperty
*>::
iterator
it
=
this
->
_sharedProperties
.
begin
();
it
!=
this
->
_sharedProperties
.
end
();
++
it
)
{
// We ensure all shared properties to be of type NumericProperty<T> in the addSharedProperty overload.
// Hence, static_cast ist safe.
NumericProperty
<
T
>*
child
=
static_cast
<
NumericProperty
<
T
>*
>
(
*
it
);
child
->
setMinValue
(
value
);
}
s_minMaxChanged
(
this
);
this
->
s_minMaxChanged
(
this
);
}
template
<
typename
T
>
void
campvis
::
NumericProperty
<
T
>::
setMaxValue
(
const
T
&
value
)
{
_maxValue
=
value
;
this
->
_maxValue
=
value
;
this
->
setValue
(
validateValue
(
this
->
_value
));
for
(
std
::
set
<
AbstractProperty
*>::
iterator
it
=
_sharedProperties
.
begin
();
it
!=
_sharedProperties
.
end
();
++
it
)
{
for
(
std
::
set
<
AbstractProperty
*>::
iterator
it
=
this
->
_sharedProperties
.
begin
();
it
!=
this
->
_sharedProperties
.
end
();
++
it
)
{
// We ensure all shared properties to be of type NumericProperty<T> in the addSharedProperty overload.
// Hence, static_cast ist safe.
NumericProperty
<
T
>*
child
=
static_cast
<
NumericProperty
<
T
>*
>
(
*
it
);
child
->
setMaxValue
(
value
);
}
s_minMaxChanged
(
this
);
this
->
s_minMaxChanged
(
this
);
}
template
<
typename
T
>
...
...
ext/sigslot/sigslot.h
View file @
779ab835
...
...
@@ -92,7 +92,7 @@
#include
<set>
#include
<list>
#include
"tbb/
include/tbb/
spin_mutex.h"
#include
"tbb/spin_mutex.h"
#define _SIGSLOT_HAS_TBB
/*
...
...
ext/tgt/texturemanager.cpp
View file @
779ab835
...
...
@@ -176,7 +176,7 @@ Texture* TextureManager::loadFromMemory(Texture* t, Texture::Filter filter, bool
break
;
default:
LERROR
(
static_cast
<
int
>
(
t
->
bpp_
)
<<
" bits per pixel...error!"
);
return
false
;
return
0
;
}
if
(
createOGLTex
)
{
...
...
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