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

Measure: Fix quickmeasure globalplacement.

Browse Source
This commit is contained in:
PaddleStroke
2024-09-17 09:44:58 +02:00
committed by Chris Hennes
parent 3b4b4413f7
commit 81d3690397
2 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,19 +117,23 @@ void QuickMeasure::addSelectionToMeasurement()
int count = 0;
int limit = 100;
for (auto& selObj : Gui::Selection().getSelectionEx()) {
App::DocumentObject* obj = selObj.getObject();
// Lambda function to check whether to continue
auto shouldSkip = [](App::DocumentObject* obj) {
std::string vpType = obj->getViewProviderName();
auto* vp = Gui::Application::Instance->getViewProvider(obj);
if ((vpType == "SketcherGui::ViewProviderSketch" && vp->isEditing())
return (vpType == "SketcherGui::ViewProviderSketch" && vp->isEditing())
|| vpType.find("Gui::ViewProviderOrigin") != std::string::npos
|| vpType.find("Gui::ViewProviderPart") != std::string::npos
|| vpType.find("SpreadsheetGui") != std::string::npos
|| vpType.find("TechDrawGui") != std::string::npos) {
continue;
}
|| vpType.find("TechDrawGui") != std::string::npos;
};
auto selObjs = Gui::Selection().getSelectionEx(nullptr,
App::DocumentObject::getClassTypeId(),
Gui::ResolveMode::NoResolve);
for (auto& selObj : selObjs) {
App::DocumentObject* rootObj = selObj.getObject();
const std::vector<std::string> subNames = selObj.getSubNames();
// Check that there's not too many selection
@@ -140,12 +144,19 @@ void QuickMeasure::addSelectionToMeasurement()
}
if (subNames.empty()) {
measurement->addReference3D(obj, "");
}
else {
for (auto& subName : subNames) {
measurement->addReference3D(obj, subName);
if (!shouldSkip(rootObj)) {
measurement->addReference3D(rootObj, "");
}
continue;
}
for (auto& subName : subNames) {
App::DocumentObject* obj = rootObj->getSubObject(subName.c_str());
if (shouldSkip(obj)) {
continue;
}
measurement->addReference3D(rootObj, subName);
}
}
}