Skip to content

GitLab

C
CGoGN
Commit 78546092 authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files
Options

SCHNApps : bientôt une première version..

parent 90c61bbf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1434 additions and 1508 deletions
SCHNApps/CMakeLists.txt
View file @ 78546092
......@@ -8,12 +8,14 @@ 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")
INCLUDE(${CGoGN_ROOT_DIR}/apps_cmake.txt)
find_package(Qt4 REQUIRED)
#=======QGLViewer=========#
find_package(QGLViewer REQUIRED)
......
SCHNApps/Debug/CMakeLists.txt
View file @ 78546092
......@@ -20,28 +20,35 @@ INCLUDE_DIRECTORIES(
file(
GLOB
SCHNApps_SRC_FILES
${SCHNApps_ROOT_DIR}/src/camera.cpp
${SCHNApps_ROOT_DIR}/src/context.cpp
${SCHNApps_ROOT_DIR}/src/main.cpp
${SCHNApps_ROOT_DIR}/src/interface/*.cpp
${SCHNApps_ROOT_DIR}/src/visualization/*.cpp
${SCHNApps_ROOT_DIR}/src/dialogs/*.cpp
${SCHNApps_ROOT_DIR}/src/mapHandler.cpp
${SCHNApps_ROOT_DIR}/src/plugin.cpp
${SCHNApps_ROOT_DIR}/src/scene.cpp
${SCHNApps_ROOT_DIR}/src/splitArea.cpp
${SCHNApps_ROOT_DIR}/src/system.cpp
${SCHNApps_ROOT_DIR}/src/view.cpp
${SCHNApps_ROOT_DIR}/src/viewSelector.cpp
${SCHNApps_ROOT_DIR}/src/window.cpp
)
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
${SCHNApps_ROOT_DIR}/include/window.h
${SCHNApps_ROOT_DIR}/include/scene.h
${SCHNApps_ROOT_DIR}/include/view.h
${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
${SCHNApps_ROOT_DIR}/include/system.h
${SCHNApps_ROOT_DIR}/include/splitArea.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
)
file(
......@@ -74,4 +81,4 @@ TARGET_LINK_LIBRARIES( SCHNAppsD
)
ADD_SUBDIRECTORY(${SCHNApps_ROOT_DIR}/Plugins PluginsD)
#ADD_SUBDIRECTORY(${SCHNApps_ROOT_DIR}/Plugins PluginsD)
SCHNApps/Release/CMakeLists.txt
View file @ 78546092
......@@ -22,28 +22,35 @@ INCLUDE_DIRECTORIES(
file(
GLOB
SCHNApps_SRC_FILES
${SCHNApps_ROOT_DIR}/src/camera.cpp
${SCHNApps_ROOT_DIR}/src/context.cpp
${SCHNApps_ROOT_DIR}/src/main.cpp
${SCHNApps_ROOT_DIR}/src/interface/*.cpp
${SCHNApps_ROOT_DIR}/src/visualization/*.cpp
${SCHNApps_ROOT_DIR}/src/dialogs/*.cpp
${SCHNApps_ROOT_DIR}/src/mapHandler.cpp
${SCHNApps_ROOT_DIR}/src/plugin.cpp
${SCHNApps_ROOT_DIR}/src/scene.cpp
${SCHNApps_ROOT_DIR}/src/splitArea.cpp
${SCHNApps_ROOT_DIR}/src/system.cpp
${SCHNApps_ROOT_DIR}/src/view.cpp
${SCHNApps_ROOT_DIR}/src/viewSelector.cpp
${SCHNApps_ROOT_DIR}/src/window.cpp
)
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
${SCHNApps_ROOT_DIR}/include/window.h
${SCHNApps_ROOT_DIR}/include/scene.h
${SCHNApps_ROOT_DIR}/include/view.h
${SCHNApps_ROOT_DIR}/include/viewButtonArea.h
${SCHNApps_ROOT_DIR}/include/system.h
${SCHNApps_ROOT_DIR}/include/splitArea.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
)
file(
......@@ -76,4 +83,4 @@ TARGET_LINK_LIBRARIES( SCHNApps
)
ADD_SUBDIRECTORY(${SCHNApps_ROOT_DIR}/Plugins Plugins)
#ADD_SUBDIRECTORY(${SCHNApps_ROOT_DIR}/Plugins Plugins)
SCHNApps/forms/window.ui
View file @ 78546092
......@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>CGoGN Plug</string>
<string>SCHNApps</string>
</property>
<property name="windowIcon">
<iconset resource="../resources/resources.qrc">
......@@ -24,39 +24,23 @@
<x>0</x>
<y>0</y>
<width>785</width>
<height>29</height>
<height>23</height>
</rect>
</property>
<widget class="QMenu" name="menuFichier">
<widget class="QMenu" name="menuFile">
<property name="title">
<string>Fichier</string>
<string>File</string>
</property>
<addaction name="actionQuitter"/>
<addaction name="actionQuit"/>
</widget>
<widget class="QMenu" name="menuHelp">
<property name="title">
<string>Help</string>
</property>
<addaction name="actionAbout_CGoGN"/>
<addaction name="actionAbout"/>
<addaction name="actionAboutSCHNApps"/>
<addaction name="actionAboutCGoGN"/>
</widget>
<widget class="QMenu" name="menuPlugins">
<property name="title">
<string>Plugins</string>
</property>
<addaction name="actionPlugins"/>
</widget>
<widget class="QMenu" name="menuViews">
<property name="title">
<string>Visu</string>
</property>
<addaction name="actionNew_Scene"/>
<addaction name="actionGlobalCamera"/>
<addaction name="actionLinkPluginMap"/>
</widget>
<addaction name="menuFichier"/>
<addaction name="menuViews"/>
<addaction name="menuPlugins"/>
<addaction name="menuFile"/>
<addaction name="menuHelp"/>
</widget>
<widget class="QStatusBar" name="statusbar"/>
......@@ -65,71 +49,65 @@
<string>toolBar</string>
</property>
<attribute name="toolBarArea">
<enum>TopToolBarArea</enum>
<enum>LeftToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="actionNew_Scene"/>
<addaction name="actionPlugins"/>
<addaction name="actionGlobalCamera"/>
<addaction name="actionLinkPluginMap"/>
<addaction name="actionManagePlugins"/>
<addaction name="actionManageView"/>
<addaction name="actionManageCameras"/>
<addaction name="actionManageMaps"/>
</widget>
<action name="actionAbout_CGoGN">
<action name="actionAboutCGoGN">
<property name="text">
<string>About CGoGN ...</string>
<string>About CGoGN</string>
</property>
</action>
<action name="actionAbout">
<action name="actionAboutSCHNApps">
<property name="text">
<string>About ...</string>
<string>About SCHNApps</string>
</property>
</action>
<action name="actionQuitter">
<action name="actionQuit">
<property name="text">
<string>Quitter</string>
<string>Quit</string>
</property>
</action>
<action name="actionPlugins">
<action name="actionManagePlugins">
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/icons/plugins.png</normaloff>:/icons/icons/plugins.png</iconset>
</property>
<property name="text">
<string>Plugins ...</string>
<string>Manage plugins</string>
</property>
</action>
<action name="actionNew_Scene">
<action name="actionManageView">
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/icons/add_view.png</normaloff>:/icons/icons/add_view.png</iconset>
</property>
<property name="text">
<string>Ajouter nouvelle scène ...</string>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Adds a new empty view.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>Add view</string>
</property>
</action>
<action name="actionGlobalCamera">
<action name="actionManageCameras">
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/icons/camera_b.png</normaloff>:/icons/icons/camera_b.png</iconset>
</property>
<property name="text">
<string>Gestion des caméras ...</string>
</property>
<property name="toolTip">
<string>Gestion des caméras</string>
<string>Manage cameras</string>
</property>
</action>
<action name="actionLinkPluginMap">
<action name="actionManageMaps">
<property name="icon">
<iconset resource="../resources/resources.qrc">
<normaloff>:/icons/icons/map_plugin.png</normaloff>:/icons/icons/map_plugin.png</iconset>
</property>
<property name="text">
<string>Lier plugins et maps</string>
<string>Manage CGoGN maps</string>
</property>
</action>
</widget>
......@@ -138,7 +116,7 @@
</resources>
<connections>
<connection>
<sender>actionQuitter</sender>
<sender>actionQuit</sender>
<signal>triggered()</signal>
<receiver>Window</receiver>
<slot>close()</slot>
......
SCHNApps/include/camera.h
View file @ 78546092
#ifndef _CAMERA_H_
#define _CAMERA_H_
#include "view.h"
#include "types.h"
#include "QGLViewer/camera.h"
//forward declaration
class Window;
class View;
class Camera : public qglviewer::Camera
{
public:
Camera(Window* window, View* v);
Camera(Window* window, View* v, const qglviewer::Camera& c);
Camera(const QString& name, Window* window);
Camera(const QString& name, Window* window, const qglviewer::Camera& c);
~Camera();
void setName(QString name) { m_name = name; }
......@@ -51,13 +53,14 @@ public:
void updateGL();
void viewShowButton(bool b);
// void viewShowButton(bool b);
protected:
static unsigned int cameraCount;
QString m_name;
Window* m_window;
QList<View*> l_views;
bool m_draw;
......
SCHNApps/include/mapHandler.h
View file @ 78546092
#ifndef _VIZUHANDLER_H_
#define _VIZUHANDLER_H_
#ifndef _MAPHANDLER_H_
#define _MAPHANDLER_H_
#include <QHash>
#include <QString>
#include "types.h"
namespace CGoGN
{
......@@ -12,36 +13,30 @@ namespace CGoGN
}
}
class VBOHandler;
class MapHandler
{
public:
MapHandler(CGoGN::GenericMap *map);
MapHandler(const QString& name, CGoGN::GenericMap* map);
~MapHandler();
CGoGN::GenericMap *map()
{
return m_map;
}
const QString& getName() { return m_name; }
void setName(const QString& name) { m_name = name; }
VBOHandler* findVBO(QString name);
VBOHandler* findFirstVBOMatching(QRegExp regexp);
QList<VBOHandler*> findVBOsMatching(QRegExp regexp);
CGoGN::GenericMap* getMap() { return m_map; }
bool addVBO(VBOHandler* vboH);
VBOHandler* addNewVBO(QString vboName);
CGoGN::Utils::VBO* addVBO(const QString& name);
void removeVBO(const QString& name);
CGoGN::Utils::VBO* getVBO(const QString& name);
CGoGN::Utils::VBO* findFirstVBOMatching(const QRegExp& regexp);
QList<CGoGN::Utils::VBO*> findVBOsMatching(const QRegExp& regexp);
VBOHandler* takeVBO(VBOHandler* vbo);
int countVBO()
{
return l_vbo.count();
}
int getNbVBO() { return h_vbo.count(); }
protected:
QString m_name;
CGoGN::GenericMap* m_map;
QList<VBOHandler*> l_vbo;
VBOHash h_vbo;
};
#endif
SCHNApps/include/scene.h
View file @ 78546092
......@@ -11,13 +11,11 @@
#include "types.h"
//forward declarations
class View;
class Window;
class Camera;
class Plugin;
class VBOHandler;
class Context;
class View;
class Camera;
//class Context;
class ViewButton;
class Scene : public QObject
......@@ -34,8 +32,8 @@ public:
Window* getWindow() { return m_window; }
void setWindow(Window* w) { m_window = w; }
Context* getContext() { return m_context; }
void setContext(Context* c) { m_context = c; }
QGLContext* getContext() { return m_context; }
void setContext(QGLContext* c) { m_context = c; }
void initGL();
void updateGL();
......@@ -53,7 +51,7 @@ public:
*********************************************************/
void linkView(View* view);
void unlinkView(View* view);
View* getLinkedView(unsigned int num);
View* getLinkedView(int num);
QList<View*> getLinkedViews() { return l_views; }
int getNbLinkedViews() { return l_views.size(); }
......@@ -78,9 +76,11 @@ public:
void firstViewFitSphere(float x, float y, float z, float radius);
protected:
static unsigned int sceneCount;
QString m_name;
Window* m_window;
Context* m_context;
QGLContext* m_context;
QList<View*> l_views;
QList<Plugin*> l_plugins;
......
SCHNApps/include/splitArea.h
View file @ 78546092
......@@ -3,10 +3,14 @@
#include <QSplitter>
class SplitArea : public QSplitter{
class SplitArea : public QSplitter
{
Q_OBJECT
public:
SplitArea(QWidget* parent=0);
SplitArea(QWidget* parent = NULL);
int getNbRows() { return nbRows; }
void addFitElement(QWidget* element);
void addElementAt(QWidget* element, int x, int y);
......@@ -14,24 +18,21 @@ public:
void addElementRightTo(QWidget* element, QWidget* left);
bool isEmpty();
int getNbRow(){return nbRow;}
void updateSize();
protected:
int nbRow, nbMaxColumn;
int nbRows;
int maxNbColumns;
int rowMin;
int nbElement;
int nbElements;
protected slots:
void elementRemoved();
private:
bool sizeUpdated;
void determineRowMin();
};
#endif
SCHNApps/include/system.h
View file @ 78546092
......@@ -56,11 +56,37 @@ public:
typedef enum
{
SUCCESS, NO_SCENE, SCENE_UNREFERENCED, SCENE_EXISTS, NO_DOCK, NO_PLUGIN_PATH_FILE,
ERROR_OPEN_PLUGIN_FILE , BAD_PLUGIN_PATH_FILE, BAD_PLUGIN_PATH_IN_FILE, NO_PLUGIN_IN_DIR,
PLUGIN_EXISTS, ERROR_PLUGIN_LOAD, BAD_LINK_PLUGIN_WINDOW, UNSATSIFIED_PLUGIN_DEPENDENCIE,
BAD_ACTION_MENU_PATH, MAP_UNREFERENCED, MAP_EXISTS, SHADER_EXISTS, SHADER_NOT_FOUND,
VBO_EXISTS, VBO_NOT_FOUND, TOPO3RENDER_EXISTS, TOPO3RENDER_NOT_FOUND, OPEN_FILE_ERROR,
SUCCESS,
NO_SCENE,
SCENE_EXISTS,
SCENE_DOES_NOT_EXIST,
VIEW_EXISTS,
VIEW_DOES_NOT_EXIST,
CAMERA_EXISTS,
CAMERA_DOES_NOT_EXIST,
NO_DOCK,
NO_PLUGIN_PATH_FILE,
ERROR_OPEN_PLUGIN_FILE,
BAD_PLUGIN_PATH_FILE,
BAD_PLUGIN_PATH_IN_FILE,
NO_PLUGIN_IN_DIR,
PLUGIN_EXISTS,
PLUGIN_DOES_NOT_EXIST,
ERROR_PLUGIN_LOAD,
BAD_LINK_PLUGIN_WINDOW,
UNSATSIFIED_PLUGIN_DEPENDENCIE,
BAD_ACTION_MENU_PATH,
MAP_UNREFERENCED,
MAP_EXISTS,
MAP_DOES_NOT_EXIST,
SHADER_EXISTS,
SHADER_NOT_FOUND,
VBO_EXISTS,
VBO_DOES_NOT_EXIST,
VBO_NOT_FOUND,
TOPO3RENDER_EXISTS,
TOPO3RENDER_NOT_FOUND,
OPEN_FILE_ERROR,
BAD_XML_FILE
} ERROR_CODE;
......
SCHNApps/include/vboHandler.h
View file @ 78546092
......@@ -3,31 +3,27 @@
#include "Utils/vbo.h"
#include <QString>
#include <QList>
using namespace CGoGN;
using namespace Utils;
class Scene;
class MapHandler;
class VBOHandler : public VBO{
class VBOHandler
{
public:
VBOHandler(QString name) : VBO(), m_name(name){}
VBOHandler(VBO vbo, QString name) : VBO(vbo), m_name(name){}
VBOHandler(const QString& name, CGoGN::Utils::VBO* vbo) :
m_name(name),
m_vbo(vbo)
{}
~VBOHandler()
{
delete m_vbo;
}
bool isShared(){return l_vizuHandler.size()>1;}
bool shareWith(MapHandler* vh);
void unshareWith(MapHandler* vh);
const QString& getName() { return m_name; }
void setName(const QString& name) { m_name = name; }
QString getName(){return m_name;}
CGoGN::Utils::VBO* getVBO() { return m_vbo; }
bool operator==(QString const & name);
protected:
QString m_name;
QList<MapHandler*> l_vizuHandler;
CGoGN::Utils::VBO* m_vbo;
};
#endif
SCHNApps/include/view.h
View file @ 78546092
......@@ -6,23 +6,24 @@
#include "types.h"
#include "viewButtonArea.h"
# include <QKeyEvent>
#include <QKeyEvent>
#include <QList>
#include <QWidget>
#include <QGLContext>
#include "Utils/gl_matrices.h"
class Window;
class Scene;
class Camera;
class Context;
//class Context;
class View : public QGLViewer
{
Q_OBJECT
public:
View(const QString& name, Window* w, Scene* s, Camera* c, QWidget* parent, const QGLWidget* shareWidget = NULL);
View(const QString& name, Window* w, QWidget* parent);
~View();
const QString& getName() { return m_name; }
......@@ -89,10 +90,13 @@ public:
// void setShowButtons(bool b) { b_showButtons = b; }
protected:
static unsigned int viewCount;
QString m_name;
Window* m_window;
Scene* m_scene;
QGLContext* m_context;
Scene* m_scene;
Camera* m_currentCamera;
// ViewButtonArea* m_buttonArea;
......
SCHNApps/include/sceneSelector.h → SCHNApps/include/viewSelector.h
View file @ 78546092
#ifndef _SCENESELECTOR_H_
#define _SCENESELECTOR_H_
#ifndef _VIEWSELECTOR_H_
#define _VIEWSELECTOR_H_
#include "visualization/view.h"
#include "view.h"
#include <QDialog>
#include <QRect>
......@@ -14,16 +14,33 @@ struct PixElem
QRect rect;
QColor color;
PixElem() : view(NULL),color(Qt::gray){}
PixElem(View* view) : view(view),color(Qt::gray){}
PixElem(const PixElem& pixElem) : view(pixElem.view),rect(pixElem.rect),color(pixElem.color){}
bool operator== ( const PixElem & other ) const{
return view==other.view;
PixElem() :
view(NULL),
color(Qt::gray)
{}
PixElem(View* view) :
view(view),
color(Qt::gray)
{}
PixElem(const PixElem& pixElem) :