Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
CGoGN
CGoGN
Commits
a9026e1f
Commit
a9026e1f
authored
Jul 19, 2013
by
Thomas Jund
Browse files
Options
Browse Files
Download
Plain Diff
correction of some warning for Particle
parents
f656d2cc
2023e6b7
Changes
101
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
101 changed files
with
3711 additions
and
2062 deletions
+3711
-2062
Apps/Examples/viewer.cpp
Apps/Examples/viewer.cpp
+14
-7
Apps/Examples/viewer.h
Apps/Examples/viewer.h
+4
-2
Apps/Tuto/show_traversors.cpp
Apps/Tuto/show_traversors.cpp
+6
-6
Apps/Tuto/tuto_oper3.cpp
Apps/Tuto/tuto_oper3.cpp
+10
-0
Apps/Tuto/tuto_oper3.ui
Apps/Tuto/tuto_oper3.ui
+5
-0
CMakeLists.txt
CMakeLists.txt
+6
-7
README_APPS.TXT
README_APPS.TXT
+1
-1
README_ECLIPSE.TXT
README_ECLIPSE.TXT
+1
-1
README_MAC.TXT
README_MAC.TXT
+7
-28
README_VISUAL.TXT
README_VISUAL.TXT
+3
-1
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+5
-0
SCHNApps/Plugins/CMakeLists.txt
SCHNApps/Plugins/CMakeLists.txt
+1
-0
SCHNApps/Plugins/differentialProperties/forms/computeCurvatureDialog.ui
...ns/differentialProperties/forms/computeCurvatureDialog.ui
+148
-174
SCHNApps/Plugins/differentialProperties/include/differentialProperties.h
...s/differentialProperties/include/differentialProperties.h
+6
-2
SCHNApps/Plugins/differentialProperties/src/computeCurvatureDialog.cpp
...ins/differentialProperties/src/computeCurvatureDialog.cpp
+6
-2
SCHNApps/Plugins/differentialProperties/src/computeNormalDialog.cpp
...lugins/differentialProperties/src/computeNormalDialog.cpp
+0
-1
SCHNApps/Plugins/differentialProperties/src/differentialProperties.cpp
...ins/differentialProperties/src/differentialProperties.cpp
+43
-4
SCHNApps/Plugins/importSurface/src/importSurface.cpp
SCHNApps/Plugins/importSurface/src/importSurface.cpp
+6
-2
SCHNApps/Plugins/importVolume/src/importVolume.cpp
SCHNApps/Plugins/importVolume/src/importVolume.cpp
+6
-2
SCHNApps/Plugins/render/include/render.h
SCHNApps/Plugins/render/include/render.h
+10
-3
SCHNApps/Plugins/render/include/renderDockTab.h
SCHNApps/Plugins/render/include/renderDockTab.h
+4
-2
SCHNApps/Plugins/render/src/render.cpp
SCHNApps/Plugins/render/src/render.cpp
+64
-71
SCHNApps/Plugins/render/src/renderDockTab.cpp
SCHNApps/Plugins/render/src/renderDockTab.cpp
+22
-29
SCHNApps/Plugins/renderExplod/include/renderExplod.h
SCHNApps/Plugins/renderExplod/include/renderExplod.h
+7
-4
SCHNApps/Plugins/renderExplod/include/renderExplodDockTab.h
SCHNApps/Plugins/renderExplod/include/renderExplodDockTab.h
+2
-0
SCHNApps/Plugins/renderExplod/src/renderExplod.cpp
SCHNApps/Plugins/renderExplod/src/renderExplod.cpp
+45
-40
SCHNApps/Plugins/renderExplod/src/renderExplodDockTab.cpp
SCHNApps/Plugins/renderExplod/src/renderExplodDockTab.cpp
+14
-1
SCHNApps/Plugins/renderScalar/CMakeLists.txt
SCHNApps/Plugins/renderScalar/CMakeLists.txt
+32
-0
SCHNApps/Plugins/renderScalar/forms/renderScalar.ui
SCHNApps/Plugins/renderScalar/forms/renderScalar.ui
+92
-0
SCHNApps/Plugins/renderScalar/include/renderScalar.h
SCHNApps/Plugins/renderScalar/include/renderScalar.h
+97
-0
SCHNApps/Plugins/renderScalar/include/renderScalarDockTab.h
SCHNApps/Plugins/renderScalar/include/renderScalarDockTab.h
+46
-0
SCHNApps/Plugins/renderScalar/src/renderScalar.cpp
SCHNApps/Plugins/renderScalar/src/renderScalar.cpp
+280
-0
SCHNApps/Plugins/renderScalar/src/renderScalarDockTab.cpp
SCHNApps/Plugins/renderScalar/src/renderScalarDockTab.cpp
+142
-0
SCHNApps/Plugins/renderTopoSurface/forms/renderTopoSurface.ui
...Apps/Plugins/renderTopoSurface/forms/renderTopoSurface.ui
+97
-65
SCHNApps/Plugins/renderTopoSurface/include/renderTopoSurface.h
...pps/Plugins/renderTopoSurface/include/renderTopoSurface.h
+19
-4
SCHNApps/Plugins/renderTopoSurface/include/renderTopoSurfaceDockTab.h
...gins/renderTopoSurface/include/renderTopoSurfaceDockTab.h
+10
-2
SCHNApps/Plugins/renderTopoSurface/src/renderTopoSurface.cpp
SCHNApps/Plugins/renderTopoSurface/src/renderTopoSurface.cpp
+153
-51
SCHNApps/Plugins/renderTopoSurface/src/renderTopoSurfaceDockTab.cpp
...lugins/renderTopoSurface/src/renderTopoSurfaceDockTab.cpp
+90
-8
SCHNApps/Plugins/renderVector/include/renderVector.h
SCHNApps/Plugins/renderVector/include/renderVector.h
+7
-4
SCHNApps/Plugins/renderVector/include/renderVectorDockTab.h
SCHNApps/Plugins/renderVector/include/renderVectorDockTab.h
+4
-2
SCHNApps/Plugins/renderVector/src/renderVector.cpp
SCHNApps/Plugins/renderVector/src/renderVector.cpp
+50
-50
SCHNApps/Plugins/renderVector/src/renderVectorDockTab.cpp
SCHNApps/Plugins/renderVector/src/renderVectorDockTab.cpp
+16
-23
SCHNApps/Plugins/surfaceDeformation/include/surfaceDeformation.h
...s/Plugins/surfaceDeformation/include/surfaceDeformation.h
+19
-8
SCHNApps/Plugins/surfaceDeformation/include/surfaceDeformationDockTab.h
...ns/surfaceDeformation/include/surfaceDeformationDockTab.h
+2
-0
SCHNApps/Plugins/surfaceDeformation/src/surfaceDeformation.cpp
...pps/Plugins/surfaceDeformation/src/surfaceDeformation.cpp
+136
-99
SCHNApps/Plugins/surfaceDeformation/src/surfaceDeformationDockTab.cpp
...gins/surfaceDeformation/src/surfaceDeformationDockTab.cpp
+3
-3
SCHNApps/bin/init.py
SCHNApps/bin/init.py
+0
-19
SCHNApps/bin/schnappsInit.py
SCHNApps/bin/schnappsInit.py
+2
-0
SCHNApps/forms/window.ui
SCHNApps/forms/window.ui
+9
-0
SCHNApps/include/colorComboBox.h
SCHNApps/include/colorComboBox.h
+28
-0
SCHNApps/include/window.h
SCHNApps/include/window.h
+1
-0
SCHNApps/src/colorComboBox.cpp
SCHNApps/src/colorComboBox.cpp
+51
-0
SCHNApps/src/main.cpp
SCHNApps/src/main.cpp
+1
-1
SCHNApps/src/window.cpp
SCHNApps/src/window.cpp
+13
-3
ThirdParty/OpenNL/CMakeModules/FindSuperLU.cmake
ThirdParty/OpenNL/CMakeModules/FindSuperLU.cmake
+146
-0
ThirdParty/OpenNL/CMakeOptions.txt
ThirdParty/OpenNL/CMakeOptions.txt
+1
-0
ThirdParty/OpenNL/src/CMakeLists.txt
ThirdParty/OpenNL/src/CMakeLists.txt
+2
-2
ThirdParty/OpenNL/src/NL/nl.h
ThirdParty/OpenNL/src/NL/nl.h
+0
-4
ThirdParty/OpenNL/src/NL/nl_api.c
ThirdParty/OpenNL/src/NL/nl_api.c
+19
-13
ThirdParty/OpenNL/src/NL/nl_cholmod.c
ThirdParty/OpenNL/src/NL/nl_cholmod.c
+13
-10
ThirdParty/OpenNL/src/NL/nl_context.c
ThirdParty/OpenNL/src/NL/nl_context.c
+17
-5
ThirdParty/OpenNL/src/NL/nl_superlu.c
ThirdParty/OpenNL/src/NL/nl_superlu.c
+216
-160
apps_cmake.txt
apps_cmake.txt
+7
-3
include/Algo/Filtering/tools.h
include/Algo/Filtering/tools.h
+195
-0
include/Algo/Import/importMesh.hpp
include/Algo/Import/importMesh.hpp
+9
-2
include/Algo/MovingObjects/particle_base.h
include/Algo/MovingObjects/particle_base.h
+5
-0
include/Algo/MovingObjects/particle_cell_2D.h
include/Algo/MovingObjects/particle_cell_2D.h
+4
-0
include/Algo/MovingObjects/particle_cell_2D_memo.h
include/Algo/MovingObjects/particle_cell_2D_memo.h
+3
-0
include/Algo/MovingObjects/particle_cell_2D_secured.h
include/Algo/MovingObjects/particle_cell_2D_secured.h
+6
-1
include/Algo/Multiresolution/Map2MR/Filters/bertram.h
include/Algo/Multiresolution/Map2MR/Filters/bertram.h
+23
-85
include/Algo/Multiresolution/Map2MR/Filters/catmullClark.h
include/Algo/Multiresolution/Map2MR/Filters/catmullClark.h
+2
-52
include/Algo/Multiresolution/Map2MR/Filters/lerp.h
include/Algo/Multiresolution/Map2MR/Filters/lerp.h
+2
-2
include/Algo/Multiresolution/Map2MR/Filters/loop.h
include/Algo/Multiresolution/Map2MR/Filters/loop.h
+2
-32
include/Algo/Multiresolution/Map2MR/Filters/sqrt2.h
include/Algo/Multiresolution/Map2MR/Filters/sqrt2.h
+2
-7
include/Algo/Multiresolution/Map2MR/Filters/sqrt3.h
include/Algo/Multiresolution/Map2MR/Filters/sqrt3.h
+2
-26
include/Algo/Multiresolution/Map2MR/map2MR_PrimalRegular.h
include/Algo/Multiresolution/Map2MR/map2MR_PrimalRegular.h
+0
-18
include/Algo/Multiresolution/Map2MR/map2MR_PrimalRegular.hpp
include/Algo/Multiresolution/Map2MR/map2MR_PrimalRegular.hpp
+4
-29
include/Algo/Multiresolution/Map3MR/Filters/bertram.h
include/Algo/Multiresolution/Map3MR/Filters/bertram.h
+345
-343
include/Algo/Multiresolution/filter.h
include/Algo/Multiresolution/filter.h
+103
-1
include/Algo/Render/GL2/topoRender.h
include/Algo/Render/GL2/topoRender.h
+6
-3
include/Algo/Render/SVG/mapSVGRender.hpp
include/Algo/Render/SVG/mapSVGRender.hpp
+20
-12
include/Utils/Shaders/shaderScalarField.frag
include/Utils/Shaders/shaderScalarField.frag
+4
-4
include/Utils/Shaders/shaderScalarField.h
include/Utils/Shaders/shaderScalarField.h
+20
-2
include/Utils/Shaders/shaderScalarField.vert
include/Utils/Shaders/shaderScalarField.vert
+40
-2
include/Utils/Shaders/shaderVectorPerVertex.h
include/Utils/Shaders/shaderVectorPerVertex.h
+2
-1
include/Utils/convertType.h
include/Utils/convertType.h
+38
-38
include/Utils/gl_matrices.h
include/Utils/gl_matrices.h
+10
-6
include/Utils/pointSprite.frag
include/Utils/pointSprite.frag
+8
-6
include/Utils/pointSprite.geom
include/Utils/pointSprite.geom
+20
-19
include/Utils/pointSprite.h
include/Utils/pointSprite.h
+28
-62
include/Utils/pointSprite.vert
include/Utils/pointSprite.vert
+4
-4
include/Utils/svg.h
include/Utils/svg.h
+56
-17
include/Utils/vbo_base.h
include/Utils/vbo_base.h
+1
-1
src/Algo/Render/topo3Render.cpp
src/Algo/Render/topo3Render.cpp
+34
-22
src/Algo/Render/topoRender.cpp
src/Algo/Render/topoRender.cpp
+69
-20
src/Utils/GLSLShader.cpp
src/Utils/GLSLShader.cpp
+1
-1
src/Utils/Shaders/shaderScalarField.cpp
src/Utils/Shaders/shaderScalarField.cpp
+53
-5
src/Utils/drawer.cpp
src/Utils/drawer.cpp
+32
-22
src/Utils/pointSprite.cpp
src/Utils/pointSprite.cpp
+84
-129
src/Utils/svg.cpp
src/Utils/svg.cpp
+201
-156
src/Utils/text3d.cpp
src/Utils/text3d.cpp
+6
-3
No files found.
Apps/Examples/viewer.cpp
View file @
a9026e1f
...
...
@@ -78,8 +78,6 @@ void Viewer::cb_initGL()
{
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
2
)
;
setFocal
(
5.0
f
)
;
m_render
=
new
Algo
::
Render
::
GL2
::
MapRender
()
;
m_topoRender
=
new
Algo
::
Render
::
GL2
::
TopoRender
()
;
...
...
@@ -109,11 +107,12 @@ void Viewer::cb_initGL()
m_simpleColorShader
=
new
Utils
::
ShaderSimpleColor
()
;
m_simpleColorShader
->
setAttributePosition
(
m_positionVBO
)
;
Geom
::
Vec4f
c
(
0.
1
f
,
0.
1
f
,
0.
1
f
,
1.0
f
)
;
Geom
::
Vec4f
c
(
0.
0
f
,
0.
0
f
,
0.
0
f
,
1.0
f
)
;
m_simpleColorShader
->
setColor
(
c
)
;
m_pointSprite
=
new
Utils
::
PointSprite
()
;
m_pointSprite
->
setAttributePosition
(
m_positionVBO
)
;
m_pointSprite
->
setColor
(
Geom
::
Vec4f
(
0.0
f
,
0.0
f
,
1.0
f
,
1.0
f
))
;
registerShader
(
m_phongShader
)
;
registerShader
(
m_flatShader
)
;
...
...
@@ -126,11 +125,8 @@ void Viewer::cb_redraw()
{
if
(
m_drawVertices
)
{
float
size
=
vertexScaleFactor
;
m_pointSprite
->
setSize
(
size
)
;
m_pointSprite
->
predraw
(
Geom
::
Vec3f
(
0.0
f
,
0.0
f
,
1.0
f
))
;
m_pointSprite
->
setSize
(
vertexScaleFactor
)
;
m_render
->
draw
(
m_pointSprite
,
Algo
::
Render
::
GL2
::
POINTS
)
;
m_pointSprite
->
postdraw
()
;
}
if
(
m_drawEdges
)
...
...
@@ -296,6 +292,17 @@ void Viewer::slot_drawEdges(bool b)
void
Viewer
::
slot_drawFaces
(
bool
b
)
{
m_drawFaces
=
b
;
if
(
b
)
{
Geom
::
Vec4f
c
(
0.0
f
,
0.0
f
,
0.0
f
,
1.0
f
)
;
m_simpleColorShader
->
setColor
(
c
)
;
}
else
{
Geom
::
Vec4f
c
(
0.9
f
,
0.9
f
,
0.1
f
,
1.0
f
)
;
m_simpleColorShader
->
setColor
(
c
)
;
}
updateGL
()
;
}
...
...
Apps/Examples/viewer.h
View file @
a9026e1f
...
...
@@ -24,7 +24,8 @@
#include <iostream>
#include "Utils/Qt/qtSimple.h"
//#include "Utils/Qt/qtSimple.h"
#include "Utils/Qt/qtQGLV.h"
#include "ui_viewer.h"
#include "Utils/Qt/qtui.h"
...
...
@@ -65,7 +66,8 @@ struct PFP: public PFP_STANDARD
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
VEC3
VEC3
;
class
Viewer
:
public
Utils
::
QT
::
SimpleQT
//class Viewer : public Utils::QT::SimpleQT
class
Viewer
:
public
Utils
::
QT
::
SimpleQGLV
{
Q_OBJECT
...
...
Apps/Tuto/show_traversors.cpp
View file @
a9026e1f
...
...
@@ -163,15 +163,15 @@ void MyQT::cb_Save()
Utils
::
SVG
::
SVGOut
svg1
(
modelViewMatrix
(),
projectionMatrix
());
m_drawer
.
toSVG
(
svg1
);
svg1
.
addOpacityAnimation
(
1.0
f
);
svg1
.
addOpacityAnimation
(
1.0
f
);
svg1
.
addOpacityAnimation
(
0.0
f
);
//
svg1.addOpacityAnimation(1.0f);
//
svg1.addOpacityAnimation(1.0f);
//
svg1.addOpacityAnimation(0.0f);
Utils
::
SVG
::
SVGOut
svg2
(
modelViewMatrix
(),
projectionMatrix
());
m_render_topo
->
toSVG
(
svg2
);
svg2
.
addOpacityAnimation
(
1.0
f
);
svg2
.
addOpacityAnimation
(
0.0
f
);
svg2
.
addOpacityAnimation
(
1.0
f
);
//
svg2.addOpacityAnimation(1.0f);
//
svg2.addOpacityAnimation(0.0f);
//
svg2.addOpacityAnimation(1.0f);
Utils
::
SVG
::
AnimatedSVGOut
anim
;
...
...
Apps/Tuto/tuto_oper3.cpp
View file @
a9026e1f
...
...
@@ -235,6 +235,16 @@ void MyQT::operation(int x)
std
::
cout
<<
"nb darts after = "
<<
myMap
.
getNbDarts
()
<<
std
::
endl
;
}
break
;
case
11
:
CGoGNout
<<
"unsew volumes"
<<
CGoGNendl
;
if
(
m_selected
!=
NIL
)
{
myMap
.
unsewVolumes
(
m_selected
);
dm
.
markAll
();
m_selected
=
NIL
;
updateMap
();
}
break
;
default:
break
;
}
...
...
Apps/Tuto/tuto_oper3.ui
View file @
a9026e1f
...
...
@@ -145,6 +145,11 @@
<string>
splitVertex
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
unsewVolumes
</string>
</property>
</item>
</widget>
</item>
<item
row=
"6"
column=
"0"
>
...
...
CMakeLists.txt
View file @
a9026e1f
...
...
@@ -33,8 +33,7 @@ find_package(Boost COMPONENTS regex thread system REQUIRED)
find_package
(
ZLIB REQUIRED
)
find_package
(
LibXml2 REQUIRED
)
find_package
(
GLEW REQUIRED
)
find_package
(
SuiteSparse REQUIRED
)
find_package
(
QGLViewer REQUIRED
)
#find_package(SuiteSparse REQUIRED)
IF
(
DEFINED ASSERTON
)
add_definitions
(
-DCGOGN_ASSERT_BOOL=
${
ASSERTON
}
)
...
...
@@ -74,7 +73,7 @@ SET (CGoGN_EXT_INCLUDES
${
ZLIB_INCLUDE_DIRS
}
${
LIBXML2_INCLUDE_DIR
}
${
Boost_INCLUDE_DIRS
}
${
QGLVIEWER
_INCLUDE_DIR
}
#
${
SUITESPARSE
_INCLUDE_DIR
S
}
)
# define libs for external libs
...
...
@@ -87,8 +86,7 @@ SET (CGoGN_EXT_LIBS
${
Boost_SYSTEM_LIBRARY
}
${
Boost_REGEX_LIBRARY
}
${
Boost_THREAD_LIBRARY
}
${
SUITESPARSE_LIBRARIES
}
${
QGLVIEWER_LIBRARIES
}
# ${SUITESPARSE_LIBRARIES}
)
#optionnal libs
...
...
@@ -113,8 +111,9 @@ IF (WITH_QT)
SET
(
QT_USE_QTXML TRUE
)
INCLUDE
(
${
QT_USE_FILE
}
)
ADD_DEFINITIONS
(
${
QT_DEFINITIONS
}
)
SET
(
CGoGN_EXT_INCLUDES
${
CGoGN_EXT_INCLUDES
}
${
QT_INCLUDE_DIR
}
)
SET
(
CGoGN_EXT_LIBS
${
CGoGN_EXT_LIBS
}
${
QT_LIBRARIES
}
)
find_package
(
QGLViewer REQUIRED
)
SET
(
CGoGN_EXT_INCLUDES
${
CGoGN_EXT_INCLUDES
}
${
QT_INCLUDE_DIR
}
${
QGLVIEWER_INCLUDE_DIR
}
)
SET
(
CGoGN_EXT_LIBS
${
CGoGN_EXT_LIBS
}
${
QT_LIBRARIES
}
${
QGLVIEWER_LIBRARIES
}
)
ENDIF
(
WITH_QT
)
IF
(
WITH_GLEWMX
)
...
...
README_APPS.TXT
View file @
a9026e1f
Principe des applications dans CGoGN_Apps (english version bel
l
ow
Principe des applications dans CGoGN_Apps (english version below
)
...
...
README_ECLIPSE.TXT
View file @
a9026e1f
***
E
nglish version below ***
***
e
nglish version below ***
Pour utiliser Eclipse (testé avec la version Helios, Galileo, Indigo & Juno)
* Configurer un projet dans Eclipse :
...
...
README_MAC.TXT
View file @
a9026e1f
Pour compiler CGoGN sur MAC (testé sur OS X 10.6)
*** english version below ***
1) créer un lien de sys/malloc vers malloc.h dans usr/include:
cd /usr/include; sudo ln -s sys/malloc.h .
Ceci permet d'éviter pas mal de pb de compilation de source linux.
Pour compiler CGoGN sur MAC (testé sur OS X 10.8.2)
2) installer avec macports ou homebrew
zlib, glew (sudo port install xxxx)
3) installer Qt (http://qt.nokia.com/downloads/)
4) Ajouter (si ce n'est déjà fait) dans bash_profile:
export LD_LIBRARY_PATH=/opt/local/lib
export C_INCLUDE_PATH=/opt/local/include:/usr/X11/include
export CPLUS_INCLUDE_PATH=/opt/local/include:/usr/X11/include
export LIBRARY_PATH=/opt/local/lib:/usr/X11/lib
Installer avec homebrew
cmake, lzlib, glew, boost149, suite-sparse, qt
=========================================================================================
ENGLISH VERSION
=========================================================================================
To compile CGoGN on MAC (tested on OSX 10.6 and OSX 10.7.2)
1) create a link from sys/malloc to malloc.h in usr/include:
cd /usr/include; sudo ln -s sys/malloc.h .
This solve compilation problems of some linux codes on mac
2) install with macports or homebrew
zlib, glew, boost (sudo port install xxxx)
3) install Qt (http://qt.nokia.com/downloads/
)
To compile CGoGN on MAC (tested on OSX 10.8.2
)
4) Add if not already done (by homebrew) in bash_profile:
export LD_LIBRARY_PATH=/opt/local/lib
export C_INCLUDE_PATH=/opt/local/include:/usr/X11/include
export CPLUS_INCLUDE_PATH=/opt/local/include:/usr/X11/include
export LIBRARY_PATH=/opt/local/lib:/usr/X11/lib
Install with homebrew
cmake, lzlib, glew, boost149, suite-sparse, qt
README_VISUAL.TXT
View file @
a9026e1f
Compilation sous VisualExpress C++ (english version bellow)
*** english version below ***
Compilation sous VisualExpress C++
Prérequis:
Visual Studio ou C++ Express (au moins 2005, si possible 2010)
...
...
SCHNApps/CMakeLists.txt
View file @
a9026e1f
...
...
@@ -18,6 +18,8 @@ find_package(Qt4 REQUIRED)
find_package
(
QGLViewer REQUIRED
)
find_package
(
PythonLibs 2.7 REQUIRED
)
find_package
(
SuiteSparse REQUIRED
)
#find_package(SuperLU REQUIRED)
SET
(
QT_USE_QTOPENGL TRUE
)
SET
(
QT_USE_QTXML TRUE
)
...
...
@@ -68,6 +70,7 @@ SET (EXT_INCLUDES
${
QGLVIEWER_INCLUDE_DIR
}
${
PYTHON_INCLUDE_DIRS
}
${
SUITESPARSE_INCLUDE_DIRS
}
# ${SUPERLU_INCLUDE_DIRS}
)
# define libs for external libs
...
...
@@ -85,6 +88,7 @@ SET (EXT_LIBS
${
QGLVIEWER_LIBRARIES
}
${
PYTHON_LIBRARIES
}
${
SUITESPARSE_LIBRARIES
}
# ${SUPERLU_LIBRARIES}
)
...
...
@@ -134,6 +138,7 @@ SET(SCHNApps_QOBJECT_FILES
${
SCHNApps_ROOT_DIR
}
/include/dialogs/cameraViewDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/pluginsViewDialog.h
${
SCHNApps_ROOT_DIR
}
/include/dialogs/mapsViewDialog.h
${
SCHNApps_ROOT_DIR
}
/include/colorComboBox.h
)
...
...
SCHNApps/Plugins/CMakeLists.txt
View file @
a9026e1f
...
...
@@ -5,6 +5,7 @@ ADD_SUBDIRECTORY(importVolume)
ADD_SUBDIRECTORY
(
differentialProperties
)
ADD_SUBDIRECTORY
(
render
)
ADD_SUBDIRECTORY
(
renderVector
)
ADD_SUBDIRECTORY
(
renderScalar
)
ADD_SUBDIRECTORY
(
renderExplod
)
ADD_SUBDIRECTORY
(
renderTopoSurface
)
ADD_SUBDIRECTORY
(
subdivideSurface
)
...
...
SCHNApps/Plugins/differentialProperties/forms/computeCurvatureDialog.ui
View file @
a9026e1f
...
...
@@ -6,19 +6,19 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
5
70
</width>
<height>
4
5
2
</height>
<width>
5
68
</width>
<height>
4
4
2
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
<string>
Compute Curvature
</string>
</property>
<layout
class=
"Q
VBox
Layout"
name=
"
vertical
Layout"
>
<item>
<layout
class=
"Q
Grid
Layout"
name=
"
grid
Layout
_2
"
>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QListWidget"
name=
"mapList"
/>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout
_2
"
>
<item
row=
"1"
column=
"0"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
...
...
@@ -61,25 +61,52 @@
</item>
</layout>
</item>
<item>
<item
row=
"2"
column=
"0"
>
<widget
class=
"QGroupBox"
name=
"groupBox"
>
<property
name=
"title"
>
<string>
Computed attributes
</string>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_4"
>
<property
name=
"font"
>
<font>
<weight>
75
</weight>
<italic>
true
</italic>
<bold>
true
</bold>
</font>
</property>
<property
name=
"text"
>
<string>
Kmax :
</string>
</property>
</widget>
</item>
<item
row=
"0"
column=
"1"
>
<widget
class=
"QLabel"
name=
"label_3"
>
<property
name=
"text"
>
<string>
Existing attribute :
</string>
</property>
</widget>
</item>
<item
row=
"0"
column=
"2"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_4"
>
<item>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
<string>
New attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"KmaxAttributeName"
/>
</item>
</layout>
<widget
class=
"QComboBox"
name=
"combo_KmaxAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item
row=
"0"
column=
"3"
>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
<string>
New attribute :
</string>
</property>
</widget>
</item>
<item
row=
"0"
column=
"4"
>
<widget
class=
"QLineEdit"
name=
"KmaxAttributeName"
/>
</item>
<item
row=
"1"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_10"
>
...
...
@@ -96,39 +123,31 @@
</widget>
</item>
<item
row=
"1"
column=
"1"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_8"
>
<item>
<widget
class=
"QLabel"
name=
"label_9"
>
<property
name=
"text"
>
<string>
Existing attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QComboBox"
name=
"combo_kmaxAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
<widget
class=
"QLabel"
name=
"label_9"
>
<property
name=
"text"
>
<string>
Existing attribute :
</string>
</property>
</widget>
</item>
<item
row=
"1"
column=
"2"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_7"
>
<item>
<widget
class=
"QLabel"
name=
"label_8"
>
<property
name=
"text"
>
<string>
New attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"kmaxAttributeName"
/>
</item>
</layout>
<widget
class=
"QComboBox"
name=
"combo_kmaxAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item
row=
"1"
column=
"3"
>
<widget
class=
"QLabel"
name=
"label_8"
>
<property
name=
"text"
>
<string>
New attribute :
</string>
</property>
</widget>
</item>
<item
row=
"1"
column=
"4"
>
<widget
class=
"QLineEdit"
name=
"kmaxAttributeName"
/>
</item>
<item
row=
"2"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_7"
>
...
...
@@ -145,39 +164,31 @@
</widget>
</item>
<item
row=
"2"
column=
"1"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_6"
>
<item>
<widget
class=
"QLabel"
name=
"label_6"
>
<property
name=
"text"
>
<string>
Existing attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QComboBox"
name=
"combo_KminAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
<widget
class=
"QLabel"
name=
"label_6"
>
<property
name=
"text"
>
<string>
Existing attribute :
</string>
</property>
</widget>
</item>
<item
row=
"2"
column=
"2"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_5"
>
<item>
<widget
class=
"QLabel"
name=
"label_5"
>
<property
name=
"text"
>
<string>
New attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"KminAttributeName"
/>
</item>
</layout>
<widget
class=
"QComboBox"
name=
"combo_KminAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item
row=
"2"
column=
"3"
>
<widget
class=
"QLabel"
name=
"label_5"
>
<property
name=
"text"
>
<string>
New attribute :
</string>
</property>
</widget>
</item>
<item
row=
"2"
column=
"4"
>
<widget
class=
"QLineEdit"
name=
"KminAttributeName"
/>
</item>
<item
row=
"3"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_13"
>
...
...
@@ -194,39 +205,31 @@
</widget>
</item>
<item
row=
"3"
column=
"1"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_10"
>
<item>
<widget
class=
"QLabel"
name=
"label_12"
>
<property
name=
"text"
>
<string>
Existing attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QComboBox"
name=
"combo_kminAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
<widget
class=
"QLabel"
name=
"label_12"
>
<property
name=
"text"
>
<string>
Existing attribute :
</string>
</property>
</widget>
</item>
<item
row=
"3"
column=
"2"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_9"
>
<item>
<widget
class=
"QLabel"
name=
"label_11"
>
<property
name=
"text"
>
<string>
New attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLineEdit"
name=
"kminAttributeName"
/>
</item>
</layout>
<widget
class=
"QComboBox"
name=
"combo_kminAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item
row=
"3"
column=
"3"
>
<widget
class=
"QLabel"
name=
"label_11"
>
<property
name=
"text"
>
<string>
New attribute :
</string>
</property>
</widget>
</item>
<item
row=
"3"
column=
"4"
>
<widget
class=
"QLineEdit"
name=
"kminAttributeName"
/>
</item>
<item
row=
"4"
column=
"0"
>
<widget
class=
"QLabel"
name=
"label_15"
>
...
...
@@ -243,80 +246,51 @@
</widget>
</item>
<item
row=
"4"
column=
"1"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_12"
>
<item>
<widget
class=
"QLabel"
name=
"label_17"
>
<property
name=
"text"
>
<string>
Existing attribute :
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QComboBox"
name=
"combo_KnormalAttribute"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
</widget>
<