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
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
3c68fbb4
Commit
3c68fbb4
authored
Jul 03, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug cleanAll, vizu view name
parent
ec5fcdbb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
6 deletions
+21
-6
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+16
-6
SCHNApps/src/view.cpp
SCHNApps/src/view.cpp
+5
-0
No files found.
SCHNApps/src/schnapps.cpp
View file @
3c68fbb4
...
...
@@ -1282,17 +1282,24 @@ void SCHNApps::cleanAll()
//remove views
foreach(View* v, m_views)
{
if
(
v
->
getName
()
!=
QString
(
"view_0"
))
removeView
(
v
->
getName
());
else
v
->
setCurrentCamera
(
QString
(
"camera_0"
));
removeView(v->getName());
}
// 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
foreach(Camera* cam, m_cameras)
{
if
(
cam
->
getName
()
!=
QString
(
"camera_0"
))
removeCamera
(
cam
->
getName
());
removeCamera(cam->getName());
}
//remove maps
...
...
@@ -1306,6 +1313,9 @@ void SCHNApps::cleanAll()
{
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)
void
View
::
mousePressEvent
(
QMouseEvent
*
event
)
{
if
(
!
isSelectedView
())
{
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
()))
m_buttonAreaLeft
->
clickButton
(
event
->
x
(),
event
->
y
(),
event
->
globalX
(),
event
->
globalY
());
...
...
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