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
Hurstel
CGoGN
Commits
895926cd
Commit
895926cd
authored
Oct 02, 2013
by
Pierre Kraemer
Browse files
debug some selection problems
parent
88b0df6d
Changes
4
Hide whitespace changes
Inline
Side-by-side
SCHNApps/include/mapHandler.h
View file @
895926cd
...
...
@@ -148,6 +148,7 @@ public slots:
CellSelectorGen
*
getCellSelector
(
unsigned
int
orbit
,
const
QString
&
name
)
const
;
const
CellSelectorSet
&
getCellSelectorSet
(
unsigned
int
orbit
)
const
{
return
m_cellSelectors
[
orbit
];
}
private
slots
:
void
selectedCellsChanged
();
public:
...
...
SCHNApps/include/schnapps.h
View file @
895926cd
...
...
@@ -98,6 +98,7 @@ public slots:
MapHandlerGen
*
getSelectedMap
()
const
;
unsigned
int
getCurrentOrbit
()
const
;
void
notifySelectedCellSelectorChanged
(
CellSelectorGen
*
cs
)
{
emit
(
selectedCellSelectorChanged
(
cs
));
}
CellSelectorGen
*
getSelectedSelector
(
unsigned
int
orbit
)
const
;
/*********************************************************
...
...
@@ -140,6 +141,7 @@ signals:
void
mapAdded
(
MapHandlerGen
*
map
);
void
mapRemoved
(
MapHandlerGen
*
map
);
void
selectedMapChanged
(
MapHandlerGen
*
old
,
MapHandlerGen
*
cur
);
void
selectedCellSelectorChanged
(
CellSelectorGen
*
cs
);
void
pluginAvailableAdded
(
QString
name
);
void
pluginEnabled
(
Plugin
*
plugin
);
...
...
SCHNApps/src/controlDock_mapTab.cpp
View file @
895926cd
...
...
@@ -157,7 +157,10 @@ void ControlDock_MapTab::selectedSelectorChanged()
case
VOLUME
:
items
=
list_volumeSelectors
->
selectedItems
();
break
;
}
if
(
!
items
.
empty
())
{
m_selectedSelector
[
orbit
]
=
m_selectedMap
->
getCellSelector
(
orbit
,
items
[
0
]
->
text
());
m_schnapps
->
notifySelectedCellSelectorChanged
(
m_selectedSelector
[
orbit
]);
}
}
}
}
...
...
SCHNApps/src/view.cpp
View file @
895926cd
...
...
@@ -35,6 +35,7 @@ View::View(const QString& name, SCHNApps* s, const QGLWidget* shareWidget) :
m_currentCamera
=
m_schnapps
->
addCamera
();
connect
(
m_schnapps
,
SIGNAL
(
selectedMapChanged
(
MapHandlerGen
*
,
MapHandlerGen
*
)),
this
,
SLOT
(
selectedMapChanged
(
MapHandlerGen
*
,
MapHandlerGen
*
)));
connect
(
m_schnapps
,
SIGNAL
(
selectedCellSelectorChanged
(
CellSelectorGen
*
)),
this
,
SLOT
(
updateGL
()));
}
View
::~
View
()
...
...
@@ -162,7 +163,7 @@ void View::unlinkMap(MapHandlerGen* map)
updateGL
();
disconnect
(
map
->
getFrame
(),
SIGNAL
(
modified
()),
this
,
SLOT
(
updateGL
()));
disconnect
(
map
,
SIGNAL
(
selectedCellsChanged
()),
this
,
SLOT
(
updateGL
()));
disconnect
(
map
,
SIGNAL
(
selectedCellsChanged
(
CellSelectorGen
*
)),
this
,
SLOT
(
updateGL
()));
if
(
map
==
m_schnapps
->
getSelectedMap
())
setManipulatedFrame
(
NULL
);
...
...
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