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
Etienne Schmitt
CGoGN
Commits
16ece449
Commit
16ece449
authored
Nov 14, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SCHNApps : reorganize compilation and inclusion / no plugin available yet
parent
89373f2c
Changes
45
Hide whitespace changes
Inline
Side-by-side
Showing
45 changed files
with
386 additions
and
487 deletions
+386
-487
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+9
-11
SCHNApps/Debug/CMakeLists.txt
SCHNApps/Debug/CMakeLists.txt
+37
-71
SCHNApps/Release/CMakeLists.txt
SCHNApps/Release/CMakeLists.txt
+37
-71
SCHNApps/include/dialogs/globalCameraDialog.h
SCHNApps/include/dialogs/globalCameraDialog.h
+2
-6
SCHNApps/include/dialogs/newSceneDialog.h
SCHNApps/include/dialogs/newSceneDialog.h
+0
-3
SCHNApps/include/dialogs/pluginDialog.h
SCHNApps/include/dialogs/pluginDialog.h
+0
-1
SCHNApps/include/dialogs/sceneSelector.h
SCHNApps/include/dialogs/sceneSelector.h
+7
-12
SCHNApps/include/interface/system.h
SCHNApps/include/interface/system.h
+0
-8
SCHNApps/include/interface/window.h
SCHNApps/include/interface/window.h
+3
-10
SCHNApps/include/plugins/plugin.h
SCHNApps/include/plugins/plugin.h
+10
-9
SCHNApps/include/plugins/simplePlugin.h
SCHNApps/include/plugins/simplePlugin.h
+3
-3
SCHNApps/include/plugins/visualPlugin.h
SCHNApps/include/plugins/visualPlugin.h
+3
-3
SCHNApps/include/types.h
SCHNApps/include/types.h
+0
-2
SCHNApps/include/visualization/camera.h
SCHNApps/include/visualization/camera.h
+3
-4
SCHNApps/include/visualization/context.h
SCHNApps/include/visualization/context.h
+2
-4
SCHNApps/include/visualization/mapHandler.h
SCHNApps/include/visualization/mapHandler.h
+2
-5
SCHNApps/include/visualization/renderContainer.h
SCHNApps/include/visualization/renderContainer.h
+1
-3
SCHNApps/include/visualization/scene.h
SCHNApps/include/visualization/scene.h
+0
-3
SCHNApps/include/visualization/view.h
SCHNApps/include/visualization/view.h
+3
-7
SCHNApps/resources/resources.qrc
SCHNApps/resources/resources.qrc
+1
-1
SCHNApps/src/dialogs/cameraOptionDialog.cpp
SCHNApps/src/dialogs/cameraOptionDialog.cpp
+16
-11
SCHNApps/src/dialogs/cameraSceneDialog.cpp
SCHNApps/src/dialogs/cameraSceneDialog.cpp
+75
-50
SCHNApps/src/dialogs/cameraViewDialog.cpp
SCHNApps/src/dialogs/cameraViewDialog.cpp
+3
-5
SCHNApps/src/dialogs/globalCameraDialog.cpp
SCHNApps/src/dialogs/globalCameraDialog.cpp
+37
-37
SCHNApps/src/dialogs/linkViewDialog.cpp
SCHNApps/src/dialogs/linkViewDialog.cpp
+14
-13
SCHNApps/src/dialogs/mapPluginDialog.cpp
SCHNApps/src/dialogs/mapPluginDialog.cpp
+4
-4
SCHNApps/src/dialogs/newSceneDialog.cpp
SCHNApps/src/dialogs/newSceneDialog.cpp
+7
-8
SCHNApps/src/dialogs/pluginDialog.cpp
SCHNApps/src/dialogs/pluginDialog.cpp
+3
-3
SCHNApps/src/dialogs/sceneSelector.cpp
SCHNApps/src/dialogs/sceneSelector.cpp
+2
-2
SCHNApps/src/interface/splitArea.cpp
SCHNApps/src/interface/splitArea.cpp
+1
-2
SCHNApps/src/interface/stateHandler.cpp
SCHNApps/src/interface/stateHandler.cpp
+5
-8
SCHNApps/src/interface/system.cpp
SCHNApps/src/interface/system.cpp
+1
-1
SCHNApps/src/interface/viewButtonArea.cpp
SCHNApps/src/interface/viewButtonArea.cpp
+4
-9
SCHNApps/src/interface/window.cpp
SCHNApps/src/interface/window.cpp
+12
-12
SCHNApps/src/main.cpp
SCHNApps/src/main.cpp
+7
-8
SCHNApps/src/plugins/simplePlugin.cpp
SCHNApps/src/plugins/simplePlugin.cpp
+2
-6
SCHNApps/src/plugins/visualPlugin.cpp
SCHNApps/src/plugins/visualPlugin.cpp
+2
-2
SCHNApps/src/visualization/camera.cpp
SCHNApps/src/visualization/camera.cpp
+40
-24
SCHNApps/src/visualization/context.cpp
SCHNApps/src/visualization/context.cpp
+5
-10
SCHNApps/src/visualization/mapHandler.cpp
SCHNApps/src/visualization/mapHandler.cpp
+3
-9
SCHNApps/src/visualization/renderContainer.cpp
SCHNApps/src/visualization/renderContainer.cpp
+2
-3
SCHNApps/src/visualization/scene.cpp
SCHNApps/src/visualization/scene.cpp
+7
-11
SCHNApps/src/visualization/vboHandler.cpp
SCHNApps/src/visualization/vboHandler.cpp
+2
-3
SCHNApps/src/visualization/view.cpp
SCHNApps/src/visualization/view.cpp
+8
-8
apps_cmake.txt
apps_cmake.txt
+1
-1
No files found.
SCHNApps/CMakeLists.txt
View file @
16ece449
...
...
@@ -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
)
...
...
SCHNApps/Debug/CMakeLists.txt
View file @
16ece449
...
...
@@ -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_plug
D
TARGET_LINK_LIBRARIES
(
SCHNapps
D
${
CGoGN_LIBS_D
}
${
COMMON_LIBS
}
${
QGLVIEWER_LIBRARIES
}
)
#ADD_SUBDIRECTORY(${PLUGIN_DIR} plugins)
SCHNApps/Release/CMakeLists.txt
View file @
16ece449
...
...
@@ -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)
SCHNApps/include/dialogs/globalCameraDialog.h
View file @
16ece449
#ifndef _GLOBALCAMERADIALOG_H_
#define _GLOBALCAMERADIALOG_H_
#include "ui_globalCameraDialog.h"
#include <QListWidget>
#include <QTreeWidget>
#include <QVariant>
#include <QMenu>
#include "camera.h"
#include "view.h"
#include "visualization/camera.h"
#include "visualization/view.h"
class
Window
;
...
...
SCHNApps/include/dialogs/newSceneDialog.h
View file @
16ece449
#ifndef _NEWSCENEDIALOG_H_
#define _NEWSCENEDIALOG_H_
#include "ui_newSceneDialog.h"
#include <QListWidget>
namespace
myListCameraTypes
{
enum
type
{
view
,
camera
,
scene
};
}
class
Window
;
class
NewSceneDialog
:
public
QDialog
,
Ui
::
NSDialog
{
...
...
SCHNApps/include/dialogs/pluginDialog.h
View file @
16ece449
...
...
@@ -11,7 +11,6 @@
#include "types.h"
class
Plugin
;
class
Window
;
...
...
SCHNApps/include/dialogs/sceneSelector.h
View file @
16ece449
#ifndef _SCENESELECTOR_H_
#define _SCENESELECTOR_H_
#include "view.h"
#include "visualization/view.h"
#include <QDialog>
#include <QRect>
class
SplitArea
;
struct
PixElem
{
struct
PixElem
{
View
*
view
;
QRect
rect
;
QColor
color
;
...
...
@@ -30,12 +28,12 @@ struct PixElem{
};
class
ViewPixMaps
:
public
QList
<
QList
<
PixElem
>
>
{
class
ViewPixMaps
:
public
QList
<
QList
<
PixElem
>
>
{
public:
typedef
ViewPixMaps
::
iterator
y_iterator
;
typedef
QList
<
PixElem
>::
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
SCHNApps/include/interface/system.h
View file @
16ece449
...
...
@@ -4,7 +4,6 @@
#include <QWidget>
#include <QSplashScreen>
#include <unistd.h>
#include <stdarg.h>
#include <iostream>
...
...
@@ -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
SCHNApps/include/interface/window.h
View file @
16ece449
#ifndef _WINDOW_H_
#define _WINDOW_H_
#include "ui_window.h"
#include <QVBoxLayout>
#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:
...
...
SCHNApps/include/plugins/plugin.h
View file @
16ece449
...
...
@@ -7,15 +7,16 @@
#include <iostream>
#include <list>
#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
};
...
...
SCHNApps/include/plugins/simplePlugin.h
View file @
16ece449
#ifndef _SIMPLEPLUGIN_H_
#define _SIMPLEPLUGIN_H_
#include "plugin.h"
#include "plugin
s/plugin
.h"
class
SimplePlugin
:
public
QObject
,
public
Plugin
{
class
SimplePlugin
:
public
QObject
,
public
Plugin
{
Q_OBJECT
public:
SimplePlugin
();
...
...
SCHNApps/include/plugins/visualPlugin.h
View file @
16ece449
#ifndef _VISUALPLUGIN_H_
#define _VISUALPLUGIN_H_
#include "plugin.h"
#include "plugin
s/plugin
.h"
class
VisualPlugin
:
public
QObject
,
public
Plugin
{
class
VisualPlugin
:
public
QObject
,
public
Plugin
{
Q_OBJECT
public:
VisualPlugin
();
...
...
SCHNApps/include/types.h
View file @
16ece449
#ifndef _TYPES_H_
#define _TYPES_H_
#include <GL/glew.h>
#include <QGLViewer/qglviewer.h>
...
...
@@ -45,5 +44,4 @@ namespace Qt{
extern
int
UserRoleType
;
}
#endif
SCHNApps/include/visualization/camera.h
View file @
16ece449
#ifndef _CAMERA_H_
#define _CAMERA_H_
#include "view.h"
#include "vi
sualization/vi
ew.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
SCHNApps/include/visualization/context.h
View file @
16ece449
#ifndef _CONTEXT_H_
#define _CONTEXT_H_
#include "types.h"
#include <QGLContext>
class
Context
:
public
QGLContext
{
class
Context
:
public
QGLContext
{
public:
Context
(
QWidget
*
w
,
const
QGLFormat
&
format
);
void
setDevice
(
QWidget
*
w
);
};
#endif
SCHNApps/include/visualization/mapHandler.h
View file @
16ece449
#ifndef _VIZUHANDLER_H_
#define _VIZUHANDLER_H_