diff --git a/src/Mod/TechDraw/App/DimensionFormatter.cpp b/src/Mod/TechDraw/App/DimensionFormatter.cpp index 479058d7c0..2caea690b5 100644 --- a/src/Mod/TechDraw/App/DimensionFormatter.cpp +++ b/src/Mod/TechDraw/App/DimensionFormatter.cpp @@ -30,7 +30,6 @@ #include #include "DimensionFormatter.h" -#include "DrawViewDimension.h" #include "Preferences.h" @@ -392,7 +391,7 @@ std::string DimensionFormatter::getDefaultFormatSpec(bool isToleranceFormat) con //true if value is too small to display using formatSpec bool DimensionFormatter::isTooSmall(double value, QString formatSpec) { - if (DU::fpCompare(value, 0.0)) { + if (TechDraw::DrawUtil::fpCompare(value, 0.0)) { //zero values always fit, so it isn't too small return false; } diff --git a/src/Mod/TechDraw/App/DimensionFormatter.h b/src/Mod/TechDraw/App/DimensionFormatter.h index c0a63341df..e1d26f6e75 100644 --- a/src/Mod/TechDraw/App/DimensionFormatter.h +++ b/src/Mod/TechDraw/App/DimensionFormatter.h @@ -27,6 +27,7 @@ #include + namespace TechDraw { class TechDrawExport DimensionFormatter { diff --git a/src/Mod/TechDraw/App/DimensionGeometry.h b/src/Mod/TechDraw/App/DimensionGeometry.h index 8c2f7615d4..73fe7a10e0 100644 --- a/src/Mod/TechDraw/App/DimensionGeometry.h +++ b/src/Mod/TechDraw/App/DimensionGeometry.h @@ -23,11 +23,11 @@ #ifndef TECHDRAW_DIMENSIONGEOMETRY_h_ #define TECHDRAW_DIMENSIONGEOMETRY_h_ -#include - #include #include +#include + namespace TechDraw { diff --git a/src/Mod/TechDraw/App/DimensionReferences.cpp b/src/Mod/TechDraw/App/DimensionReferences.cpp index c3626b10d0..bfc3d748ac 100644 --- a/src/Mod/TechDraw/App/DimensionReferences.cpp +++ b/src/Mod/TechDraw/App/DimensionReferences.cpp @@ -26,13 +26,11 @@ #endif #include -#include #include #include "DimensionReferences.h" #include "DrawUtil.h" #include "DrawViewPart.h" -#include "Geometry.h" using namespace TechDraw; diff --git a/src/Mod/TechDraw/App/DimensionReferences.h b/src/Mod/TechDraw/App/DimensionReferences.h index 9607e7cbdf..7be437bb5b 100644 --- a/src/Mod/TechDraw/App/DimensionReferences.h +++ b/src/Mod/TechDraw/App/DimensionReferences.h @@ -30,6 +30,7 @@ #include + namespace App { class DocumentObject; diff --git a/src/Mod/TechDraw/App/DrawDimHelper.cpp b/src/Mod/TechDraw/App/DrawDimHelper.cpp index 31ff4988c0..bbeb0fc260 100644 --- a/src/Mod/TechDraw/App/DrawDimHelper.cpp +++ b/src/Mod/TechDraw/App/DrawDimHelper.cpp @@ -42,12 +42,12 @@ #include #include -#include "Cosmetic.h" #include "DrawDimHelper.h" +#include "Cosmetic.h" #include "DrawPage.h" #include "DrawUtil.h" -#include "DrawViewDimExtent.h" #include "DrawViewDimension.h" +#include "DrawViewDimExtent.h" #include "DrawViewPart.h" #include "Geometry.h" #include "GeometryObject.h" diff --git a/src/Mod/TechDraw/App/DrawDimHelper.h b/src/Mod/TechDraw/App/DrawDimHelper.h index aefa33001d..c8d315750f 100644 --- a/src/Mod/TechDraw/App/DrawDimHelper.h +++ b/src/Mod/TechDraw/App/DrawDimHelper.h @@ -23,12 +23,12 @@ #ifndef DrawDimHelper_h_ #define DrawDimHelper_h_ -#include -#include - #include #include +#include +#include + #include #include diff --git a/src/Mod/TechDraw/App/DrawPage.cpp b/src/Mod/TechDraw/App/DrawPage.cpp index bb3ef85393..432a9c4bc3 100644 --- a/src/Mod/TechDraw/App/DrawPage.cpp +++ b/src/Mod/TechDraw/App/DrawPage.cpp @@ -21,11 +21,10 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ -#include -#include -#include +# include + +# include #endif #include @@ -34,7 +33,7 @@ #include #include "DrawPage.h" -#include "DrawPagePy.h"// generated from DrawPagePy.xml +#include "DrawPagePy.h" // generated from DrawPagePy.xml #include "DrawProjGroup.h" #include "DrawTemplate.h" #include "DrawView.h" diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp index ef2fd0a417..6844a7dbb1 100644 --- a/src/Mod/TechDraw/App/DrawUtil.cpp +++ b/src/Mod/TechDraw/App/DrawUtil.cpp @@ -33,6 +33,8 @@ # include # include +# include +# include # include # include # include @@ -42,8 +44,6 @@ # include # include # include -# include -# include # include # include # include diff --git a/src/Mod/TechDraw/App/DrawUtil.h b/src/Mod/TechDraw/App/DrawUtil.h index 0af9da39e0..dec064c824 100644 --- a/src/Mod/TechDraw/App/DrawUtil.h +++ b/src/Mod/TechDraw/App/DrawUtil.h @@ -30,18 +30,18 @@ #include #include -#include -#include -#include -#include -#include -#include #include #include #include #include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index 1b277a5c1f..793203525e 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -22,30 +22,30 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +# include +# include + +# include +# include +# include +# include +# include + +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include #endif #include @@ -56,19 +56,17 @@ #include #include #include -//#include - -#include // generated from DrawViewDimensionPy.xml +#include // generated from DrawViewDimensionPy.xml +#include "DrawViewDimension.h" #include "DimensionFormatter.h" #include "DrawUtil.h" -#include "DrawViewDimension.h" #include "DrawViewPart.h" #include "Geometry.h" #include "Preferences.h" + using namespace TechDraw; -using DU = DrawUtil; //=========================================================================== // DrawViewDimension @@ -613,7 +611,7 @@ pointPair DrawViewDimension::getPointsOneEdge(ReferenceVector references) gp_Pnt gEnd0 = BRep_Tool::Pnt(TopExp::FirstVertex(edge)); gp_Pnt gEnd1 = BRep_Tool::Pnt(TopExp::LastVertex(edge)); - pointPair pts(DU::toVector3d(gEnd0), DU::toVector3d(gEnd1)); + pointPair pts(DrawUtil::toVector3d(gEnd0), DrawUtil::toVector3d(gEnd1)); pts.move(getViewPart()->getOriginalCentroid()); pts.project(getViewPart()); pts.mapToPage(getViewPart()); @@ -688,7 +686,7 @@ pointPair DrawViewDimension::getPointsTwoVerts(ReferenceVector references) gp_Pnt gPoint0 = BRep_Tool::Pnt(vertex0); gp_Pnt gPoint1 = BRep_Tool::Pnt(vertex1); - pointPair pts(DU::toVector3d(gPoint0), DU::toVector3d(gPoint1)); + pointPair pts(DrawUtil::toVector3d(gPoint0), DrawUtil::toVector3d(gPoint1)); pts.move(getViewPart()->getOriginalCentroid()); pts.project(getViewPart()); pts.mapToPage(getViewPart()); @@ -879,22 +877,22 @@ arcPoints DrawViewDimension::arcPointsFromEdge(TopoDS_Edge occEdge) double pLast = adapt.LastParameter(); double pMid = (pFirst + pLast) / 2.0; BRepLProp_CLProps props(adapt, pFirst, 0, Precision::Confusion()); - pts.arcEnds.first(DU::toVector3d(props.Value())); + pts.arcEnds.first(DrawUtil::toVector3d(props.Value())); props.SetParameter(pLast); - pts.arcEnds.second(DU::toVector3d(props.Value())); + pts.arcEnds.second(DrawUtil::toVector3d(props.Value())); props.SetParameter(pMid); - pts.onCurve.first(DU::toVector3d(props.Value())); - pts.midArc = DU::toVector3d(props.Value()); + pts.onCurve.first(DrawUtil::toVector3d(props.Value())); + pts.midArc = DrawUtil::toVector3d(props.Value()); if (adapt.GetType() == GeomAbs_Circle) { gp_Circ circle = adapt.Circle(); - pts.center = DU::toVector3d(circle.Location()); + pts.center = DrawUtil::toVector3d(circle.Location()); pts.radius = circle.Radius(); if (pts.isArc) { //part of circle gp_Ax1 axis = circle.Axis(); - gp_Vec startVec = DU::togp_Vec(pts.arcEnds.first() - pts.center); - gp_Vec endVec = DU::togp_Vec(pts.arcEnds.second() - pts.center); + gp_Vec startVec = DrawUtil::togp_Vec(pts.arcEnds.first() - pts.center); + gp_Vec endVec = DrawUtil::togp_Vec(pts.arcEnds.second() - pts.center); double angle = startVec.AngleWithRef(endVec, axis.Direction().XYZ()); pts.arcCW = (angle < 0.0); } @@ -908,13 +906,13 @@ arcPoints DrawViewDimension::arcPointsFromEdge(TopoDS_Edge occEdge) } else if (adapt.GetType() == GeomAbs_Ellipse) { gp_Elips ellipse = adapt.Ellipse(); - pts.center = DU::toVector3d(ellipse.Location()); + pts.center = DrawUtil::toVector3d(ellipse.Location()); pts.radius = (ellipse.MajorRadius() + ellipse.MinorRadius()) / 2.0; if (pts.isArc) { //part of ellipse gp_Ax1 axis = ellipse.Axis(); - gp_Vec startVec = DU::togp_Vec(pts.arcEnds.first() - pts.center); - gp_Vec endVec = DU::togp_Vec(pts.arcEnds.second() - pts.center); + gp_Vec startVec = DrawUtil::togp_Vec(pts.arcEnds.first() - pts.center); + gp_Vec endVec = DrawUtil::togp_Vec(pts.arcEnds.second() - pts.center); double angle = startVec.AngleWithRef(endVec, axis.Direction().XYZ()); pts.arcCW = (angle < 0.0); } @@ -937,13 +935,13 @@ arcPoints DrawViewDimension::arcPointsFromEdge(TopoDS_Edge occEdge) } gp_Circ circle = adapt.Circle(); //TODO: same code as above. reuse opportunity. - pts.center = DU::toVector3d(circle.Location()); + pts.center = DrawUtil::toVector3d(circle.Location()); pts.radius = circle.Radius(); if (pts.isArc) { //part of circle gp_Ax1 axis = circle.Axis(); - gp_Vec startVec = DU::togp_Vec(pts.arcEnds.first() - pts.center); - gp_Vec endVec = DU::togp_Vec(pts.arcEnds.second() - pts.center); + gp_Vec startVec = DrawUtil::togp_Vec(pts.arcEnds.first() - pts.center); + gp_Vec endVec = DrawUtil::togp_Vec(pts.arcEnds.second() - pts.center); double angle = startVec.AngleWithRef(endVec, axis.Direction().XYZ()); pts.arcCW = (angle < 0.0); } @@ -1016,13 +1014,13 @@ anglePoints DrawViewDimension::getAnglePointsTwoEdges(ReferenceVector references } Base::Vector3d leg0Dir = (generic0->getStartPoint() - generic0->getEndPoint()).Normalize(); Base::Vector3d leg1Dir = (generic1->getStartPoint() - generic1->getEndPoint()).Normalize(); - if (DU::fpCompare(fabs(leg0Dir.Dot(leg1Dir)), 1.0)) { + if (DrawUtil::fpCompare(fabs(leg0Dir.Dot(leg1Dir)), 1.0)) { //legs of the angle are parallel. throw Base::RuntimeError("Can not make angle from parallel edges"); } Base::Vector3d extenPoint0 = farPoint0;//extension line points Base::Vector3d extenPoint1 = farPoint1; - if (DU::fpCompare(fabs(leg0Dir.Dot(leg1Dir)), 0.0)) { + if (DrawUtil::fpCompare(fabs(leg0Dir.Dot(leg1Dir)), 0.0)) { //legs of angle are perpendicular farPoints will do } else { @@ -1069,13 +1067,13 @@ anglePoints DrawViewDimension::getAnglePointsTwoEdges(ReferenceVector references gp_Pnt gEnd1 = BRep_Tool::Pnt(TopExp::LastVertex(edge1)); gp_Vec gDir1(gEnd1.XYZ() - gStart1.XYZ()); Base::Vector3d vApex; - bool haveIntersection = - DU::intersect2Lines3d(DU::toVector3d(gStart0), DU::toVector3d(gDir0), - DU::toVector3d(gStart1), DU::toVector3d(gDir1), vApex); + bool haveIntersection = DrawUtil::intersect2Lines3d( + DrawUtil::toVector3d(gStart0), DrawUtil::toVector3d(gDir0), DrawUtil::toVector3d(gStart1), + DrawUtil::toVector3d(gDir1), vApex); if (!haveIntersection) { throw Base::RuntimeError("Geometry for 3d angle dimension does not intersect"); } - gp_Pnt gApex = DU::togp_Pnt(vApex); + gp_Pnt gApex = DrawUtil::togp_Pnt(vApex); gp_Pnt gFar0 = gEnd0; if (gStart0.Distance(gApex) > gEnd0.Distance(gApex)) { @@ -1086,7 +1084,8 @@ anglePoints DrawViewDimension::getAnglePointsTwoEdges(ReferenceVector references if (gStart1.Distance(gApex) > gEnd1.Distance(gApex)) { gFar1 = gStart1; } - anglePoints pts(DU::toVector3d(gApex), DU::toVector3d(gFar0), DU::toVector3d(gFar1)); + anglePoints pts(DrawUtil::toVector3d(gApex), DrawUtil::toVector3d(gFar0), + DrawUtil::toVector3d(gFar1)); pts.move(getViewPart()->getOriginalCentroid()); pts.project(getViewPart()); pts.mapToPage(getViewPart()); @@ -1133,7 +1132,8 @@ anglePoints DrawViewDimension::getAnglePointsThreeVerts(ReferenceVector referenc gp_Pnt point1 = BRep_Tool::Pnt(vertex1); TopoDS_Vertex vertex2 = TopoDS::Vertex(geometry2); gp_Pnt point2 = BRep_Tool::Pnt(vertex2); - anglePoints pts(DU::toVector3d(point1), DU::toVector3d(point0), DU::toVector3d(point2)); + anglePoints pts(DrawUtil::toVector3d(point1), DrawUtil::toVector3d(point0), + DrawUtil::toVector3d(point2)); pts.move(getViewPart()->getOriginalCentroid()); pts.project(getViewPart()); pts.mapToPage(getViewPart()); diff --git a/src/Mod/TechDraw/App/DrawViewDimension.h b/src/Mod/TechDraw/App/DrawViewDimension.h index 7d50658644..bdd3c29a1b 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.h +++ b/src/Mod/TechDraw/App/DrawViewDimension.h @@ -25,21 +25,17 @@ #include -#include - #include #include #include -#include "DrawViewPart.h" #include "DimensionGeometry.h" #include "DimensionReferences.h" - -#include "Geometry.h" -#include "DrawView.h" #include "DrawUtil.h" +#include "DrawView.h" +#include "DrawViewPart.h" + -using DU = TechDraw::DrawUtil; class TopoDS_Shape; namespace Measure { diff --git a/src/Mod/TechDraw/App/DrawViewSymbol.cpp b/src/Mod/TechDraw/App/DrawViewSymbol.cpp index 288aebf75d..90dc8aa606 100644 --- a/src/Mod/TechDraw/App/DrawViewSymbol.cpp +++ b/src/Mod/TechDraw/App/DrawViewSymbol.cpp @@ -33,7 +33,7 @@ #include #include "DrawViewSymbol.h" -#include "DrawViewSymbolPy.h"// generated from DrawViewSymbolPy.xml +#include "DrawViewSymbolPy.h" // generated from DrawViewSymbolPy.xml #include "DrawPage.h" #include "DrawUtil.h" diff --git a/src/Mod/TechDraw/App/Preferences.cpp b/src/Mod/TechDraw/App/Preferences.cpp index 429b31e1a1..e0d6f41a22 100644 --- a/src/Mod/TechDraw/App/Preferences.cpp +++ b/src/Mod/TechDraw/App/Preferences.cpp @@ -21,10 +21,10 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ -#include -#include +# include + +# include #endif #include diff --git a/src/Mod/TechDraw/App/Preferences.h b/src/Mod/TechDraw/App/Preferences.h index 81c68d95bf..f3ba116acb 100644 --- a/src/Mod/TechDraw/App/Preferences.h +++ b/src/Mod/TechDraw/App/Preferences.h @@ -28,8 +28,8 @@ #include -class QString; class QColor; +class QString; namespace App { diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp index b6848f01e4..e395d1df23 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp @@ -45,25 +45,25 @@ #include "ViewProviderCosmeticExtension.h" #include "ViewProviderDimension.h" #include "ViewProviderDrawingView.h" +#include "ViewProviderDrawingViewExtension.h" #include "ViewProviderGeomHatch.h" #include "ViewProviderHatch.h" #include "ViewProviderImage.h" #include "ViewProviderLeader.h" #include "ViewProviderPage.h" +#include "ViewProviderPageExtension.h" #include "ViewProviderProjGroup.h" #include "ViewProviderProjGroupItem.h" #include "ViewProviderRichAnno.h" #include "ViewProviderSpreadsheet.h" #include "ViewProviderSymbol.h" #include "ViewProviderTemplate.h" +#include "ViewProviderTemplateExtension.h" #include "ViewProviderTile.h" #include "ViewProviderViewClip.h" #include "ViewProviderViewPart.h" #include "ViewProviderViewSection.h" #include "ViewProviderWeld.h" -#include "ViewProviderPageExtension.h" -#include "ViewProviderDrawingViewExtension.h" -#include "ViewProviderTemplateExtension.h" #include "Workbench.h" diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp index 7aa067cc8e..2772caf3fb 100644 --- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp +++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp @@ -23,16 +23,15 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include -#include -#include -#include -#include +# include +# include + +# include +# include #endif //#ifndef _PreComp_ #include #include -#include #include #include #include @@ -43,7 +42,6 @@ #include #include #include - #include #include #include @@ -53,10 +51,11 @@ #include #include -#include "DrawGuiUtil.h" -#include "TaskLinkDim.h" -#include "TaskDimRepair.h" #include "DimensionValidators.h" +#include "DrawGuiUtil.h" +#include "TaskDimRepair.h" +#include "TaskLinkDim.h" + using namespace TechDrawGui; using namespace TechDraw; diff --git a/src/Mod/TechDraw/Gui/DimensionValidators.cpp b/src/Mod/TechDraw/Gui/DimensionValidators.cpp index 7b81eeb6a8..89d4164d25 100644 --- a/src/Mod/TechDraw/Gui/DimensionValidators.cpp +++ b/src/Mod/TechDraw/Gui/DimensionValidators.cpp @@ -28,15 +28,10 @@ #endif //#ifndef _PreComp_ #include -#include #include #include - -#include -#include #include #include -#include #include "DimensionValidators.h" @@ -185,7 +180,6 @@ DimensionGeometryType TechDraw::validateDimSelection3d( std::vector minimumCounts, //how many of each geometry are needed for a good dimension std::vector acceptableDimensionGeometrys)//isVertical, isHorizontal, ... { - // Base::Console().Message("DV::validateDimSelection3d() - references: %d\n", references.size()); StringVector subNames; for (auto& ref : references) { if (!ref.getSubName().empty()) { @@ -226,7 +220,6 @@ DimensionGeometryType TechDraw::validateDimSelection3d( bool TechDraw::validateSubnameList(StringVector subNames, GeometrySet acceptableGeometrySet) { -// Base::Console().Message("DV::validateSubNameList()\n"); for (auto& sub : subNames) { std::string geometryType = DrawUtil::getGeomTypeFromName(sub); if (acceptableGeometrySet.count(geometryType) == 0) { @@ -241,7 +234,6 @@ bool TechDraw::validateSubnameList(StringVector subNames, bool TechDraw::checkGeometryOccurences(StringVector subNames, GeomCountMap keyedMinimumCounts) { -// Base::Console().Message("DV::checkGeometryOccurences() - subNames: %d\n", subNames.size()); //how many of each geometry descriptor are input GeomCountMap foundCounts; for (auto& sub : subNames) { @@ -618,7 +610,6 @@ DimensionGeometryType TechDraw::isValidVertexes(ReferenceVector refs) //! verify that the vertex references can make a dimension DimensionGeometryType TechDraw::isValidVertexes3d(DrawViewPart *dvp, ReferenceVector refs) { -// Base::Console().Message("DV::isValidVertexes3d() - refs: %d\n", refs.size()); (void) dvp; if (refs.size() == 2) { //2 vertices can only make a distance dimension diff --git a/src/Mod/TechDraw/Gui/DlgStringListEditor.cpp b/src/Mod/TechDraw/Gui/DlgStringListEditor.cpp index f7f7660303..5e4907ef4e 100644 --- a/src/Mod/TechDraw/Gui/DlgStringListEditor.cpp +++ b/src/Mod/TechDraw/Gui/DlgStringListEditor.cpp @@ -22,16 +22,15 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include -#include +# include #endif -#include // for FC_LOG_LEVEL_INIT #include #include "DlgStringListEditor.h" #include "ui_DlgStringListEditor.h" + using namespace TechDrawGui; /* TRANSLATOR Gui::DlgStringListEditor */ diff --git a/src/Mod/TechDraw/Gui/DlgStringListEditor.h b/src/Mod/TechDraw/Gui/DlgStringListEditor.h index e8b53e384c..eadc48da90 100644 --- a/src/Mod/TechDraw/Gui/DlgStringListEditor.h +++ b/src/Mod/TechDraw/Gui/DlgStringListEditor.h @@ -19,6 +19,7 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ****************************************************************************/ + #ifndef GUI_DLGEDITABLETEXT_H #define GUI_DLGEDITABLETEXT_H @@ -26,6 +27,7 @@ #include + class QListWidgetItem; namespace TechDrawGui { diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp index bf9748787a..755706210d 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp @@ -22,13 +22,13 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include +# include -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include #endif #include @@ -37,10 +37,10 @@ #include #include +#include "QGILeaderLine.h" #include "PreferencesGui.h" #include "QGEPath.h" #include "QGIArrow.h" -#include "QGILeaderLine.h" #include "QGIPrimPath.h" #include "Rez.h" #include "ViewProviderLeader.h" diff --git a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp index 30a002b511..2cdf7f8bca 100644 --- a/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp +++ b/src/Mod/TechDraw/Gui/QGISVGTemplate.cpp @@ -21,7 +21,6 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ # include # include @@ -42,13 +41,14 @@ #include #include -#include "PreferencesGui.h" #include "QGISVGTemplate.h" +#include "PreferencesGui.h" #include "QGSPage.h" #include "Rez.h" #include "TemplateTextField.h" #include "ZVALUE.h" + using namespace TechDrawGui; using namespace TechDraw; diff --git a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp index bbe175913a..45410438c1 100644 --- a/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewBalloon.cpp @@ -23,15 +23,15 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include -#include +# include +# include -#include -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include +# include #endif #include @@ -46,10 +46,10 @@ #include #include +#include "QGIViewBalloon.h" #include "PreferencesGui.h" #include "QGIArrow.h" #include "QGIDimLines.h" -#include "QGIViewBalloon.h" #include "Rez.h" #include "ViewProviderBalloon.h" #include "ViewProviderViewPart.h" diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index 55692812d3..a4040133ed 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -23,37 +23,35 @@ #include "PreCompiled.h" #ifdef FC_OS_WIN32 -#define _USE_MATH_DEFINES//re Windows & M_PI issues +# define _USE_MATH_DEFINES //resolves Windows & M_PI issues #endif #ifndef _PreComp_ -#include +# include -#include -#include -#include -#include -#include -#include +# include +# include +# include +# include +# include +# include #endif #include - #include #include #include #include - #include #include #include #include +#include "QGIViewDimension.h" #include "PreferencesGui.h" #include "QGIArrow.h" #include "QGIDimLines.h" #include "QGIVertex.h" -#include "QGIViewDimension.h" #include "ViewProviderDimension.h" #include "ZVALUE.h" diff --git a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp index b466c946a7..af1fa299e7 100644 --- a/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewSymbol.cpp @@ -27,7 +27,6 @@ # include # include -# include # include # include #endif @@ -37,10 +36,10 @@ #include #include +#include "QGIViewSymbol.h" #include "PreferencesGui.h" #include "QGCustomSvg.h" #include "QGDisplayArea.h" -#include "QGIViewSymbol.h" #include "Rez.h" diff --git a/src/Mod/TechDraw/Gui/TaskDimRepair.cpp b/src/Mod/TechDraw/Gui/TaskDimRepair.cpp index 1df8552118..4cdbc43ad0 100644 --- a/src/Mod/TechDraw/Gui/TaskDimRepair.cpp +++ b/src/Mod/TechDraw/Gui/TaskDimRepair.cpp @@ -22,32 +22,25 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +# include +# include # include # include #endif // #ifndef _PreComp_ -#include #include -#include -#include #include -#include -#include #include #include -#include #include #include -#include #include #include -#include -#include "DimensionValidators.h" -#include "ui_TaskDimRepair.h" #include "TaskDimRepair.h" +#include "ui_TaskDimRepair.h" +#include "DimensionValidators.h" using namespace Gui; @@ -126,7 +119,6 @@ void TaskDimRepair::saveDimState() //restore the start conditions void TaskDimRepair::restoreDimState() { -// Base::Console().Message("TDR::restoreDimState()\n"); if (m_dim) { m_dim->setReferences2d(m_saveRefs2d); m_dim->setReferences3d(m_saveRefs3d); @@ -137,7 +129,6 @@ void TaskDimRepair::restoreDimState() //use the current selection to replace the references in dim void TaskDimRepair::slotUseSelection() { -// Base::Console().Message("TDR::slotUseSelection()\n"); const std::vector dimObjects = Gui::Selection().getObjectsOfType(TechDraw::DrawViewDimension::getClassTypeId()); if (dimObjects.empty()) { //selection does not include a dimension, so we need to add our dimension to keep the @@ -200,7 +191,6 @@ void TaskDimRepair::slotUseSelection() void TaskDimRepair::updateUi() { -// Base::Console().Message("TDR::updateUi()\n"); std::string objName = m_dim->getViewPart()->getNameInDocument(); std::string objLabel = m_dim->getViewPart()->Label.getValue(); ui->leObject2d->setText(Base::Tools::fromStdString(objName + " / " + objLabel)); @@ -216,7 +206,6 @@ void TaskDimRepair::updateUi() void TaskDimRepair::loadTableWidget(QTableWidget* tw, ReferenceVector refs) { -// Base::Console().Message("TDR::loadTableWidget() - refs: %d\n", refs.size()); tw->clearContents(); tw->setRowCount(refs.size() + 1); size_t iRow = 0; @@ -257,7 +246,6 @@ void TaskDimRepair::fillList(QListWidget* lwItems, std::vector labe } void TaskDimRepair::replaceReferences() { -// Base::Console().Message("TDR::replaceReferences() - refs2d: %d refs3d %d\n", m_references2d.size(), m_references3d.size()); if (!m_dim) { return; } @@ -271,7 +259,6 @@ void TaskDimRepair::replaceReferences() bool TaskDimRepair::accept() { -// Base::Console().Message("TDR::accept()\n"); Gui::Command::doCommand(Gui::Command::Gui, "Gui.ActiveDocument.resetEdit()"); replaceReferences(); m_dim->Type.setValue(m_dimType); @@ -281,7 +268,6 @@ bool TaskDimRepair::accept() bool TaskDimRepair::reject() { -// Base::Console().Message("TDR::reject()\n"); restoreDimState(); Gui::Command::doCommand(Gui::Command::Gui, "Gui.ActiveDocument.resetEdit()"); return false; diff --git a/src/Mod/TechDraw/Gui/TaskDimRepair.h b/src/Mod/TechDraw/Gui/TaskDimRepair.h index 308f8aae02..7ff88f34bf 100644 --- a/src/Mod/TechDraw/Gui/TaskDimRepair.h +++ b/src/Mod/TechDraw/Gui/TaskDimRepair.h @@ -23,14 +23,13 @@ #ifndef TECHDRAW_TASKDIMREPAIR_H #define TECHDRAW_TASKDIMREPAIR_H -#include +#include +#include #include #include - +#include #include -#include -#include class Ui_TaskDimRepair; diff --git a/src/Mod/TechDraw/Gui/ViewProviderDimension.h b/src/Mod/TechDraw/Gui/ViewProviderDimension.h index ef3f96882f..783c16943a 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDimension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDimension.h @@ -24,14 +24,13 @@ #ifndef DRAWINGGUI_VIEWPROVIDERDIMENSION_H #define DRAWINGGUI_VIEWPROVIDERDIMENSION_H -#include - #include - +#include #include #include "ViewProviderDrawingView.h" + namespace TechDrawGui { class TechDrawGuiExport ViewProviderDimension : public ViewProviderDrawingView diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp index 43812e91dc..991ca34d12 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.cpp @@ -21,16 +21,8 @@ ***************************************************************************/ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif #include -#include -#include -#include -#include -#include #include "ViewProviderDrawingViewExtension.h" #include "ViewProviderDrawingView.h" diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h index b8ab12d42e..e00f5505fb 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingViewExtension.h @@ -24,7 +24,6 @@ #define TECHDRAWGUI_VIEWPROVIDERDRAWINGVIEWEXTENSION_H #include -#include #include #include diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index f840da4565..c96d9837c5 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -53,12 +53,12 @@ #include #include +#include "ViewProviderPage.h" #include "MDIViewPage.h" #include "PreferencesGui.h" #include "QGITemplate.h" #include "QGSPage.h" #include "QGVPage.h" -#include "ViewProviderPage.h" #include "ViewProviderPageExtension.h" #include "ViewProviderTemplate.h" @@ -451,7 +451,6 @@ void ViewProviderPage::setFrameState(bool state) { ShowFrames.setValue(state); } void ViewProviderPage::toggleFrameState() { - // Base::Console().Message("VPP::toggleFrameState()\n"); if (m_graphicsScene) { setFrameState(!getFrameState()); m_graphicsScene->refreshViews(); @@ -461,7 +460,6 @@ void ViewProviderPage::toggleFrameState() void ViewProviderPage::setTemplateMarkers(bool state) { - // Base::Console().Message("VPP::setTemplateMarkers(%d)\n", state); App::DocumentObject* templateFeat = nullptr; templateFeat = getDrawPage()->Template.getValue(); Gui::Document* guiDoc = Gui::Application::Instance->getDocument(templateFeat->getDocument()); diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index f8649fe42c..c00df10c17 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -24,16 +24,18 @@ #ifndef DRAWINGGUI_VIEWPROVIDERPAGE_H #define DRAWINGGUI_VIEWPROVIDERPAGE_H -#include - #include #include + #include #include #include +#include + #include + namespace TechDraw { class DrawPage; diff --git a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp index 68050fc046..5cf0e88bbb 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.cpp @@ -21,14 +21,8 @@ ***************************************************************************/ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif -#include #include -#include -#include #include #include #include diff --git a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h index 5cf0d7d83e..755e986a1c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPageExtension.h @@ -24,7 +24,6 @@ #define TECHDRAWGUI_VIEWPROVIDERPAGEEXTENSION_H #include -#include #include #include diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp index 8f13650297..bebdf0cb31 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.cpp @@ -21,19 +21,10 @@ ***************************************************************************/ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif -#include #include -#include -#include -#include -#include #include "ViewProviderTemplateExtension.h" -#include "ViewProviderPage.h" #include "ViewProviderTemplate.h" diff --git a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h index e690b46ee9..6dbf02684d 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h +++ b/src/Mod/TechDraw/Gui/ViewProviderTemplateExtension.h @@ -24,7 +24,6 @@ #define TECHDRAWGUI_VIEWPROVIDERTEMPLATEEXTENSION_H #include -#include #include #include