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

4
src/Mod/Part/Gui/DlgFilletEdges.cpp
View File

@@ -506,7 +506,7 @@ void DlgFilletEdges::toggleCheckState(const QModelIndex& index)
QString name = QString::fromLatin1("Edge%1").arg(id);
Qt::CheckState checkState = static_cast<Qt::CheckState>(check.toInt());
bool block = this->blockConnection(true);
bool block = this->blockSelection(true);
// is item checked
if (checkState & Qt::Checked) {
@@ -522,7 +522,7 @@ void DlgFilletEdges::toggleCheckState(const QModelIndex& index)
(const char*)name.toLatin1());
}
this->blockConnection(block);
this->blockSelection(block);
}
void DlgFilletEdges::findShapes()

32
src/Mod/Part/Gui/TaskDimension.cpp
View File

@@ -583,9 +583,9 @@ void PartGui::TaskMeasureLinear::selectionClearDelayedSlot()
//clearing selections are not working as I hoped. Apparently the observer callback gets called
//before the actual selection takes place. Resulting in selections being left. this addresses this
//by being called from the event loop.
this->blockConnection(true);
this->blockSelection(true);
Gui::Selection().clearSelection();
this->blockConnection(false);
this->blockSelection(false);
}
void PartGui::TaskMeasureLinear::buildDimension() {
@@ -663,13 +663,13 @@ void PartGui::TaskMeasureLinear::selection1Slot(bool checked)
}
buttonSelectedIndex = 0;
this->blockConnection(true);
this->blockSelection(true);
Gui::Selection().clearSelection();
//we should only be working with 1 entity, but oh well do the loop anyway.
std::vector<DimSelections::DimSelection>::const_iterator it;
for (it = selections1.selections.begin(); it != selections1.selections.end(); ++it)
Gui::Selection().addSelection(it->documentName.c_str(), it->objectName.c_str(), it->subObjectName.c_str());
this->blockConnection(false);
this->blockSelection(false);
}
void PartGui::TaskMeasureLinear::selection2Slot(bool checked)
@@ -677,22 +677,22 @@ void PartGui::TaskMeasureLinear::selection2Slot(bool checked)
if (!checked)
return;
buttonSelectedIndex = 1;
this->blockConnection(true);
this->blockSelection(true);
Gui::Selection().clearSelection();
std::vector<DimSelections::DimSelection>::const_iterator it;
for (it = selections2.selections.begin(); it != selections2.selections.end(); ++it)
Gui::Selection().addSelection(it->documentName.c_str(), it->objectName.c_str(), it->subObjectName.c_str());
this->blockConnection(false);
this->blockSelection(false);
}
void PartGui::TaskMeasureLinear::resetDialogSlot(bool)
{
clearSelectionStrings();
this->blockConnection(true);
this->blockSelection(true);
Gui::Selection().clearSelection();
stepped->getButton(0)->setChecked(true);
stepped->getButton(1)->setEnabled(false);
this->blockConnection(false);
this->blockSelection(false);
}
void PartGui::TaskMeasureLinear::toggle3dSlot(bool)
@@ -1664,9 +1664,9 @@ void PartGui::TaskMeasureAngular::selectionClearDelayedSlot()
//clearing selections are not working as I hoped. Apparently the observer callback gets called
//before the actual selection takes place. Resulting in selections being left. this addresses this
//by being called from the event loop.
this->blockConnection(true);
this->blockSelection(true);
Gui::Selection().clearSelection();
this->blockConnection(false);
this->blockSelection(false);
}
PartGui::VectorAdapter PartGui::TaskMeasureAngular::buildAdapter(const PartGui::DimSelections& selection)
@@ -1796,12 +1796,12 @@ void PartGui::TaskMeasureAngular::selection1Slot(bool checked)
if (checked)
{
buttonSelectedIndex = 0;
this->blockConnection(true);
this->blockSelection(true);
Gui::Selection().clearSelection();
std::vector<DimSelections::DimSelection>::const_iterator it;
for (it = selections1.selections.begin(); it != selections1.selections.end(); ++it)
Gui::Selection().addSelection(it->documentName.c_str(), it->objectName.c_str(), it->subObjectName.c_str());
this->blockConnection(false);
this->blockSelection(false);
}
else
{
@@ -1814,22 +1814,22 @@ void PartGui::TaskMeasureAngular::selection2Slot(bool checked)
{
if (checked)
buttonSelectedIndex = 1;
this->blockConnection(true);
this->blockSelection(true);
Gui::Selection().clearSelection();
std::vector<DimSelections::DimSelection>::const_iterator it;
for (it = selections2.selections.begin(); it != selections2.selections.end(); ++it)
Gui::Selection().addSelection(it->documentName.c_str(), it->objectName.c_str(), it->subObjectName.c_str());
this->blockConnection(false);
this->blockSelection(false);
}
void PartGui::TaskMeasureAngular::resetDialogSlot(bool)
{
clearSelection();
this->blockConnection(true);
this->blockSelection(true);
Gui::Selection().clearSelection();
stepped->getButton(0)->setChecked(true);
stepped->getButton(1)->setEnabled(false);
this->blockConnection(false);
this->blockSelection(false);
}
void PartGui::TaskMeasureAngular::toggle3dSlot(bool)

4
src/Mod/Part/Gui/TaskShapeBuilder.cpp
View File

@@ -144,7 +144,7 @@ void ShapeBuilderWidget::onSelectionChanged(const Gui::SelectionChanges& msg)
std::string subName(msg.pSubName);
if (!subName.empty()) {
// From the shape get all faces and add them to the selection
bool blocked = blockConnection(true);
bool blocked = blockSelection(true);
App::Document* doc = App::GetApplication().getDocument(msg.pDocName);
App::DocumentObject* obj = doc->getObject(msg.pObjectName);
if (obj->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
@@ -161,7 +161,7 @@ void ShapeBuilderWidget::onSelectionChanged(const Gui::SelectionChanges& msg)
}
}
blockConnection(blocked);
blockSelection(blocked);
}
}
}