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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
KennethVanhoey
CGoGN
Commits
170fedde
Commit
170fedde
authored
Jan 18, 2013
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
premiers essais.
parent
8db5ec3f
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
113 additions
and
64 deletions
+113
-64
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+1
-4
SCHNApps/Debug/CMakeLists.txt
SCHNApps/Debug/CMakeLists.txt
+1
-2
SCHNApps/Plugins/differentialProperties/CMakeLists.txt
SCHNApps/Plugins/differentialProperties/CMakeLists.txt
+2
-0
SCHNApps/Plugins/importSurface/CMakeLists.txt
SCHNApps/Plugins/importSurface/CMakeLists.txt
+2
-0
SCHNApps/Plugins/render/CMakeLists.txt
SCHNApps/Plugins/render/CMakeLists.txt
+2
-0
SCHNApps/Plugins/render/render.ui
SCHNApps/Plugins/render/render.ui
+4
-8
SCHNApps/Plugins/renderVector/CMakeLists.txt
SCHNApps/Plugins/renderVector/CMakeLists.txt
+2
-0
SCHNApps/Plugins/subdivideSurface/CMakeLists.txt
SCHNApps/Plugins/subdivideSurface/CMakeLists.txt
+2
-0
SCHNApps/Release/CMakeLists.txt
SCHNApps/Release/CMakeLists.txt
+1
-2
SCHNApps/build/python/setup.py
SCHNApps/build/python/setup.py
+16
-0
SCHNApps/build/python/window_py.cpp
SCHNApps/build/python/window_py.cpp
+17
-0
SCHNApps/include/plugin.h
SCHNApps/include/plugin.h
+2
-2
SCHNApps/include/types.h
SCHNApps/include/types.h
+3
-3
SCHNApps/include/window.h
SCHNApps/include/window.h
+12
-6
SCHNApps/main.py
SCHNApps/main.py
+14
-0
SCHNApps/settings/plugin_path.xml
SCHNApps/settings/plugin_path.xml
+0
-11
SCHNApps/settings/state_save.xml
SCHNApps/settings/state_save.xml
+0
-9
SCHNApps/src/dialogs/pluginsDialog.cpp
SCHNApps/src/dialogs/pluginsDialog.cpp
+4
-4
SCHNApps/src/main.cpp
SCHNApps/src/main.cpp
+5
-5
SCHNApps/src/window.cpp
SCHNApps/src/window.cpp
+18
-3
include/Topology/generic/cellmarker.h
include/Topology/generic/cellmarker.h
+3
-3
include/Topology/generic/dartmarker.h
include/Topology/generic/dartmarker.h
+2
-2
No files found.
SCHNApps/CMakeLists.txt
View file @
170fedde
...
...
@@ -23,16 +23,13 @@ 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
)
SET
(
LIBRARY_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/lib
)
ADD_SUBDIRECTORY
(
${
CMAKE_SOURCE_DIR
}
/Release Release
)
IF
(
NOT WIN32
)
ADD_SUBDIRECTORY
(
${
CMAKE_SOURCE_DIR
}
/Debug Debug
)
ENDIF
(
NOT WIN32
)
configure_file
(
${
CMAKE_SOURCE_DIR
}
/settings/state_save.xml
${
EXECUTABLE_OUTPUT_PATH
}
/state_save.xml @ONLY
)
#======Documentation=======#
find_package
(
Doxygen
)
...
...
SCHNApps/Debug/CMakeLists.txt
View file @
170fedde
...
...
@@ -21,7 +21,6 @@ file(
GLOB
SCHNApps_SRC_FILES
${
SCHNApps_ROOT_DIR
}
/src/camera.cpp
${
SCHNApps_ROOT_DIR
}
/src/main.cpp
${
SCHNApps_ROOT_DIR
}
/src/mapHandler.cpp
${
SCHNApps_ROOT_DIR
}
/src/plugin.cpp
${
SCHNApps_ROOT_DIR
}
/src/view.cpp
...
...
@@ -69,7 +68,7 @@ QT4_ADD_RESOURCES( RCC_FILES
${
SCHNApps_ROOT_DIR
}
/resources/resources.qrc
)
ADD_
EXECUTABLE
(
SCHNApps
D
ADD_
LIBRARY
(
SCHNAppsD SHARE
D
${
SCHNApps_SRC_FILES
}
${
UI_H_FILES
}
${
MOC_FILES
}
...
...
SCHNApps/Plugins/differentialProperties/CMakeLists.txt
View file @
170fedde
...
...
@@ -43,6 +43,7 @@ IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
DifferentialPropertiesPluginD
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_D
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
@@ -70,6 +71,7 @@ ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
DifferentialPropertiesPlugin
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_R
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
SCHNApps/Plugins/importSurface/CMakeLists.txt
View file @
170fedde
...
...
@@ -34,6 +34,7 @@ IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
ImportSurfacePluginD
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_D
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
@@ -61,6 +62,7 @@ ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
ImportSurfacePlugin
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_R
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
SCHNApps/Plugins/render/CMakeLists.txt
View file @
170fedde
...
...
@@ -38,6 +38,7 @@ IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
RenderPluginD
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_D
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
@@ -65,6 +66,7 @@ ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
RenderPlugin
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_R
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
SCHNApps/Plugins/render/render.ui
View file @
170fedde
...
...
@@ -56,16 +56,16 @@
</property>
</widget>
</item>
<item
row=
"2"
column=
"2"
alignment=
"Qt::AlignRight"
>
<item
row=
"2"
column=
"2"
>
<widget
class=
"QPushButton"
name=
"button_refreshVBOs"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"
Preferr
ed"
vsizetype=
"Fixed"
>
<sizepolicy
hsizetype=
"
Fix
ed"
vsizetype=
"Fixed"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"layoutDirection"
>
<enum>
Qt::
LeftToRigh
t
</enum>
<enum>
Qt::
RightToLef
t
</enum>
</property>
<property
name=
"text"
>
<string>
Refresh
</string>
...
...
@@ -75,11 +75,7 @@
</layout>
</item>
<item>
<widget
class=
"Line"
name=
"line"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
</widget>
<widget
class=
"Line"
name=
"line"
/>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"check_renderVertices"
>
...
...
SCHNApps/Plugins/renderVector/CMakeLists.txt
View file @
170fedde
...
...
@@ -38,6 +38,7 @@ IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
RenderVectorPluginD
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_D
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
@@ -65,6 +66,7 @@ ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
RenderVectorPlugin
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_R
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
SCHNApps/Plugins/subdivideSurface/CMakeLists.txt
View file @
170fedde
...
...
@@ -38,6 +38,7 @@ IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
SubdivideSurfacePluginD
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_D
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
@@ -65,6 +66,7 @@ ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
)
TARGET_LINK_LIBRARIES
(
SubdivideSurfacePlugin
${
LIBRARY_OUTPUT_PATH
}
/libSCHNApps.so
${
CGoGN_LIBS_R
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
...
...
SCHNApps/Release/CMakeLists.txt
View file @
170fedde
...
...
@@ -21,7 +21,6 @@ file(
GLOB
SCHNApps_SRC_FILES
${
SCHNApps_ROOT_DIR
}
/src/camera.cpp
${
SCHNApps_ROOT_DIR
}
/src/main.cpp
${
SCHNApps_ROOT_DIR
}
/src/mapHandler.cpp
${
SCHNApps_ROOT_DIR
}
/src/plugin.cpp
${
SCHNApps_ROOT_DIR
}
/src/view.cpp
...
...
@@ -69,7 +68,7 @@ QT4_ADD_RESOURCES( RCC_FILES
${
SCHNApps_ROOT_DIR
}
/resources/resources.qrc
)
ADD_
EXECUTABLE
(
SCHNApps
ADD_
LIBRARY
(
SCHNApps SHARED
${
SCHNApps_SRC_FILES
}
${
UI_H_FILES
}
${
MOC_FILES
}
...
...
SCHNApps/build/python/setup.py
0 → 100644
View file @
170fedde
from
distutils.core
import
setup
,
Extension
ext
=
Extension
(
'PySCHNApps'
,
library_dirs
=
[
'/usr/lib'
,
'usr/local/lib'
,
'../../lib'
],
libraries
=
[
'python2.7'
,
'boost_python-py27'
,
'SCHNApps'
],
include_dirs
=
[
'../../include'
,
'../../build/Release'
,
'../../../include'
,
'/usr/include/qt4'
,
'/usr/include/libxml2'
],
sources
=
[
'window_py.cpp'
]
)
setup
(
name
=
'PySCHNApps'
,
version
=
'1.0'
,
description
=
'SCHNApps from Python'
,
ext_modules
=
[
ext
]
)
SCHNApps/build/python/window_py.cpp
0 → 100644
View file @
170fedde
#include <boost/python.hpp>
#include <boost/python/module.hpp>
#include <boost/python/def.hpp>
#include "plugin.h"
#include "window.h"
using
namespace
boost
::
python
;
BOOST_PYTHON_MODULE
(
PySCHNApps
)
{
class_
<
CGoGN
::
SCHNApps
::
Window
>
(
"Window"
)
.
def
(
init
<>
())
.
def
(
"launch"
,
&
CGoGN
::
SCHNApps
::
Window
::
launch
)
.
def
(
"loadPlugin"
,
&
CGoGN
::
SCHNApps
::
Window
::
loadPlugin_py
)
;
}
SCHNApps/include/plugin.h
View file @
170fedde
#ifndef _PLUGIN_H_
#define _PLUGIN_H_
#include <QtPlugin>
#include <QAction>
#include <Qt
Core/Qt
Plugin>
#include <Q
tGui/Q
Action>
#include "types.h"
...
...
SCHNApps/include/types.h
View file @
170fedde
#ifndef _TYPES_H_
#define _TYPES_H_
#include <QHash>
#include <QMap>
#include <QString>
#include <Q
tCore/Q
Hash>
#include <Q
tCore/Q
Map>
#include <Q
tCore/Q
String>
#include "Topology/generic/parameters.h"
#include "Topology/map/embeddedMap2.h"
...
...
SCHNApps/include/window.h
View file @
170fedde
...
...
@@ -26,19 +26,24 @@ class Window : public QMainWindow, Ui::Window
public:
/**
* \fn Window(QWidget* parent = NULL)
* \brief Default (and unique) constructor
*
* \param parent the parent of the window
* \fn Window()
* \brief Constructor
*/
Window
(
const
QString
&
appPath
,
QWidget
*
parent
=
NULL
);
Window
();
Window
(
const
Window
&
w
);
/**
* \fn ~Window()
* \brief
the class d
estructor
* \brief
D
estructor
*/
~
Window
();
void
launch
()
{
this
->
QMainWindow
::
show
();
}
const
QString
&
getAppPath
()
{
return
m_appPath
;
}
/*********************************************************
...
...
@@ -202,6 +207,7 @@ public:
* \see Plugin::enable()
*/
Plugin
*
loadPlugin
(
const
QString
&
pluginFilePath
);
void
loadPlugin_py
(
std
::
string
path
);
/**
* \fn void unloadPlugin(QString pluginName)
...
...
SCHNApps/main.py
0 → 100644
View file @
170fedde
import
sys
from
PyQt4
import
QtGui
import
PySCHNApps
if
__name__
==
'__main__'
:
app
=
QtGui
.
QApplication
(
sys
.
argv
)
window
=
PySCHNApps
.
Window
()
window
.
launch
()
# window.loadPlugin("/home/kraemer/Dev/CGoGN/SCHNApps/lib/libRenderPlugin.so")
sys
.
exit
(
app
.
exec_
())
SCHNApps/settings/plugin_path.xml
deleted
100644 → 0
View file @
8db5ec3f
<!-- DO NOT EDIT MANUALLY -->
<PLUGIN_INFO>
<PLUGIN_PATH>
<DIR>
@PLUGIN_COMPILE_DIR@
</DIR>
<DIR>
@PLUGIN_COMPILE_DIR@D
</DIR>
</PLUGIN_PATH>
<ACTIVE_PLUGIN/>
<GLVIEWS/>
</PLUGIN_INFO>
SCHNApps/settings/state_save.xml
deleted
100644 → 0
View file @
8db5ec3f
<SETTINGS>
<PLUGINS>
<DIR
path=
"@PLUGIN_COMPILE_DIR@"
/>
<DIR
path=
"@PLUGIN_COMPILE_DIR@D"
/>
</PLUGINS>
<CAMERAS/>
<SCENES/>
<DISPLAY/>
</SETTINGS>
SCHNApps/src/dialogs/pluginsDialog.cpp
View file @
170fedde
...
...
@@ -36,14 +36,14 @@ PluginsDialog::PluginsDialog(Window* window) :
connect
(
removeButton
,
SIGNAL
(
pressed
()),
this
,
SLOT
(
cb_removePlugins
()));
connect
(
directoryButton
,
SIGNAL
(
pressed
()),
this
,
SLOT
(
cb_addPluginsDirectory
()));
connect
(
treeWidget
,
SIGNAL
(
itemChanged
(
QTreeWidgetItem
*
,
int
)),
this
,
SLOT
(
cb_togglePlugin
(
QTreeWidgetItem
*
,
int
)));
connect
(
treeWidget
,
SIGNAL
(
itemChanged
(
QTreeWidgetItem
*
,
int
)),
this
,
SLOT
(
cb_togglePlugin
(
QTreeWidgetItem
*
,
int
)));
// connect(treeWidget, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(customContextMenu(const QPoint &)));
// connect(this, SIGNAL(accepted()), this, SLOT(cb_acceptDialog()));
// restoreState();
addPluginsDirectory
(
m_window
->
getAppPath
()
+
QString
(
"/
../Plugins
/"
));
addPluginsDirectory
(
m_window
->
getAppPath
()
+
QString
(
"/
lib
/"
));
init
=
false
;
}
...
...
@@ -231,7 +231,7 @@ void PluginsDialog::cb_addPluginsDirectory()
QString
dir
=
QFileDialog
::
getExistingDirectory
(
this
,
tr
(
"Select a directory"
),
m_window
->
getAppPath
()
+
QString
(
"/
../Plugins
/"
),
m_window
->
getAppPath
()
+
QString
(
"/
lib
/"
),
QFileDialog
::
ShowDirsOnly
|
QFileDialog
::
DontResolveSymlinks
);
...
...
@@ -312,7 +312,7 @@ void PluginsDialog::cb_removePlugins()
}
}
void
PluginsDialog
::
cb_togglePlugin
(
QTreeWidgetItem
*
item
,
int
column
)
void
PluginsDialog
::
cb_togglePlugin
(
QTreeWidgetItem
*
item
,
int
column
)
{
if
(
!
init
&&
column
==
0
)
{
...
...
SCHNApps/src/main.cpp
View file @
170fedde
...
...
@@ -5,15 +5,15 @@ int main(int argc, char* argv[])
{
QApplication
app
(
argc
,
argv
);
QSplashScreen
*
splash
=
new
QSplashScreen
(
QPixmap
(
":splash/cgogn/splash.png"
));
splash
->
show
();
splash
->
showMessage
(
"Welcome to SCHNApps"
,
Qt
::
AlignBottom
|
Qt
::
AlignCenter
);
//
QSplashScreen* splash = new QSplashScreen(QPixmap(":splash/cgogn/splash.png"));
//
splash->show();
//
splash->showMessage("Welcome to SCHNApps", Qt::AlignBottom | Qt::AlignCenter);
CGoGN
::
SCHNApps
::
Window
window
(
app
.
applicationDirPath
());
window
.
show
();
splash
->
finish
(
&
window
);
delete
splash
;
//
splash->finish(&window);
//
delete splash;
return
app
.
exec
();
}
SCHNApps/src/window.cpp
View file @
170fedde
...
...
@@ -26,9 +26,9 @@ namespace CGoGN
namespace
SCHNApps
{
Window
::
Window
(
const
QString
&
appPath
,
QWidget
*
parent
)
:
QMainWindow
(
parent
),
m_appPath
(
appPath
),
Window
::
Window
()
:
QMainWindow
(),
m_appPath
(
"/home/kraemer/Dev/CGoGN/SCHNApps"
),
m_firstView
(
NULL
),
m_currentView
(
NULL
)
{
...
...
@@ -82,6 +82,11 @@ Window::Window(const QString& appPath, QWidget *parent) :
m_initialization
=
false
;
}
Window
::
Window
(
const
Window
&
w
)
{
std
::
cout
<<
"hiohoihoih"
<<
std
::
endl
;
}
Window
::~
Window
()
{
// System::StateHandler::saveState(this, h_plugins);
...
...
@@ -448,13 +453,23 @@ Plugin* Window::loadPlugin(const QString& pluginFilePath)
}
else
{
std
::
cout
<<
"plugin enable failed"
<<
std
::
endl
;
delete
plugin
;
return
NULL
;
}
}
// if loading fails
else
{
std
::
cout
<<
"loader.instance failed"
<<
std
::
endl
<<
loader
.
errorString
().
toUtf8
().
constData
()
<<
std
::
endl
;
return
NULL
;
}
}
void
Window
::
loadPlugin_py
(
std
::
string
path
)
{
QString
p
(
QString
::
fromStdString
(
path
));
loadPlugin
(
p
);
}
void
Window
::
unloadPlugin
(
const
QString
&
pluginName
)
...
...
include/Topology/generic/cellmarker.h
View file @
170fedde
...
...
@@ -275,7 +275,7 @@ public:
{
unmarkAll
()
;
// assert(isAllUnmarked);
CGoGN_ASSERT
(
this
->
isAllUnmarked
())
//
CGoGN_ASSERT(this->isAllUnmarked())
}
protected:
...
...
@@ -323,7 +323,7 @@ public:
{
unmarkAll
()
;
// assert(isAllUnmarked);
CGoGN_ASSERT
(
this
->
isAllUnmarked
())
//
CGoGN_ASSERT(this->isAllUnmarked())
}
protected:
...
...
@@ -371,7 +371,7 @@ public:
virtual
~
CellMarkerNoUnmark
()
{
// assert(isAllUnmarked()) ;
CGoGN_ASSERT
(
this
->
isAllUnmarked
())
//
CGoGN_ASSERT(this->isAllUnmarked())
}
protected:
...
...
include/Topology/generic/dartmarker.h
View file @
170fedde
...
...
@@ -270,7 +270,7 @@ public:
{
unmarkAll
()
;
// assert(isAllUnmarked) ;
CGoGN_ASSERT
(
isAllUnmarked
())
//
CGoGN_ASSERT(isAllUnmarked())
}
protected:
...
...
@@ -339,7 +339,7 @@ public:
~
DartMarkerNoUnmark
()
{
// assert(isAllUnmarked) ;
CGoGN_ASSERT
(
isAllUnmarked
())
//
CGoGN_ASSERT(isAllUnmarked())
}
protected:
...
...
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