diff --git a/SCHNApps/CMakeLists.txt b/SCHNApps/CMakeLists.txt index bb3146cda58eaa186a3401b43dfd9fd7c2d1f886..17bb6b443736486a07adfc3da763f5e879338bfb 100644 --- a/SCHNApps/CMakeLists.txt +++ b/SCHNApps/CMakeLists.txt @@ -3,9 +3,9 @@ cmake_minimum_required(VERSION 2.8) project(SCHNApps) SET( QT_USE_QTXML TRUE ) -SET (QT_USE_QTDESIGNER TRUE) -SET (QT_USE_QTGUI TRUE) -SET(QT_USE_QTPLUGIN TRUE) +SET( QT_USE_QTDESIGNER TRUE ) +SET( QT_USE_QTGUI TRUE ) +SET( QT_USE_QTPLUGIN TRUE ) #========CGoGN========# SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/.. CACHE STRING "CGoGN root dir") @@ -16,14 +16,8 @@ INCLUDE(${CGoGN_ROOT_DIR}/apps_cmake.txt) find_package(QGLViewer REQUIRED) -#======Directories=======# -SET(INC_DIR ${CMAKE_SOURCE_DIR}/include) -SET(SRC_DIR ${CMAKE_SOURCE_DIR}/src) -SET(FORMS_DIR ${CMAKE_SOURCE_DIR}/forms) -SET(RESOURCES_DIR ${CMAKE_SOURCE_DIR}/resources) - -SET(PLUGIN_DIR ${CMAKE_SOURCE_DIR}/Plugins) -SET(PLUGIN_COMPILE_DIR ${EXECUTABLE_OUTPUT_PATH}/plugins) +#======SCHNApps=======# +SET(SCHNApps_ROOT_DIR ${CGoGN_ROOT_DIR}/SCHNApps) ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/Release Release) IF (NOT WIN32) @@ -33,6 +27,10 @@ ENDIF (NOT WIN32) configure_file(${CMAKE_SOURCE_DIR}/settings/state_save.xml ${EXECUTABLE_OUTPUT_PATH}/state_save.xml @ONLY) +#======Plugins=======# +#ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/Plugins) + + #======Documentation=======# find_package(Doxygen) if(DOXYGEN_FOUND) diff --git a/SCHNApps/Debug/CMakeLists.txt b/SCHNApps/Debug/CMakeLists.txt index 23b48738ecf9af9659689e05ce86a16df3ec665b..1b06f8538254a124781cef477ab4c7bd9c2bb336 100644 --- a/SCHNApps/Debug/CMakeLists.txt +++ b/SCHNApps/Debug/CMakeLists.txt @@ -14,95 +14,61 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QGLVIEWER_INCLUDE_DIR} + ${SCHNApps_ROOT_DIR}/include ) -SET(SRC_FILES - ${SRC_DIR}/main.cpp - ${SRC_DIR}/interface/window.cpp - ${SRC_DIR}/interface/system.cpp - ${SRC_DIR}/interface/stateHandler.cpp - ${SRC_DIR}/visualization/view.cpp - ${SRC_DIR}/visualization/scene.cpp - ${SRC_DIR}/visualization/camera.cpp - ${SRC_DIR}/interface/splitArea.cpp - ${SRC_DIR}/dialogs/newSceneDialog.cpp - ${SRC_DIR}/dialogs/sceneSelector.cpp - ${SRC_DIR}/interface/viewButtonArea.cpp - ${SRC_DIR}/dialogs/cameraViewDialog.cpp - ${SRC_DIR}/dialogs/cameraOptionDialog.cpp - ${SRC_DIR}/dialogs/cameraSceneDialog.cpp - ${SRC_DIR}/dialogs/globalCameraDialog.cpp - ${SRC_DIR}/dialogs/pluginDialog.cpp - ${SRC_DIR}/dialogs/linkViewDialog.cpp - ${SRC_DIR}/visualization/vboHandler.cpp - ${SRC_DIR}/visualization/mapHandler.cpp - ${SRC_DIR}/visualization/context.cpp - ${SRC_DIR}/dialogs/mapPluginDialog.cpp +file( + GLOB + SCHNApps_SRC_FILES + ${SCHNApps_ROOT_DIR}/src/main.cpp + ${SCHNApps_ROOT_DIR}/src/interface/*.cpp + ${SCHNApps_ROOT_DIR}/src/visualization/*.cpp + ${SCHNApps_ROOT_DIR}/src/dialogs/*.cpp ) -SET(H_OBJECT_FILES - ${INC_DIR}/interface/window.h - ${INC_DIR}/interface/system.h - ${INC_DIR}/visualization/view.h - ${INC_DIR}/visualization/scene.h - ${INC_DIR}/interface/splitArea.h - ${INC_DIR}/dialogs/newSceneDialog.h - ${INC_DIR}/dialogs/sceneSelector.h - ${INC_DIR}/interface/viewButtonArea.h - ${INC_DIR}/dialogs/cameraViewDialog.h - ${INC_DIR}/dialogs/cameraOptionDialog.h - ${INC_DIR}/dialogs/cameraSceneDialog.h - ${INC_DIR}/dialogs/globalCameraDialog.h - ${INC_DIR}/dialogs/pluginDialog.h - ${INC_DIR}/dialogs/linkViewDialog.h - ${INC_DIR}/dialogs/mapPluginDialog.h +SET(SCHNApps_H_OBJECT_FILES + ${SCHNApps_ROOT_DIR}/include/interface/window.h + ${SCHNApps_ROOT_DIR}/include/interface/system.h + ${SCHNApps_ROOT_DIR}/include/interface/viewButtonArea.h + ${SCHNApps_ROOT_DIR}/include/interface/splitArea.h + ${SCHNApps_ROOT_DIR}/include/visualization/view.h + ${SCHNApps_ROOT_DIR}/include/visualization/scene.h + ${SCHNApps_ROOT_DIR}/include/dialogs/newSceneDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/sceneSelector.h + ${SCHNApps_ROOT_DIR}/include/dialogs/cameraViewDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/cameraOptionDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/cameraSceneDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/globalCameraDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/pluginDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/linkViewDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/mapPluginDialog.h ) -SET(FORMS_FILES - ${FORMS_DIR}/window.ui - ${FORMS_DIR}/questionSessionDialog.ui - ${FORMS_DIR}/infoDialog.ui - ${FORMS_DIR}/newSceneDialog.ui - ${FORMS_DIR}/cameraViewDialog.ui - ${FORMS_DIR}/cameraOptionDialog.ui - ${FORMS_DIR}/cameraSceneDialog.ui - ${FORMS_DIR}/globalCameraDialog.ui - ${FORMS_DIR}/pluginDialog.ui - ${FORMS_DIR}/linkViewDialog.ui - ${FORMS_DIR}/mapPluginDialog.ui +file( + GLOB + SCHNApps_FORM_FILES + ${SCHNApps_ROOT_DIR}/forms/*.ui ) -QT4_WRAP_UI(UI_H_FILES - ${FORMS_FILES} +QT4_WRAP_UI( UI_H_FILES + ${SCHNApps_FORM_FILES} ) -QT4_WRAP_CPP(MOC_FILES - ${H_OBJECT_FILES} +QT4_WRAP_CPP( MOC_FILES + ${SCHNApps_H_OBJECT_FILES} ) -QT4_ADD_RESOURCES(RCC_FILES - ${RESOURCES_DIR}/resources.qrc +QT4_ADD_RESOURCES( RCC_FILES + ${SCHNApps_ROOT_DIR}/resources/resources.qrc ) -INCLUDE_DIRECTORIES( - ${FORMS} - ${INC_DIR} - ${INC_DIR}/interface - ${INC_DIR}/visualization - ${INC_DIR}/dialogs - ${INC_DIR}/plugins -) - -ADD_EXECUTABLE(CGoGN_plugD - ${SRC_FILES} +ADD_EXECUTABLE( SCHNappsD + ${SCHNApps_SRC_FILES} ${UI_H_FILES} ${MOC_FILES} ${RCC_FILES} ) -TARGET_LINK_LIBRARIES(CGoGN_plugD +TARGET_LINK_LIBRARIES( SCHNappsD ${CGoGN_LIBS_D} ${COMMON_LIBS} ${QGLVIEWER_LIBRARIES} ) - -#ADD_SUBDIRECTORY(${PLUGIN_DIR} plugins) - diff --git a/SCHNApps/Release/CMakeLists.txt b/SCHNApps/Release/CMakeLists.txt index 4459c22ed8dbf3c62a4d0e4fe11f8791cf322583..6175bae431ddd36b4b6dd41c91a1944cfef4cd61 100644 --- a/SCHNApps/Release/CMakeLists.txt +++ b/SCHNApps/Release/CMakeLists.txt @@ -16,95 +16,61 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QGLVIEWER_INCLUDE_DIR} + ${SCHNApps_ROOT_DIR}/include ) -SET(SRC_FILES - ${SRC_DIR}/main.cpp - ${SRC_DIR}/interface/window.cpp - ${SRC_DIR}/interface/system.cpp - ${SRC_DIR}/interface/stateHandler.cpp - ${SRC_DIR}/visualization/view.cpp - ${SRC_DIR}/visualization/scene.cpp - ${SRC_DIR}/visualization/camera.cpp - ${SRC_DIR}/interface/splitArea.cpp - ${SRC_DIR}/dialogs/newSceneDialog.cpp - ${SRC_DIR}/dialogs/sceneSelector.cpp - ${SRC_DIR}/interface/viewButtonArea.cpp - ${SRC_DIR}/dialogs/cameraViewDialog.cpp - ${SRC_DIR}/dialogs/cameraOptionDialog.cpp - ${SRC_DIR}/dialogs/cameraSceneDialog.cpp - ${SRC_DIR}/dialogs/globalCameraDialog.cpp - ${SRC_DIR}/dialogs/pluginDialog.cpp - ${SRC_DIR}/dialogs/linkViewDialog.cpp - ${SRC_DIR}/visualization/vboHandler.cpp - ${SRC_DIR}/visualization/mapHandler.cpp - ${SRC_DIR}/visualization/context.cpp - ${SRC_DIR}/dialogs/mapPluginDialog.cpp +file( + GLOB + SCHNApps_SRC_FILES + ${SCHNApps_ROOT_DIR}/src/main.cpp + ${SCHNApps_ROOT_DIR}/src/interface/*.cpp + ${SCHNApps_ROOT_DIR}/src/visualization/*.cpp + ${SCHNApps_ROOT_DIR}/src/dialogs/*.cpp ) -SET(H_OBJECT_FILES - ${INC_DIR}/interface/window.h - ${INC_DIR}/interface/system.h - ${INC_DIR}/visualization/view.h - ${INC_DIR}/visualization/scene.h - ${INC_DIR}/interface/splitArea.h - ${INC_DIR}/dialogs/newSceneDialog.h - ${INC_DIR}/dialogs/sceneSelector.h - ${INC_DIR}/interface/viewButtonArea.h - ${INC_DIR}/dialogs/cameraViewDialog.h - ${INC_DIR}/dialogs/cameraOptionDialog.h - ${INC_DIR}/dialogs/cameraSceneDialog.h - ${INC_DIR}/dialogs/globalCameraDialog.h - ${INC_DIR}/dialogs/pluginDialog.h - ${INC_DIR}/dialogs/linkViewDialog.h - ${INC_DIR}/dialogs/mapPluginDialog.h +SET(SCHNApps_H_OBJECT_FILES + ${SCHNApps_ROOT_DIR}/include/interface/window.h + ${SCHNApps_ROOT_DIR}/include/interface/system.h + ${SCHNApps_ROOT_DIR}/include/interface/viewButtonArea.h + ${SCHNApps_ROOT_DIR}/include/interface/splitArea.h + ${SCHNApps_ROOT_DIR}/include/visualization/view.h + ${SCHNApps_ROOT_DIR}/include/visualization/scene.h + ${SCHNApps_ROOT_DIR}/include/dialogs/newSceneDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/sceneSelector.h + ${SCHNApps_ROOT_DIR}/include/dialogs/cameraViewDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/cameraOptionDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/cameraSceneDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/globalCameraDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/pluginDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/linkViewDialog.h + ${SCHNApps_ROOT_DIR}/include/dialogs/mapPluginDialog.h ) -SET(FORMS_FILES - ${FORMS_DIR}/window.ui - ${FORMS_DIR}/questionSessionDialog.ui - ${FORMS_DIR}/infoDialog.ui - ${FORMS_DIR}/newSceneDialog.ui - ${FORMS_DIR}/cameraViewDialog.ui - ${FORMS_DIR}/cameraOptionDialog.ui - ${FORMS_DIR}/cameraSceneDialog.ui - ${FORMS_DIR}/globalCameraDialog.ui - ${FORMS_DIR}/pluginDialog.ui - ${FORMS_DIR}/linkViewDialog.ui - ${FORMS_DIR}/mapPluginDialog.ui +file( + GLOB + SCHNApps_FORM_FILES + ${SCHNApps_ROOT_DIR}/forms/*.ui ) -QT4_WRAP_UI(UI_H_FILES - ${FORMS_FILES} +QT4_WRAP_UI( UI_H_FILES + ${SCHNApps_FORM_FILES} ) -QT4_WRAP_CPP(MOC_FILES - ${H_OBJECT_FILES} +QT4_WRAP_CPP( MOC_FILES + ${SCHNApps_H_OBJECT_FILES} ) -QT4_ADD_RESOURCES(RCC_FILES - ${RESOURCES_DIR}/resources.qrc +QT4_ADD_RESOURCES( RCC_FILES + ${SCHNApps_ROOT_DIR}/resources/resources.qrc ) -INCLUDE_DIRECTORIES( - ${FORMS} - ${INC_DIR} - ${INC_DIR}/interface - ${INC_DIR}/visualization - ${INC_DIR}/dialogs - ${INC_DIR}/plugins -) - -ADD_EXECUTABLE(CGoGN_plug - ${SRC_FILES} +ADD_EXECUTABLE( SCHNapps + ${SCHNApps_SRC_FILES} ${UI_H_FILES} ${MOC_FILES} ${RCC_FILES} ) -TARGET_LINK_LIBRARIES(CGoGN_plug +TARGET_LINK_LIBRARIES( SCHNapps ${CGoGN_LIBS_R} ${COMMON_LIBS} ${QGLVIEWER_LIBRARIES} ) - -#ADD_SUBDIRECTORY(${PLUGIN_DIR} plugins) - diff --git a/SCHNApps/include/dialogs/globalCameraDialog.h b/SCHNApps/include/dialogs/globalCameraDialog.h index 2bca70888b7df0e6f6a69848ab30f17b1cbdd18c..44fa0053c381d765d91ef4eef1f1767bb96b470b 100644 --- a/SCHNApps/include/dialogs/globalCameraDialog.h +++ b/SCHNApps/include/dialogs/globalCameraDialog.h @@ -1,19 +1,15 @@ #ifndef _GLOBALCAMERADIALOG_H_ #define _GLOBALCAMERADIALOG_H_ - - #include "ui_globalCameraDialog.h" - #include #include #include #include - -#include "camera.h" -#include "view.h" +#include "visualization/camera.h" +#include "visualization/view.h" class Window; diff --git a/SCHNApps/include/dialogs/newSceneDialog.h b/SCHNApps/include/dialogs/newSceneDialog.h index f603eb4e60a9b1eae2c410dda595db04a013d283..280a1bfade214f9c676370a3f83af369824756fb 100644 --- a/SCHNApps/include/dialogs/newSceneDialog.h +++ b/SCHNApps/include/dialogs/newSceneDialog.h @@ -1,17 +1,14 @@ #ifndef _NEWSCENEDIALOG_H_ #define _NEWSCENEDIALOG_H_ - #include "ui_newSceneDialog.h" - #include namespace myListCameraTypes{ enum type {view, camera,scene}; } - class Window; class NewSceneDialog : public QDialog, Ui::NSDialog{ diff --git a/SCHNApps/include/dialogs/pluginDialog.h b/SCHNApps/include/dialogs/pluginDialog.h index 1393aa65f60cbb469f62bcfdf89091217baa5306..dfaefa1262d8ee9b9965be436639ab1bec66162d 100644 --- a/SCHNApps/include/dialogs/pluginDialog.h +++ b/SCHNApps/include/dialogs/pluginDialog.h @@ -11,7 +11,6 @@ #include "types.h" - class Plugin; class Window; diff --git a/SCHNApps/include/dialogs/sceneSelector.h b/SCHNApps/include/dialogs/sceneSelector.h index 7972eafa3ca7a418ebda3227afaf7ce3c78bcca7..ff4b2b2d8a29a319cacc3696ebe18689bfb54ed9 100644 --- a/SCHNApps/include/dialogs/sceneSelector.h +++ b/SCHNApps/include/dialogs/sceneSelector.h @@ -1,17 +1,15 @@ #ifndef _SCENESELECTOR_H_ #define _SCENESELECTOR_H_ - -#include "view.h" +#include "visualization/view.h" #include #include class SplitArea; - - -struct PixElem{ +struct PixElem +{ View* view; QRect rect; QColor color; @@ -30,12 +28,12 @@ struct PixElem{ }; -class ViewPixMaps : public QList >{ +class ViewPixMaps : public QList > +{ public: typedef ViewPixMaps::iterator y_iterator; typedef QList::iterator x_iterator; - ViewPixMaps(); ~ViewPixMaps(); @@ -53,7 +51,6 @@ public: x_iterator x_begin(y_iterator y_it){return y_it->begin();} x_iterator x_end(y_iterator y_it){return y_it->end();} - void beginMove(int x, int y); void moveTmp(int x, int y); void confirmMove(); @@ -80,7 +77,8 @@ protected: void computeSize(); }; -class ViewSelector : public QDialog { +class ViewSelector : public QDialog +{ Q_OBJECT public: enum SelectorDialogType {MOVE,SELECT}; @@ -98,7 +96,6 @@ public: bool keys[3]; - protected: ViewPixMaps viewPixMap; @@ -124,6 +121,4 @@ private: QPoint mouseToIndice(); }; - - #endif diff --git a/SCHNApps/include/interface/system.h b/SCHNApps/include/interface/system.h index 01489a2b60d830522cad3afc68f58efb0485be4a..92357b2e6a0d817f04520dbc7cf4168791f2c56d 100644 --- a/SCHNApps/include/interface/system.h +++ b/SCHNApps/include/interface/system.h @@ -4,7 +4,6 @@ #include #include - #include #include #include @@ -14,7 +13,6 @@ #include "ui_questionSessionDialog.h" #include "ui_infoDialog.h" - class Window; class SplitArea; @@ -53,8 +51,6 @@ namespace System{ static ERROR_CODE code; - - static ERROR_CODE BAD_PLUGIN_PATH_IN_FILE_f(QString file); static ERROR_CODE NO_PLUGIN_IN_DIR_f(QString dir); static ERROR_CODE PLUGIN_EXISTS_f(QString plugin); @@ -73,7 +69,6 @@ namespace System{ static ERROR_CODE OPEN_FILE_ERROR_f(QString filepath); static ERROR_CODE BAD_XML_FILE_f(QString filepath); - static void showError(QWidget* parent=0); }; @@ -102,14 +97,11 @@ namespace System{ static bool savePluginsInfo(Window* window, PluginHash* pluginHash, QStringList paths); }; - - typedef enum{GLVIEWER_IN_DOCK, SIMPLE_GLVIEWER} QGLV_CREATE_SETTINGS; extern QString app_path; extern QSplashScreen* splash; - } #endif diff --git a/SCHNApps/include/interface/window.h b/SCHNApps/include/interface/window.h index e01c513cddd3d2612d4cb928fe62a5a832a12c21..b86ced04d239bc342ed7defd4b8c8b4844976a87 100644 --- a/SCHNApps/include/interface/window.h +++ b/SCHNApps/include/interface/window.h @@ -1,21 +1,15 @@ #ifndef _WINDOW_H_ #define _WINDOW_H_ - #include "ui_window.h" #include -#include "mapHandler.h" - #include "Topology/generic/genericmap.h" - #include "types.h" - -#include "splitArea.h" - -#include "system.h" - +#include "visualization/mapHandler.h" +#include "interface/splitArea.h" +#include "interface/system.h" class Scene; class View; @@ -24,7 +18,6 @@ class Plugin; class Context; class MapHandler; - class Window : public QMainWindow, Ui::Window{ Q_OBJECT public: diff --git a/SCHNApps/include/plugins/plugin.h b/SCHNApps/include/plugins/plugin.h index 4002b508bf943c84a0f1a772063b4e3f3f6ae019..e2d860f03dfe9206edbf26dd67a6242f7a9c63fc 100644 --- a/SCHNApps/include/plugins/plugin.h +++ b/SCHNApps/include/plugins/plugin.h @@ -7,15 +7,16 @@ #include #include -#include "window.h" -#include "view.h" -#include "camera.h" -#include "system.h" -#include "mapHandler.h" -#include "vboHandler.h" -#include "scene.h" - -class Plugin{ +#include "interface/window.h" +#include "interface/system.h" +#include "visualization/view.h" +#include "visualization/camera.h" +#include "visualization/mapHandler.h" +#include "visualization/vboHandler.h" +#include "visualization/scene.h" + +class Plugin +{ public: enum {UNLIMITED_MAP_NUMBER=-1}; diff --git a/SCHNApps/include/plugins/simplePlugin.h b/SCHNApps/include/plugins/simplePlugin.h index a311a935c6a2ff06160869c507b2a1cae7532337..485faeb6d07db6c69985cb533cf7f85a0ddbdce3 100644 --- a/SCHNApps/include/plugins/simplePlugin.h +++ b/SCHNApps/include/plugins/simplePlugin.h @@ -1,10 +1,10 @@ #ifndef _SIMPLEPLUGIN_H_ #define _SIMPLEPLUGIN_H_ -#include "plugin.h" +#include "plugins/plugin.h" - -class SimplePlugin : public QObject, public Plugin{ +class SimplePlugin : public QObject, public Plugin +{ Q_OBJECT public: SimplePlugin(); diff --git a/SCHNApps/include/plugins/visualPlugin.h b/SCHNApps/include/plugins/visualPlugin.h index 736c9fb771590b1481138693fe7c9cd635213c46..f15dca009b70b4d772baec38c77fcb3ae7e15901 100644 --- a/SCHNApps/include/plugins/visualPlugin.h +++ b/SCHNApps/include/plugins/visualPlugin.h @@ -1,10 +1,10 @@ #ifndef _VISUALPLUGIN_H_ #define _VISUALPLUGIN_H_ -#include "plugin.h" +#include "plugins/plugin.h" - -class VisualPlugin : public QObject, public Plugin{ +class VisualPlugin : public QObject, public Plugin +{ Q_OBJECT public: VisualPlugin(); diff --git a/SCHNApps/include/types.h b/SCHNApps/include/types.h index a3528004965c5552963a3c897115f5dc1c9d4fd2..33aa479782a07f6af0d962022dc022305997ebd4 100644 --- a/SCHNApps/include/types.h +++ b/SCHNApps/include/types.h @@ -1,7 +1,6 @@ #ifndef _TYPES_H_ #define _TYPES_H_ - #include #include @@ -45,5 +44,4 @@ namespace Qt{ extern int UserRoleType; } - #endif diff --git a/SCHNApps/include/visualization/camera.h b/SCHNApps/include/visualization/camera.h index ceb7ecc22edc47ae66feb31d7a10483a3f1b711d..5dd9fc6726ad7470c31b2dc7ef7f5c794a94a5a5 100644 --- a/SCHNApps/include/visualization/camera.h +++ b/SCHNApps/include/visualization/camera.h @@ -1,12 +1,12 @@ #ifndef _CAMERA_H_ #define _CAMERA_H_ -#include "view.h" +#include "visualization/view.h" //forward declaration - -class Camera : public qglviewer::Camera{ +class Camera : public qglviewer::Camera +{ public: Camera(View* v); Camera(View* v, Camera c); @@ -62,5 +62,4 @@ protected: int m_snapCount; }; - #endif diff --git a/SCHNApps/include/visualization/context.h b/SCHNApps/include/visualization/context.h index 1cc2c21cd301bea48cecedb865f1792a54427eef..f4bb86f4991c3cc26af7e5b65084a1f8774c213a 100644 --- a/SCHNApps/include/visualization/context.h +++ b/SCHNApps/include/visualization/context.h @@ -1,18 +1,16 @@ #ifndef _CONTEXT_H_ #define _CONTEXT_H_ - #include "types.h" #include - -class Context : public QGLContext{ +class Context : public QGLContext +{ public: Context(QWidget* w, const QGLFormat & format); void setDevice(QWidget* w); }; - #endif diff --git a/SCHNApps/include/visualization/mapHandler.h b/SCHNApps/include/visualization/mapHandler.h index c10e935db7f573db18c7e4676a491e0629b8ab26..fb80a0bd31c696c9bdbed6b4f67de5dba0cd8802 100644 --- a/SCHNApps/include/visualization/mapHandler.h +++ b/SCHNApps/include/visualization/mapHandler.h @@ -1,11 +1,8 @@ #ifndef _VIZUHANDLER_H_ #define _VIZUHANDLER_H_ - #include - - namespace CGoGN { class GenericMap; namespace Utils{ @@ -15,7 +12,8 @@ namespace CGoGN { class VBOHandler; -class MapHandler{ +class MapHandler +{ public: MapHandler(CGoGN::GenericMap* map); ~MapHandler(); @@ -38,5 +36,4 @@ protected: QList l_vbo; }; - #endif diff --git a/SCHNApps/include/visualization/renderContainer.h b/SCHNApps/include/visualization/renderContainer.h index 9874060f394bfbead6edce404c55a5f5ce1ea165..3321d2b21fdec3f812a6e9703499ad68f360b394 100644 --- a/SCHNApps/include/visualization/renderContainer.h +++ b/SCHNApps/include/visualization/renderContainer.h @@ -1,18 +1,16 @@ #ifndef _RENDERCONTAINER_H_ #define _RENDERCONTAINER_H_ - #include "Utils/GLSLShader.h" #include "Algo/Render/GL2/topo3Render.h" #include "Utils/vbo.h" #include "types.h" -#include "system.h" +#include "interface/system.h" #include #include - //forward declaration class Scene; diff --git a/SCHNApps/include/visualization/scene.h b/SCHNApps/include/visualization/scene.h index fb765b2130acadc28ea7bce23b9206c05a309604..1a449bf44d5df943d475a799947d0e1ba29474be 100644 --- a/SCHNApps/include/visualization/scene.h +++ b/SCHNApps/include/visualization/scene.h @@ -11,9 +11,6 @@ #include "types.h" - - - //forward declarations class View; class Window; diff --git a/SCHNApps/include/visualization/view.h b/SCHNApps/include/visualization/view.h index d6595f807db7aa89be57fa77b8413c2881cd4b09..1459acfea63ecca924ff92b5e154a6c36c5e3338 100644 --- a/SCHNApps/include/visualization/view.h +++ b/SCHNApps/include/visualization/view.h @@ -1,21 +1,17 @@ #ifndef _VIEW_H_ #define _VIEW_H_ +#include #include "types.h" -//#include -//#include -# include - -#include +#include "interface/viewButtonArea.h" +# include #include #include #include "Utils/gl_matrices.h" -#include "viewButtonArea.h" - //forward declaration class Scene; class Camera; diff --git a/SCHNApps/resources/resources.qrc b/SCHNApps/resources/resources.qrc index 8ec1075292bc8a5736fc2d4f62314547ed6d9e6b..4cf21e43db543fac7ca593e352789c2619af6ad7 100644 --- a/SCHNApps/resources/resources.qrc +++ b/SCHNApps/resources/resources.qrc @@ -3,8 +3,8 @@ cgogn/splash.png - icons/map_plugin.png cgogn/cgogn2.png + icons/map_plugin.png icons/check.png icons/close.png icons/share.png diff --git a/SCHNApps/src/dialogs/cameraOptionDialog.cpp b/SCHNApps/src/dialogs/cameraOptionDialog.cpp index 5df9087d5149be5395ef6ce3af6d91fc62b1cdfb..9769eae10ceaaa25c925e29f6fbc947e824cfe56 100644 --- a/SCHNApps/src/dialogs/cameraOptionDialog.cpp +++ b/SCHNApps/src/dialogs/cameraOptionDialog.cpp @@ -1,9 +1,8 @@ -#include "cameraOptionDialog.h" +#include "dialogs/cameraOptionDialog.h" +#include "visualization/camera.h" -#include "camera.h" - -CameraOptionDialog::CameraOptionDialog(Camera* camera, QWidget* parent=0) : QDialog(parent), - m_camera(camera) +CameraOptionDialog::CameraOptionDialog(Camera* camera, QWidget* parent=0) : + QDialog(parent), m_camera(camera) { this->setupUi(this); @@ -32,24 +31,30 @@ CameraOptionDialog::CameraOptionDialog(Camera* camera, QWidget* parent=0) : QDia connect(drawPath_Check, SIGNAL(toggled(bool)), this, SLOT(drawPathChecked(bool))); } -void CameraOptionDialog::drawChecked(bool b){ +void CameraOptionDialog::drawChecked(bool b) +{ farPlane_Check->setEnabled(b); scale_Spin->setEnabled(b); } -void CameraOptionDialog::drawPathChecked(bool b){ +void CameraOptionDialog::drawPathChecked(bool b) +{ groupBox_2->setEnabled(b); } -void CameraOptionDialog::accept(){ - if(m_camera){ +void CameraOptionDialog::accept() +{ + if(m_camera) + { m_camera->enableDraw(draw_Check->isChecked()); - if(draw_Check->isChecked()){ + if(draw_Check->isChecked()) + { m_camera->enableDrawFarPlan(farPlane_Check->isChecked()); m_camera->setDrawScale(scale_Spin->value()); } m_camera->enablePathDraw(drawPath_Check->isChecked()); - if(drawPath_Check->isChecked()){ + if(drawPath_Check->isChecked()) + { m_camera->enablePathAxisDrawn(drawAxis_Check->isChecked()); m_camera->setPathDrawScale(frameScale_Spin->value()); } diff --git a/SCHNApps/src/dialogs/cameraSceneDialog.cpp b/SCHNApps/src/dialogs/cameraSceneDialog.cpp index fc44a3d10f8ba2127f956345037c5eb99bbc0ec6..240303db0299a0119f0973b876caf70889753bb9 100644 --- a/SCHNApps/src/dialogs/cameraSceneDialog.cpp +++ b/SCHNApps/src/dialogs/cameraSceneDialog.cpp @@ -1,9 +1,8 @@ -#include "cameraSceneDialog.h" - -#include "scene.h" -#include "view.h" -#include "camera.h" +#include "dialogs/cameraSceneDialog.h" +#include "visualization/scene.h" +#include "visualization/view.h" +#include "visualization/camera.h" #include #include @@ -11,17 +10,19 @@ Q_DECLARE_METATYPE(Camera*) Q_DECLARE_METATYPE(View*) -QDataStream &operator<<(QDataStream &out, Camera* &c){ +QDataStream &operator<<(QDataStream &out, Camera* &c) +{ return out << (quintptr)(c); } -QDataStream &operator>>(QDataStream &in, Camera* &c){ +QDataStream &operator>>(QDataStream &in, Camera* &c) +{ return in >> reinterpret_cast(c); } -MyTreeWidget::MyTreeWidget(Scene* originalScene, QWidget* parent) : QTreeWidget(parent), - m_scene(originalScene) +MyTreeWidget::MyTreeWidget(Scene* originalScene, QWidget* parent) : + QTreeWidget(parent), m_scene(originalScene) { setDragEnabled(true); setAcceptDrops(true); @@ -31,36 +32,40 @@ MyTreeWidget::MyTreeWidget(Scene* originalScene, QWidget* parent) : QTreeWidget( root->setFlags(root->flags() & ~Qt::ItemIsDropEnabled); } -bool MyTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action){ +bool MyTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action) +{ QTreeWidgetItem *item; - Camera* c; QByteArray ba= data->data("Camera*"); QDataStream st(&ba, QIODevice::ReadOnly); - while(!st.atEnd()){ + while(!st.atEnd()) + { st >> c; QTreeWidgetItem* curItem= this->currentItem(); QTreeWidgetItem* curParent= curItem->parent(); - if(curParent!=parent){ + if(curParent!=parent) + { View* cur_view= curParent->data(0,Qt::UserRole).value(); cur_view->takeCamera(c); delete (curItem); - if(curParent->childCount()<1){ + if(curParent->childCount()<1) m_scene->deleteView(cur_view); - } } - else{ + else + { delete (curItem); } - if(parent==NULL){ + if(parent==NULL) return false; - } - int t= parent->data(0,Qt::UserRoleType).value(); - if (t==myTreeWidget::view){ + + int t = parent->data(0,Qt::UserRoleType).value(); + if (t == myTreeWidget::view) + { View* view= parent->data(0,Qt::UserRole).value(); - if(parent->childCount()==0 || !view){ + if(parent->childCount()==0 || !view) + { QVariant var; View* newView= m_scene->addNewView(c); var.setValue(newView); @@ -68,66 +73,71 @@ bool MyTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QMimeD parent->setText(0,newView->getName()); newView->enableSceneCameraGesture(m_scene->countViews()>1 || view->countCameras()>1); } - else{ + else + { view->insertCamera(index,c); view->enableSceneCameraGesture(m_scene->countViews()>1 || view->countCameras()>1); } - - item= new QTreeWidgetItem(); + item = new QTreeWidgetItem(); parent->insertChild(index,item); QVariant var,varType; var.setValue(c); varType.setValue((int)(myTreeWidget::camera)); item->setData(0,Qt::UserRole, var); item->setData(0,Qt::UserRoleType,varType); - if(c->isShared()){ + if(c->isShared()) + { item->setText(0,c->getName()+" (shared)"); } - else{ + else + { item->setText(0,c->getName()); } item->setFlags((item->flags() | Qt::ItemIsDragEnabled) & ~Qt::ItemIsDropEnabled); parent->setExpanded(true); } - else{ + else + { } } return true; } -QStringList MyTreeWidget::mimeTypes() const{ +QStringList MyTreeWidget::mimeTypes() const +{ QStringList qstrList; // list of accepted mime types for drop qstrList.append("Camera*"); return qstrList; } -QMimeData* MyTreeWidget::mimeData(const QList items) const{ +QMimeData* MyTreeWidget::mimeData(const QList items) const +{ QByteArray ba; QDataStream st(&ba, QIODevice::WriteOnly); - foreach(QTreeWidgetItem * item, items){ - Camera* c= item->data(0,Qt::UserRole).value(); + foreach(QTreeWidgetItem * item, items) + { + Camera* c = item->data(0,Qt::UserRole).value(); st << c; } QMimeData* md= new QMimeData(); md->setData("Camera*",ba); - return md; } -Qt::DropActions MyTreeWidget::supportedDropActions () const{ +Qt::DropActions MyTreeWidget::supportedDropActions () const +{ // returns what actions are supported when dropping return (Qt::MoveAction | Qt::CopyAction | Qt::TargetMoveAction); } CameraSceneDialog::CameraSceneDialog(Scene* scene, QWidget* parent) : - QDialog(parent), - m_scene(scene) + QDialog(parent), m_scene(scene) { this->setupUi(this); @@ -137,9 +147,11 @@ CameraSceneDialog::CameraSceneDialog(Scene* scene, QWidget* parent) : horizontalLayout->insertWidget(0,treeWidget); qRegisterMetaTypeStreamOperators("Camera*"); - if(m_scene){ + if(m_scene) + { QList listViews= m_scene->views(); - foreach(View* view, listViews){ + foreach(View* view, listViews) + { QTreeWidgetItem* viewItem= new QTreeWidgetItem(treeWidget); QVariant varScene, varType; varType.setValue((int)(myTreeWidget::view)); @@ -150,17 +162,20 @@ CameraSceneDialog::CameraSceneDialog(Scene* scene, QWidget* parent) : viewItem->setFlags((viewItem->flags() | Qt::ItemIsDropEnabled) & (~Qt::ItemIsDragEnabled)); QList listCameras= view->cameras(); - foreach(Camera* camera, listCameras){ + foreach(Camera* camera, listCameras) + { QTreeWidgetItem* item= new QTreeWidgetItem(viewItem); QVariant var, varT; var.setValue(camera); varT.setValue((int)(myTreeWidget::camera)); item->setData(0, Qt::UserRole, var); item->setData(0, Qt::UserRoleType, varT); - if(camera->isShared()){ + if(camera->isShared()) + { item->setText(0,camera->getName()+" (shared)"); } - else{ + else + { item->setText(0,camera->getName()); } item->setFlags((item->flags() | Qt::ItemIsDragEnabled) & ~Qt::ItemIsDropEnabled); @@ -174,7 +189,8 @@ CameraSceneDialog::CameraSceneDialog(Scene* scene, QWidget* parent) : this, SLOT(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*))); } -void CameraSceneDialog::newDuplicatedView(){ +void CameraSceneDialog::newDuplicatedView() +{ int n= treeWidget->topLevelItemCount() + 1; QTreeWidgetItem* item= new QTreeWidgetItem(treeWidget); QVariant var, varType; @@ -186,21 +202,27 @@ void CameraSceneDialog::newDuplicatedView(){ item->setFlags((item->flags() | Qt::ItemIsDropEnabled) & (~Qt::ItemIsDragEnabled)); } -void CameraSceneDialog::removeView(){ +void CameraSceneDialog::removeView() +{ QTreeWidgetItem* curItem= treeWidget->currentItem(); - if(curItem && curItem->data(0,Qt::UserRoleType).value()== myTreeWidget::view){ + if(curItem && curItem->data(0,Qt::UserRoleType).value()== myTreeWidget::view) + { View* curItemView= curItem->data(0, Qt::UserRole).value(); - if(!curItemView){ + if(!curItemView) + { delete curItem; } - else if(m_scene->countViews()>1){ + else if(m_scene->countViews()>1) + { m_scene->deleteView(curItemView); delete curItem; - if(m_scene->countViews()<=1){ + if(m_scene->countViews()<=1) + { m_scene->getView(0)->enableSceneCameraGesture(false); } } - else{ + else + { QMessageBox err(this); err.setText(QString::fromUtf8("Vous ne pouvez supprimer toute les vues de la scène.")); err.exec(); @@ -208,11 +230,14 @@ void CameraSceneDialog::removeView(){ } } -void CameraSceneDialog::currentItemChanged(QTreeWidgetItem* cur, QTreeWidgetItem* prev){ - if(cur && cur->data(0,Qt::UserRoleType).value()== myTreeWidget::view){ +void CameraSceneDialog::currentItemChanged(QTreeWidgetItem* cur, QTreeWidgetItem* prev) +{ + if(cur && cur->data(0,Qt::UserRoleType).value() == myTreeWidget::view) + { removeView_Button->setEnabled(true); } - else{ + else + { removeView_Button->setEnabled(false); } } diff --git a/SCHNApps/src/dialogs/cameraViewDialog.cpp b/SCHNApps/src/dialogs/cameraViewDialog.cpp index 8dadbc561091f09bf5e62472476c216d4642e5ad..925ac1ae82dd23c78922c9891b7733425ae6dcb7 100644 --- a/SCHNApps/src/dialogs/cameraViewDialog.cpp +++ b/SCHNApps/src/dialogs/cameraViewDialog.cpp @@ -1,9 +1,7 @@ -#include "cameraViewDialog.h" - -#include "camera.h" -#include "cameraOptionDialog.h" - +#include "dialogs/cameraViewDialog.h" +#include "dialogs/cameraOptionDialog.h" +#include "visualization/camera.h" Q_DECLARE_METATYPE(Camera*); diff --git a/SCHNApps/src/dialogs/globalCameraDialog.cpp b/SCHNApps/src/dialogs/globalCameraDialog.cpp index 8191d6dc38173387a02320dd70c18cf221e583cb..55506bdf7b47631c2a3ee0c3d08a1d7fd2c85e09 100644 --- a/SCHNApps/src/dialogs/globalCameraDialog.cpp +++ b/SCHNApps/src/dialogs/globalCameraDialog.cpp @@ -1,4 +1,4 @@ -#include "globalCameraDialog.h" +#include "dialogs/globalCameraDialog.h" namespace Qt{ int UserRoleType= 33; @@ -9,8 +9,8 @@ namespace Qt{ #include #include -#include "scene.h" -#include "window.h" +#include "visualization/scene.h" +#include "interface/window.h" Q_DECLARE_METATYPE(Camera*) Q_DECLARE_METATYPE(View*) @@ -33,9 +33,6 @@ QDataStream &operator>>(QDataStream &in, CarryCamera &c){ } - - - MyCameraMenu::MyCameraMenu(const QString & title, QWidget * parent, int mode) : QMenu(title, parent), m_result(none) @@ -54,9 +51,6 @@ MyCameraMenu::MyCameraMenu(const QString & title, QWidget * parent, int mode) : } - - - MyDragListWidget::MyDragListWidget(QWidget* parent) : QListWidget(parent) { setDragEnabled(true); @@ -65,7 +59,6 @@ MyDragListWidget::MyDragListWidget(QWidget* parent) : QListWidget(parent) } - QMimeData* MyDragListWidget::mimeData(const QList items) const{ QByteArray ba; QDataStream st(&ba, QIODevice::WriteOnly); @@ -86,8 +79,6 @@ QMimeData* MyDragListWidget::mimeData(const QList items) cons } - - MyDropTreeWidget::MyDropTreeWidget(QWidget* parent) : QTreeWidget(parent) { setAcceptDrops(true); @@ -101,42 +92,49 @@ MyDropTreeWidget::MyDropTreeWidget(QWidget* parent) : QTreeWidget(parent) } -bool MyDropTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action){ +bool MyDropTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action) +{ CarryCamera cc; View* origin_view; Camera* c; - if(parent->data(0,Qt::UserRoleType).value()==myDragDropWidgets::view){ + if(parent->data(0,Qt::UserRoleType).value()==myDragDropWidgets::view) + { QByteArray ba= data->data("CarryCamera"); QDataStream st(&ba, QIODevice::ReadOnly); - while(!st.atEnd()){ + while(!st.atEnd()) + { st >> cc; c= cc.camera; origin_view= cc.view; - - if(c && origin_view){ + if(c && origin_view) + { Scene* origin_scene= origin_view->getScene(); View* dest_view= parent->data(0,Qt::UserRole).value(); Scene* dest_scene= dest_view->getScene(); - if(origin_view==dest_view) return false; + if(origin_view==dest_view) + return false; MyCameraMenu::ResultType result; - if(origin_scene==dest_scene){ + if(origin_scene==dest_scene) + { MyCameraMenu menu(QString::fromUtf8("Gestion caméra"), this, MyCameraMenu::moving); menu.exec(QCursor::pos()); result= menu.result(); } - else{ - + else + { MyCameraMenu menu(QString::fromUtf8("Gestion caméra"), this); menu.exec(QCursor::pos()); result= menu.result(); } - switch (result) { + switch (result) + { case MyCameraMenu::move: - if(origin_view->countCameras()<=1 && origin_scene->countViews()<=1){ + if(origin_view->countCameras()<=1 && origin_scene->countViews()<=1) + { QMessageBox err(this); err.setText(QString::fromUtf8("Vous ne pouvez pas retirer toutes les caméras" "de l'unique vue d'une scène.")); @@ -144,18 +142,23 @@ bool MyDropTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QM return false; } - else{ + else + { origin_view->takeCamera(c); dest_view->insertCamera(index,c); } - if(origin_view->countCameras()<=0){ + if(origin_view->countCameras()<=0) + { View* tmp_view; QTreeWidgetItemIterator it(this); - while(*it){ - if((*it)->data(0,Qt::UserRoleType).value()==myDragDropWidgets::view){ + while(*it) + { + if((*it)->data(0,Qt::UserRoleType).value()==myDragDropWidgets::view) + { tmp_view= (*it)->data(0,Qt::UserRole).value(); - if(tmp_view==origin_view){ + if(tmp_view==origin_view) + { delete *it; break; } @@ -179,32 +182,31 @@ bool MyDropTreeWidget::dropMimeData(QTreeWidgetItem *parent, int index, const QM this->currentItemChanged(this->currentItem(),this->currentItem()); } - - } return true; } - else{ + else + { return false; } } -QStringList MyDropTreeWidget::mimeTypes() const{ +QStringList MyDropTreeWidget::mimeTypes() const +{ QStringList qstrList; // list of accepted mime types for drop qstrList.append("CarryCamera"); return qstrList; } -Qt::DropActions MyDropTreeWidget::supportedDropActions () const{ +Qt::DropActions MyDropTreeWidget::supportedDropActions () const +{ // returns what actions are supported when dropping return (Qt::CopyAction | Qt::TargetMoveAction); } - - GlobalCameraDialog::GlobalCameraDialog(Window* window) : QDialog(window) { this->setupUi(this); @@ -329,5 +331,3 @@ void GlobalCameraDialog::treeCurrentItemChanged(QTreeWidgetItem* cur, QTreeWidge } } } - - diff --git a/SCHNApps/src/dialogs/linkViewDialog.cpp b/SCHNApps/src/dialogs/linkViewDialog.cpp index 9f8d2360e3b933d41b0a6f7cbe4ffeca48e603f0..49baf5fc9a47eb8e01bd2673d1a4f38ba2177f72 100644 --- a/SCHNApps/src/dialogs/linkViewDialog.cpp +++ b/SCHNApps/src/dialogs/linkViewDialog.cpp @@ -1,15 +1,15 @@ -#include "linkViewDialog.h" - +#include "dialogs/linkViewDialog.h" #include #include #include -#include +#include Q_DECLARE_METATYPE(Plugin*); -LinkViewDialog::LinkViewDialog(Window* parent, PluginHash* activePlugins, Scene* scene) : QDialog(parent), +LinkViewDialog::LinkViewDialog(Window* parent, PluginHash* activePlugins, Scene* scene) : + QDialog(parent), m_scene(scene), m_mode(LINK) { @@ -20,8 +20,6 @@ LinkViewDialog::LinkViewDialog(Window* parent, PluginHash* activePlugins, Scene* if(scene) groupBox->setTitle(QString::fromUtf8("Lier la vue ")+scene->getName()); - - if(!activePlugins || activePlugins->isEmpty()){ listWidget->setEnabled(false); buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); @@ -60,10 +58,10 @@ LinkViewDialog::LinkViewDialog(Window* parent, PluginHash* activePlugins, Scene* } - -LinkViewDialog::LinkViewDialog(Window* parent, QList dependingPlugin, Scene* scene) : QDialog(parent), - m_scene(scene), - m_mode(UNLINK) +LinkViewDialog::LinkViewDialog(Window* parent, QList dependingPlugin, Scene* scene) : + QDialog(parent), + m_scene(scene), + m_mode(UNLINK) { std::cout << "UNLINK MODE" << std::endl; this->setupUi(this); @@ -108,7 +106,8 @@ LinkViewDialog::LinkViewDialog(Window* parent, QList dependingPlugin, S } -void LinkViewDialog::button_OK(){ +void LinkViewDialog::button_OK() +{ if(m_mode==LINK){ Window* parent=((Window*)this->parent()); QListWidgetItem* cur_item= listWidget->currentItem(); @@ -175,7 +174,8 @@ void LinkViewDialog::button_OK(){ } } -void LinkViewDialog::customContextMenu(const QPoint & pos){ +void LinkViewDialog::customContextMenu(const QPoint & pos) +{ QPoint globalPos= listWidget->mapToGlobal(pos); QListWidgetItem* item= listWidget->itemAt(pos); @@ -192,7 +192,8 @@ void LinkViewDialog::customContextMenu(const QPoint & pos){ } } -void LinkViewDialog::showPluginInfo(){ +void LinkViewDialog::showPluginInfo() +{ QListWidgetItem* item= listWidget->currentItem(); if(item){ Plugin* plugin= item->data(Qt::UserRole).value(); diff --git a/SCHNApps/src/dialogs/mapPluginDialog.cpp b/SCHNApps/src/dialogs/mapPluginDialog.cpp index 12ec538f6a24d482a785405fabb7a000bd00f166..daa2bf87144f40e2bd8690a88d0002b8fa8496ad 100644 --- a/SCHNApps/src/dialogs/mapPluginDialog.cpp +++ b/SCHNApps/src/dialogs/mapPluginDialog.cpp @@ -1,8 +1,8 @@ -#include "mapPluginDialog.h" +#include "dialogs/mapPluginDialog.h" -#include "window.h" -#include "plugin.h" -#include "mapHandler.h" +#include "interface/window.h" +#include "plugins/plugin.h" +#include "visualization/mapHandler.h" Q_DECLARE_METATYPE(Plugin*) Q_DECLARE_METATYPE(MapHandler*) diff --git a/SCHNApps/src/dialogs/newSceneDialog.cpp b/SCHNApps/src/dialogs/newSceneDialog.cpp index 6e4974e968b48cca856fb2e12b0a289bb3e77756..1e93f61716b5b6931723f634003d63c005ed04ff 100644 --- a/SCHNApps/src/dialogs/newSceneDialog.cpp +++ b/SCHNApps/src/dialogs/newSceneDialog.cpp @@ -1,15 +1,14 @@ -#include "newSceneDialog.h" +#include "dialogs/newSceneDialog.h" #include #include -#include "system.h" -#include "window.h" -#include "scene.h" -#include "view.h" -#include "camera.h" -#include "plugin.h" - +#include "interface/system.h" +#include "interface/window.h" +#include "visualization/scene.h" +#include "visualization/view.h" +#include "visualization/camera.h" +#include "plugins/plugin.h" Q_DECLARE_METATYPE(Camera*) Q_DECLARE_METATYPE(View*) diff --git a/SCHNApps/src/dialogs/pluginDialog.cpp b/SCHNApps/src/dialogs/pluginDialog.cpp index 934e1fd78d3496c140bf0e66c110340016ed81ae..f31d092aad7d2b4f0c391b8412c1d891ed1566d6 100644 --- a/SCHNApps/src/dialogs/pluginDialog.cpp +++ b/SCHNApps/src/dialogs/pluginDialog.cpp @@ -1,4 +1,4 @@ -#include "pluginDialog.h" +#include "dialogs/pluginDialog.h" #include #include @@ -9,8 +9,8 @@ #include #include -#include "system.h" -#include "plugin.h" +#include "interface/system.h" +#include "plugins/plugin.h" PluginDialog::PluginDialog(Window* parent, PluginHash* activePlugins) : QDialog(parent), diff --git a/SCHNApps/src/dialogs/sceneSelector.cpp b/SCHNApps/src/dialogs/sceneSelector.cpp index 47810499238a53d124162fca45123788e181bfd4..7b44198ee04fad167f26e95e933bcfd8a22fa4de 100644 --- a/SCHNApps/src/dialogs/sceneSelector.cpp +++ b/SCHNApps/src/dialogs/sceneSelector.cpp @@ -8,8 +8,8 @@ */ -#include "sceneSelector.h" -#include "splitArea.h" +#include "dialogs/sceneSelector.h" +#include "interface/splitArea.h" #include #include diff --git a/SCHNApps/src/interface/splitArea.cpp b/SCHNApps/src/interface/splitArea.cpp index c6b3b1d129059944e8a0c278bb4767a6a81ccc9a..4901c1cf77bf62c409295f59b3bc9c1d3a00a8f0 100644 --- a/SCHNApps/src/interface/splitArea.cpp +++ b/SCHNApps/src/interface/splitArea.cpp @@ -1,5 +1,4 @@ -#include "splitArea.h" - +#include "interface/splitArea.h" #include diff --git a/SCHNApps/src/interface/stateHandler.cpp b/SCHNApps/src/interface/stateHandler.cpp index 40dbe01877fc05d56b66f464b22a2cc812c8aceb..f4d8919944c33152336cdb7cad7f84bb01f42376 100644 --- a/SCHNApps/src/interface/stateHandler.cpp +++ b/SCHNApps/src/interface/stateHandler.cpp @@ -1,10 +1,8 @@ -#include "system.h" - - -#include "window.h" -#include "plugin.h" -#include "camera.h" -#include "splitArea.h" +#include "interface/system.h" +#include "interface/window.h" +#include "interface/splitArea.h" +#include "plugins/plugin.h" +#include "visualization/camera.h" #include #include @@ -14,7 +12,6 @@ bool System::StateHandler::saveState(Window* window, PluginHash* pluginHash, Sce QList plugins; QList scenes; - Dialog::QuestionSessionDialog qsd(window); qsd.label->setText(QString::fromUtf8("Voulez-vous sauvergarder cette session (Plugins chargé, scènes, vues et caméras)?")); qsd.exec(); diff --git a/SCHNApps/src/interface/system.cpp b/SCHNApps/src/interface/system.cpp index 60bb41c673f582b59d7fe818546f50f533afb3a6..ff1c4652eb0003471d6a7055e1e374581e9d7b78 100644 --- a/SCHNApps/src/interface/system.cpp +++ b/SCHNApps/src/interface/system.cpp @@ -1,4 +1,4 @@ -#include "system.h" +#include "interface/system.h" #include #include diff --git a/SCHNApps/src/interface/viewButtonArea.cpp b/SCHNApps/src/interface/viewButtonArea.cpp index c7bfdac88bb3ac1eb736ff410069e964abb53c45..ba3b953347277b5ea142aef49324982ec353edc2 100644 --- a/SCHNApps/src/interface/viewButtonArea.cpp +++ b/SCHNApps/src/interface/viewButtonArea.cpp @@ -1,13 +1,11 @@ -#include "viewButtonArea.h" +#include "interface/viewButtonArea.h" - -#include "camera.h" -#include "scene.h" -#include "context.h" +#include "visualization/camera.h" +#include "visualization/scene.h" +#include "visualization/context.h" #include - ViewButton::ViewButton(QString image, View* view) { m_GLimg.load(image); @@ -36,9 +34,6 @@ void ViewButton::drawAt(int x, int y){ } - - - ViewButtonArea::~ViewButtonArea(){} void ViewButtonArea::addButton(ViewButton* button){ diff --git a/SCHNApps/src/interface/window.cpp b/SCHNApps/src/interface/window.cpp index 6ef808354de9cc0c3ec7dff71d9c5237c1276f45..d986bf360e760d6e1e260dc9eb0bf891eaf5add9 100644 --- a/SCHNApps/src/interface/window.cpp +++ b/SCHNApps/src/interface/window.cpp @@ -1,4 +1,4 @@ -#include "window.h" +#include "interface/window.h" #include #include @@ -6,17 +6,17 @@ #include #include -#include "scene.h" -#include "sceneSelector.h" -#include "view.h" -#include "newSceneDialog.h" -#include "globalCameraDialog.h" -#include "plugin.h" -#include "pluginDialog.h" -#include "linkViewDialog.h" -#include "context.h" -#include "mapPluginDialog.h" -#include "mapHandler.h" +#include "plugins/plugin.h" +#include "visualization/scene.h" +#include "visualization/view.h" +#include "visualization/context.h" +#include "visualization/mapHandler.h" +#include "dialogs/sceneSelector.h" +#include "dialogs/newSceneDialog.h" +#include "dialogs/globalCameraDialog.h" +#include "dialogs/pluginDialog.h" +#include "dialogs/linkViewDialog.h" +#include "dialogs/mapPluginDialog.h" Window::Window(QWidget* parent): QMainWindow(parent), diff --git a/SCHNApps/src/main.cpp b/SCHNApps/src/main.cpp index db3286e501abf63c2ec78faf3332c9dd764427f5..75bf14d15884c78df289d16c7aa12fff69a8d329 100644 --- a/SCHNApps/src/main.cpp +++ b/SCHNApps/src/main.cpp @@ -1,18 +1,17 @@ -#include "system.h" - -#include "window.h" +#include "interface/system.h" +#include "interface/window.h" QSplashScreen* System::splash; -QString System::app_path= QString(); +QString System::app_path = QString(); -int main(int argc, char* argv[]){ +int main(int argc, char* argv[]) +{ QApplication app(argc, argv); - System::app_path= app.applicationDirPath(); - + System::app_path = app.applicationDirPath(); - System::splash= new QSplashScreen(QPixmap(":splash/cgogn/splash.png")); + System::splash = new QSplashScreen(QPixmap(":splash/cgogn/splash.png")); System::splash->show(); diff --git a/SCHNApps/src/plugins/simplePlugin.cpp b/SCHNApps/src/plugins/simplePlugin.cpp index a2c000092ac79e1c414972166d18e7cdee524d2a..dbb3dea34abbc2a17f850bd1f267c4dcf2f5c537 100644 --- a/SCHNApps/src/plugins/simplePlugin.cpp +++ b/SCHNApps/src/plugins/simplePlugin.cpp @@ -1,7 +1,7 @@ -#include "simplePlugin.h" +#include "plugins/simplePlugin.h" +#include "Utils/GLSLShader.h" #include -#include SimplePlugin::SimplePlugin() { @@ -32,9 +32,6 @@ bool SimplePlugin::activate(bool initializing){ return r; } - - - void SimplePlugin::addDependantPlugin(Plugin* dependant){ this->l_dependantPlugins.push_back(dependant); } @@ -145,7 +142,6 @@ void SimplePlugin::suppressAllDependantLinks(){ } } - QAction* SimplePlugin::addMenuAction(QString menuPath, const char* method){ QAction* action= new QAction(m_window); QObject::connect(action, SIGNAL(triggered()), this, method); diff --git a/SCHNApps/src/plugins/visualPlugin.cpp b/SCHNApps/src/plugins/visualPlugin.cpp index 5d67500fdd460c9ed18a963d79d6652d2d406ae8..025c2987cf736cfd271bd4fa58c91f252b7b68bd 100644 --- a/SCHNApps/src/plugins/visualPlugin.cpp +++ b/SCHNApps/src/plugins/visualPlugin.cpp @@ -1,7 +1,7 @@ -#include "visualPlugin.h" +#include "plugins/visualPlugin.h" +#include "Utils/GLSLShader.h" #include -#include VisualPlugin::VisualPlugin() : m_waitedScene(UNLIMITED_NUMBER_OF_SCENES), diff --git a/SCHNApps/src/visualization/camera.cpp b/SCHNApps/src/visualization/camera.cpp index d1af171fe6ad6258fc160a945c29cebd02dd759c..25a88ff1bd4d9d438e8892b0a79393c11256785f 100644 --- a/SCHNApps/src/visualization/camera.cpp +++ b/SCHNApps/src/visualization/camera.cpp @@ -1,8 +1,5 @@ -#include "camera.h" - - -#include "scene.h" - +#include "visualization/camera.h" +#include "visualization/scene.h" Camera::Camera(View* v) : m_name("camera"), @@ -15,7 +12,8 @@ Camera::Camera(View* v) : m_lastWorkingView(v), m_snapCount(0) { - if(v){ + if(v) + { l_views.push_back(v); } this->setZClippingCoefficient(100); @@ -32,7 +30,8 @@ Camera::Camera(View* v, Camera c) : qglviewer::Camera(c), m_lastWorkingView(v), m_snapCount(0) { - if(v){ + if(v) + { l_views.push_back(v); } this->setZClippingCoefficient(100); @@ -41,56 +40,73 @@ Camera::Camera(View* v, Camera c) : qglviewer::Camera(c), Camera::~Camera(){} -void Camera::draw(){ - if(m_draw){ +void Camera::draw() +{ + if(m_draw) + { qglviewer::Camera::draw(m_drawFarPlane,m_drawScale); - if(m_drawUserPath){ + if(m_drawUserPath) + { int mask=1; - if(m_drawUserPathAxis){ + if(m_drawUserPathAxis) + { mask= mask | 4; } - if(this->keyFrameInterpolator(0)){ + if(this->keyFrameInterpolator(0)) + { this->keyFrameInterpolator(0)->drawPath(mask,6,m_drawUserPathScale); } } } } -void Camera::takenFrom(View* v){ +void Camera::takenFrom(View* v) +{ int i= l_views.indexOf(v); - if(i>=0){ + if(i>=0) + { l_views.takeAt(i); } } -void Camera::sharedWith(View* v){ - if(!l_views.contains(v)){ +void Camera::sharedWith(View* v) +{ + if(!l_views.contains(v)) + { l_views.push_back(v); } } -void Camera::fitParamWith(View* v){ - if(v!=m_lastWorkingView){ +void Camera::fitParamWith(View* v) +{ + if(v!=m_lastWorkingView) + { setScreenWidthAndHeight(v->width(), v->height()); m_lastWorkingView= v; } } -void Camera::saveSnapshot(QString snapPathName){ - foreach(View* view, l_views){ +void Camera::saveSnapshot(QString snapPathName) +{ + foreach(View* view, l_views) + { view->saveSnapshot(snapPathName+view->getName()+'_'+QString::number(m_snapCount)+".jpeg", true); } m_snapCount++; } -void Camera::updateGL(){ - foreach(View* view, l_views){ +void Camera::updateGL() +{ + foreach(View* view, l_views) + { view->updateGL(); } } -void Camera::viewShowButton(bool b){ - foreach(View* view, l_views){ +void Camera::viewShowButton(bool b) +{ + foreach(View* view, l_views) + { view->setShowButtons(b); } } diff --git a/SCHNApps/src/visualization/context.cpp b/SCHNApps/src/visualization/context.cpp index d33bd124c94fd962610771019b6cdc91fe9e0b4f..071bd5a4afd8ad265fb7b2d804093e76d2d40d9b 100644 --- a/SCHNApps/src/visualization/context.cpp +++ b/SCHNApps/src/visualization/context.cpp @@ -1,14 +1,9 @@ -#include "context.h" +#include "visualization/context.h" +Context::Context(QWidget* w, const QGLFormat & format) : QGLContext(format, w) +{} - - - -Context::Context(QWidget* w, const QGLFormat & format) : QGLContext(format, w){} - - - -void Context::setDevice(QWidget* w){ +void Context::setDevice(QWidget* w) +{ QGLContext::setDevice(w); } - diff --git a/SCHNApps/src/visualization/mapHandler.cpp b/SCHNApps/src/visualization/mapHandler.cpp index 6dc2e3f267b7cd42d42e197d6f3fd96748aeaaee..c35bec85ab1a7f46dce9cf4c78e9dedb943463af 100644 --- a/SCHNApps/src/visualization/mapHandler.cpp +++ b/SCHNApps/src/visualization/mapHandler.cpp @@ -1,12 +1,9 @@ -#include "mapHandler.h" +#include "visualization/mapHandler.h" +#include "visualization/vboHandler.h" +#include "interface/system.h" #include "Topology/generic/genericmap.h" -#include "vboHandler.h" - -#include "system.h" - - MapHandler::MapHandler(CGoGN::GenericMap* map) : m_map(map) {} @@ -85,7 +82,6 @@ QList MapHandler::findVBOsMatching(QRegExp regexp){ return rlist; } - VBOHandler* MapHandler::takeVBO(VBOHandler* vbo){ int i= l_vbo.indexOf(vbo); if(i>=0){ @@ -97,5 +93,3 @@ VBOHandler* MapHandler::takeVBO(VBOHandler* vbo){ return NULL; } } - - diff --git a/SCHNApps/src/visualization/renderContainer.cpp b/SCHNApps/src/visualization/renderContainer.cpp index eb65b3b8a9a033a5c64d6520fa7e209c953b63d2..5fb7945f70b2791e556049f7292c473ac74b2242 100644 --- a/SCHNApps/src/visualization/renderContainer.cpp +++ b/SCHNApps/src/visualization/renderContainer.cpp @@ -1,6 +1,5 @@ -#include "renderContainer.h" - -#include "scene.h" +#include "visualization/renderContainer.h" +#include "visualization/scene.h" RenderContainer::RenderContainer(Scene* scene) : h_vbo(NULL), diff --git a/SCHNApps/src/visualization/scene.cpp b/SCHNApps/src/visualization/scene.cpp index 35cfaf026be9169e90c3d0207a746a172c1f61bc..f01c6acdf9793f4bd5155e2d5ad674bd0ec0d6b4 100644 --- a/SCHNApps/src/visualization/scene.cpp +++ b/SCHNApps/src/visualization/scene.cpp @@ -1,15 +1,14 @@ -#include "scene.h" +#include "visualization/scene.h" #include #include -#include "camera.h" -#include "view.h" -#include "context.h" -#include "window.h" -#include "plugin.h" -#include "vboHandler.h" - +#include "visualization/camera.h" +#include "visualization/view.h" +#include "visualization/context.h" +#include "visualization/vboHandler.h" +#include "interface/window.h" +#include "plugins/plugin.h" Scene::Scene(QString name, Window* window, Camera* sharedCamera) : m_window(window), @@ -17,8 +16,6 @@ Scene::Scene(QString name, Window* window, Camera* sharedCamera) : m_creator(NULL), m_context(window->context()) { - - View* view= new View(this,name+"_view1",sharedCamera,0,m_context); l_view.push_back(view); @@ -419,4 +416,3 @@ ViewButton* Scene::takeCustomViewButton(ViewButton* viewButton){ return NULL; } } - diff --git a/SCHNApps/src/visualization/vboHandler.cpp b/SCHNApps/src/visualization/vboHandler.cpp index e5aefb2623b38591e462613f2331f1fc8b1c93ec..b9f73fe26adb9535e9e50e3bccff814d2b175882 100644 --- a/SCHNApps/src/visualization/vboHandler.cpp +++ b/SCHNApps/src/visualization/vboHandler.cpp @@ -1,6 +1,5 @@ -#include "vboHandler.h" - -#include "mapHandler.h" +#include "visualization/vboHandler.h" +#include "visualization/mapHandler.h" bool VBOHandler::shareWith(MapHandler* vh){ if(!vh || l_vizuHandler.contains(vh)){ diff --git a/SCHNApps/src/visualization/view.cpp b/SCHNApps/src/visualization/view.cpp index 0eb8944dea2f2863a914cd71b090dad66ef9797f..e42aa6e53c45305f6268a09b82e9eac456932518 100644 --- a/SCHNApps/src/visualization/view.cpp +++ b/SCHNApps/src/visualization/view.cpp @@ -1,11 +1,11 @@ -#include "view.h" - -#include "system.h" -#include "camera.h" -#include "scene.h" -#include "cameraViewDialog.h" -#include "cameraSceneDialog.h" -#include "context.h" +#include "visualization/view.h" + +#include "interface/system.h" +#include "visualization/camera.h" +#include "visualization/scene.h" +#include "visualization/context.h" +#include "dialogs/cameraViewDialog.h" +#include "dialogs/cameraSceneDialog.h" //#include "GL/glut.h" //#include "GL/freeglut_ext.h" //#include "GL/freeglut_std.h" diff --git a/apps_cmake.txt b/apps_cmake.txt index e0334c66a54c1ae3ff9071b35464f82cba448f8c..d41e03588b95948c068643011d90f0239a2461be 100644 --- a/apps_cmake.txt +++ b/apps_cmake.txt @@ -1,4 +1,4 @@ -# A mettre juste apres la definition de CGoGN_ROOT_DIR a la racine du CGoGN_Apps +# A mettre juste apres la definition de CGoGN_ROOT_DIR a la racine du CGoGN_Apps # include(${CGoGN_ROOT_DIR}/build/apps_cmake.txt) SET(CMAKE_MODULE_PATH ${CGoGN_ROOT_DIR}/cmake_modules/)