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
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
6d79653e
Commit
6d79653e
authored
Mar 05, 2015
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SCHNApps: draw background first + update plugin dock icons
parent
5c229ffd
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
80 additions
and
19 deletions
+80
-19
SCHNApps/forms/controlDock_CameraTabWidget.ui
SCHNApps/forms/controlDock_CameraTabWidget.ui
+2
-2
SCHNApps/forms/controlDock_MapTabWidget.ui
SCHNApps/forms/controlDock_MapTabWidget.ui
+3
-3
SCHNApps/forms/controlDock_PluginTabWidget.ui
SCHNApps/forms/controlDock_PluginTabWidget.ui
+67
-3
SCHNApps/resources/icons/arrow_down.png
SCHNApps/resources/icons/arrow_down.png
+0
-0
SCHNApps/resources/icons/arrow_up.png
SCHNApps/resources/icons/arrow_up.png
+0
-0
SCHNApps/src/controlDock_pluginTab.cpp
SCHNApps/src/controlDock_pluginTab.cpp
+0
-3
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+1
-1
SCHNApps/src/view.cpp
SCHNApps/src/view.cpp
+7
-7
No files found.
SCHNApps/forms/controlDock_CameraTabWidget.ui
View file @
6d79653e
...
...
@@ -18,13 +18,13 @@
</property>
<property
name=
"minimumSize"
>
<size>
<width>
20
0
</width>
<width>
0
</width>
<height>
0
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
200
</width>
<width>
16777215
</width>
<height>
16777215
</height>
</size>
</property>
...
...
SCHNApps/forms/controlDock_MapTabWidget.ui
View file @
6d79653e
...
...
@@ -6,7 +6,7 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
2
00
</width>
<width>
2
18
</width>
<height>
673
</height>
</rect>
</property>
...
...
@@ -18,13 +18,13 @@
</property>
<property
name=
"minimumSize"
>
<size>
<width>
20
0
</width>
<width>
0
</width>
<height>
0
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
200
</width>
<width>
16777215
</width>
<height>
16777215
</height>
</size>
</property>
...
...
SCHNApps/forms/controlDock_PluginTabWidget.ui
View file @
6d79653e
...
...
@@ -6,7 +6,7 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
2
00
</width>
<width>
2
22
</width>
<height>
621
</height>
</rect>
</property>
...
...
@@ -18,13 +18,13 @@
</property>
<property
name=
"minimumSize"
>
<size>
<width>
20
0
</width>
<width>
0
</width>
<height>
0
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
200
</width>
<width>
16777215
</width>
<height>
16777215
</height>
</size>
</property>
...
...
@@ -63,6 +63,38 @@ e</string>
</item>
<item
row=
"2"
column=
"1"
>
<widget
class=
"QPushButton"
name=
"button_enablePlugins"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Preferred"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"minimumSize"
>
<size>
<width>
0
</width>
<height>
32
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
16777215
</width>
<height>
32
</height>
</size>
</property>
<property
name=
"styleSheet"
>
<string
notr=
"true"
>
QPushButton {
background-color: #bbb;
border: 2px solid black;
border-radius: 5px;
background-image: url(':icons/icons/arrow_down.png');
background-repeat: no-repeat;
background-position: center;
margin-right: 5px;
}
QPushButton:pressed {
background-color: #eee;
}
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -76,6 +108,38 @@ e</string>
</item>
<item
row=
"2"
column=
"2"
>
<widget
class=
"QPushButton"
name=
"button_disablePlugins"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Preferred"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"minimumSize"
>
<size>
<width>
0
</width>
<height>
32
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
16777215
</width>
<height>
32
</height>
</size>
</property>
<property
name=
"styleSheet"
>
<string
notr=
"true"
>
QPushButton {
background-color: #bbb;
border: 2px solid black;
border-radius: 5px;
background-image: url(':icons/icons/arrow_up.png');
background-repeat: no-repeat;
background-position: center;
margin-left: 5px;
}
QPushButton:pressed {
background-color: #eee;
}
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
SCHNApps/resources/icons/arrow_down.png
View replaced file @
5c229ffd
View file @
6d79653e
598 Bytes
|
W:
|
H:
2.87 KB
|
W:
|
H:
2-up
Swipe
Onion skin
SCHNApps/resources/icons/arrow_up.png
View replaced file @
5c229ffd
View file @
6d79653e
575 Bytes
|
W:
|
H:
2.84 KB
|
W:
|
H:
2-up
Swipe
Onion skin
SCHNApps/src/controlDock_pluginTab.cpp
View file @
6d79653e
...
...
@@ -20,9 +20,6 @@ ControlDock_PluginTab::ControlDock_PluginTab(SCHNApps* s) :
{
setupUi
(
this
);
button_enablePlugins
->
setIcon
(
QIcon
(
":icons/icons/arrow_down.png"
));
button_disablePlugins
->
setIcon
(
QIcon
(
":icons/icons/arrow_up.png"
));
connect
(
button_addPluginDirectory
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
addPluginDirectoryClicked
()));
connect
(
button_enablePlugins
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
enableSelectedPluginsClicked
()));
connect
(
button_disablePlugins
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
disableSelectedPluginsClicked
()));
...
...
SCHNApps/src/schnapps.cpp
View file @
6d79653e
...
...
@@ -75,7 +75,7 @@ SCHNApps::SCHNApps(const QString& appPath, PythonQtObjectPtr& pythonContext, Pyt
m_controlPluginTab
=
new
ControlDock_PluginTab
(
this
);
m_controlDockTabWidget
->
addTab
(
m_controlPluginTab
,
m_controlPluginTab
->
title
());
m_controlDockTabWidget
->
setMaximumWidth
(
m_controlCameraTab
->
width
());
//
m_controlDockTabWidget->setMaximumWidth(m_controlCameraTab->width());
connect
(
action_ShowHideControlDock
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
showHideControlDock
()));
...
...
SCHNApps/src/view.cpp
View file @
6d79653e
...
...
@@ -419,7 +419,7 @@ void View::init()
// WALLPAPER
m_textureWallpaper
=
new
Utils
::
Texture
<
2
,
Geom
::
Vec3uc
>
(
GL_UNSIGNED_BYTE
);
m_textureWallpaper
->
create
(
Geom
::
Vec2ui
(
1
024
,
1024
));
m_textureWallpaper
->
create
(
Geom
::
Vec2ui
(
1
6
,
16
));
const
float
max
=
m_textureWallpaper
->
size
()[
0
];
for
(
unsigned
int
ki
=
0
;
ki
<
m_textureWallpaper
->
size
()[
0
];
++
ki
)
{
...
...
@@ -457,14 +457,16 @@ void View::draw()
glClear
(
GL_DEPTH_BUFFER_BIT
|
GL_COLOR_BUFFER_BIT
);
}
m_shaderWallpaper
->
draw
();
const
CameraSet
&
cams
=
m_schnapps
->
getCameraSet
();
QList
<
Camera
*>
lc
=
cams
.
values
();
foreach
(
Camera
*
camera
,
lc
)
foreach
(
Camera
*
camera
,
lc
)
{
if
(
camera
!=
m_currentCamera
)
if
(
camera
!=
m_currentCamera
)
{
if
(
camera
->
getDraw
())
camera
->
draw
();
if
(
camera
->
getDrawPath
())
camera
->
drawAllPaths
();
if
(
camera
->
getDraw
())
camera
->
draw
();
if
(
camera
->
getDrawPath
())
camera
->
drawAllPaths
();
}
}
...
...
@@ -495,8 +497,6 @@ void View::draw()
foreach
(
PluginInteraction
*
plugin
,
l_plugins
)
plugin
->
draw
(
this
);
m_shaderWallpaper
->
draw
();
}
void
View
::
postDraw
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment