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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hurstel
CGoGN
Commits
44890c80
Commit
44890c80
authored
Nov 19, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SCHNApps : CMakeLists debug
parent
e739fd2a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
32 additions
and
35 deletions
+32
-35
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+1
-1
SCHNApps/Plugins/firstPlugin/CMakeLists.txt
SCHNApps/Plugins/firstPlugin/CMakeLists.txt
+2
-2
SCHNApps/src/dialogs/pluginDialog.cpp
SCHNApps/src/dialogs/pluginDialog.cpp
+0
-1
SCHNApps/src/interface/window.cpp
SCHNApps/src/interface/window.cpp
+1
-6
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+28
-25
No files found.
SCHNApps/CMakeLists.txt
View file @
44890c80
...
...
@@ -19,7 +19,7 @@ find_package(QGLViewer REQUIRED)
#======SCHNApps=======#
SET
(
SCHNApps_ROOT_DIR
${
CGoGN_ROOT_DIR
}
/SCHNApps
)
SET
(
EXECUTABLE_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/bin
)
SET
(
LIBRARY_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/
plugins/lib
)
SET
(
LIBRARY_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/
Plugins
)
ADD_SUBDIRECTORY
(
${
CMAKE_SOURCE_DIR
}
/Release Release
)
IF
(
NOT WIN32
)
...
...
SCHNApps/Plugins/firstPlugin/CMakeLists.txt
View file @
44890c80
...
...
@@ -34,7 +34,7 @@ IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
TARGET_LINK_LIBRARIES
(
FirstPluginD
${
CGoGN_LIBS_D
}
${
COMMON_LIBS
}
${
QGLVIEWER_
INCLUDE_LIBRARY
}
${
QGLVIEWER_
LIBRARIES
}
)
ADD_DEPENDENCIES
(
FirstPluginD SCHNAppsD
)
...
...
@@ -59,7 +59,7 @@ ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
TARGET_LINK_LIBRARIES
(
FirstPlugin
${
CGoGN_LIBS_R
}
${
COMMON_LIBS
}
${
QGLVIEWER_
INCLUDE_LIBRARY
}
${
QGLVIEWER_
LIBRARIES
}
)
ADD_DEPENDENCIES
(
FirstPlugin SCHNApps
)
...
...
SCHNApps/src/dialogs/pluginDialog.cpp
View file @
44890c80
...
...
@@ -21,7 +21,6 @@ PluginDialog::PluginDialog(Window *parent, PluginHash *activePlugins) :
parentWindow
(
parent
),
init
(
true
)
{
// if(!xmlFile.exists())
// {
// System::Error::code= System::Error::NO_PLUGIN_PATH_FILE;
...
...
SCHNApps/src/interface/window.cpp
View file @
44890c80
...
...
@@ -561,9 +561,7 @@ Plugin *Window::loadPlugin(QString pluginPath)
{
Plugin
*
plugin
=
qobject_cast
<
Plugin
*>
(
pluginObject
);
QString
pluginName
=
QFileInfo
(
pluginPath
).
fileName
();
pluginName
.
remove
(
0
,
3
);
pluginName
.
remove
(
pluginName
.
lastIndexOf
(
".so"
),
3
);
QString
pluginName
=
QFileInfo
(
pluginPath
).
baseName
().
remove
(
0
,
3
);
//we set the plugin with correct parameters (name, filepath)
plugin
->
setWindow
(
this
);
...
...
@@ -573,10 +571,8 @@ Plugin *Window::loadPlugin(QString pluginPath)
//then we call its activate() methods
if
(
plugin
->
activate
(
m_initialization
))
{
//if it succeeded we reference this plugin
h_plugin
.
insert
(
pluginName
,
plugin
);
//method success
return
plugin
;
}
...
...
@@ -617,7 +613,6 @@ void Window::unloadPlugin(QString pluginName)
}
}
Plugin
*
Window
::
checkPluginDependencie
(
QString
name
,
Plugin
*
dependantPlugin
)
{
//if the plugin is referenced and found
...
...
src/Topology/generic/genericmap.cpp
View file @
44890c80
...
...
@@ -39,37 +39,41 @@ int GenericMap::m_nbInstances = 0;
GenericMap
::
GenericMap
()
:
m_nbThreads
(
1
)
{
if
(
m_attributes_registry_map
==
NULL
)
{
std
::
cout
<<
"INITIALIZE REGISTRY MAP"
<<
std
::
endl
;
m_attributes_registry_map
=
new
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*>
;
m_nbInstances
++
;
// register all known types
registerAttribute
<
Dart
>
(
"Dart"
);
registerAttribute
<
Mark
>
(
"Mark"
);
// register all known types
registerAttribute
<
Dart
>
(
"Dart"
);
registerAttribute
<
Mark
>
(
"Mark"
);
registerAttribute
<
long
>
(
"long"
);
registerAttribute
<
int
>
(
"int"
);
registerAttribute
<
short
>
(
"short"
);
registerAttribute
<
char
>
(
"char"
);
registerAttribute
<
long
>
(
"long"
);
registerAttribute
<
int
>
(
"int"
);
registerAttribute
<
short
>
(
"short"
);
registerAttribute
<
char
>
(
"char"
);
registerAttribute
<
unsigned
long
>
(
"unsigned long"
);
registerAttribute
<
unsigned
int
>
(
"unsigned int"
);
registerAttribute
<
unsigned
short
>
(
"unsigned short"
);
registerAttribute
<
unsigned
char
>
(
"unsigned char"
);
registerAttribute
<
unsigned
long
>
(
"unsigned long"
);
registerAttribute
<
unsigned
int
>
(
"unsigned int"
);
registerAttribute
<
unsigned
short
>
(
"unsigned short"
);
registerAttribute
<
unsigned
char
>
(
"unsigned char"
);
registerAttribute
<
Geom
::
Vec2f
>
(
Geom
::
Vec2f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec3f
>
(
Geom
::
Vec3f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec4f
>
(
Geom
::
Vec4f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec2f
>
(
Geom
::
Vec2f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec3f
>
(
Geom
::
Vec3f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec4f
>
(
Geom
::
Vec4f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec2d
>
(
Geom
::
Vec2d
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec3d
>
(
Geom
::
Vec3d
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec4d
>
(
Geom
::
Vec4d
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec2d
>
(
Geom
::
Vec2d
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec3d
>
(
Geom
::
Vec3d
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Vec4d
>
(
Geom
::
Vec4d
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Matrix33f
>
(
Geom
::
Matrix33f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Matrix44f
>
(
Geom
::
Matrix44f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Matrix33f
>
(
Geom
::
Matrix33f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Matrix44f
>
(
Geom
::
Matrix44f
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Matrix33d
>
(
Geom
::
Matrix33d
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Matrix44d
>
(
Geom
::
Matrix44d
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Matrix33d
>
(
Geom
::
Matrix33d
::
CGoGNnameOfType
());
registerAttribute
<
Geom
::
Matrix44d
>
(
Geom
::
Matrix44d
::
CGoGNnameOfType
());
}
m_nbInstances
++
;
for
(
unsigned
int
i
=
0
;
i
<
NB_ORBITS
;
++
i
)
{
...
...
@@ -108,7 +112,6 @@ GenericMap::~GenericMap()
m_attribs
[
i
].
clear
(
true
)
;
}
for
(
std
::
multimap
<
AttributeMultiVectorGen
*
,
AttributeHandlerGen
*>::
iterator
it
=
attributeHandlers
.
begin
();
it
!=
attributeHandlers
.
end
();
++
it
)
(
*
it
).
second
->
setInvalid
()
;
attributeHandlers
.
clear
()
;
...
...
@@ -126,7 +129,7 @@ GenericMap::~GenericMap()
// clean type registry if necessary
m_nbInstances
--
;
if
(
m_nbInstances
<=
0
)
if
(
m_nbInstances
<=
0
)
{
for
(
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*>::
iterator
it
=
m_attributes_registry_map
->
begin
();
it
!=
m_attributes_registry_map
->
end
();
++
it
)
delete
it
->
second
;
...
...
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