kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: rename methods of SelectionObserver to clarify intention in client code

Browse Source
This commit is contained in:
wmayer
2021-12-07 14:17:07 +01:00
parent ce88fa2052
commit ca5c799ce2
18 changed files with 123 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Gui/Selection.cpp
View File

@@ -85,21 +85,23 @@ bool SelectionGateFilterExternal::allow(App::Document *doc ,App::DocumentObject
//////////////////////////////////////////////////////////////////////////////////////////
SelectionObserver::SelectionObserver(bool attach,int resolve)
:resolve(resolve),blockSelection(false)
SelectionObserver::SelectionObserver(bool attach, int resolve)
: resolve(resolve)
, blockedSelection(false)
{
if(attach)
if (attach)
attachSelection();
}
SelectionObserver::SelectionObserver(const ViewProviderDocumentObject *vp,bool attach,int resolve)
:resolve(resolve),blockSelection(false)
SelectionObserver::SelectionObserver(const ViewProviderDocumentObject *vp,bool attach, int resolve)
: resolve(resolve)
, blockedSelection(false)
{
if(vp && vp->getObject() && vp->getObject()->getDocument()) {
if (vp && vp->getObject() && vp->getObject()->getDocument()) {
filterDocName = vp->getObject()->getDocument()->getName();
filterObjName = vp->getObject()->getNameInDocument();
}
if(attach)
if (attach)
attachSelection();
}
@@ -109,22 +111,19 @@ SelectionObserver::~SelectionObserver()
detachSelection();
}
bool SelectionObserver::blockConnection(bool block)
bool SelectionObserver::blockSelection(bool block)
{
bool ok = blockSelection;
if (block)
blockSelection = true;
else
blockSelection = false;
bool ok = blockedSelection;
blockedSelection = block;
return ok;
}
bool SelectionObserver::isConnectionBlocked() const
bool SelectionObserver::isSelectionBlocked() const
{
return blockSelection;
return blockedSelection;
}
bool SelectionObserver::isConnectionAttached() const
bool SelectionObserver::isSelectionAttached() const
{
return connectSelection.connected();
}
@@ -147,7 +146,7 @@ void SelectionObserver::attachSelection()
void SelectionObserver::_onSelectionChanged(const SelectionChanges& msg) {
try {
if (blockSelection)
if (blockedSelection)
return;
onSelectionChanged(msg);
} catch (Base::Exception &e) {
@@ -164,7 +163,7 @@ void SelectionObserver::detachSelection()
{
if (connectSelection.connected()) {
connectSelection.disconnect();
if(filterDocName.size())
if (filterDocName.size())
Selection().rmvSelectionGate();
}
}