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

Merge pull request #23399 from wwmayer/quick_measure

Browse Source 
Measure: Fix quick measure command
This commit is contained in:
Benjamin Nauck
2025-09-01 21:11:26 +02:00
committed by GitHub
parent a353ef9307 8512585a41
commit e5ed0b3cb9
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/Workbench.cpp
View File

@@ -813,7 +813,7 @@ ToolBarItem* StdWorkbench::setupToolBars() const
auto view = new ToolBarItem( root );
view->setCommand("View");
*view << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_ViewGroup" << "Std_AlignToSelection"
<< "Separator" << "Std_DrawStyle" << "Std_TreeViewActions" << "Std_Measure" << "Std_QuickMeasure";
<< "Separator" << "Std_DrawStyle" << "Std_TreeViewActions" << "Std_Measure";
// Individual views
auto individualViews = new ToolBarItem(root, ToolBarItem::DefaultVisibility::Hidden);

5
src/Mod/Measure/Gui/Command.cpp
View File

@@ -115,6 +115,9 @@ protected:
}
if (iMsg == 0) {
if (quickMeasure) {
quickMeasure->print(QString());
}
quickMeasure.reset();
}
else {
@@ -125,7 +128,7 @@ protected:
{
Gui::Action* action = Gui::Command::createAction();
action->setCheckable(true);
action->setChecked(parameter->GetBool("EnableQuickMeasure", false));
action->setChecked(parameter->GetBool("EnableQuickMeasure", true));
return action;
}
void accessParameter()

2
src/Mod/Measure/Gui/QuickMeasure.h
View File

@@ -47,6 +47,7 @@ class QuickMeasure: public QObject, Gui::SelectionObserver
public:
explicit QuickMeasure(QObject* parent = nullptr);
~QuickMeasure() override;
void print(const QString& message);
private:
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
@@ -56,7 +57,6 @@ private:
void addSelectionToMeasurement();
bool isObjAcceptable(App::DocumentObject* obj);
void printResult();
void print(const QString& message);
void processSelection();