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
7edd6039
Commit
7edd6039
authored
Aug 19, 2013
by
Christian Schulte zu Berge
Browse files
various minor changes
Revert "* fixes Issue #99" This reverts commit
97fb9f3c
.
parent
c740d32c
Changes
4
Hide whitespace changes
Inline
Side-by-side
application/gui/properties/datanamepropertywidget.cpp
View file @
7edd6039
...
...
@@ -80,20 +80,10 @@ namespace campvis {
void
DataNamePropertyWidget
::
updateWidgetFromProperty
()
{
DataNameProperty
*
prop
=
static_cast
<
DataNameProperty
*>
(
_property
);
QString
qs
=
QString
::
fromStdString
(
prop
->
getValue
());
if
(
prop
->
getAccessInfo
()
==
DataNameProperty
::
READ
)
{
int
idx
=
_combobox
->
findText
(
qs
);
if
(
idx
!=
-
1
)
_combobox
->
setCurrentIndex
(
idx
);
else
_combobox
->
setEditText
(
qs
);
}
else
{
if
(
_lineEdit
->
text
()
!=
qs
)
{
_lineEdit
->
blockSignals
(
true
);
_lineEdit
->
setText
(
qs
);
_lineEdit
->
blockSignals
(
false
);
}
if
(
_lineEdit
->
text
()
!=
qs
)
{
_lineEdit
->
blockSignals
(
true
);
_lineEdit
->
setText
(
qs
);
_lineEdit
->
blockSignals
(
false
);
}
}
...
...
modules/columbia/datastructures/fiberdata.cpp
View file @
7edd6039
...
...
@@ -150,7 +150,7 @@ namespace campvis {
}
void
FiberData
::
createGlBuffers
()
const
{
if
(
_buffersInitialized
)
if
(
_buffersInitialized
||
_fibers
.
empty
()
||
_vertices
.
empty
()
)
return
;
// reset everything
...
...
@@ -200,6 +200,9 @@ namespace campvis {
}
void
FiberData
::
render
(
GLenum
mode
/*= GL_LINE_STRIP*/
)
const
{
if
(
_fibers
.
empty
()
||
_vertices
.
empty
())
return
;
createGlBuffers
();
if
(
!
_buffersInitialized
)
{
LERRORC
(
"CAMPVis.modules.columbia.FiberData"
,
"Cannot render without initialized OpenGL buffers."
);
...
...
modules/scr_msk/glsl/trackedussweepframerenderer3d.frag
View file @
7edd6039
...
...
@@ -27,8 +27,6 @@
//
// ================================================================================================
#version 330
in
vec3
ex_TexCoord
;
out
vec4
out_Color
;
...
...
modules/scr_msk/scr_msk.cmake
View file @
7edd6039
...
...
@@ -17,8 +17,8 @@ IF(cisst_FOUND AND MskSourceDirectory AND MskBuildDirectory AND RegEngineSourceD
LIST
(
APPEND ThisModExternalLibs debug usinterface-vc10d optimized usinterface-vc10
)
LIST
(
APPEND ThisModLinkDirectories
${
MskLibraryDirectory
}
${
PCL_LIBRARY_DIRS
}
"
${
MSK_SOURCE_DIR
}
/extern/lib"
${
RegEngineBuildDir
}
)
LIST
(
APPEND ThisModExternalDllsDebug
"
${
RegEngineBuildDir
}
/Debug/RegistrationEngined.dll"
"
${
cisst_DIR
}
/lib/Debug/cisstCommon.dll"
"
${
cisst_DIR
}
/lib/Debug/cisstVector.dll"
"
${
PCL_DIR
}
/bin/pcl_common_debug.dll"
"
${
MskBuildDirectory
}
/Debug/usinterface-vc10d.dll"
)
LIST
(
APPEND ThisModExternalDllsRelease
"
${
RegEngineBuildDir
}
/Release/RegistrationEngine.dll"
"
${
cisst_DIR
}
/lib/Release/cisstCommon.dll"
"
${
cisst_DIR
}
/lib/Release/cisstVector.dll"
"
${
PCL_DIR
}
/bin/pcl_common_release.dll"
"
${
MskBuildDirectory
}
/Release/usinterface-vc10.dll"
)
LIST
(
APPEND ThisModExternalDllsDebug
"
${
RegEngineBuildDir
}
/Debug/RegistrationEngined.dll"
"
${
cisst_DIR
}
/lib/Debug/cisstCommon.dll"
"
${
cisst_DIR
}
/lib/Debug/cisstVector.dll"
"
${
PCL_DIR
}
/
../
bin/pcl_common_debug.dll"
"
${
MskBuildDirectory
}
/Debug/usinterface-vc10d.dll"
)
LIST
(
APPEND ThisModExternalDllsRelease
"
${
RegEngineBuildDir
}
/Release/RegistrationEngine.dll"
"
${
cisst_DIR
}
/lib/Release/cisstCommon.dll"
"
${
cisst_DIR
}
/lib/Release/cisstVector.dll"
"
${
PCL_DIR
}
/
../
bin/pcl_common_release.dll"
"
${
MskBuildDirectory
}
/Release/usinterface-vc10.dll"
)
ELSE
()
MESSAGE
(
FATAL_ERROR
"Please specify the path to the MSK project and its dependencies!"
)
ENDIF
()
...
...
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