Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
CAMP
campvis-public
Commits
efa1e0a7
Commit
efa1e0a7
authored
Dec 16, 2014
by
Christian Schulte zu Berge
Browse files
Various further GCC fixes.
parent
5f1ee836
Changes
9
Hide whitespace changes
Inline
Side-by-side
application/gui/mainwindow.cpp
View file @
efa1e0a7
...
...
@@ -313,7 +313,7 @@ namespace campvis {
PropertyCollectionLuaScriptGenerator
*
_pcLua
=
new
PropertyCollectionLuaScriptGenerator
();
std
::
string
pipeScript
=
"pipeline = pipelines[
\"
"
+
_selectedPipeline
->
getName
()
+
"
\"
]
\n\n
"
;
for
(
in
t
i
=
1
;
i
<
_selectedPipeline
->
getProcessors
().
size
();
i
++
)
{
for
(
size_
t
i
=
0
;
i
<
_selectedPipeline
->
getProcessors
().
size
();
i
++
)
{
pipeScript
+=
"proc = pipeline:getProcessor("
+
StringUtils
::
toString
(
i
)
+
")
\n
"
;
AbstractProcessor
*
proc
=
_selectedPipeline
->
getProcessor
(
i
);
...
...
modules/base/bindings/base.i
View file @
efa1e0a7
%
module
base
%
include
std_string
.
i
%
import
"ext/cgt/bindings/cgt.i"
%
i
mport
"core/bindings/campvis.i"
%
i
nclude
"core/bindings/campvis.i"
%
{
#
include
"core/pipeline/autoevaluationpipeline.h"
#
include
"core/pipeline/visualizationprocessor.h"
...
...
modules/devil/bindings/devil.i
View file @
efa1e0a7
%
module
devil
%
include
std_string
.
i
%
i
mport
"core/bindings/campvis.i"
%
i
nclude
"core/bindings/campvis.i"
%
{
#
include
"core/pipeline/visualizationprocessor.h"
...
...
modules/io/bindings/cvio.i
View file @
efa1e0a7
%
module
cvio
%
include
std_string
.
i
%
i
mport
"core/bindings/campvis.i"
%
i
nclude
"core/bindings/campvis.i"
%
{
#
include
"core/pipeline/visualizationprocessor.h"
#
include
"core/pipeline/autoevaluationpipeline.h"
...
...
modules/microscopysegmentation/bindings/microscopysegmentation.i
View file @
efa1e0a7
%
module
microscopysegmentation
%
include
std_string
.
i
%
i
mport
"core/bindings/campvis.i"
%
i
nclude
"core/bindings/campvis.i"
%
{
#
include
"core/pipeline/autoevaluationpipeline.h"
...
...
modules/preprocessing/bindings/preprocessing.i
View file @
efa1e0a7
%
module
preprocessing
%
include
std_string
.
i
%
i
mport
"core/bindings/campvis.i"
%
i
nclude
"core/bindings/campvis.i"
%
{
#
include
"core/pipeline/autoevaluationpipeline.h"
#
include
"modules/preprocessing/processors/glimageresampler.h"
...
...
modules/vis/bindings/vis.i
View file @
efa1e0a7
%
module
vis
%
include
std_string
.
i
%
i
mport
"core/bindings/campvis.i"
%
i
nclude
"core/bindings/campvis.i"
%
{
#
include
"core/pipeline/autoevaluationpipeline.h"
#
include
"modules/vis/processors/volumeexplorer.h"
...
...
scripting/luagen/properties/floatpropertylua.h
View file @
efa1e0a7
...
...
@@ -133,7 +133,7 @@ namespace campvis {
{
}
std
::
string
Vec2PropertyLua
::
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
std
::
string
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
cgt
::
vec2
value
=
static_cast
<
Vec2Property
*>
(
_property
)
->
getValue
();
std
::
string
ret
=
""
;
ret
+=
luaProc
;
...
...
@@ -151,7 +151,7 @@ namespace campvis {
:
VecPropertyLua
<
3
>
(
property
,
dataContainer
)
{
}
std
::
string
Vec3PropertyLua
::
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
std
::
string
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
cgt
::
vec3
value
=
static_cast
<
Vec3Property
*>
(
_property
)
->
getValue
();
std
::
string
ret
=
""
;
ret
+=
luaProc
;
...
...
@@ -171,7 +171,7 @@ namespace campvis {
{
}
std
::
string
Vec4PropertyLua
::
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
std
::
string
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
cgt
::
vec4
value
=
static_cast
<
Vec4Property
*>
(
_property
)
->
getValue
();
std
::
string
ret
=
""
;
ret
+=
luaProc
;
...
...
scripting/luagen/properties/intpropertylua.h
View file @
efa1e0a7
...
...
@@ -131,7 +131,7 @@ namespace campvis {
{
}
std
::
string
IVec2PropertyLua
::
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
std
::
string
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
cgt
::
ivec2
value
=
static_cast
<
IVec2Property
*>
(
_property
)
->
getValue
();
std
::
string
ret
=
""
;
ret
+=
luaProc
;
...
...
@@ -150,7 +150,7 @@ namespace campvis {
{
}
std
::
string
IVec3PropertyLua
::
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
std
::
string
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
cgt
::
ivec3
value
=
static_cast
<
IVec3Property
*>
(
_property
)
->
getValue
();
std
::
string
ret
=
""
;
ret
+=
luaProc
;
...
...
@@ -170,7 +170,7 @@ namespace campvis {
{
}
std
::
string
IVec4PropertyLua
::
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
std
::
string
getLuaScript
(
const
std
::
string
&
propNamePrefix
,
const
std
::
string
&
luaProc
)
{
cgt
::
ivec4
value
=
static_cast
<
IVec4Property
*>
(
_property
)
->
getValue
();
std
::
string
ret
=
""
;
ret
+=
luaProc
;
...
...
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