Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
KennethVanhoey
CGoGN
Commits
9096488e
Commit
9096488e
authored
Nov 29, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SCHNApps : encore un effort..
parent
77d3c5bb
Changes
60
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
60 changed files
with
600 additions
and
4309 deletions
+600
-4309
SCHNApps/Debug/CMakeLists.txt
SCHNApps/Debug/CMakeLists.txt
+7
-15
SCHNApps/Plugins/firstPlugin/CMakeLists.txt
SCHNApps/Plugins/firstPlugin/CMakeLists.txt
+2
-2
SCHNApps/Plugins/firstPlugin/include/firstPlugin.h
SCHNApps/Plugins/firstPlugin/include/firstPlugin.h
+24
-24
SCHNApps/Plugins/firstPlugin/src/firstPlugin.cpp
SCHNApps/Plugins/firstPlugin/src/firstPlugin.cpp
+1
-1
SCHNApps/Release/CMakeLists.txt
SCHNApps/Release/CMakeLists.txt
+7
-15
SCHNApps/forms/cameraOptionDialog.ui
SCHNApps/forms/cameraOptionDialog.ui
+0
-174
SCHNApps/forms/cameraSceneDialog.ui
SCHNApps/forms/cameraSceneDialog.ui
+0
-136
SCHNApps/forms/cameraViewDialog.ui
SCHNApps/forms/cameraViewDialog.ui
+10
-28
SCHNApps/forms/globalCameraDialog.ui
SCHNApps/forms/globalCameraDialog.ui
+0
-99
SCHNApps/forms/infoDialog.ui
SCHNApps/forms/infoDialog.ui
+0
-67
SCHNApps/forms/linkViewDialog.ui
SCHNApps/forms/linkViewDialog.ui
+0
-94
SCHNApps/forms/mapPluginDialog.ui
SCHNApps/forms/mapPluginDialog.ui
+0
-111
SCHNApps/forms/newSceneDialog.ui
SCHNApps/forms/newSceneDialog.ui
+0
-134
SCHNApps/forms/pluginDialog.ui
SCHNApps/forms/pluginDialog.ui
+62
-96
SCHNApps/forms/questionSessionDialog.ui
SCHNApps/forms/questionSessionDialog.ui
+0
-77
SCHNApps/forms/viewDialog.ui
SCHNApps/forms/viewDialog.ui
+0
-55
SCHNApps/forms/window.ui
SCHNApps/forms/window.ui
+1
-11
SCHNApps/include/camera.h
SCHNApps/include/camera.h
+12
-0
SCHNApps/include/cameraDialog.h
SCHNApps/include/cameraDialog.h
+27
-0
SCHNApps/include/cameraOptionDialog.h
SCHNApps/include/cameraOptionDialog.h
+0
-26
SCHNApps/include/cameraSceneDialog.h
SCHNApps/include/cameraSceneDialog.h
+0
-51
SCHNApps/include/cameraViewDialog.h
SCHNApps/include/cameraViewDialog.h
+0
-29
SCHNApps/include/globalCameraDialog.h
SCHNApps/include/globalCameraDialog.h
+0
-93
SCHNApps/include/linkViewDialog.h
SCHNApps/include/linkViewDialog.h
+0
-32
SCHNApps/include/mapDialog.h
SCHNApps/include/mapDialog.h
+0
-0
SCHNApps/include/mapPluginDialog.h
SCHNApps/include/mapPluginDialog.h
+0
-32
SCHNApps/include/newSceneDialog.h
SCHNApps/include/newSceneDialog.h
+0
-37
SCHNApps/include/plugin.h
SCHNApps/include/plugin.h
+22
-38
SCHNApps/include/pluginDialog.h
SCHNApps/include/pluginDialog.h
+17
-3
SCHNApps/include/renderContainer.h
SCHNApps/include/renderContainer.h
+0
-72
SCHNApps/include/scene.h
SCHNApps/include/scene.h
+0
-80
SCHNApps/include/sceneDialog.h
SCHNApps/include/sceneDialog.h
+0
-0
SCHNApps/include/types.h
SCHNApps/include/types.h
+0
-3
SCHNApps/include/view.h
SCHNApps/include/view.h
+39
-46
SCHNApps/include/viewButtonArea.h
SCHNApps/include/viewButtonArea.h
+0
-1
SCHNApps/include/window.h
SCHNApps/include/window.h
+5
-34
SCHNApps/resources/icons/broken_link.png
SCHNApps/resources/icons/broken_link.png
+0
-0
SCHNApps/resources/icons/camera.png
SCHNApps/resources/icons/camera.png
+0
-0
SCHNApps/resources/icons/check.png
SCHNApps/resources/icons/check.png
+0
-0
SCHNApps/resources/icons/close.png
SCHNApps/resources/icons/close.png
+0
-0
SCHNApps/resources/icons/give.png
SCHNApps/resources/icons/give.png
+0
-0
SCHNApps/resources/icons/link.png
SCHNApps/resources/icons/link.png
+0
-0
SCHNApps/resources/icons/separate_camera.png
SCHNApps/resources/icons/separate_camera.png
+0
-0
SCHNApps/resources/icons/share.png
SCHNApps/resources/icons/share.png
+0
-0
SCHNApps/resources/resources.qrc
SCHNApps/resources/resources.qrc
+10
-8
SCHNApps/src/cameraDialog.cpp
SCHNApps/src/cameraDialog.cpp
+71
-0
SCHNApps/src/cameraOptionDialog.cpp
SCHNApps/src/cameraOptionDialog.cpp
+0
-63
SCHNApps/src/cameraSceneDialog.cpp
SCHNApps/src/cameraSceneDialog.cpp
+0
-243
SCHNApps/src/cameraViewDialog.cpp
SCHNApps/src/cameraViewDialog.cpp
+0
-84
SCHNApps/src/globalCameraDialog.cpp
SCHNApps/src/globalCameraDialog.cpp
+0
-333
SCHNApps/src/linkViewDialog.cpp
SCHNApps/src/linkViewDialog.cpp
+0
-202
SCHNApps/src/mapPluginDialog.cpp
SCHNApps/src/mapPluginDialog.cpp
+0
-120
SCHNApps/src/newSceneDialog.cpp
SCHNApps/src/newSceneDialog.cpp
+0
-234
SCHNApps/src/plugin.cpp
SCHNApps/src/plugin.cpp
+17
-107
SCHNApps/src/pluginDialog.cpp
SCHNApps/src/pluginDialog.cpp
+174
-163
SCHNApps/src/renderContainer.cpp
SCHNApps/src/renderContainer.cpp
+0
-212
SCHNApps/src/scene.cpp
SCHNApps/src/scene.cpp
+0
-254
SCHNApps/src/view.cpp
SCHNApps/src/view.cpp
+65
-255
SCHNApps/src/window.cpp
SCHNApps/src/window.cpp
+26
-315
include/Topology/generic/genericmap.hpp
include/Topology/generic/genericmap.hpp
+1
-0
No files found.
SCHNApps/Debug/CMakeLists.txt
View file @
9096488e
...
...
@@ -25,41 +25,33 @@ file(
${
SCHNApps_ROOT_DIR
}
/src/main.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/window.cpp
${
SCHNApps_ROOT_DIR
}
/src/viewSelector.cpp
${
SCHNApps_ROOT_DIR
}
/src/camera
View
Dialog.cpp
${
SCHNApps_ROOT_DIR
}
/src/cameraDialog.cpp
${
SCHNApps_ROOT_DIR
}
/src/pluginDialog.cpp
${
SCHNApps_ROOT_DIR
}
/src/cameraViewDialog.cpp
)
SET
(
SCHNApps_H_OBJECT_FILES
${
SCHNApps_ROOT_DIR
}
/include/window.h
${
SCHNApps_ROOT_DIR
}
/include/scene.h
${
SCHNApps_ROOT_DIR
}
/include/view.h
${
SCHNApps_ROOT_DIR
}
/include/splitArea.h
${
SCHNApps_ROOT_DIR
}
/include/viewSelector.h
${
SCHNApps_ROOT_DIR
}
/include/camera
View
Dialog.h
${
SCHNApps_ROOT_DIR
}
/include/cameraDialog.h
${
SCHNApps_ROOT_DIR
}
/include/pluginDialog.h
# ${SCHNApps_ROOT_DIR}/include/dialogs/newSceneDialog.h
# ${SCHNApps_ROOT_DIR}/include/dialogs/sceneSelector.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/cameraViewDialog.h
)
file
(
GLOB
SCHNApps_FORM_FILES
${
SCHNApps_ROOT_DIR
}
/forms/window.ui
${
SCHNApps_ROOT_DIR
}
/forms/camera
View
Dialog.ui
${
SCHNApps_ROOT_DIR
}
/forms/cameraDialog.ui
${
SCHNApps_ROOT_DIR
}
/forms/pluginDialog.ui
${
SCHNApps_ROOT_DIR
}
/forms/cameraViewDialog.ui
)
QT4_WRAP_UI
(
UI_H_FILES
...
...
@@ -86,4 +78,4 @@ TARGET_LINK_LIBRARIES( SCHNAppsD
)
#
ADD_SUBDIRECTORY(${SCHNApps_ROOT_DIR}/Plugins PluginsD)
ADD_SUBDIRECTORY
(
${
SCHNApps_ROOT_DIR
}
/Plugins PluginsD
)
SCHNApps/Plugins/firstPlugin/CMakeLists.txt
View file @
9096488e
...
...
@@ -7,17 +7,17 @@ INCLUDE_DIRECTORIES(
)
SET
(
FIRSTPLUGIN_PLUGIN_SRC
${
SCHNApps_ROOT_DIR
}
/src/plugins/visualPlugin.cpp
${
SCHNApps_ROOT_DIR
}
/Plugins/firstPlugin/src/firstPlugin.cpp
)
SET
(
FIRSTPLUGIN_PLUGIN_H
${
SCHNApps_ROOT_DIR
}
/include/plugins/visualPlugin.h
${
SCHNApps_ROOT_DIR
}
/Plugins/firstPlugin/include/firstPlugin.h
)
IF
(
${
CMAKE_BUILD_TYPE
}
STREQUAL Debug
)
ADD_DEFINITIONS
(
-DDEBUG
)
IF
(
WIN32
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/lib/Release
)
ELSE
(
WIN32
)
...
...
SCHNApps/Plugins/firstPlugin/include/firstPlugin.h
View file @
9096488e
#ifndef _FIRSTPLUGIN_H_
#define _FIRSTPLUGIN_H_
#include "plugin
s/visualPlugin
.h"
#include "plugin.h"
/**---CGoGN includes **/
#include "Topology/generic/parameters.h"
...
...
@@ -36,12 +36,9 @@ typedef PFP::VEC3 VEC3;
*/
/**
* Our plugin must inherit from VisualPlugin,
* that is a class that itself is an implementation
* of the Plugin interface (virtual class). It contains
* many useful and essantial methods.
* Our plugin must inherit from Plugin
*/
class
FirstPlugin
:
public
Visual
Plugin
class
FirstPlugin
:
public
Plugin
{
/**
* Essential Qt macros.
...
...
@@ -50,26 +47,14 @@ class FirstPlugin : public VisualPlugin
Q_INTERFACES
(
Plugin
)
public:
FirstPlugin
()
{}
~
FirstPlugin
()
{}
FirstPlugin
()
{}
/**
* The classical call back for the initGL method
* When a scene will be link to this plugin, it will call
* back this method with itself as a parameter.
*/
void
cb_initGL
(
Scene
*
scene
);
/**
* The drawing method that needs to be overloaded.
* Each time a scene (that is to say, at least one of the
* views that is contains) needs to be refresh, it calls back
* this method with itself as a parameter
*/
void
cb_redraw
(
Scene
*
scene
);
~
FirstPlugin
()
{}
/**
* The plugin's
activation
method
* The plugin's
enable
method
* Each time the main application loads this plugin,
* it call this method. Writing this method is
* the occasion to initialize the plugin and check certain
...
...
@@ -79,12 +64,27 @@ public:
bool
enable
();
/**
* The plugin's disabl
ing
method
* The plugin's disabl
e
method
* Each time the main application will unload the plugin
* it will call this method.
*/
void
disable
();
void
cb_initGL
(
Scene
*
scene
);
virtual
void
cb_updateMatrix
(
View
*
view
)
{}
void
cb_redraw
(
Scene
*
scene
);
virtual
void
cb_keyPress
(
Scene
*
scene
,
int
key
)
{}
virtual
void
cb_keyRelease
(
Scene
*
scene
,
int
key
)
{}
virtual
void
cb_mousePress
(
Scene
*
scene
,
int
button
,
int
x
,
int
y
)
{}
virtual
void
cb_mouseRelease
(
Scene
*
scene
,
int
button
,
int
x
,
int
y
)
{}
// virtual void cb_mouseClick(Scene* scene, int button, int x, int y) {}
virtual
void
cb_mouseMove
(
Scene
*
scene
,
int
buttons
,
int
x
,
int
y
)
{}
virtual
void
cb_wheelEvent
(
Scene
*
scene
,
int
delta
,
int
x
,
int
y
)
{}
virtual
void
cb_viewAdded
(
Scene
*
s
)
{}
virtual
void
cb_viewRemoved
(
Scene
*
s
)
{}
protected:
/** Attributes that are specific to this plugin **/
MAP
myMap
;
...
...
SCHNApps/Plugins/firstPlugin/src/firstPlugin.cpp
View file @
9096488e
...
...
@@ -67,7 +67,7 @@ void FirstPlugin::disable()
// essential Qt function:
// arguments are
// - the complied name of the plugin
// - the main class of our plugin
(that extends VisualPlugin)
// - the main class of our plugin
Q_EXPORT_PLUGIN2
(
FirstPlugin
,
FirstPlugin
)
#else
Q_EXPORT_PLUGIN2
(
FirstPluginD
,
FirstPlugin
)
...
...
SCHNApps/Release/CMakeLists.txt
View file @
9096488e
...
...
@@ -27,41 +27,33 @@ file(
${
SCHNApps_ROOT_DIR
}
/src/main.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/window.cpp
${
SCHNApps_ROOT_DIR
}
/src/viewSelector.cpp
${
SCHNApps_ROOT_DIR
}
/src/camera
View
Dialog.cpp
${
SCHNApps_ROOT_DIR
}
/src/cameraDialog.cpp
${
SCHNApps_ROOT_DIR
}
/src/pluginDialog.cpp
${
SCHNApps_ROOT_DIR
}
/src/cameraViewDialog.cpp
)
SET
(
SCHNApps_H_OBJECT_FILES
${
SCHNApps_ROOT_DIR
}
/include/window.h
${
SCHNApps_ROOT_DIR
}
/include/scene.h
${
SCHNApps_ROOT_DIR
}
/include/view.h
${
SCHNApps_ROOT_DIR
}
/include/splitArea.h
${
SCHNApps_ROOT_DIR
}
/include/viewSelector.h
${
SCHNApps_ROOT_DIR
}
/include/camera
View
Dialog.h
${
SCHNApps_ROOT_DIR
}
/include/cameraDialog.h
${
SCHNApps_ROOT_DIR
}
/include/pluginDialog.h
# ${SCHNApps_ROOT_DIR}/include/dialogs/newSceneDialog.h
# ${SCHNApps_ROOT_DIR}/include/dialogs/sceneSelector.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/cameraViewDialog.h
)
file
(
GLOB
SCHNApps_FORM_FILES
${
SCHNApps_ROOT_DIR
}
/forms/window.ui
${
SCHNApps_ROOT_DIR
}
/forms/camera
View
Dialog.ui
${
SCHNApps_ROOT_DIR
}
/forms/cameraDialog.ui
${
SCHNApps_ROOT_DIR
}
/forms/pluginDialog.ui
${
SCHNApps_ROOT_DIR
}
/forms/cameraViewDialog.ui
)
QT4_WRAP_UI
(
UI_H_FILES
...
...
@@ -88,4 +80,4 @@ TARGET_LINK_LIBRARIES( SCHNApps
)
#
ADD_SUBDIRECTORY(${SCHNApps_ROOT_DIR}/Plugins Plugins)
ADD_SUBDIRECTORY
(
${
SCHNApps_ROOT_DIR
}
/Plugins Plugins
)
SCHNApps/forms/cameraOptionDialog.ui
deleted
100644 → 0
View file @
77d3c5bb
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
CODialog
</class>
<widget
class=
"QDialog"
name=
"CODialog"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
363
</width>
<height>
357
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
<string>
Dialog
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<item>
<widget
class=
"QGroupBox"
name=
"groupBox"
>
<property
name=
"title"
>
<string>
Camera draw options
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_2"
>
<item>
<widget
class=
"QCheckBox"
name=
"draw_Check"
>
<property
name=
"text"
>
<string>
Draw
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"farPlane_Check"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
<property
name=
"text"
>
<string>
Draw far plane
</string>
</property>
</widget>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
<property
name=
"text"
>
<string>
Camera scale:
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QDoubleSpinBox"
name=
"scale_Spin"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
<property
name=
"minimum"
>
<double>
0.100000000000000
</double>
</property>
<property
name=
"value"
>
<double>
1.000000000000000
</double>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget
class=
"QCheckBox"
name=
"drawPath_Check"
>
<property
name=
"text"
>
<string>
Draw user path
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QGroupBox"
name=
"groupBox_2"
>
<property
name=
"enabled"
>
<bool>
false
</bool>
</property>
<property
name=
"title"
>
<string>
Draw path option
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_3"
>
<item>
<widget
class=
"QCheckBox"
name=
"drawAxis_Check"
>
<property
name=
"text"
>
<string>
draw axis
</string>
</property>
</widget>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_2"
>
<item>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
<string>
Scale:
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QDoubleSpinBox"
name=
"frameScale_Spin"
>
<property
name=
"minimum"
>
<double>
0.100000000000000
</double>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<spacer
name=
"verticalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
40
</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget
class=
"QDialogButtonBox"
name=
"buttonBox"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"standardButtons"
>
<set>
QDialogButtonBox::Cancel|QDialogButtonBox::Ok
</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>
buttonBox
</sender>
<signal>
accepted()
</signal>
<receiver>
CODialog
</receiver>
<slot>
accept()
</slot>
<hints>
<hint
type=
"sourcelabel"
>
<x>
248
</x>
<y>
254
</y>
</hint>
<hint
type=
"destinationlabel"
>
<x>
157
</x>
<y>
274
</y>
</hint>
</hints>
</connection>
<connection>
<sender>
buttonBox
</sender>
<signal>
rejected()
</signal>
<receiver>
CODialog
</receiver>
<slot>
reject()
</slot>
<hints>
<hint
type=
"sourcelabel"
>
<x>
316
</x>
<y>
260
</y>
</hint>
<hint
type=
"destinationlabel"
>
<x>
286
</x>
<y>
274
</y>
</hint>
</hints>
</connection>
</connections>
</ui>
SCHNApps/forms/cameraSceneDialog.ui
deleted
100644 → 0
View file @
77d3c5bb
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
CSDialog
</class>
<widget
class=
"QDialog"
name=
"CSDialog"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
325
</width>
<height>
414
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
<string>
Dialog
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_2"
>
<item>
<widget
class=
"QGroupBox"
name=
"groupBox"
>
<property
name=
"title"
>
<string>
Gestions des caméras
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_3"
>
<item>
<widget
class=
"QLabel"
name=
"label"
>
<property
name=
"text"
>
<string>
(Glissez et déposez pour déplacer
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QLabel"
name=
"label_2"
>
<property
name=
"text"
>
<string>
les caméras entre les vues)
</string>
</property>
</widget>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<item>
<widget
class=
"QToolButton"
name=
"addView_Button"
>
<property
name=
"text"
>
<string>
+
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QToolButton"
name=
"removeView_Button"
>
<property
name=
"text"
>
<string>
-
</string>
</property>
</widget>
</item>
<item>
<spacer
name=
"verticalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
40
</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_2"
>
<item>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
40
</width>
<height>
20
</height>
</size>
</property>
</spacer>
</item>
<item>
<widget
class=
"QPushButton"
name=
"OK_Button"
>
<property
name=
"text"
>
<string>
OK
</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>
OK_Button
</sender>
<signal>
pressed()
</signal>
<receiver>
CSDialog
</receiver>
<slot>
accept()
</slot>
<hints>
<hint
type=
"sourcelabel"
>
<x>
297
</x>
<y>
390
</y>
</hint>
<hint
type=
"destinationlabel"
>
<x>
162
</x>
<y>
206
</y>
</hint>
</hints>
</connection>
<connection>
<sender>
CSDialog
</sender>
<signal>
rejected()
</signal>
<receiver>
CSDialog
</receiver>
<slot>
accept()
</slot>
<hints>
<hint
type=
"sourcelabel"
>
<x>
162
</x>
<y>
206
</y>
</hint>
<hint
type=
"destinationlabel"
>
<x>
162
</x>
<y>
206
</y>
</hint>
</hints>
</connection>
</connections>
</ui>
SCHNApps/forms/cameraViewDialog.ui
View file @
9096488e
...
...
@@ -6,41 +6,23 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
400
</width>
<height>
518
</height>
<width>
232
</width>
<height>
430
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
<string>
Dialog
</string>
<string>
CameraView
Dialog
</string>
</property>
<layout
class=
"Q
H
BoxLayout"
name=
"
horizont
alLayout
_2
"
>
<layout
class=
"Q
V
BoxLayout"
name=
"
vertic
alLayout"
>
<item>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout"
>
<item>
<widget
class=
"QListWidget"
name=
"cameraList"
/>
</item>
<item>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<item>
<widget
class=
"QPushButton"
name=
"addCameraButton"
>
<property
name=
"text"
>
<string>
Add
</string>
</property>
</widget>
</item>
<item>
<widget
class=
"QPushButton"
name=
"removeCameraButton"
>
<property
name=
"text"
>
<string>
Remove
</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
<widget
class=
"QListWidget"
name=
"cameraList"
/>
</item>
<item>
<widget
class=
"QListWidget"
name=
"viewList"
/>
<widget
class=
"QPushButton"
name=
"pushButton"
>
<property
name=
"text"
>
<string>
OK
</string>
</property>
</widget>
</item>
</layout>
</widget>
...
...
SCHNApps/forms/globalCameraDialog.ui
deleted
100644 → 0
View file @
77d3c5bb
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
GCDialog
</class>
<widget
class=
"QDialog"
name=
"GCDialog"
>
<property
name=
"geometry"
>
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
713
</width>
<height>
451
</height>
</rect>
</property>
<property
name=
"windowTitle"
>
<string>
Dialog
</string>
</property>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_4"
>