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

Changed QuickMeasurement to be conservative (#17060)

Browse Source 
* Changed QuickMeasurement to be conservative

QuickMeasurement should not measure while tool dialogs are open
this includes but is not limited to editing sketches
also changed several other sanity checks to be opt-in vs opt-out, as discussed.

* move the test if it is safe to measure to when the measurement actually happens - avoids any potential race conditions
This commit is contained in:
Eric Price
2024-10-07 15:33:31 +02:00
committed by GitHub
parent 24b9f75d5a
commit 2d0fc0a177
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Mod/Measure/Gui/QuickMeasure.cpp
View File

@@ -36,7 +36,7 @@
#include <Gui/Application.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Gui/ViewProvider.h>
#include <Gui/Control.h>
#include <Mod/Part/App/PartFeature.h>
#include <Mod/Part/App/TopoShape.h>
@@ -104,31 +104,41 @@ void QuickMeasure::processSelection()
void QuickMeasure::tryMeasureSelection()
{
Gui::Document* doc = Gui::Application::Instance->activeDocument();
measurement->clear();
addSelectionToMeasurement();
if (doc && Gui::Control().activeDialog() == nullptr) {
// we (still) have a doc and are not in a tool dialog where the user needs to click on stuff
addSelectionToMeasurement();
}
printResult();
}
bool QuickMeasure::shouldMeasure(const Gui::SelectionChanges& msg) const
{
if (msg.Type == Gui::SelectionChanges::SetPreselect
|| msg.Type == Gui::SelectionChanges::RmvPreselect) {
return false;
}
// measure only IF
Gui::Document* doc = Gui::Application::Instance->activeDocument();
return doc != nullptr;
if (doc) {
// we have a document
if (msg.Type == Gui::SelectionChanges::AddSelection
|| msg.Type == Gui::SelectionChanges::RmvSelection
|| msg.Type == Gui::SelectionChanges::SetSelection
|| msg.Type == Gui::SelectionChanges::ClrSelection) {
// the event is about a change in selected objects
return true;
}
}
return false;
}
bool QuickMeasure::isObjAcceptable(App::DocumentObject* obj)
{
if (!obj || !obj->isDerivedFrom(Part::Feature::getClassTypeId())) {
return false;
// only measure shapes
if (obj && obj->isDerivedFrom(Part::Feature::getClassTypeId())) {
return true;
}
std::string vpType = obj->getViewProviderName();
auto* vp = Gui::Application::Instance->getViewProvider(obj);
return !(vpType == "SketcherGui::ViewProviderSketch" && vp && vp->isEditing());
return false;
}
void QuickMeasure::addSelectionToMeasurement()