From 75ceb8e03eed10d70e82f441965a5bc40939e349 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Wed, 18 Jan 2023 09:11:13 -0500 Subject: [PATCH] [TD]Ungroup dimension commands --- src/Mod/TechDraw/Gui/CommandCreateDims.cpp | 1171 ++++++++------------ src/Mod/TechDraw/Gui/Workbench.cpp | 248 ++--- 2 files changed, 588 insertions(+), 831 deletions(-) diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index 2772caf3fb..2648c30c21 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -23,12 +23,12 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include +#include +#include -# include -# include -#endif //#ifndef _PreComp_ +#include +#include +#endif//#ifndef _PreComp_ #include #include @@ -80,10 +80,8 @@ void execDiameter(Gui::Command* cmd); void execExtent(Gui::Command* cmd, int direction); -DrawViewDimension* dimensionMaker(TechDraw::DrawViewPart* dvp, - std::string dimType, - ReferenceVector references2d, - ReferenceVector references3d); +DrawViewDimension* dimensionMaker(TechDraw::DrawViewPart* dvp, std::string dimType, + ReferenceVector references2d, ReferenceVector references3d); void positionDimText(DrawViewDimension* dim); @@ -98,15 +96,15 @@ void positionDimText(DrawViewDimension* dim); DEF_STD_CMD_A(CmdTechDrawDimension) CmdTechDrawDimension::CmdTechDrawDimension() - : Command("TechDraw_Dimension") + : Command("TechDraw_Dimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_Dimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_Dimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_Dimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_Dimension"; } void CmdTechDrawDimension::activated(int iMsg) @@ -121,98 +119,6 @@ bool CmdTechDrawDimension::isActive() return (havePage && haveView); } -//=========================================================================== -// TechDraw_RadialGroup -//=========================================================================== - -DEF_STD_CMD_ACL(CmdTechDrawRadialGroup) - -CmdTechDrawRadialGroup::CmdTechDrawRadialGroup() - : Command("TechDraw_RadialGroup") -{ - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Radius Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_RadialGroup"; - sStatusTip = sToolTipText; -} - -void CmdTechDrawRadialGroup::activated(int iMsg) -{ - // Base::Console().Message("CMD::LinearGrp - activated(%d)\n", iMsg); - Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); - if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); - return; - } - - Gui::ActionGroup* pcAction = qobject_cast(_pcAction); - pcAction->setIcon(pcAction->actions().at(iMsg)->icon()); - switch(iMsg) { - case 0: - execRadius(this); - break; - case 1: - execDiameter(this); - break; - default: - Base::Console().Message("CMD::RadialGrp - invalid iMsg: %d\n", iMsg); - }; -} - -Gui::Action * CmdTechDrawRadialGroup::createAction() -{ - Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); - pcAction->setDropDownMenu(true); - applyCommandData(this->className(), pcAction); - - QAction* p0 = pcAction->addAction(QString()); - p0->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_RadiusDimension")); - p0->setObjectName(QString::fromLatin1("TechDraw_RadiusDimension")); - p0->setWhatsThis(QString::fromLatin1("TechDraw_RadiusDimension")); - QAction* p1 = pcAction->addAction(QString()); - p1->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_DiameterDimension")); - p1->setObjectName(QString::fromLatin1("TechDraw_DiameterDimension")); - p1->setWhatsThis(QString::fromLatin1("TechDraw_DiameterDimension")); - - _pcAction = pcAction; - languageChange(); - - pcAction->setIcon(p0->icon()); - int defaultId = 0; - pcAction->setProperty("defaultAction", QVariant(defaultId)); - - return pcAction; -} - -void CmdTechDrawRadialGroup::languageChange() -{ - Command::languageChange(); - - if (!_pcAction) - return; - Gui::ActionGroup* pcAction = qobject_cast(_pcAction); - QList a = pcAction->actions(); - - QAction* arc0 = a[0]; - arc0->setText(QApplication::translate("CmdTechDrawRadialGroup", "Radius Dimension")); - arc0->setToolTip(QApplication::translate("TechDraw_RadiusDimension", "Insert Radius Dimension")); - arc0->setStatusTip(arc0->toolTip()); - QAction* arc1 = a[1]; - arc1->setText(QApplication::translate("CmdTechDrawRadialGroup", "Diameter Linear")); - arc1->setToolTip(QApplication::translate("TechDraw_DiameterDimension", "Insert Diameter Dimension")); - arc1->setStatusTip(arc1->toolTip()); -} - -bool CmdTechDrawRadialGroup::isActive() -{ - bool havePage = DrawGuiUtil::needPage(this); - bool haveView = DrawGuiUtil::needView(this, false); - return (havePage && haveView); -} - //=========================================================================== // TechDraw_RadiusDimension //=========================================================================== @@ -220,20 +126,28 @@ bool CmdTechDrawRadialGroup::isActive() DEF_STD_CMD_A(CmdTechDrawRadiusDimension) CmdTechDrawRadiusDimension::CmdTechDrawRadiusDimension() - : Command("TechDraw_RadiusDimension") + : Command("TechDraw_RadiusDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Radius Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_RadiusDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_RadiusDimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Radius Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_RadiusDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_RadiusDimension"; } void CmdTechDrawRadiusDimension::activated(int iMsg) { Q_UNUSED(iMsg); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); + if (dlg) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); + return; + } + execRadius(this); } @@ -248,27 +162,27 @@ void execRadius(Gui::Command* cmd) { bool result = _checkDrawViewPart(cmd); if (!result) { - QMessageBox::warning( Gui::getMainWindow(), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.") ); + QObject::tr("No View of a Part in selection.")); return; } ReferenceVector references2d; ReferenceVector references3d; - TechDraw::DrawViewPart* partFeat = TechDraw::getReferencesFromSelection(references2d, references3d); + TechDraw::DrawViewPart* partFeat = + TechDraw::getReferencesFromSelection(references2d, references3d); //Define the geometric configuration required for a radius dimension - StringVector acceptableGeometry( { "Edge" } ); - std::vector minimumCounts( { 1 } ); - std::vector acceptableDimensionGeometrys( { isCircle, isEllipse, isBSplineCircle } ); + StringVector acceptableGeometry({"Edge"}); + std::vector minimumCounts({1}); + std::vector acceptableDimensionGeometrys( + {isCircle, isEllipse, isBSplineCircle}); //what 2d geometry configuration did we receive? - DimensionGeometryType geometryRefs2d = validateDimSelection(references2d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs2d == TechDraw::isInvalid ) { + DimensionGeometryType geometryRefs2d = validateDimSelection( + references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); + if (geometryRefs2d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 2d radius dimension from selection")); @@ -277,63 +191,60 @@ void execRadius(Gui::Command* cmd) //what 3d geometry configuration did we receive? DimensionGeometryType geometryRefs3d(isInvalid); - if (geometryRefs2d == TechDraw::isViewReference && - !references3d.empty()) { + if (geometryRefs2d == TechDraw::isViewReference && !references3d.empty()) { geometryRefs3d = validateDimSelection3d(partFeat, - references3d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs3d == TechDraw::isInvalid ) { + references3d, + acceptableGeometry, + minimumCounts, + acceptableDimensionGeometrys); + if (geometryRefs3d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 3d radius dimension from selection")); return; } - } //errors and warnings - if (geometryRefs2d == isEllipse || - geometryRefs3d == isEllipse) { - QMessageBox::StandardButton result = - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Ellipse Curve Warning"), - QObject::tr("Selected edge is an Ellipse. Radius will be approximate. Continue?"), - QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel); + if (geometryRefs2d == isEllipse || geometryRefs3d == isEllipse) { + QMessageBox::StandardButton result = QMessageBox::warning( + Gui::getMainWindow(), + QObject::tr("Ellipse Curve Warning"), + QObject::tr("Selected edge is an Ellipse. Radius will be approximate. Continue?"), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Cancel); if (result != QMessageBox::Ok) { return; } } - if (geometryRefs2d == isBSplineCircle || - geometryRefs3d == isBSplineCircle) { - QMessageBox::StandardButton result = - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("BSpline Curve Warning"), - QObject::tr("Selected edge is a BSpline. Radius will be approximate. Continue?"), - QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel); + if (geometryRefs2d == isBSplineCircle || geometryRefs3d == isBSplineCircle) { + QMessageBox::StandardButton result = QMessageBox::warning( + Gui::getMainWindow(), + QObject::tr("BSpline Curve Warning"), + QObject::tr("Selected edge is a BSpline. Radius will be approximate. Continue?"), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Cancel); if (result != QMessageBox::Ok) { return; } } - if (geometryRefs2d == isBSpline || - geometryRefs3d == isBSpline) { - QMessageBox::critical(Gui::getMainWindow(), QObject::tr("BSpline Curve Error"), - QObject::tr("Selected edge is a BSpline and a radius can not be calculated.")); + if (geometryRefs2d == isBSpline || geometryRefs3d == isBSpline) { + QMessageBox::critical( + Gui::getMainWindow(), + QObject::tr("BSpline Curve Error"), + QObject::tr("Selected edge is a BSpline and a radius can not be calculated.")); return; } //build the dimension // DrawViewDimension* dim = - dimensionMaker(partFeat, - "Radius", - references2d, - references3d); + dimensionMaker(partFeat, "Radius", references2d, references3d); //Horrible hack to force Tree update double x = partFeat->X.getValue(); partFeat->X.setValue(x); } - //=========================================================================== // TechDraw_DiameterDimension //=========================================================================== @@ -341,20 +252,28 @@ void execRadius(Gui::Command* cmd) DEF_STD_CMD_A(CmdTechDrawDiameterDimension) CmdTechDrawDiameterDimension::CmdTechDrawDiameterDimension() - : Command("TechDraw_DiameterDimension") + : Command("TechDraw_DiameterDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Diameter Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_DiameterDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_DiameterDimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Diameter Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_DiameterDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_DiameterDimension"; } void CmdTechDrawDiameterDimension::activated(int iMsg) { Q_UNUSED(iMsg); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); + if (dlg) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); + return; + } + execDiameter(this); } @@ -369,27 +288,27 @@ void execDiameter(Gui::Command* cmd) { bool result = _checkDrawViewPart(cmd); if (!result) { - QMessageBox::warning( Gui::getMainWindow(), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.") ); + QObject::tr("No View of a Part in selection.")); return; } ReferenceVector references2d; ReferenceVector references3d; - TechDraw::DrawViewPart* partFeat = TechDraw::getReferencesFromSelection(references2d, references3d); + TechDraw::DrawViewPart* partFeat = + TechDraw::getReferencesFromSelection(references2d, references3d); //Define the geometric configuration required for a diameter dimension - StringVector acceptableGeometry( { "Edge" } ); - std::vector minimumCounts( { 1 } ); - std::vector acceptableDimensionGeometrys( { isCircle, isEllipse, isBSplineCircle } ); + StringVector acceptableGeometry({"Edge"}); + std::vector minimumCounts({1}); + std::vector acceptableDimensionGeometrys( + {isCircle, isEllipse, isBSplineCircle}); //what 2d geometry configuration did we receive? - DimensionGeometryType geometryRefs2d = validateDimSelection(references2d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs2d == TechDraw::isInvalid ) { + DimensionGeometryType geometryRefs2d = validateDimSelection( + references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); + if (geometryRefs2d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 2d diameter dimension from selection")); @@ -398,164 +317,60 @@ void execDiameter(Gui::Command* cmd) //what 3d geometry configuration did we receive? DimensionGeometryType geometryRefs3d(isInvalid); - if (geometryRefs2d == TechDraw::isViewReference && - !references3d.empty()) { + if (geometryRefs2d == TechDraw::isViewReference && !references3d.empty()) { geometryRefs3d = validateDimSelection3d(partFeat, - references3d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs3d == TechDraw::isInvalid ) { + references3d, + acceptableGeometry, + minimumCounts, + acceptableDimensionGeometrys); + if (geometryRefs3d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 3d diameter dimension from selection")); return; } - } //errors and warnings - if (geometryRefs2d == isEllipse || - geometryRefs3d == isEllipse) { - QMessageBox::StandardButton result = - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Ellipse Curve Warning"), - QObject::tr("Selected edge is an Ellipse. Diameter will be approximate. Continue?"), - QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel); + if (geometryRefs2d == isEllipse || geometryRefs3d == isEllipse) { + QMessageBox::StandardButton result = QMessageBox::warning( + Gui::getMainWindow(), + QObject::tr("Ellipse Curve Warning"), + QObject::tr("Selected edge is an Ellipse. Diameter will be approximate. Continue?"), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Cancel); if (result != QMessageBox::Ok) { return; } } - if (geometryRefs2d == isBSplineCircle || - geometryRefs3d == isBSplineCircle) { - QMessageBox::StandardButton result = - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("BSpline Curve Warning"), - QObject::tr("Selected edge is a BSpline. Diameter will be approximate. Continue?"), - QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Cancel); + if (geometryRefs2d == isBSplineCircle || geometryRefs3d == isBSplineCircle) { + QMessageBox::StandardButton result = QMessageBox::warning( + Gui::getMainWindow(), + QObject::tr("BSpline Curve Warning"), + QObject::tr("Selected edge is a BSpline. Diameter will be approximate. Continue?"), + QMessageBox::Ok | QMessageBox::Cancel, + QMessageBox::Cancel); if (result != QMessageBox::Ok) { return; } } - if (geometryRefs2d == isBSpline || - geometryRefs3d == isBSpline) { - QMessageBox::critical(Gui::getMainWindow(), QObject::tr("BSpline Curve Error"), - QObject::tr("Selected edge is a BSpline and a diameter can not be calculated.")); + if (geometryRefs2d == isBSpline || geometryRefs3d == isBSpline) { + QMessageBox::critical( + Gui::getMainWindow(), + QObject::tr("BSpline Curve Error"), + QObject::tr("Selected edge is a BSpline and a diameter can not be calculated.")); return; } //build the dimension // DrawViewDimension* dim = - dimensionMaker(partFeat, - "Diameter", - references2d, - references3d); + dimensionMaker(partFeat, "Diameter", references2d, references3d); //Horrible hack to force Tree update double x = partFeat->X.getValue(); partFeat->X.setValue(x); } -//=========================================================================== -// TechDraw_LinearGroup -//=========================================================================== - -DEF_STD_CMD_ACL(CmdTechDrawLinearGroup) - -CmdTechDrawLinearGroup::CmdTechDrawLinearGroup() - : Command("TechDraw_LinearGroup") -{ - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Linear Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_LinearGroup"; - sStatusTip = sToolTipText; -} - -void CmdTechDrawLinearGroup::activated(int iMsg) -{ - // Base::Console().Message("CMD::LinearGrp - activated(%d)\n", iMsg); - Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); - if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); - return; - } - - Gui::ActionGroup* pcAction = qobject_cast(_pcAction); - pcAction->setIcon(pcAction->actions().at(iMsg)->icon()); - switch(iMsg) { - case 0: - execDistance(this); - break; - case 1: - execDistanceX(this); - break; - case 2: - execDistanceY(this); - break; - default: - Base::Console().Message("CMD::LinearGrp - invalid iMsg: %d\n", iMsg); - }; -} - -Gui::Action * CmdTechDrawLinearGroup::createAction() -{ - Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); - pcAction->setDropDownMenu(true); - applyCommandData(this->className(), pcAction); - - QAction* p0 = pcAction->addAction(QString()); - p0->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_LengthDimension")); - p0->setObjectName(QString::fromLatin1("TechDraw_LengthDimension")); - p0->setWhatsThis(QString::fromLatin1("TechDraw_LengthDimension")); - QAction* p1 = pcAction->addAction(QString()); - p1->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_HorizontalDimension")); - p1->setObjectName(QString::fromLatin1("TechDraw_HorizontalDimension")); - p1->setWhatsThis(QString::fromLatin1("TechDraw_HorizontalDimension")); - QAction* p2 = pcAction->addAction(QString()); - p2->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_VerticalDimension")); - p2->setObjectName(QString::fromLatin1("TechDraw_VerticalDimension")); - p2->setWhatsThis(QString::fromLatin1("TechDraw_VerticalDimension")); - - _pcAction = pcAction; - languageChange(); - - pcAction->setIcon(p0->icon()); - int defaultId = 0; - pcAction->setProperty("defaultAction", QVariant(defaultId)); - - return pcAction; -} - -void CmdTechDrawLinearGroup::languageChange() -{ - Command::languageChange(); - - if (!_pcAction) - return; - Gui::ActionGroup* pcAction = qobject_cast(_pcAction); - QList a = pcAction->actions(); - - QAction* arc0 = a[0]; - arc0->setText(QApplication::translate("CmdTechDrawLinearGroup", "Linear Dimension")); - arc0->setToolTip(QApplication::translate("TechDraw_LengthDimension", "Insert Linear Dimension")); - arc0->setStatusTip(arc0->toolTip()); QAction* arc1 = a[1]; - arc1->setText(QApplication::translate("CmdTechDrawLinearGroup", "Horizontal Linear")); - arc1->setToolTip(QApplication::translate("TechDraw_HorizontalLinear", "Insert Horizontal Linear Dimension")); - arc1->setStatusTip(arc1->toolTip()); - QAction* arc2 = a[2]; - arc2->setText(QApplication::translate("CmdTechDrawLinearGroup", "Vertical Linear")); - arc2->setToolTip(QApplication::translate("TechDraw_VerticalDimension", "Insert Vertical Linear Dimension")); - arc2->setStatusTip(arc2->toolTip()); -} - -bool CmdTechDrawLinearGroup::isActive() -{ - bool havePage = DrawGuiUtil::needPage(this); - bool haveView = DrawGuiUtil::needView(this, false); - return (havePage && haveView); -} - //=========================================================================== // TechDraw_LengthDimension //=========================================================================== @@ -563,21 +378,29 @@ bool CmdTechDrawLinearGroup::isActive() DEF_STD_CMD_A(CmdTechDrawLengthDimension) CmdTechDrawLengthDimension::CmdTechDrawLengthDimension() - : Command("TechDraw_LengthDimension") + : Command("TechDraw_LengthDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Length Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_LengthDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_LengthDimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Length Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_LengthDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_LengthDimension"; } void CmdTechDrawLengthDimension::activated(int iMsg) { Q_UNUSED(iMsg); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); + if (dlg) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); + return; + } + execDistance(this); } bool CmdTechDrawLengthDimension::isActive() @@ -591,28 +414,28 @@ void execDistance(Gui::Command* cmd) { bool result = _checkDrawViewPart(cmd); if (!result) { - QMessageBox::warning( Gui::getMainWindow(), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.") ); + QObject::tr("No View of a Part in selection.")); return; } ReferenceVector references2d; ReferenceVector references3d; - TechDraw::DrawViewPart* partFeat = TechDraw::getReferencesFromSelection(references2d, references3d); + TechDraw::DrawViewPart* partFeat = + TechDraw::getReferencesFromSelection(references2d, references3d); //Define the geometric configuration required for a length dimension - StringVector acceptableGeometry( { "Edge", "Vertex" } ); - std::vector minimumCounts( { 1, 2 } ); - std::vector acceptableDimensionGeometrys( { isVertical, isHorizontal, isDiagonal } ); + StringVector acceptableGeometry({"Edge", "Vertex"}); + std::vector minimumCounts({1, 2}); + std::vector acceptableDimensionGeometrys( + {isVertical, isHorizontal, isDiagonal}); //what 2d geometry configuration did we receive? - DimensionGeometryType geometryRefs2d = validateDimSelection(references2d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); + DimensionGeometryType geometryRefs2d = validateDimSelection( + references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); - if ( geometryRefs2d == TechDraw::isInvalid ) { + if (geometryRefs2d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 2d linear dimension from selection")); @@ -621,15 +444,14 @@ void execDistance(Gui::Command* cmd) //what 3d geometry configuration did we receive? DimensionGeometryType geometryRefs3d; - if (geometryRefs2d == TechDraw::isViewReference && - !references3d.empty()) { + if (geometryRefs2d == TechDraw::isViewReference && !references3d.empty()) { geometryRefs3d = validateDimSelection3d(partFeat, - references3d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); + references3d, + acceptableGeometry, + minimumCounts, + acceptableDimensionGeometrys); - if ( geometryRefs3d == TechDraw::isInvalid ) { + if (geometryRefs3d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 3d linear dimension from selection")); @@ -638,10 +460,7 @@ void execDistance(Gui::Command* cmd) } //build the dimension - DrawViewDimension* dim = dimensionMaker(partFeat, - "Distance", - references2d, - references3d); + DrawViewDimension* dim = dimensionMaker(partFeat, "Distance", references2d, references3d); //position the Dimension text on the view positionDimText(dim); @@ -658,21 +477,29 @@ void execDistance(Gui::Command* cmd) DEF_STD_CMD_A(CmdTechDrawHorizontalDimension) CmdTechDrawHorizontalDimension::CmdTechDrawHorizontalDimension() - : Command("TechDraw_HorizontalDimension") + : Command("TechDraw_HorizontalDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Horizontal Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_HorizontalDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_HorizontalDimension"; - sAccel = "SHIFT+H"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Horizontal Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_HorizontalDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_HorizontalDimension"; + sAccel = "SHIFT+H"; } void CmdTechDrawHorizontalDimension::activated(int iMsg) { Q_UNUSED(iMsg); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); + if (dlg) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); + return; + } + execDistanceX(this); } @@ -687,27 +514,26 @@ void execDistanceX(Gui::Command* cmd) { bool result = _checkDrawViewPart(cmd); if (!result) { - QMessageBox::warning( Gui::getMainWindow(), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.") ); + QObject::tr("No View of a Part in selection.")); return; } ReferenceVector references2d; ReferenceVector references3d; - TechDraw::DrawViewPart* partFeat = TechDraw::getReferencesFromSelection(references2d, references3d); + TechDraw::DrawViewPart* partFeat = + TechDraw::getReferencesFromSelection(references2d, references3d); //Define the geometric configuration required for a length dimension - StringVector acceptableGeometry( { "Edge", "Vertex" } ); - std::vector minimumCounts( { 1, 2 } ); - std::vector acceptableDimensionGeometrys( { isHorizontal, isDiagonal } ); + StringVector acceptableGeometry({"Edge", "Vertex"}); + std::vector minimumCounts({1, 2}); + std::vector acceptableDimensionGeometrys({isHorizontal, isDiagonal}); //what 2d geometry configuration did we receive? - DimensionGeometryType geometryRefs2d = validateDimSelection(references2d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs2d == TechDraw::isInvalid ) { + DimensionGeometryType geometryRefs2d = validateDimSelection( + references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); + if (geometryRefs2d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 2d horizontal dimension from selection")); @@ -716,26 +542,23 @@ void execDistanceX(Gui::Command* cmd) //what 3d geometry configuration did we receive? DimensionGeometryType geometryRefs3d; - if (geometryRefs2d == TechDraw::isViewReference && - !references3d.empty()) { + if (geometryRefs2d == TechDraw::isViewReference && !references3d.empty()) { geometryRefs3d = validateDimSelection3d(partFeat, - references3d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); + references3d, + acceptableGeometry, + minimumCounts, + acceptableDimensionGeometrys); if (geometryRefs3d == TechDraw::isInvalid) { - QMessageBox::warning(Gui::getMainWindow(), - QObject::tr("Incorrect Selection"), - QObject::tr("Can not make 3d horizontal dimension from selection")); + QMessageBox::warning( + Gui::getMainWindow(), + QObject::tr("Incorrect Selection"), + QObject::tr("Can not make 3d horizontal dimension from selection")); return; } } //build the dimension - DrawViewDimension* dim = dimensionMaker(partFeat, - "DistanceX", - references2d, - references3d); + DrawViewDimension* dim = dimensionMaker(partFeat, "DistanceX", references2d, references3d); //position the Dimension text on the view @@ -753,21 +576,29 @@ void execDistanceX(Gui::Command* cmd) DEF_STD_CMD_A(CmdTechDrawVerticalDimension) CmdTechDrawVerticalDimension::CmdTechDrawVerticalDimension() - : Command("TechDraw_VerticalDimension") + : Command("TechDraw_VerticalDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Vertical Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_VerticalDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_VerticalDimension"; - sAccel = "SHIFT+V"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Vertical Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_VerticalDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_VerticalDimension"; + sAccel = "SHIFT+V"; } void CmdTechDrawVerticalDimension::activated(int iMsg) { Q_UNUSED(iMsg); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); + if (dlg) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); + return; + } + execDistanceY(this); } @@ -782,27 +613,26 @@ void execDistanceY(Gui::Command* cmd) { bool result = _checkDrawViewPart(cmd); if (!result) { - QMessageBox::warning( Gui::getMainWindow(), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.") ); + QObject::tr("No View of a Part in selection.")); return; } ReferenceVector references2d; ReferenceVector references3d; - TechDraw::DrawViewPart* partFeat = TechDraw::getReferencesFromSelection(references2d, references3d); + TechDraw::DrawViewPart* partFeat = + TechDraw::getReferencesFromSelection(references2d, references3d); //Define the geometric configuration required for a length dimension - StringVector acceptableGeometry( { "Edge", "Vertex" } ); - std::vector minimumCounts( { 1, 2 } ); - std::vector acceptableDimensionGeometrys( { isVertical, isDiagonal } ); + StringVector acceptableGeometry({"Edge", "Vertex"}); + std::vector minimumCounts({1, 2}); + std::vector acceptableDimensionGeometrys({isVertical, isDiagonal}); //what 2d geometry configuration did we receive? - DimensionGeometryType geometryRefs2d = validateDimSelection(references2d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs2d == TechDraw::isInvalid ) { + DimensionGeometryType geometryRefs2d = validateDimSelection( + references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); + if (geometryRefs2d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 2d vertical dimension from selection")); @@ -811,14 +641,13 @@ void execDistanceY(Gui::Command* cmd) //what 3d geometry configuration did we receive? DimensionGeometryType geometryRefs3d; - if (geometryRefs2d == TechDraw::isViewReference && - !references3d.empty()) { + if (geometryRefs2d == TechDraw::isViewReference && !references3d.empty()) { geometryRefs3d = validateDimSelection3d(partFeat, - references3d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs3d == TechDraw::isVertical) { + references3d, + acceptableGeometry, + minimumCounts, + acceptableDimensionGeometrys); + if (geometryRefs3d == TechDraw::isVertical) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 3d vertical dimension from selection")); @@ -827,10 +656,7 @@ void execDistanceY(Gui::Command* cmd) } //build the dimension - DrawViewDimension* dim = dimensionMaker(partFeat, - "DistanceY", - references2d, - references3d); + DrawViewDimension* dim = dimensionMaker(partFeat, "DistanceY", references2d, references3d); //position the Dimension text on the view positionDimText(dim); @@ -840,96 +666,6 @@ void execDistanceY(Gui::Command* cmd) partFeat->X.setValue(x); } -//=========================================================================== -// TechDraw_AngularGroup -//=========================================================================== - -DEF_STD_CMD_ACL(CmdTechDrawAngularGroup) - -CmdTechDrawAngularGroup::CmdTechDrawAngularGroup() - : Command("TechDraw_AngularGroup") -{ - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Angular Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_AngularGroup"; - sStatusTip = sToolTipText; -} - -void CmdTechDrawAngularGroup::activated(int iMsg) -{ - // Base::Console().Message("CMD::LinearGrp - activated(%d)\n", iMsg); - Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); - if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); - return; - } - - Gui::ActionGroup* pcAction = qobject_cast(_pcAction); - pcAction->setIcon(pcAction->actions().at(iMsg)->icon()); - switch(iMsg) { - case 0: - execAngle(this); - break; - case 1: - execAngle3Pt(this); - break; - default: - Base::Console().Message("CMD::AngularGrp - invalid iMsg: %d\n", iMsg); - }; -} - -Gui::Action * CmdTechDrawAngularGroup::createAction() -{ - Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); - pcAction->setDropDownMenu(true); - applyCommandData(this->className(), pcAction); - - QAction* p0 = pcAction->addAction(QString()); - p0->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_AngleDimension")); - p0->setObjectName(QString::fromLatin1("TechDraw_AngleDimension")); - p0->setWhatsThis(QString::fromLatin1("TechDraw_AngleDimension")); - QAction* p1 = pcAction->addAction(QString()); - p1->setIcon(Gui::BitmapFactory().iconFromTheme("TechDraw_3PtAngleDimension")); - p1->setObjectName(QString::fromLatin1("TechDraw_3PtAngleDimension")); - p1->setWhatsThis(QString::fromLatin1("TechDraw_3PtAngleDimension")); - - _pcAction = pcAction; - languageChange(); - - pcAction->setIcon(p0->icon()); - int defaultId = 0; - pcAction->setProperty("defaultAction", QVariant(defaultId)); - - return pcAction; -} - -void CmdTechDrawAngularGroup::languageChange() -{ - Command::languageChange(); - - if (!_pcAction) - return; - Gui::ActionGroup* pcAction = qobject_cast(_pcAction); - QList a = pcAction->actions(); - - QAction* arc0 = a[0]; - arc0->setText(QApplication::translate("CmdTechDrawAngularGroup", "Angular Dimension")); - arc0->setToolTip(QApplication::translate("TechDraw_AngleDimension", "Insert Angle Dimension")); - arc0->setStatusTip(arc0->toolTip()); QAction* arc1 = a[1]; - arc1->setText(QApplication::translate("CmdTechDrawAngularGroup", "3Pt Angular Dimension")); - arc1->setToolTip(QApplication::translate("TechDraw_3PtAngleDimension", "Insert 3-Point Angle Dimension")); - arc1->setStatusTip(arc1->toolTip()); -} - -bool CmdTechDrawAngularGroup::isActive() -{ - bool havePage = DrawGuiUtil::needPage(this); - bool haveView = DrawGuiUtil::needView(this, false); - return (havePage && haveView); -} //=========================================================================== // TechDraw_AngleDimension //=========================================================================== @@ -937,20 +673,28 @@ bool CmdTechDrawAngularGroup::isActive() DEF_STD_CMD_A(CmdTechDrawAngleDimension) CmdTechDrawAngleDimension::CmdTechDrawAngleDimension() - : Command("TechDraw_AngleDimension") + : Command("TechDraw_AngleDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Angle Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_AngleDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_AngleDimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Angle Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_AngleDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_AngleDimension"; } void CmdTechDrawAngleDimension::activated(int iMsg) { Q_UNUSED(iMsg); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); + if (dlg) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); + return; + } + execAngle(this); } @@ -965,27 +709,26 @@ void execAngle(Gui::Command* cmd) { bool result = _checkDrawViewPart(cmd); if (!result) { - QMessageBox::warning( Gui::getMainWindow(), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.") ); + QObject::tr("No View of a Part in selection.")); return; } ReferenceVector references2d; ReferenceVector references3d; - TechDraw::DrawViewPart* partFeat = TechDraw::getReferencesFromSelection(references2d, references3d); + TechDraw::DrawViewPart* partFeat = + TechDraw::getReferencesFromSelection(references2d, references3d); //Define the geometric configuration required for a length dimension - StringVector acceptableGeometry( { "Edge" } ); - std::vector minimumCounts( { 2 } ); - std::vector acceptableDimensionGeometrys( { isAngle } ); + StringVector acceptableGeometry({"Edge"}); + std::vector minimumCounts({2}); + std::vector acceptableDimensionGeometrys({isAngle}); //what 2d geometry configuration did we receive? - DimensionGeometryType geometryRefs2d = validateDimSelection(references2d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs2d == TechDraw::isInvalid ) { + DimensionGeometryType geometryRefs2d = validateDimSelection( + references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); + if (geometryRefs2d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 2d angle dimension from selection")); @@ -994,14 +737,13 @@ void execAngle(Gui::Command* cmd) //what 3d geometry configuration did we receive? DimensionGeometryType geometryRefs3d; - if (geometryRefs2d == TechDraw::isViewReference && - !references3d.empty()) { + if (geometryRefs2d == TechDraw::isViewReference && !references3d.empty()) { geometryRefs3d = validateDimSelection3d(partFeat, - references3d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs3d == TechDraw::isInvalid ) { + references3d, + acceptableGeometry, + minimumCounts, + acceptableDimensionGeometrys); + if (geometryRefs3d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 3d angle dimension from selection")); @@ -1010,10 +752,7 @@ void execAngle(Gui::Command* cmd) } //build the dimension - DrawViewDimension* dim = dimensionMaker(partFeat, - "Angle", - references2d, - references3d); + DrawViewDimension* dim = dimensionMaker(partFeat, "Angle", references2d, references3d); //position the Dimension text on the view positionDimText(dim); @@ -1030,20 +769,28 @@ void execAngle(Gui::Command* cmd) DEF_STD_CMD_A(CmdTechDraw3PtAngleDimension) CmdTechDraw3PtAngleDimension::CmdTechDraw3PtAngleDimension() - : Command("TechDraw_3PtAngleDimension") + : Command("TechDraw_3PtAngleDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert 3-Point Angle Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_3PtAngleDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_3PtAngleDimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert 3-Point Angle Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_3PtAngleDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_3PtAngleDimension"; } void CmdTechDraw3PtAngleDimension::activated(int iMsg) { Q_UNUSED(iMsg); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); + if (dlg) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); + return; + } + execAngle3Pt(this); } @@ -1058,27 +805,26 @@ void execAngle3Pt(Gui::Command* cmd) { bool result = _checkDrawViewPart(cmd); if (!result) { - QMessageBox::warning( Gui::getMainWindow(), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.") ); + QObject::tr("No View of a Part in selection.")); return; } ReferenceVector references2d; ReferenceVector references3d; - TechDraw::DrawViewPart* partFeat = TechDraw::getReferencesFromSelection(references2d, references3d); + TechDraw::DrawViewPart* partFeat = + TechDraw::getReferencesFromSelection(references2d, references3d); //Define the geometric configuration required for a length dimension - StringVector acceptableGeometry( { "Vertex" } ); - std::vector minimumCounts( { 3 } ); - std::vector acceptableDimensionGeometrys( { isAngle3Pt } ); + StringVector acceptableGeometry({"Vertex"}); + std::vector minimumCounts({3}); + std::vector acceptableDimensionGeometrys({isAngle3Pt}); //what 2d geometry configuration did we receive? - DimensionGeometryType geometryRefs2d = validateDimSelection(references2d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs2d == TechDraw::isInvalid ) { + DimensionGeometryType geometryRefs2d = validateDimSelection( + references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); + if (geometryRefs2d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 2d angle dimension from selection")); @@ -1087,14 +833,13 @@ void execAngle3Pt(Gui::Command* cmd) //what 3d geometry configuration did we receive? DimensionGeometryType geometryRefs3d; - if (geometryRefs2d == TechDraw::isViewReference && - !references3d.empty()) { + if (geometryRefs2d == TechDraw::isViewReference && !references3d.empty()) { geometryRefs3d = validateDimSelection3d(partFeat, - references3d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs3d == TechDraw::isInvalid ) { + references3d, + acceptableGeometry, + minimumCounts, + acceptableDimensionGeometrys); + if (geometryRefs3d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 3d angle dimension from selection")); @@ -1103,10 +848,7 @@ void execAngle3Pt(Gui::Command* cmd) } //build the dimension - DrawViewDimension* dim = dimensionMaker(partFeat, - "Angle3Pt", - references2d, - references3d); + DrawViewDimension* dim = dimensionMaker(partFeat, "Angle3Pt", references2d, references3d); //position the Dimension text on the view positionDimText(dim); @@ -1115,7 +857,6 @@ void execAngle3Pt(Gui::Command* cmd) partFeat->X.setValue(x); } - //! link 3D geometry to Dimension(s) on a Page //TODO: should we present all potential Dimensions from all Pages? //=========================================================================== @@ -1125,15 +866,15 @@ void execAngle3Pt(Gui::Command* cmd) DEF_STD_CMD_A(CmdTechDrawLinkDimension) CmdTechDrawLinkDimension::CmdTechDrawLinkDimension() - : Command("TechDraw_LinkDimension") + : Command("TechDraw_LinkDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Link Dimension to 3D Geometry"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_LinkDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_LinkDimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Link Dimension to 3D Geometry"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_LinkDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_LinkDimension"; } void CmdTechDrawLinkDimension::activated(int iMsg) @@ -1145,35 +886,38 @@ void CmdTechDrawLinkDimension::activated(int iMsg) } bool result = _checkSelection(this, 2); - if (!result) + if (!result) { return; + } - std::vector selection = getSelection().getSelectionEx(nullptr, - App::DocumentObject::getClassTypeId(), Gui::ResolveMode::NoResolve); + std::vector selection = getSelection().getSelectionEx( + nullptr, App::DocumentObject::getClassTypeId(), Gui::ResolveMode::NoResolve); App::DocumentObject* obj3D = nullptr; std::vector parts; std::vector subs; std::vector::iterator itSel = selection.begin(); - for (; itSel != selection.end(); itSel++) { + for (; itSel != selection.end(); itSel++) { obj3D = ((*itSel).getObject()); std::vector subList = (*itSel).getSubNames(); - for (auto& s:subList) { + for (auto& s : subList) { parts.push_back(obj3D); subs.push_back(s); } } if (!obj3D) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("There is no 3D object in your selection")); + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Incorrect Selection"), + QObject::tr("There is no 3D object in your selection")); return; } if (subs.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), - QObject::tr("There are no 3D Edges or Vertices in your selection")); + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Incorrect Selection"), + QObject::tr("There are no 3D Edges or Vertices in your selection")); return; } @@ -1181,7 +925,7 @@ void CmdTechDrawLinkDimension::activated(int iMsg) // dialog to select the Dimension to link Gui::Control().showDialog(new TaskDlgLinkDim(parts, subs, page)); - page->getDocument()->recompute(); //still need to recompute in Gui. why? + page->getDocument()->recompute();//still need to recompute in Gui. why? } bool CmdTechDrawLinkDimension::isActive() @@ -1202,30 +946,31 @@ bool CmdTechDrawLinkDimension::isActive() DEF_STD_CMD_ACL(CmdTechDrawExtentGroup) CmdTechDrawExtentGroup::CmdTechDrawExtentGroup() - : Command("TechDraw_ExtentGroup") + : Command("TechDraw_ExtentGroup") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Extent Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_ExtentGroup"; - sStatusTip = sToolTipText; -// eType = ForEdit; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Extent Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_ExtentGroup"; + sStatusTip = sToolTipText; + // eType = ForEdit; } void CmdTechDrawExtentGroup::activated(int iMsg) { -// Base::Console().Message("CMD::ExtentGrp - activated(%d)\n", iMsg); - Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); + // Base::Console().Message("CMD::ExtentGrp - activated(%d)\n", iMsg); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); return; } Gui::ActionGroup* pcAction = qobject_cast(_pcAction); pcAction->setIcon(pcAction->actions().at(iMsg)->icon()); - switch(iMsg) { + switch (iMsg) { case 0: execExtent(this, 0); break; @@ -1237,7 +982,7 @@ void CmdTechDrawExtentGroup::activated(int iMsg) }; } -Gui::Action * CmdTechDrawExtentGroup::createAction() +Gui::Action* CmdTechDrawExtentGroup::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -1266,18 +1011,21 @@ void CmdTechDrawExtentGroup::languageChange() { Command::languageChange(); - if (!_pcAction) + if (!_pcAction) { return; + } Gui::ActionGroup* pcAction = qobject_cast(_pcAction); QList a = pcAction->actions(); QAction* arc1 = a[0]; arc1->setText(QApplication::translate("CmdTechDrawExtentGroup", "Horizontal Extent")); - arc1->setToolTip(QApplication::translate("TechDraw_HorizontalExtent", "Insert Horizontal Extent Dimension")); + arc1->setToolTip( + QApplication::translate("TechDraw_HorizontalExtent", "Insert Horizontal Extent Dimension")); arc1->setStatusTip(arc1->toolTip()); QAction* arc2 = a[1]; arc2->setText(QApplication::translate("CmdTechDrawExtentGroup", "Vertical Extent")); - arc2->setToolTip(QApplication::translate("TechDraw_VerticalExtentDimension", "Insert Vertical Extent Dimension")); + arc2->setToolTip(QApplication::translate("TechDraw_VerticalExtentDimension", + "Insert Vertical Extent Dimension")); arc2->setStatusTip(arc2->toolTip()); } @@ -1295,25 +1043,26 @@ bool CmdTechDrawExtentGroup::isActive() DEF_STD_CMD_A(CmdTechDrawHorizontalExtentDimension) CmdTechDrawHorizontalExtentDimension::CmdTechDrawHorizontalExtentDimension() - : Command("TechDraw_HorizontalExtentDimension") + : Command("TechDraw_HorizontalExtentDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Horizontal Extent Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_HorizontalExtentDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_HorizontalExtentDimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Horizontal Extent Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_HorizontalExtentDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_HorizontalExtentDimension"; } void CmdTechDrawHorizontalExtentDimension::activated(int iMsg) { Q_UNUSED(iMsg); - Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); return; } @@ -1331,20 +1080,21 @@ void execExtent(Gui::Command* cmd, int direction) { bool result = _checkDrawViewPart(cmd); if (!result) { - QMessageBox::warning( Gui::getMainWindow(), + QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("No View of a Part in selection.") ); + QObject::tr("No View of a Part in selection.")); return; } ReferenceVector references2d; ReferenceVector references3d; - TechDraw::DrawViewPart* partFeat = TechDraw::getReferencesFromSelection(references2d, references3d); + TechDraw::DrawViewPart* partFeat = + TechDraw::getReferencesFromSelection(references2d, references3d); //Define the geometric configuration required for a extent dimension - StringVector acceptableGeometry( { "Edge" } ); - std::vector minimumCounts( { 1 } ); - std::vector acceptableDimensionGeometrys( { isMultiEdge, + StringVector acceptableGeometry({"Edge"}); + std::vector minimumCounts({1}); + std::vector acceptableDimensionGeometrys({isMultiEdge, isHorizontal, isVertical, isDiagonal, @@ -1352,14 +1102,12 @@ void execExtent(Gui::Command* cmd, int direction) isEllipse, isBSplineCircle, isBSpline, - isZLimited } ); + isZLimited}); //what 2d geometry configuration did we receive? - DimensionGeometryType geometryRefs2d = validateDimSelection(references2d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs2d == TechDraw::isInvalid) { + DimensionGeometryType geometryRefs2d = validateDimSelection( + references2d, acceptableGeometry, minimumCounts, acceptableDimensionGeometrys); + if (geometryRefs2d == TechDraw::isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 2d extent dimension from selection")); @@ -1367,14 +1115,13 @@ void execExtent(Gui::Command* cmd, int direction) } //what 3d geometry configuration did we receive? DimensionGeometryType geometryRefs3d; - if (geometryRefs2d == TechDraw::isViewReference && - !references3d.empty()) { + if (geometryRefs2d == TechDraw::isViewReference && !references3d.empty()) { geometryRefs3d = validateDimSelection3d(partFeat, - references3d, - acceptableGeometry, - minimumCounts, - acceptableDimensionGeometrys); - if ( geometryRefs3d == isInvalid ) { + references3d, + acceptableGeometry, + minimumCounts, + acceptableDimensionGeometrys); + if (geometryRefs3d == isInvalid) { QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), QObject::tr("Can not make 3d extent dimension from selection")); @@ -1393,13 +1140,12 @@ void execExtent(Gui::Command* cmd, int direction) edgeNames.push_back(ref.getSubName()); } } - DrawDimHelper::makeExtentDim(partFeat, - edgeNames, - direction); //0 - horizontal, 1 - vertical + DrawDimHelper::makeExtentDim(partFeat, edgeNames, + direction);//0 - horizontal, 1 - vertical } else { DrawDimHelper::makeExtentDim3d(partFeat, references3d, - direction); //0 - horizontal, 1 - vertical + direction);//0 - horizontal, 1 - vertical } } @@ -1410,25 +1156,26 @@ void execExtent(Gui::Command* cmd, int direction) DEF_STD_CMD_A(CmdTechDrawVerticalExtentDimension) CmdTechDrawVerticalExtentDimension::CmdTechDrawVerticalExtentDimension() - : Command("TechDraw_VerticalExtentDimension") + : Command("TechDraw_VerticalExtentDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Vertical Extent Dimension"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_VerticalExtentDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_VerticalExtentDimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Vertical Extent Dimension"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_VerticalExtentDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_VerticalExtentDimension"; } void CmdTechDrawVerticalExtentDimension::activated(int iMsg) { Q_UNUSED(iMsg); - Gui::TaskView::TaskDialog *dlg = Gui::Control().activeDialog(); + Gui::TaskView::TaskDialog* dlg = Gui::Control().activeDialog(); if (dlg) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Task In Progress"), - QObject::tr("Close active task dialog and try again.")); + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Task In Progress"), + QObject::tr("Close active task dialog and try again.")); return; } @@ -1451,22 +1198,24 @@ DEF_STD_CMD_A(CmdTechDrawDimensionRepair) CmdTechDrawDimensionRepair::CmdTechDrawDimensionRepair() : Command("TechDraw_DimensionRepair") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Repair Dimension References"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_DimensionRepair"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_DimensionRepair"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Repair Dimension References"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_DimensionRepair"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_DimensionRepair"; } void CmdTechDrawDimensionRepair::activated(int iMsg) { Q_UNUSED(iMsg); - std::vector dimObjs = getSelection().getObjectsOfType(TechDraw::DrawViewDimension::getClassTypeId()); + std::vector dimObjs = + getSelection().getObjectsOfType(TechDraw::DrawViewDimension::getClassTypeId()); TechDraw::DrawViewDimension* dim = nullptr; if (dimObjs.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect Selection"), + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Incorrect Selection"), QObject::tr("There is no Dimension in your selection")); return; } else { @@ -1501,37 +1250,40 @@ bool CmdTechDrawDimensionRepair::isActive(void) DEF_STD_CMD_A(CmdTechDrawLandmarkDimension) CmdTechDrawLandmarkDimension::CmdTechDrawLandmarkDimension() - : Command("TechDraw_LandmarkDimension") + : Command("TechDraw_LandmarkDimension") { - sAppModule = "TechDraw"; - sGroup = QT_TR_NOOP("TechDraw"); - sMenuText = QT_TR_NOOP("Insert Landmark Dimension - EXPERIMENTAL"); - sToolTipText = sMenuText; - sWhatsThis = "TechDraw_LandmarkDimension"; - sStatusTip = sToolTipText; - sPixmap = "TechDraw_LandmarkDimension"; + sAppModule = "TechDraw"; + sGroup = QT_TR_NOOP("TechDraw"); + sMenuText = QT_TR_NOOP("Insert Landmark Dimension - EXPERIMENTAL"); + sToolTipText = sMenuText; + sWhatsThis = "TechDraw_LandmarkDimension"; + sStatusTip = sToolTipText; + sPixmap = "TechDraw_LandmarkDimension"; } void CmdTechDrawLandmarkDimension::activated(int iMsg) { Q_UNUSED(iMsg); bool result = _checkSelection(this, 3); - if (!result) - return; - - const std::vector objects = getSelection(). - getObjectsOfType(Part::Feature::getClassTypeId()); //?? - if (objects.size() != 2) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select 2 point objects and 1 View. (1)")); + if (!result) { return; } - const std::vector views = getSelection(). - getObjectsOfType(TechDraw::DrawViewPart::getClassTypeId()); + const std::vector objects = + getSelection().getObjectsOfType(Part::Feature::getClassTypeId());//?? + if (objects.size() != 2) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Wrong selection"), + QObject::tr("Select 2 point objects and 1 View. (1)")); + return; + } + + const std::vector views = + getSelection().getObjectsOfType(TechDraw::DrawViewPart::getClassTypeId()); if (views.size() != 1) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"), - QObject::tr("Select 2 point objects and 1 View. (2)")); + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Wrong selection"), + QObject::tr("Select 2 point objects and 1 View. (2)")); return; } @@ -1546,34 +1298,39 @@ void CmdTechDrawLandmarkDimension::activated(int iMsg) std::string parentName = dvp->getNameInDocument(); std::string PageName = page->getNameInDocument(); - TechDraw::LandmarkDimension *dim = nullptr; + TechDraw::LandmarkDimension* dim = nullptr; std::string FeatName = getUniqueObjectName("LandmarkDim"); openCommand(QT_TRANSLATE_NOOP("Command", "Create Dimension")); - doCommand(Doc, "App.activeDocument().addObject('TechDraw::LandmarkDimension', '%s')", FeatName.c_str()); + doCommand(Doc, + "App.activeDocument().addObject('TechDraw::LandmarkDimension', '%s')", + FeatName.c_str()); if (objects.size() == 2) { //what about distanceX and distanceY?? doCommand(Doc, "App.activeDocument().%s.Type = '%s'", FeatName.c_str(), "Distance"); refs2d.push_back(dvp); refs2d.push_back(dvp); } -// } else if (objects.size() == 3) { //not implemented yet -// doCommand(Doc, "App.activeDocument().%s.Type = '%s'", FeatName.c_str(), "Angle3Pt"); -// refs2d.push_back(dvp); -// refs2d.push_back(dvp); -// refs2d.push_back(dvp); -// //subs.push_back("Vertex1"); -// //subs.push_back("Vertex1"); -// //subs.push_back("Vertex1"); -// } + // } else if (objects.size() == 3) { //not implemented yet + // doCommand(Doc, "App.activeDocument().%s.Type = '%s'", FeatName.c_str(), "Angle3Pt"); + // refs2d.push_back(dvp); + // refs2d.push_back(dvp); + // refs2d.push_back(dvp); + // //subs.push_back("Vertex1"); + // //subs.push_back("Vertex1"); + // //subs.push_back("Vertex1"); + // } - dim = dynamic_cast(getDocument()->getObject(FeatName.c_str())); + dim = dynamic_cast(getDocument()->getObject(FeatName.c_str())); if (!dim) { throw Base::TypeError("CmdTechDrawLandmarkDimension - dim not found\n"); } dim->References2D.setValues(refs2d, subs); dim->References3D.setValues(objects, subs); - doCommand(Doc, "App.activeDocument().%s.addView(App.activeDocument().%s)", PageName.c_str(), FeatName.c_str()); + doCommand(Doc, + "App.activeDocument().%s.addView(App.activeDocument().%s)", + PageName.c_str(), + FeatName.c_str()); commitCommand(); dim->recomputeFeature(); @@ -1594,17 +1351,14 @@ bool CmdTechDrawLandmarkDimension::isActive() void CreateTechDrawCommandsDims() { - Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); + Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager(); - rcCmdMgr.addCommand(new CmdTechDrawRadialGroup()); rcCmdMgr.addCommand(new CmdTechDrawDimension()); rcCmdMgr.addCommand(new CmdTechDrawRadiusDimension()); rcCmdMgr.addCommand(new CmdTechDrawDiameterDimension()); - rcCmdMgr.addCommand(new CmdTechDrawLinearGroup()); rcCmdMgr.addCommand(new CmdTechDrawLengthDimension()); rcCmdMgr.addCommand(new CmdTechDrawHorizontalDimension()); rcCmdMgr.addCommand(new CmdTechDrawVerticalDimension()); - rcCmdMgr.addCommand(new CmdTechDrawAngularGroup()); rcCmdMgr.addCommand(new CmdTechDrawAngleDimension()); rcCmdMgr.addCommand(new CmdTechDraw3PtAngleDimension()); rcCmdMgr.addCommand(new CmdTechDrawExtentGroup()); @@ -1618,26 +1372,29 @@ void CreateTechDrawCommandsDims() //------------------------------------------------------------------------------ //Common code to build a dimension feature -DrawViewDimension* dimensionMaker(TechDraw::DrawViewPart* dvp, - std::string dimType, - ReferenceVector references2d, - ReferenceVector references3d) +DrawViewDimension* dimensionMaker(TechDraw::DrawViewPart* dvp, std::string dimType, + ReferenceVector references2d, ReferenceVector references3d) { TechDraw::DrawPage* page = dvp->findParentPage(); std::string PageName = page->getNameInDocument(); - TechDraw::DrawViewDimension *dim = nullptr; + TechDraw::DrawViewDimension* dim = nullptr; std::string dimName = dvp->getDocument()->getUniqueObjectName("Dimension"); Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Create Dimension")); - Gui::Command::doCommand(Gui::Command::Doc, "App.activeDocument().addObject('TechDraw::DrawViewDimension', '%s')", dimName.c_str()); - Gui::Command::doCommand(Gui::Command::Doc, "App.activeDocument().%s.Type = '%s'", dimName.c_str() - ,dimType.c_str()); + Gui::Command::doCommand(Gui::Command::Doc, + "App.activeDocument().addObject('TechDraw::DrawViewDimension', '%s')", + dimName.c_str()); + Gui::Command::doCommand( + Gui::Command::Doc, "App.activeDocument().%s.Type = '%s'", dimName.c_str(), dimType.c_str()); - Gui::Command::doCommand(Gui::Command::Doc,"App.activeDocument().%s.MeasureType = '%s'", dimName.c_str(), - "Projected"); + Gui::Command::doCommand(Gui::Command::Doc, + "App.activeDocument().%s.MeasureType = '%s'", + dimName.c_str(), + "Projected"); - dim = dynamic_cast(dvp->getDocument()->getObject(dimName.c_str())); + dim = + dynamic_cast(dvp->getDocument()->getObject(dimName.c_str())); if (!dim) { throw Base::TypeError("CmdTechDrawNewDiameterDimension - dim not found\n"); } @@ -1646,7 +1403,10 @@ DrawViewDimension* dimensionMaker(TechDraw::DrawViewPart* dvp, dim->setReferences2d(references2d); dim->setReferences3d(references3d); - Gui::Command::doCommand(Gui::Command::Doc, "App.activeDocument().%s.addView(App.activeDocument().%s)", PageName.c_str(), dimName.c_str()); + Gui::Command::doCommand(Gui::Command::Doc, + "App.activeDocument().%s.addView(App.activeDocument().%s)", + PageName.c_str(), + dimName.c_str()); Gui::Command::commitCommand(); dim->recomputeFeature(); @@ -1657,7 +1417,7 @@ DrawViewDimension* dimensionMaker(TechDraw::DrawViewPart* dvp, void positionDimText(DrawViewDimension* dim) { TechDraw::pointPair pp = dim->getLinearPoints(); - Base::Vector3d mid = (pp.first() + pp.second())/2.0; + Base::Vector3d mid = (pp.first() + pp.second()) / 2.0; dim->X.setValue(mid.x); double fontSize = Preferences::dimFontSizeMM(); dim->Y.setValue(-mid.y + 0.5 * fontSize); @@ -1668,38 +1428,43 @@ void positionDimText(DrawViewDimension* dim) //! common checks of Selection for Dimension commands //non-empty selection, no more than maxObjs selected and at least 1 DrawingPage exists -bool _checkSelection(Gui::Command* cmd, unsigned maxObjs) { +bool _checkSelection(Gui::Command* cmd, unsigned maxObjs) +{ std::vector selection = cmd->getSelection().getSelectionEx(); if (selection.empty()) { - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Incorrect selection"), QObject::tr("Select an object first")); return false; } const std::vector SubNames = selection[0].getSubNames(); - if (SubNames.size() > maxObjs){ - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("Too many objects selected")); + if (SubNames.size() > maxObjs) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Incorrect selection"), + QObject::tr("Too many objects selected")); return false; } - std::vector pages = cmd->getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); - if (pages.empty()){ - QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Incorrect selection"), - QObject::tr("Create a page first.")); + std::vector pages = + cmd->getDocument()->getObjectsOfType(TechDraw::DrawPage::getClassTypeId()); + if (pages.empty()) { + QMessageBox::warning(Gui::getMainWindow(), + QObject::tr("Incorrect selection"), + QObject::tr("Create a page first.")); return false; } return true; } -bool _checkDrawViewPart(Gui::Command* cmd) { +bool _checkDrawViewPart(Gui::Command* cmd) +{ std::vector selection = cmd->getSelection().getSelectionEx(); for (auto& sel : selection) { - auto dvp = dynamic_cast( sel.getObject() ); - if( dvp ) { + auto dvp = dynamic_cast(sel.getObject()); + if (dvp) { return true; } } return false; } - diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp index 2f2144aa01..f1e4cd3c2e 100644 --- a/src/Mod/TechDraw/Gui/Workbench.cpp +++ b/src/Mod/TechDraw/Gui/Workbench.cpp @@ -24,17 +24,17 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +#include #endif +#include "Workbench.h" #include #include -#include "Workbench.h" using namespace TechDrawGui; -#if 0 // needed for Qt's lupdate utility +#if 0// needed for Qt's lupdate utility qApp->translate("Workbench", "Dimensions"); qApp->translate("Workbench", "Extensions: Attributes/Modifications"); qApp->translate("Workbench", "Extensions: Centerlines/Threading"); @@ -59,12 +59,10 @@ using namespace TechDrawGui; TYPESYSTEM_SOURCE(TechDrawGui::Workbench, Gui::StdWorkbench) Workbench::Workbench() -{ -} +{} Workbench::~Workbench() -{ -} +{} Gui::MenuItem* Workbench::setupMenuBar() const { @@ -242,14 +240,14 @@ Gui::ToolBarItem* Workbench::setupToolBars() const *pages << "TechDraw_RedrawPage"; *pages << "TechDraw_PrintAll"; - Gui::ToolBarItem *views = new Gui::ToolBarItem(root); + Gui::ToolBarItem* views = new Gui::ToolBarItem(root); views->setCommand("TechDraw Views"); *views << "TechDraw_View"; *views << "TechDraw_ActiveView"; *views << "TechDraw_ProjectionGroup"; *views << "TechDraw_SectionGroup"; -// *views << "TechDraw_SectionView"; -// *views << "TechDraw_ComplexSection"; + // *views << "TechDraw_SectionView"; + // *views << "TechDraw_ComplexSection"; *views << "TechDraw_DetailView"; *views << "TechDraw_DraftView"; *views << "TechDraw_ArchView"; @@ -258,104 +256,101 @@ Gui::ToolBarItem* Workbench::setupToolBars() const *views << "TechDraw_ShareView"; *views << "TechDraw_ProjectShape"; - Gui::ToolBarItem *clips = new Gui::ToolBarItem(root); + Gui::ToolBarItem* clips = new Gui::ToolBarItem(root); clips->setCommand("TechDraw Clips"); *clips << "TechDraw_ClipGroup"; *clips << "TechDraw_ClipGroupAdd"; *clips << "TechDraw_ClipGroupRemove"; - Gui::ToolBarItem *stacking = new Gui::ToolBarItem(root); + Gui::ToolBarItem* stacking = new Gui::ToolBarItem(root); stacking->setCommand("TechDraw Stacking"); *stacking << "TechDraw_StackGroup"; - Gui::ToolBarItem *dims = new Gui::ToolBarItem(root); + Gui::ToolBarItem* dims = new Gui::ToolBarItem(root); dims->setCommand("TechDraw Dimensions"); - *dims << "TechDraw_LinearGroup"; -// *dims << "TechDraw_LengthDimension"; -// *dims << "TechDraw_HorizontalDimension"; -// *dims << "TechDraw_VerticalDimension"; - *dims << "TechDraw_RadialGroup"; -// *dims << "TechDraw_RadiusDimension"; -// *dims << "TechDraw_DiameterDimension"; - *dims << "TechDraw_AngularGroup"; -// *dims << "TechDraw_AngleDimension"; -// *dims << "TechDraw_3PtAngleDimension"; + *dims << "TechDraw_LengthDimension"; + *dims << "TechDraw_HorizontalDimension"; + *dims << "TechDraw_VerticalDimension"; + *dims << "TechDraw_RadiusDimension"; + *dims << "TechDraw_DiameterDimension"; + *dims << "TechDraw_AngleDimension"; + *dims << "TechDraw_3PtAngleDimension"; *dims << "TechDraw_ExtentGroup"; -// *dims << "TechDraw_HorizontalExtentDimension"; -// *dims << "TechDraw_VerticalExtentDimension"; + // *dims << "TechDraw_HorizontalExtentDimension"; + // *dims << "TechDraw_VerticalExtentDimension"; *dims << "TechDraw_LinkDimension"; *dims << "TechDraw_Balloon"; *dims << "TechDraw_LandmarkDimension"; -// *dims << "TechDraw_Dimension" + // *dims << "TechDraw_Dimension" *dims << "TechDraw_DimensionRepair"; - Gui::ToolBarItem *extattribs = new Gui::ToolBarItem(root); + Gui::ToolBarItem* extattribs = new Gui::ToolBarItem(root); extattribs->setCommand("TechDraw Attributes"); *extattribs << "TechDraw_ExtensionSelectLineAttributes"; *extattribs << "TechDraw_ExtensionChangeLineAttributes"; *extattribs << "TechDraw_ExtensionExtendShortenLineGroup"; -// *extattribs << "TechDraw_ExtensionExtendLine"; -// *extattribs << "TechDraw_ExtensionShortenLine"; + // *extattribs << "TechDraw_ExtensionExtendLine"; + // *extattribs << "TechDraw_ExtensionShortenLine"; *extattribs << "TechDraw_ExtensionLockUnlockView"; *extattribs << "TechDraw_ExtensionPositionSectionView"; *extattribs << "TechDraw_ExtensionPosChainDimensionGroup"; -// *extattribs << "TechDraw_ExtensionPosHorizChainDimension"; -// *extattribs << "TechDraw_ExtensionPosVertChainDimension"; -// *extattribs << "TechDraw_ExtensionPosObliqueChainDimension"; + // *extattribs << "TechDraw_ExtensionPosHorizChainDimension"; + // *extattribs << "TechDraw_ExtensionPosVertChainDimension"; + // *extattribs << "TechDraw_ExtensionPosObliqueChainDimension"; *extattribs << "TechDraw_ExtensionCascadeDimensionGroup"; -// *extattribs << "TechDraw_ExtensionCascadeHorizDimension"; -// *extattribs << "TechDraw_ExtensionCascadeVertDimension"; -// *extattribs << "TechDraw_ExtensionCascadeObliqueDimension"; + // *extattribs << "TechDraw_ExtensionCascadeHorizDimension"; + // *extattribs << "TechDraw_ExtensionCascadeVertDimension"; + // *extattribs << "TechDraw_ExtensionCascadeObliqueDimension"; *extattribs << "TechDraw_ExtensionAreaAnnotation"; *extattribs << "TechDraw_ExtensionCustomizeFormat"; - Gui::ToolBarItem *extcenter = new Gui::ToolBarItem(root); + Gui::ToolBarItem* extcenter = new Gui::ToolBarItem(root); extcenter->setCommand("TechDraw Centerlines"); *extcenter << "TechDraw_ExtensionCircleCenterLinesGroup"; -// *extcenter << "TechDraw_ExtensionCircleCenterLines"; -// *extcenter << "TechDraw_ExtensionHoleCircle"; + // *extcenter << "TechDraw_ExtensionCircleCenterLines"; + // *extcenter << "TechDraw_ExtensionHoleCircle"; *extcenter << "TechDraw_ExtensionThreadsGroup"; -// *extcenter << "TechDraw_ExtensionThreadHoleSide"; -// *extcenter << "TechDraw_ExtensionThreadHoleBottom"; -// *extcenter << "TechDraw_ExtensionThreadBoltSide"; -// *extcenter << "TechDraw_ExtensionThreadBoltBottom"; + // *extcenter << "TechDraw_ExtensionThreadHoleSide"; + // *extcenter << "TechDraw_ExtensionThreadHoleBottom"; + // *extcenter << "TechDraw_ExtensionThreadBoltSide"; + // *extcenter << "TechDraw_ExtensionThreadBoltBottom"; *extcenter << "TechDraw_ExtensionVertexAtIntersection"; *extcenter << "TechDraw_ExtensionDrawCirclesGroup"; -// *extcenter << "TechDraw_ExtensionDrawCosmCircle"; -// *extcenter << "TechDraw_ExtensionDrawCosmArc"; -// *extcenter << "TechDraw_ExtensionDrawCosmCircle3Points"; + // *extcenter << "TechDraw_ExtensionDrawCosmCircle"; + // *extcenter << "TechDraw_ExtensionDrawCosmArc"; + // *extcenter << "TechDraw_ExtensionDrawCosmCircle3Points"; *extcenter << "TechDraw_ExtensionLinePPGroup"; -// *extcenter << "TechDraw_ExtensionLineParallel"; -// *extcenter << "TechDraw_ExtensionLinePerpendicular"; + // *extcenter << "TechDraw_ExtensionLineParallel"; + // *extcenter << "TechDraw_ExtensionLinePerpendicular"; - Gui::ToolBarItem *extdimensions = new Gui::ToolBarItem(root); + Gui::ToolBarItem* extdimensions = new Gui::ToolBarItem(root); extdimensions->setCommand("TechDraw Extend Dimensions"); *extdimensions << "TechDraw_ExtensionCreateChainDimensionGroup"; -// *extdimensions << "TechDraw_ExtensionCreateHorizChainDimension"; -// *extdimensions << "TechDraw_ExtensionCreateVertChainDimension"; -// *extdimensions << "TechDraw_ExtensionCreateObliqueChainDimension"; + // *extdimensions << "TechDraw_ExtensionCreateHorizChainDimension"; + // *extdimensions << "TechDraw_ExtensionCreateVertChainDimension"; + // *extdimensions << "TechDraw_ExtensionCreateObliqueChainDimension"; *extdimensions << "TechDraw_ExtensionCreateCoordDimensionGroup"; -// *extdimensions << "TechDraw_ExtensionCreateHorizCoordDimension"; -// *extdimensions << "TechDraw_ExtensionCreateVertCoordDimension"; -// *extdimensions << "TechDraw_ExtensionCreateObliqueCoordDimension"; + // *extdimensions << "TechDraw_ExtensionCreateHorizCoordDimension"; + // *extdimensions << "TechDraw_ExtensionCreateVertCoordDimension"; + // *extdimensions << "TechDraw_ExtensionCreateObliqueCoordDimension"; *extdimensions << "TechDraw_ExtensionChamferDimensionGroup"; -// *extdimensions << "TechDraw_ExtensionCreateHorizChamferDimension"; -// *extdimensions << "TechDraw_ExtensionCreateVertChamferDimension"; + // *extdimensions << "TechDraw_ExtensionCreateHorizChamferDimension"; + // *extdimensions << "TechDraw_ExtensionCreateVertChamferDimension"; *extdimensions << "TechDraw_ExtensionCreateLengthArc"; *extdimensions << "TechDraw_ExtensionInsertPrefixGroup"; -// *extdimensions << "TechDraw_ExtensionInsertDiameter"; -// *extdimensions << "TechDraw_ExtensionInsertSquare"; -// *extdimensions << "TechDraw_ExtensionRemovePrefixChar"; + // *extdimensions << "TechDraw_ExtensionInsertDiameter"; + // *extdimensions << "TechDraw_ExtensionInsertSquare"; + // *extdimensions << "TechDraw_ExtensionRemovePrefixChar"; *extdimensions << "TechDraw_ExtensionIncreaseDecreaseGroup"; -// *extdimensions << "TechDraw_ExtensionIncreaseDecimal"; -// *extdimensions << "TechDraw_ExtensionDecreaseDecimal"; + // *extdimensions << "TechDraw_ExtensionIncreaseDecimal"; + // *extdimensions << "TechDraw_ExtensionDecreaseDecimal"; - Gui::ToolBarItem *file = new Gui::ToolBarItem(root); + Gui::ToolBarItem* file = new Gui::ToolBarItem(root); file->setCommand("TechDraw File Access"); *file << "TechDraw_ExportPageSVG"; *file << "TechDraw_ExportPageDXF"; - Gui::ToolBarItem *decor = new Gui::ToolBarItem(root); + Gui::ToolBarItem* decor = new Gui::ToolBarItem(root); decor->setCommand("TechDraw Decoration"); *decor << "TechDraw_Hatch"; *decor << "TechDraw_GeometricHatch"; @@ -363,16 +358,16 @@ Gui::ToolBarItem* Workbench::setupToolBars() const *decor << "TechDraw_Image"; *decor << "TechDraw_ToggleFrame"; - Gui::ToolBarItem *anno = new Gui::ToolBarItem(root); + Gui::ToolBarItem* anno = new Gui::ToolBarItem(root); anno->setCommand("TechDraw Annotation"); *anno << "TechDraw_Annotation"; *anno << "TechDraw_LeaderLine"; *anno << "TechDraw_RichTextAnnotation"; *anno << "TechDraw_CosmeticVertexGroup"; *anno << "TechDraw_CenterLineGroup"; -// *anno << "TechDraw_FaceCenterLine"; -// *anno << "TechDraw_2LineCenterLine"; -// *anno << "TechDraw_2PointCenterLine"; + // *anno << "TechDraw_FaceCenterLine"; + // *anno << "TechDraw_2LineCenterLine"; + // *anno << "TechDraw_2PointCenterLine"; *anno << "TechDraw_2PointCosmeticLine"; *anno << "TechDraw_CosmeticEraser"; *anno << "TechDraw_DecorateLine"; @@ -385,7 +380,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* Workbench::setupCommandBars() const { Gui::ToolBarItem* root = new Gui::ToolBarItem; - Gui::ToolBarItem *pages = new Gui::ToolBarItem(root); + Gui::ToolBarItem* pages = new Gui::ToolBarItem(root); pages->setCommand("TechDraw Pages"); *pages << "TechDraw_PageDefault"; *pages << "TechDraw_PageTemplate"; @@ -393,14 +388,14 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const *pages << "TechDraw_PrintAll"; - Gui::ToolBarItem *views = new Gui::ToolBarItem(root); + Gui::ToolBarItem* views = new Gui::ToolBarItem(root); views->setCommand("Views"); *views << "TechDraw_View"; *views << "TechDraw_ActiveView"; *views << "TechDraw_ProjectionGroup"; *views << "TechDraw_SectionGroup"; -// *views << "TechDraw_SectionView"; -// *views << "TechDraw_ComplexSection"; + // *views << "TechDraw_SectionView"; + // *views << "TechDraw_ComplexSection"; *views << "TechDraw_DetailView"; *views << "TechDraw_DraftView"; *views << "TechDraw_SpreadsheetView"; @@ -409,104 +404,101 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const *views << "TechDraw_ProjectShape"; - Gui::ToolBarItem *clips = new Gui::ToolBarItem(root); + Gui::ToolBarItem* clips = new Gui::ToolBarItem(root); clips->setCommand("TechDraw Clips"); *clips << "TechDraw_ClipGroup"; *clips << "TechDraw_ClipGroupAdd"; *clips << "TechDraw_ClipGroupRemove"; - Gui::ToolBarItem *stacking = new Gui::ToolBarItem(root); + Gui::ToolBarItem* stacking = new Gui::ToolBarItem(root); stacking->setCommand("TechDraw Stacking"); *stacking << "TechDraw_StackGroup"; - Gui::ToolBarItem *dims = new Gui::ToolBarItem(root); + Gui::ToolBarItem* dims = new Gui::ToolBarItem(root); dims->setCommand("TechDraw Dimensions"); - *dims << "TechDraw_LinearGroup"; -// *dims << "TechDraw_LengthDimension"; -// *dims << "TechDraw_HorizontalDimension"; -// *dims << "TechDraw_VerticalDimension"; - *dims << "TechDraw_RadialGroup"; -// *dims << "TechDraw_RadiusDimension"; -// *dims << "TechDraw_DiameterDimension"; - *dims << "TechDraw_AngularGroup"; -// *dims << "TechDraw_AngleDimension"; -// *dims << "TechDraw_3PtAngleDimension"; + *dims << "TechDraw_LengthDimension"; + *dims << "TechDraw_HorizontalDimension"; + *dims << "TechDraw_VerticalDimension"; + *dims << "TechDraw_RadiusDimension"; + *dims << "TechDraw_DiameterDimension"; + *dims << "TechDraw_AngleDimension"; + *dims << "TechDraw_3PtAngleDimension"; *dims << "TechDraw_ExtentGroup"; -// *dims << "TechDraw_HorizontalExtentDimension"; -// *dims << "TechDraw_VerticalExtentDimension"; + // *dims << "TechDraw_HorizontalExtentDimension"; + // *dims << "TechDraw_VerticalExtentDimension"; *dims << "TechDraw_LinkDimension"; *dims << "TechDraw_Balloon"; *dims << "TechDraw_LandmarkDimension"; -// *dims << "TechDraw_Dimension"; + // *dims << "TechDraw_Dimension"; *dims << "TechDraw_DimensionRepair"; - Gui::ToolBarItem *extattribs = new Gui::ToolBarItem(root); + Gui::ToolBarItem* extattribs = new Gui::ToolBarItem(root); extattribs->setCommand("TechDraw Attributes"); *extattribs << "TechDraw_ExtensionSelectLineAttributes"; *extattribs << "TechDraw_ExtensionChangeLineAttributes"; *extattribs << "TechDraw_ExtensionExtendShortenLineGroup"; -// *extattribs << "TechDraw_ExtensionExtendLine"; -// *extattribs << "TechDraw_ExtensionShortenLine"; + // *extattribs << "TechDraw_ExtensionExtendLine"; + // *extattribs << "TechDraw_ExtensionShortenLine"; *extattribs << "TechDraw_ExtensionLockUnlockView"; *extattribs << "TechDraw_ExtensionPositionSectionView"; *extattribs << "TechDraw_ExtensionPosChainDimensionGroup"; -// *extattribs << "TechDraw_ExtensionPosHorizChainDimension"; -// *extattribs << "TechDraw_ExtensionPosVertChainDimension"; -// *extattribs << "TechDraw_ExtensionPosObliqueChainDimension"; + // *extattribs << "TechDraw_ExtensionPosHorizChainDimension"; + // *extattribs << "TechDraw_ExtensionPosVertChainDimension"; + // *extattribs << "TechDraw_ExtensionPosObliqueChainDimension"; *extattribs << "TechDraw_ExtensionCascadeDimensionGroup"; -// *extattribs << "TechDraw_ExtensionCascadeHorizDimension"; -// *extattribs << "TechDraw_ExtensionCascadeVertDimension"; -// *extattribs << "TechDraw_ExtensionCascadeObliqueDimension"; + // *extattribs << "TechDraw_ExtensionCascadeHorizDimension"; + // *extattribs << "TechDraw_ExtensionCascadeVertDimension"; + // *extattribs << "TechDraw_ExtensionCascadeObliqueDimension"; *extattribs << "TechDraw_ExtensionAreaAnnotation"; *extattribs << "TechDraw_ExtensionCustomizeFormat"; - Gui::ToolBarItem *extcenter = new Gui::ToolBarItem(root); + Gui::ToolBarItem* extcenter = new Gui::ToolBarItem(root); extcenter->setCommand("TechDraw Centerlines"); *extcenter << "TechDraw_ExtensionCircleCenterLinesGroup"; -// *extcenter << "TechDraw_ExtensionCircleCenterLines"; -// *extcenter << "TechDraw_ExtensionHoleCircle"; + // *extcenter << "TechDraw_ExtensionCircleCenterLines"; + // *extcenter << "TechDraw_ExtensionHoleCircle"; *extcenter << "TechDraw_ExtensionThreadsGroup"; -// *extcenter << "TechDraw_ExtensionThreadHoleSide"; -// *extcenter << "TechDraw_ExtensionThreadHoleBottom"; -// *extcenter << "TechDraw_ExtensionThreadBoltSide"; -// *extcenter << "TechDraw_ExtensionThreadBoltBottom"; + // *extcenter << "TechDraw_ExtensionThreadHoleSide"; + // *extcenter << "TechDraw_ExtensionThreadHoleBottom"; + // *extcenter << "TechDraw_ExtensionThreadBoltSide"; + // *extcenter << "TechDraw_ExtensionThreadBoltBottom"; *extcenter << "TechDraw_ExtensionVertexAtIntersection"; *extcenter << "TechDraw_ExtensionDrawCirclesGroup"; -// *extcenter << "TechDraw_ExtensionDrawCosmCircle"; -// *extcenter << "TechDraw_ExtensionDrawCosmArc"; -// *extcenter << "TechDraw_ExtensionDrawCosmCircle3Points"; + // *extcenter << "TechDraw_ExtensionDrawCosmCircle"; + // *extcenter << "TechDraw_ExtensionDrawCosmArc"; + // *extcenter << "TechDraw_ExtensionDrawCosmCircle3Points"; *extcenter << "TechDraw_ExtensionLinePPGroup"; -// *extcenter << "TechDraw_ExtensionLineParallel"; -// *extcenter << "TechDraw_ExtensionLinePerpendicular"; + // *extcenter << "TechDraw_ExtensionLineParallel"; + // *extcenter << "TechDraw_ExtensionLinePerpendicular"; - Gui::ToolBarItem *extdimensions = new Gui::ToolBarItem(root); + Gui::ToolBarItem* extdimensions = new Gui::ToolBarItem(root); extdimensions->setCommand("TechDraw Extend Dimensions"); *extdimensions << "TechDraw_ExtensionCreateChainDimensionGroup"; -// *extdimensions << "TechDraw_ExtensionCreateHorizChainDimension"; -// *extdimensions << "TechDraw_ExtensionCreateVertChainDimension"; -// *extdimensions << "TechDraw_ExtensionCreateObliqueChainDimension"; + // *extdimensions << "TechDraw_ExtensionCreateHorizChainDimension"; + // *extdimensions << "TechDraw_ExtensionCreateVertChainDimension"; + // *extdimensions << "TechDraw_ExtensionCreateObliqueChainDimension"; *extdimensions << "TechDraw_ExtensionCreateCoordDimensionGroup"; -// *extdimensions << "TechDraw_ExtensionCreateHorizCoordDimension"; -// *extdimensions << "TechDraw_ExtensionCreateVertCoordDimension"; -// *extdimensions << "TechDraw_ExtensionCreateObliqueCoordDimension"; + // *extdimensions << "TechDraw_ExtensionCreateHorizCoordDimension"; + // *extdimensions << "TechDraw_ExtensionCreateVertCoordDimension"; + // *extdimensions << "TechDraw_ExtensionCreateObliqueCoordDimension"; *extdimensions << "TechDraw_ExtensionChamferDimensionGroup"; -// *extdimensions << "TechDraw_ExtensionCreateHorizChamferDimension"; -// *extdimensions << "TechDraw_ExtensionCreateVertChamferDimension"; + // *extdimensions << "TechDraw_ExtensionCreateHorizChamferDimension"; + // *extdimensions << "TechDraw_ExtensionCreateVertChamferDimension"; *extdimensions << "TechDraw_ExtensionCreateLengthArc"; *extdimensions << "TechDraw_ExtensionInsertPrefixGroup"; -// *extdimensions << "TechDraw_ExtensionInsertDiameter"; -// *extdimensions << "TechDraw_ExtensionInsertSquare"; -// *extdimensions << "TechDraw_ExtensionRemovePrefixChar"; + // *extdimensions << "TechDraw_ExtensionInsertDiameter"; + // *extdimensions << "TechDraw_ExtensionInsertSquare"; + // *extdimensions << "TechDraw_ExtensionRemovePrefixChar"; *extdimensions << "TechDraw_ExtensionIncreaseDecreaseGroup"; -// *extdimensions << "TechDraw_ExtensionIncreaseDecimal"; -// *extdimensions << "TechDraw_ExtensionDecreaseDecimal"; + // *extdimensions << "TechDraw_ExtensionIncreaseDecimal"; + // *extdimensions << "TechDraw_ExtensionDecreaseDecimal"; - Gui::ToolBarItem *file = new Gui::ToolBarItem(root); + Gui::ToolBarItem* file = new Gui::ToolBarItem(root); file->setCommand("TechDraw File Access"); *file << "TechDraw_ExportPageSVG"; *file << "TechDraw_ExportPageDXF"; - Gui::ToolBarItem *decor = new Gui::ToolBarItem(root); + Gui::ToolBarItem* decor = new Gui::ToolBarItem(root); decor->setCommand("TechDraw Decoration"); *decor << "TechDraw_Hatch"; *decor << "TechDraw_GeometricHatch"; @@ -514,16 +506,16 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const *decor << "TechDraw_Image"; *decor << "TechDraw_ToggleFrame"; - Gui::ToolBarItem *anno = new Gui::ToolBarItem(root); + Gui::ToolBarItem* anno = new Gui::ToolBarItem(root); anno->setCommand("TechDraw Annotation"); *anno << "TechDraw_Annotation"; *anno << "TechDraw_LeaderLine"; *anno << "TechDraw_RichTextAnnotation"; *anno << "TechDraw_CosmeticVertexGroup"; *anno << "TechDraw_CenterLineGroup"; -// *anno << "TechDraw_FaceCenterLine"; -// *anno << "TechDraw_2LineCenterLine"; -// *anno << "TechDraw_2PointCenterLine"; + // *anno << "TechDraw_FaceCenterLine"; + // *anno << "TechDraw_2LineCenterLine"; + // *anno << "TechDraw_2PointCenterLine"; *anno << "TechDraw_2PointCosmeticLine"; *anno << "TechDraw_CosmeticEraser"; *anno << "TechDraw_DecorateLine";