Commit 9841e323 authored by Lionel Untereiner's avatar Lionel Untereiner

Merge cgogn.unistra.fr:~kraemer/CGoGN

parents 9d7fca91 1d0228be
...@@ -16,7 +16,7 @@ find_package(LibXml2 REQUIRED) ...@@ -16,7 +16,7 @@ find_package(LibXml2 REQUIRED)
find_package(GLEW REQUIRED) find_package(GLEW REQUIRED)
find_package(Qt4 REQUIRED) find_package(Qt4 REQUIRED)
find_package(QGLViewer REQUIRED) find_package(QGLViewer REQUIRED)
find_package(PythonLibs REQUIRED) find_package(PythonLibs 2.7 REQUIRED)
SET( QT_USE_QTOPENGL TRUE ) SET( QT_USE_QTOPENGL TRUE )
SET( QT_USE_QTXML TRUE ) SET( QT_USE_QTXML TRUE )
...@@ -102,6 +102,37 @@ SET(SCHNApps_ROOT_DIR ${CGoGN_ROOT_DIR}/SCHNApps) ...@@ -102,6 +102,37 @@ SET(SCHNApps_ROOT_DIR ${CGoGN_ROOT_DIR}/SCHNApps)
SET(EXECUTABLE_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/bin) SET(EXECUTABLE_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/bin)
SET(LIBRARY_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/lib) SET(LIBRARY_OUTPUT_PATH ${SCHNApps_ROOT_DIR}/lib)
file(
GLOB_RECURSE
SCHNApps_FILES
${SCHNApps_ROOT_DIR}/src/*.cpp
${SCHNApps_ROOT_DIR}/include/*.h
)
file(
GLOB_RECURSE
SCHNApps_UI_FILES
${SCHNApps_ROOT_DIR}/forms/*.ui
)
SET(SCHNApps_QOBJECT_FILES
${SCHNApps_ROOT_DIR}/include/camera.h
${SCHNApps_ROOT_DIR}/include/mapHandler.h
${SCHNApps_ROOT_DIR}/include/plugin.h
${SCHNApps_ROOT_DIR}/include/view.h
${SCHNApps_ROOT_DIR}/include/window.h
${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/pluginsDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/mapsDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/cameraViewDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/pluginsViewDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/mapsViewDialog.h
)
ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/Release Release) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/Release Release)
IF (NOT WIN32) IF (NOT WIN32)
ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/Debug Debug) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/Debug Debug)
......
...@@ -16,63 +16,21 @@ INCLUDE_DIRECTORIES( ...@@ -16,63 +16,21 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
file( QT4_WRAP_UI( UIC_FILES
GLOB ${SCHNApps_UI_FILES}
SCHNApps_SRC_FILES
${SCHNApps_ROOT_DIR}/src/main.cpp
${SCHNApps_ROOT_DIR}/src/camera.cpp
${SCHNApps_ROOT_DIR}/src/mapHandler.cpp
${SCHNApps_ROOT_DIR}/src/plugin.cpp
${SCHNApps_ROOT_DIR}/src/view.cpp
${SCHNApps_ROOT_DIR}/src/window.cpp
${SCHNApps_ROOT_DIR}/src/viewButtonArea.cpp
${SCHNApps_ROOT_DIR}/src/dialogs/camerasDialog.cpp
${SCHNApps_ROOT_DIR}/src/dialogs/pluginsDialog.cpp
${SCHNApps_ROOT_DIR}/src/dialogs/mapsDialog.cpp
${SCHNApps_ROOT_DIR}/src/dialogs/cameraViewDialog.cpp
${SCHNApps_ROOT_DIR}/src/dialogs/pluginsViewDialog.cpp
${SCHNApps_ROOT_DIR}/src/dialogs/mapsViewDialog.cpp
) )
SET(SCHNApps_H_OBJECT_FILES
${SCHNApps_ROOT_DIR}/include/view.h
${SCHNApps_ROOT_DIR}/include/window.h
${SCHNApps_ROOT_DIR}/include/mapHandler.h
${SCHNApps_ROOT_DIR}/include/plugin.h
${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
${SCHNApps_ROOT_DIR}/include/dialogs/camerasDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/pluginsDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/mapsDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/cameraViewDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/pluginsViewDialog.h
${SCHNApps_ROOT_DIR}/include/dialogs/mapsViewDialog.h
)
file(
GLOB
SCHNApps_FORM_FILES
${SCHNApps_ROOT_DIR}/forms/window.ui
${SCHNApps_ROOT_DIR}/forms/camerasDialog.ui
${SCHNApps_ROOT_DIR}/forms/pluginsDialog.ui
${SCHNApps_ROOT_DIR}/forms/mapsDialog.ui
${SCHNApps_ROOT_DIR}/forms/cameraViewDialog.ui
${SCHNApps_ROOT_DIR}/forms/pluginsViewDialog.ui
${SCHNApps_ROOT_DIR}/forms/mapsViewDialog.ui
)
QT4_WRAP_UI( UI_H_FILES
${SCHNApps_FORM_FILES}
)
QT4_WRAP_CPP( MOC_FILES QT4_WRAP_CPP( MOC_FILES
${SCHNApps_H_OBJECT_FILES} ${SCHNApps_QOBJECT_FILES}
) )
QT4_ADD_RESOURCES( RCC_FILES QT4_ADD_RESOURCES( RCC_FILES
${SCHNApps_ROOT_DIR}/resources/resources.qrc ${SCHNApps_ROOT_DIR}/resources/resources.qrc
) )
ADD_EXECUTABLE( SCHNAppsD ADD_EXECUTABLE( SCHNAppsD
${SCHNApps_SRC_FILES} ${SCHNApps_FILES}
${UI_H_FILES} ${UIC_FILES}
${MOC_FILES} ${MOC_FILES}
${RCC_FILES} ${RCC_FILES}
) )
......
...@@ -7,3 +7,4 @@ ADD_SUBDIRECTORY(render) ...@@ -7,3 +7,4 @@ ADD_SUBDIRECTORY(render)
ADD_SUBDIRECTORY(renderVector) ADD_SUBDIRECTORY(renderVector)
ADD_SUBDIRECTORY(renderExplod) ADD_SUBDIRECTORY(renderExplod)
ADD_SUBDIRECTORY(subdivideSurface) ADD_SUBDIRECTORY(subdivideSurface)
#ADD_SUBDIRECTORY(surfaceDeformation)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
SET( PLUGIN_NAME DifferentialProperties )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/differentialProperties )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${SCHNApps_ROOT_DIR}/include ${PLUGIN_ROOT_DIR}/include
${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/include
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
SET( PLUGIN_SRC file(
${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/src/differentialProperties.cpp GLOB_RECURSE
${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/src/computeNormalDialog.cpp PLUGIN_FILES
${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/src/computeCurvatureDialog.cpp ${PLUGIN_ROOT_DIR}/src/*.cpp
${PLUGIN_ROOT_DIR}/include/*.h
${PLUGIN_ROOT_DIR}/include/*.hpp
) )
SET( PLUGIN_H file(
${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/include/differentialProperties.h GLOB_RECURSE
${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/include/computeNormalDialog.h PLUGIN_UI_FILES
${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/include/computeCurvatureDialog.h ${PLUGIN_ROOT_DIR}/forms/*.ui
) )
SET( PLUGIN_FORM SET(
${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/forms/computeNormalDialog.ui PLUGIN_QOBJECT_FILES
${SCHNApps_ROOT_DIR}/Plugins/differentialProperties/forms/computeCurvatureDialog.ui ${PLUGIN_ROOT_DIR}/include/differentialProperties.h
${PLUGIN_ROOT_DIR}/include/computeNormalDialog.h
${PLUGIN_ROOT_DIR}/include/computeCurvatureDialog.h
) )
IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug ) include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )
ADD_DEFINITIONS(-DDEBUG)
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ELSE (WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF (WIN32)
QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
ADD_LIBRARY( DifferentialPropertiesPluginD SHARED
${PLUGIN_SRC}
${PLUGIN_UI}
${PLUGIN_MOC}
)
TARGET_LINK_LIBRARIES( DifferentialPropertiesPluginD
${CGoGN_LIBS_D}
${COMMON_LIBS}
)
ADD_DEPENDENCIES( DifferentialPropertiesPluginD SCHNAppsD )
SET_TARGET_PROPERTIES( DifferentialPropertiesPluginD PROPERTIES COMPILE_DEFINITIONS "DEBUG" )
ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ELSE (WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF (WIN32)
QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
ADD_LIBRARY( DifferentialPropertiesPlugin SHARED
${PLUGIN_SRC}
${PLUGIN_UI}
${PLUGIN_MOC}
)
TARGET_LINK_LIBRARIES( DifferentialPropertiesPlugin
${CGoGN_LIBS_R}
${COMMON_LIBS}
)
ADD_DEPENDENCIES( DifferentialPropertiesPlugin SCHNApps )
ENDIF ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
...@@ -21,9 +21,10 @@ public: ...@@ -21,9 +21,10 @@ public:
private: private:
Window* m_window; Window* m_window;
MapHandlerGen* m_selectedMap;
public slots: public slots:
void selectedMapChanged(); void refreshUI();
void addMapToList(MapHandlerGen* m); void addMapToList(MapHandlerGen* m);
void removeMapFromList(MapHandlerGen* m); void removeMapFromList(MapHandlerGen* m);
}; };
......
...@@ -21,9 +21,10 @@ public: ...@@ -21,9 +21,10 @@ public:
private: private:
Window* m_window; Window* m_window;
MapHandlerGen* m_selectedMap;
public slots: public slots:
void selectedMapChanged(); void refreshUI();
void addMapToList(MapHandlerGen* m); void addMapToList(MapHandlerGen* m);
void removeMapFromList(MapHandlerGen* m); void removeMapFromList(MapHandlerGen* m);
}; };
......
...@@ -30,19 +30,41 @@ public: ...@@ -30,19 +30,41 @@ public:
virtual void redraw(View *view) {} virtual void redraw(View *view) {}
virtual void keyPress(View* view, int key) {} virtual void keyPress(View* view, QKeyEvent* event) {}
virtual void keyRelease(View* view, int key) {} virtual void keyRelease(View* view, QKeyEvent* event) {}
virtual void mousePress(View* view, int button, int x, int y) {} virtual void mousePress(View* view, QMouseEvent* event) {}
virtual void mouseRelease(View* view, int button, int x, int y) {} virtual void mouseRelease(View* view, QMouseEvent* event) {}
virtual void mouseMove(View* view, int buttons, int x, int y) {} virtual void mouseMove(View* view, QMouseEvent* event) {}
virtual void wheelEvent(View* view, int delta, int x, int y) {} virtual void wheelEvent(View* view, QWheelEvent* event) {}
public slots: public slots:
void openComputeNormalDialog(); void openComputeNormalDialog();
void openComputeCurvatureDialog(); void openComputeCurvatureDialog();
void computeNormal(); void computeNormalFromDialog();
void computeCurvature(); void computeCurvatureFromDialog();
void computeNormal(
const QString& mapName,
const QString& positionAttributeName = "position",
const QString& normalAttributeName = "normal",
bool createNormalVBO = true
);
void computeCurvature(
const QString& mapName,
const QString& positionAttributeName = "position",
const QString& normalAttributeName = "normal",
const QString& KmaxAttributeName = "Kmax",
const QString& kmaxAttributeName = "kmax",
const QString& KminAttributeName = "Kmin",
const QString& kminAttributeName = "kmin",
const QString& KnormalAttributeName = "Knormal",
bool createKmaxVBO = true,
bool createkmaxVBO = true,
bool createKminVBO = true,
bool createkminVBO = true,
bool createKnormalVBO = true
);
private: private:
ComputeNormalDialog* m_computeNormalDialog; ComputeNormalDialog* m_computeNormalDialog;
......
...@@ -10,7 +10,9 @@ namespace CGoGN ...@@ -10,7 +10,9 @@ namespace CGoGN
namespace SCHNApps namespace SCHNApps
{ {
ComputeCurvatureDialog::ComputeCurvatureDialog(Window* w) : m_window(w) ComputeCurvatureDialog::ComputeCurvatureDialog(Window* w) :
m_window(w),
m_selectedMap(NULL)
{ {
setupUi(this); setupUi(this);
...@@ -23,15 +25,18 @@ ComputeCurvatureDialog::ComputeCurvatureDialog(Window* w) : m_window(w) ...@@ -23,15 +25,18 @@ ComputeCurvatureDialog::ComputeCurvatureDialog(Window* w) : m_window(w)
connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*))); connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*)));
connect(m_window, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*))); connect(m_window, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*)));
connect(mapList, SIGNAL(itemSelectionChanged()), this, SLOT(selectedMapChanged())); connect(mapList, SIGNAL(itemSelectionChanged()), this, SLOT(refreshUI()));
const QList<MapHandlerGen*>& maps = m_window->getMapsList(); const QList<MapHandlerGen*>& maps = m_window->getMapsList();
foreach(MapHandlerGen* map, maps) foreach(MapHandlerGen* map, maps)
mapList->addItem(map->getName()); mapList->addItem(map->getName());
} }
void ComputeCurvatureDialog::selectedMapChanged() void ComputeCurvatureDialog::refreshUI()
{ {
if(m_selectedMap)
disconnect(m_selectedMap, SIGNAL(attributeAdded()), this, SLOT(refreshUI()));
QList<QListWidgetItem*> currentItems = mapList->selectedItems(); QList<QListWidgetItem*> currentItems = mapList->selectedItems();
if(!currentItems.empty()) if(!currentItems.empty())
{ {
...@@ -94,7 +99,12 @@ void ComputeCurvatureDialog::selectedMapChanged() ...@@ -94,7 +99,12 @@ void ComputeCurvatureDialog::selectedMapChanged()
++k; ++k;
} }
} }
m_selectedMap = mh;
connect(m_selectedMap, SIGNAL(attributeAdded()), this, SLOT(refreshUI()));
} }
else
m_selectedMap = NULL;
} }
void ComputeCurvatureDialog::addMapToList(MapHandlerGen* m) void ComputeCurvatureDialog::addMapToList(MapHandlerGen* m)
...@@ -104,13 +114,14 @@ void ComputeCurvatureDialog::addMapToList(MapHandlerGen* m) ...@@ -104,13 +114,14 @@ void ComputeCurvatureDialog::addMapToList(MapHandlerGen* m)
void ComputeCurvatureDialog::removeMapFromList(MapHandlerGen* m) void ComputeCurvatureDialog::removeMapFromList(MapHandlerGen* m)
{ {
for(int i = 0; i < mapList->count(); ++i) QList<QListWidgetItem*> items = mapList->findItems(m->getName(), Qt::MatchExactly);
if(!items.empty())
delete items[0];
if(m_selectedMap == m)
{ {
if(mapList->item(i)->text() == m->getName()) disconnect(m_selectedMap, SIGNAL(attributeAdded()), this, SLOT(refreshUI()));
{ m_selectedMap = NULL;
delete mapList->item(i);
return;
}
} }
} }
......
...@@ -10,7 +10,9 @@ namespace CGoGN ...@@ -10,7 +10,9 @@ namespace CGoGN
namespace SCHNApps namespace SCHNApps
{ {
ComputeNormalDialog::ComputeNormalDialog(Window* w) : m_window(w) ComputeNormalDialog::ComputeNormalDialog(Window* w) :
m_window(w),
m_selectedMap(NULL)
{ {
setupUi(this); setupUi(this);
...@@ -19,15 +21,18 @@ ComputeNormalDialog::ComputeNormalDialog(Window* w) : m_window(w) ...@@ -19,15 +21,18 @@ ComputeNormalDialog::ComputeNormalDialog(Window* w) : m_window(w)
connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*))); connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*)));
connect(m_window, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*))); connect(m_window, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*)));
connect(mapList, SIGNAL(itemSelectionChanged()), this, SLOT(selectedMapChanged())); connect(mapList, SIGNAL(itemSelectionChanged()), this, SLOT(refreshUI()));
const QList<MapHandlerGen*>& maps = m_window->getMapsList(); const QList<MapHandlerGen*>& maps = m_window->getMapsList();
foreach(MapHandlerGen* map, maps) foreach(MapHandlerGen* map, maps)
mapList->addItem(map->getName()); mapList->addItem(map->getName());
} }
void ComputeNormalDialog::selectedMapChanged() void ComputeNormalDialog::refreshUI()
{ {
if(m_selectedMap)
disconnect(m_selectedMap, SIGNAL(attributeAdded()), this, SLOT(refreshUI()));
QList<QListWidgetItem*> currentItems = mapList->selectedItems(); QList<QListWidgetItem*> currentItems = mapList->selectedItems();
if(!currentItems.empty()) if(!currentItems.empty())
{ {
...@@ -59,7 +64,12 @@ void ComputeNormalDialog::selectedMapChanged() ...@@ -59,7 +64,12 @@ void ComputeNormalDialog::selectedMapChanged()
++j; ++j;
} }
} }
m_selectedMap = mh;
connect(m_selectedMap, SIGNAL(attributeAdded()), this, SLOT(refreshUI()));
} }
else
m_selectedMap = NULL;
} }
void ComputeNormalDialog::addMapToList(MapHandlerGen* m) void ComputeNormalDialog::addMapToList(MapHandlerGen* m)
...@@ -69,13 +79,14 @@ void ComputeNormalDialog::addMapToList(MapHandlerGen* m) ...@@ -69,13 +79,14 @@ void ComputeNormalDialog::addMapToList(MapHandlerGen* m)
void ComputeNormalDialog::removeMapFromList(MapHandlerGen* m) void ComputeNormalDialog::removeMapFromList(MapHandlerGen* m)
{ {
for(int i = 0; i < mapList->count(); ++i) QList<QListWidgetItem*> items = mapList->findItems(m->getName(), Qt::MatchExactly);
if(!items.empty())
delete items[0];
if(m_selectedMap == m)
{ {
if(mapList->item(i)->text() == m->getName()) disconnect(m_selectedMap, SIGNAL(attributeAdded()), this, SLOT(refreshUI()));
{ m_selectedMap = NULL;
delete mapList->item(i);
return;
}
} }
} }
......
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
SET( PLUGIN_NAME ImportSurface )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/importSurface )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${SCHNApps_ROOT_DIR}/include ${PLUGIN_ROOT_DIR}/include
${SCHNApps_ROOT_DIR}/Plugins/importSurface
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
SET( PLUGIN_SRC file(
${SCHNApps_ROOT_DIR}/Plugins/importSurface/importSurface.cpp GLOB_RECURSE
PLUGIN_FILES
${PLUGIN_ROOT_DIR}/src/*.cpp
${PLUGIN_ROOT_DIR}/include/*.h
${PLUGIN_ROOT_DIR}/include/*.hpp
) )
SET( PLUGIN_H file(
${SCHNApps_ROOT_DIR}/Plugins/importSurface/importSurface.h GLOB_RECURSE
PLUGIN_UI_FILES
${PLUGIN_ROOT_DIR}/forms/*.ui
) )
IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug ) SET(
PLUGIN_QOBJECT_FILES
ADD_DEFINITIONS(-DDEBUG) ${PLUGIN_ROOT_DIR}/include/importSurface.h
)
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ELSE (WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Debug ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF (WIN32)
# QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
ADD_LIBRARY( ImportSurfacePluginD SHARED
${PLUGIN_SRC}
${PLUGIN_UI}
${PLUGIN_MOC}
)
TARGET_LINK_LIBRARIES( ImportSurfacePluginD
${CGoGN_LIBS_D}
${COMMON_LIBS}
)
ADD_DEPENDENCIES( ImportSurfacePluginD SCHNAppsD )
SET_TARGET_PROPERTIES( ImportSurfacePluginD PROPERTIES COMPILE_DEFINITIONS "DEBUG" )
ELSE ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
IF(WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ELSE (WIN32)
link_directories( ${CGoGN_ROOT_DIR}/lib/Release )
ENDIF (WIN32)
# QT4_WRAP_UI( PLUGIN_UI ${PLUGIN_FORM} )
QT4_WRAP_CPP( PLUGIN_MOC ${PLUGIN_H} )
ADD_LIBRARY( ImportSurfacePlugin SHARED
${PLUGIN_SRC}
${PLUGIN_UI}
${PLUGIN_MOC}
)
TARGET_LINK_LIBRARIES( ImportSurfacePlugin
${CGoGN_LIBS_R}
${COMMON_LIBS}
)
ADD_DEPENDENCIES( ImportSurfacePlugin SCHNApps ) include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )
ENDIF ( ${CMAKE_BUILD_TYPE} STREQUAL Debug )
...@@ -27,12 +27,12 @@ public: ...@@ -27,12 +27,12 @@ public:
virtual void redraw(View *view) {} virtual void redraw(View *view) {}
virtual void keyPress(View* view, int key) {} virtual void keyPress(View* view, QKeyEvent* event) {}
virtual void keyRelease(View* view, int key) {} virtual void keyRelease(View* view, QKeyEvent* event) {}
virtual void mousePress(View* view, int button, int x, int y) {} virtual void mousePress(View* view, QMouseEvent* event) {}
virtual void mouseRelease(View* view, int button, int x, int y) {} virtual void mouseRelease(View* view, QMouseEvent* event) {}
virtual void mouseMove(View* view, int buttons, int x, int y) {} virtual void mou