Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
3c68fbb4
Commit
3c68fbb4
authored
Jul 03, 2015
by
Sylvain Thery
Browse files
bug cleanAll, vizu view name
parent
ec5fcdbb
Changes
2
Hide whitespace changes
Inline
Side-by-side
SCHNApps/src/schnapps.cpp
View file @
3c68fbb4
...
@@ -1282,17 +1282,24 @@ void SCHNApps::cleanAll()
...
@@ -1282,17 +1282,24 @@ void SCHNApps::cleanAll()
//remove views
//remove views
foreach
(
View
*
v
,
m_views
)
foreach
(
View
*
v
,
m_views
)
{
{
if
(
v
->
getName
()
!=
QString
(
"view_0"
))
removeView
(
v
->
getName
());
removeView
(
v
->
getName
());
}
else
v
->
setCurrentCamera
(
QString
(
"camera_0"
));
// set the camera to camera_0
m_firstView
->
setCurrentCamera
(
QString
(
"camera_0"
));
// change name of first view to view 0 if needed
if
(
m_firstView
->
m_name
!=
QString
(
"view_0"
))
{
m_views
.
remove
(
m_firstView
->
m_name
);
m_firstView
->
m_name
=
QString
(
"view_0"
);
m_views
.
insert
(
m_firstView
->
m_name
,
m_firstView
);
}
}
//remove cameras
//remove cameras
foreach
(
Camera
*
cam
,
m_cameras
)
foreach
(
Camera
*
cam
,
m_cameras
)
{
{
if
(
cam
->
getName
()
!=
QString
(
"camera_0"
))
removeCamera
(
cam
->
getName
());
removeCamera
(
cam
->
getName
());
}
}
//remove maps
//remove maps
...
@@ -1306,6 +1313,9 @@ void SCHNApps::cleanAll()
...
@@ -1306,6 +1313,9 @@ void SCHNApps::cleanAll()
{
{
disablePlugin
(
p
->
getName
());
disablePlugin
(
p
->
getName
());
}
}
Camera
::
cameraCount
=
1
;
View
::
viewCount
=
1
;
}
}
...
...
SCHNApps/src/view.cpp
View file @
3c68fbb4
...
@@ -643,7 +643,12 @@ void View::keyReleaseEvent(QKeyEvent *event)
...
@@ -643,7 +643,12 @@ void View::keyReleaseEvent(QKeyEvent *event)
void
View
::
mousePressEvent
(
QMouseEvent
*
event
)
void
View
::
mousePressEvent
(
QMouseEvent
*
event
)
{
{
if
(
!
isSelectedView
())
if
(
!
isSelectedView
())
{
m_schnapps
->
setSelectedView
(
this
);
m_schnapps
->
setSelectedView
(
this
);
m_schnapps
->
statusBarMessage
(
QString
(
"Selecting "
)
+
this
->
getName
(),
2000
);
}
else
if
(
event
->
y
()
<
20
)
m_schnapps
->
statusBarMessage
(
this
->
getName
(),
2000
);
if
(
m_buttonAreaLeft
->
isClicked
(
event
->
x
(),
event
->
y
()))
if
(
m_buttonAreaLeft
->
isClicked
(
event
->
x
(),
event
->
y
()))
m_buttonAreaLeft
->
clickButton
(
event
->
x
(),
event
->
y
(),
event
->
globalX
(),
event
->
globalY
());
m_buttonAreaLeft
->
clickButton
(
event
->
x
(),
event
->
y
(),
event
->
globalX
(),
event
->
globalY
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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