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

Merge pull request #15190 from hlorus/measure_dependency_violation

Browse Source 
MeasureGui: Fix measure dependency violation
This commit is contained in:
Chris Hennes
2024-07-13 19:56:23 -05:00
committed by GitHub
parent b08074e15b eb05effb9a
commit f8deaaaf86
10 changed files with 152 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/CMakeLists.txt
View File

@@ -466,7 +466,6 @@ SET(Dialog_CPP_SRCS
DownloadManager.cpp
DocumentRecovery.cpp
TaskElementColors.cpp
TaskMeasure.cpp
DlgObjectSelection.cpp
DlgAddProperty.cpp
DlgAddPropertyVarSet.cpp
@@ -507,7 +506,6 @@ SET(Dialog_HPP_SRCS
DownloadManager.h
DocumentRecovery.h
TaskElementColors.h
TaskMeasure.h
DlgObjectSelection.h
DlgAddProperty.h
DlgAddPropertyVarSet.h

33
src/Gui/CommandView.cpp
View File

@@ -75,7 +75,6 @@
#include "SelectionObject.h"
#include "SoAxisCrossKit.h"
#include "SoFCOffscreenRenderer.h"
#include "TaskMeasure.h"
#include "TextureMapping.h"
#include "Tools.h"
#include "Tree.h"
@@ -3137,37 +3136,6 @@ void StdCmdTreeSelectAllInstances::activated(int iMsg)
Selection().selStackPush();
}
//===========================================================================
// Std_Measure
// this is the Unified Measurement Facility Measure command
//===========================================================================
DEF_STD_CMD_A(StdCmdMeasure)
StdCmdMeasure::StdCmdMeasure()
:Command("Std_Measure")
{
sGroup = "Measure";
sMenuText = QT_TR_NOOP("&Measure");
sToolTipText = QT_TR_NOOP("Measure a feature");
sWhatsThis = "Std_Measure";
sStatusTip = QT_TR_NOOP("Measure a feature");
sPixmap = "umf-measurement";
}
void StdCmdMeasure::activated(int iMsg)
{
Q_UNUSED(iMsg);
TaskMeasure *task = new TaskMeasure();
Gui::Control().showDialog(task);
}
bool StdCmdMeasure::isActive(){
return true;
}
//===========================================================================
// Std_SceneInspector
@@ -4066,7 +4034,6 @@ void CreateViewStdCommands()
rcCmdMgr.addCommand(new StdCmdTreeExpand());
rcCmdMgr.addCommand(new StdCmdTreeCollapse());
rcCmdMgr.addCommand(new StdCmdTreeSelectAllInstances());
rcCmdMgr.addCommand(new StdCmdMeasure());
rcCmdMgr.addCommand(new StdCmdSceneInspector());
rcCmdMgr.addCommand(new StdCmdTextureMapping());
rcCmdMgr.addCommand(new StdCmdDemoMode());

5
src/Gui/Workbench.cpp
View File

@@ -719,8 +719,6 @@ MenuItem* StdWorkbench::setupMenuBar() const
<< "Std_ExportDependencyGraph"
<< "Std_ProjectUtil"
<< "Separator"
<< "Std_Measure"
<< "Separator"
<< "Std_TextDocument"
<< "Separator"
<< "Std_DemoMode"
@@ -803,8 +801,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"
<< "Separator" << "Std_Measure";
<< "Separator" << "Std_DrawStyle" << "Std_TreeViewActions";
// Individual views
auto individualViews = new ToolBarItem(root, ToolBarItem::DefaultVisibility::Hidden);

4
src/Mod/Measure/Gui/AppMeasureGui.cpp
View File

@@ -37,6 +37,7 @@
#include "ViewProviderMeasureAngle.h"
#include "ViewProviderMeasureDistance.h"
#include "ViewProviderMeasureBase.h"
#include "WorkbenchManipulator.h"
// use a different name to CreateCommand()
@@ -86,6 +87,9 @@ PyMOD_INIT_FUNC(MeasureGui)
PyObject* mod = MeasureGui::initModule();
Base::Console().Log("Loading GUI of Measure module... done\n");
auto manip = std::make_shared<MeasureGui::WorkbenchManipulator>();
Gui::WorkbenchManipulator::installManipulator(manip);
// instantiating the commands
CreateMeasureCommands();

6
src/Mod/Measure/Gui/CMakeLists.txt
View File

@@ -51,14 +51,16 @@ SET(MeasureGui_SRCS
QuickMeasurePyImp.cpp
QuickMeasure.cpp
QuickMeasure.h
TaskMeasure.cpp
TaskMeasure.h
ViewProviderMeasureBase.cpp
ViewProviderMeasureBase.h
ViewProviderMeasureAngle.cpp
ViewProviderMeasureAngle.h
ViewProviderMeasureDistance.cpp
ViewProviderMeasureDistance.h
# Workbench.cpp
# Workbench.h
WorkbenchManipulator.cpp
WorkbenchManipulator.h
DlgPrefsMeasureAppearanceImp.ui
DlgPrefsMeasureAppearanceImp.cpp
DlgPrefsMeasureAppearanceImp.h

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

@@ -23,10 +23,52 @@
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/Control.h>
#include "TaskMeasure.h"
//===========================================================================
// Std_Measure
// this is the Unified Measurement Facility Measure command
//===========================================================================
DEF_STD_CMD_A(StdCmdMeasure)
StdCmdMeasure::StdCmdMeasure()
: Command("Std_Measure")
{
sGroup = "Measure";
sMenuText = QT_TR_NOOP("&Measure");
sToolTipText = QT_TR_NOOP("Measure a feature");
sWhatsThis = "Std_Measure";
sStatusTip = QT_TR_NOOP("Measure a feature");
sPixmap = "umf-measurement";
}
void StdCmdMeasure::activated(int iMsg)
{
Q_UNUSED(iMsg);
Gui::TaskMeasure* task = new Gui::TaskMeasure();
Gui::Control().showDialog(task);
}
bool StdCmdMeasure::isActive()
{
return true;
}
using namespace std;
void CreateMeasureCommands() {
Base::Console().Log("Init MeasureGui\n");
Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager();
auto cmd = new StdCmdMeasure();
cmd->initAction();
rcCmdMgr.addCommand(cmd);
}

10
src/Gui/TaskMeasure.cpp → src/Mod/Measure/Gui/TaskMeasure.cpp
View File

@@ -30,12 +30,12 @@
#include "TaskMeasure.h"
#include "Control.h"
#include "MainWindow.h"
#include "Application.h"
#include "App/Document.h"
#include "App/DocumentObjectGroup.h"
#include <App/Document.h>
#include <App/DocumentObjectGroup.h>
#include <Gui/MainWindow.h>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Control.h>
#include <QFormLayout>
#include <QPushButton>

7
src/Gui/TaskMeasure.h → src/Mod/Measure/Gui/TaskMeasure.h
View File

@@ -30,9 +30,10 @@
#include <Mod/Measure/App/MeasureBase.h>
#include "TaskView/TaskDialog.h"
#include "TaskView/TaskView.h"
#include "Selection.h"
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
namespace Gui {

50
src/Mod/Measure/Gui/WorkbenchManipulator.cpp Normal file
View File

@@ -0,0 +1,50 @@
/***************************************************************************
* Copyright (c) 2024 David Friedli <david[at]friedli-be.ch> *
* *
* This file is part of FreeCAD. *
* *
* FreeCAD is free software: you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 2.1 of the *
* License, or (at your option) any later version. *
* *
* FreeCAD is distributed in the hope that it will be useful, but *
* WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with FreeCAD. If not, see *
* <https://www.gnu.org/licenses/>. *
* *
**************************************************************************/
#include "PreCompiled.h"
#include "WorkbenchManipulator.h"
#include <Gui/MenuManager.h>
#include <Gui/ToolBarManager.h>
using namespace MeasureGui;
void WorkbenchManipulator::modifyMenuBar([[maybe_unused]] Gui::MenuItem* menuBar)
{
auto menuTools = menuBar->findItem("&Tools");
if (!menuTools) {
return;
}
auto itemMeasure = new Gui::MenuItem();
itemMeasure->setCommand("Std_Measure");
menuTools->appendItem(itemMeasure);
}
void WorkbenchManipulator::modifyToolBars(Gui::ToolBarItem* toolBar) {
auto tbView = toolBar->findItem("View");
if (!tbView) {
return;
}
auto itemMeasure = new Gui::ToolBarItem();
itemMeasure->setCommand("Std_Measure");
tbView->appendItem(itemMeasure);
}

40
src/Mod/Measure/Gui/WorkbenchManipulator.h Normal file
View File

@@ -0,0 +1,40 @@
/***************************************************************************
* Copyright (c) 2024 David Friedli <david[at]friedli-be.ch> *
* *
* This file is part of FreeCAD. *
* *
* FreeCAD is free software: you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 2.1 of the *
* License, or (at your option) any later version. *
* *
* FreeCAD is distributed in the hope that it will be useful, but *
* WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with FreeCAD. If not, see *
* <https://www.gnu.org/licenses/>. *
* *
**************************************************************************/
#ifndef MEASUREGUI_WORKBENCHMANIPULATOR_H
#define MEASUREGUI_WORKBENCHMANIPULATOR_H
#include <Gui/WorkbenchManipulator.h>
namespace MeasureGui {
class WorkbenchManipulator: public Gui::WorkbenchManipulator
{
protected:
void modifyMenuBar(Gui::MenuItem* menuBar) override;
void modifyToolBars(Gui::ToolBarItem* toolBar) override;
};
} // namespace MeasureGui
#endif // MEASUREGUI_WORKBENCHMANIPULATOR_H