Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
b5f3f45d
Commit
b5f3f45d
authored
Apr 01, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge bugs
parent
7caafd0a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
CMakeLists.txt
CMakeLists.txt
+6
-8
SCHNApps/Plugins/CMakeLists.txt
SCHNApps/Plugins/CMakeLists.txt
+1
-1
SCHNApps/Plugins/surface_import/src/surface_import.cpp
SCHNApps/Plugins/surface_import/src/surface_import.cpp
+3
-1
SCHNApps/src/view.cpp
SCHNApps/src/view.cpp
+1
-1
No files found.
CMakeLists.txt
View file @
b5f3f45d
...
...
@@ -35,12 +35,6 @@ IF (WIN32)
SET
(
CGoGN_WITH_QTCREATOR OFF CACHE BOOL
"use QtCreator to compile (Experimental"
)
ENDIF
()
IF
(
LINUX
)
SET
(
CGoGN_GCC_4_9 OFF CACHE BOOL
"using gcc version > 4.9 (std::regex ok !)"
)
ENDIF
()
SET
(
BUILD_SHARED_LIBS ON CACHE BOOL
"if used all library are build as shared type (.so/.dylib/.dll)"
)
checkCpp11Support
()
checkCpp11Feature
(
"regex"
HAS_CPP11_REGEX
"False"
)
...
...
@@ -172,8 +166,12 @@ IF(WIN32)
ENDIF
()
IF
(
CGoGN_GCC_4_9
)
LIST
(
APPEND CGoGN_DEFS -DCGOGN_GCC_4_9
)
IF
(
APPLE
)
LIST
(
APPEND CGoGN_DEFS -DCGOGN_APPLE
)
ENDIF
()
IF
(
HAS_CPP11_REGEX
)
LIST
(
APPEND CGoGN_DEFS -DHAS_CPP11_REGEX
)
ENDIF
()
...
...
SCHNApps/Plugins/CMakeLists.txt
View file @
b5f3f45d
...
...
@@ -28,7 +28,7 @@ ADD_SUBDIRECTORY(surface_modelisation)
ADD_SUBDIRECTORY
(
surface_distance
)
ADD_SUBDIRECTORY
(
surface_radiance
)
ADD_SUBDIRECTORY
(
cage2D_deformation
)
#
ADD_SUBDIRECTORY(cage2D_deformation)
ADD_SUBDIRECTORY
(
volume_import
)
#ADD_SUBDIRECTORY(volume_render)
...
...
SCHNApps/Plugins/surface_import/src/surface_import.cpp
View file @
b5f3f45d
...
...
@@ -36,7 +36,7 @@ MapHandlerGen* Surface_Import_Plugin::importMeshFromFile(const QString& fileName
QFileInfo
fi
(
fileName
);
if
(
fi
.
exists
())
{
pythonRecording
(
"importFromFile"
,
fi
.
baseName
(),
fileName
);
pythonRecording
(
"import
Mesh
FromFile"
,
fi
.
baseName
(),
fileName
);
MapHandlerGen
*
mhg
=
m_schnapps
->
addMap
(
fi
.
baseName
(),
2
);
if
(
mhg
)
...
...
@@ -80,6 +80,8 @@ MapHandlerGen* Surface_Import_Plugin::importImageFromFile(const QString& fileNam
QFileInfo
fi
(
fileName
);
if
(
fi
.
exists
())
{
pythonRecording
(
"importImageFromFile"
,
fi
.
baseName
(),
fileName
);
MapHandlerGen
*
mhg
=
m_schnapps
->
addMap
(
fi
.
baseName
(),
2
);
if
(
mhg
)
{
...
...
SCHNApps/src/view.cpp
View file @
b5f3f45d
...
...
@@ -13,7 +13,7 @@
#include <QKeyEvent>
#include <QMouseEvent>
#include <QWheelEvent>
#include <Q
Window
>
#include <Q
MessageBox
>
namespace
CGoGN
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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