diff --git a/src/Mod/TechDraw/Gui/QGIEdge.cpp b/src/Mod/TechDraw/Gui/QGIEdge.cpp index ef198f2520..dabdf7b85b 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.cpp +++ b/src/Mod/TechDraw/Gui/QGIEdge.cpp @@ -60,7 +60,6 @@ QGIEdge::QGIEdge(int index) : // not FreeCAD cosmetic lines void QGIEdge::setCosmetic(bool state) { -// Base::Console().Message("QGIE::setCosmetic(%d)\n", state); isCosmetic = state; if (state) { setWidth(0.0); @@ -69,15 +68,9 @@ void QGIEdge::setCosmetic(bool state) void QGIEdge::setHiddenEdge(bool b) { isHiddenEdge = b; - if (b) { - m_pen.setStyle(getHiddenStyle()); - } else { - m_pen.setStyle(Qt::SolidLine); - } } void QGIEdge::setPrettyNormal() { -// Base::Console().Message("QGIE::setPrettyNormal()\n"); if (isHiddenEdge) { m_pen.setColor(getHiddenColor()); return; @@ -91,14 +84,6 @@ QColor QGIEdge::getHiddenColor() return PreferencesGui::getAccessibleQColor(fcColor.asValue()); } -Qt::PenStyle QGIEdge::getHiddenStyle() -{ - //Qt::PenStyle - NoPen, Solid, Dashed, ... - //Preferences::General - Solid, Dashed - // Dashed lines should use ISO Line #2 instead of Qt::DashedLine - Qt::PenStyle hidStyle = static_cast (Preferences::getPreferenceGroup("General")->GetInt("HiddenLine", 0) + 1); - return hidStyle; -} double QGIEdge::getEdgeFuzz() const { @@ -123,16 +108,17 @@ QPainterPath QGIEdge::shape() const void QGIEdge::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { Q_UNUSED(event) - QGIView *parent = dynamic_cast(parentItem()); + auto* parent = dynamic_cast(parentItem()); if (parent && parent->getViewObject() && parent->getViewObject()->isDerivedFrom()) { - TechDraw::DrawViewPart *baseFeat = static_cast(parent->getViewObject()); + auto* baseFeat = static_cast(parent->getViewObject()); std::vector edgeName(1, DrawUtil::makeGeomName("Edge", getProjIndex())); Gui::Control().showDialog(new TaskDlgLineDecor(baseFeat, edgeName)); } } -void QGIEdge::setLinePen(QPen linePen) +void QGIEdge::setLinePen(const QPen& linePen) { m_pen = linePen; } + diff --git a/src/Mod/TechDraw/Gui/QGIEdge.h b/src/Mod/TechDraw/Gui/QGIEdge.h index 2d662a1e26..543458ce19 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.h +++ b/src/Mod/TechDraw/Gui/QGIEdge.h @@ -47,14 +47,14 @@ public: void setCosmetic(bool state); void setHiddenEdge(bool b); - bool getHiddenEdge() { return(isHiddenEdge); } + bool getHiddenEdge() const { return(isHiddenEdge); } void setSmoothEdge(bool b) { isSmoothEdge = b; } - bool getSmoothEdge() { return(isSmoothEdge); } + bool getSmoothEdge() const { return(isSmoothEdge); } void setPrettyNormal() override; double getEdgeFuzz() const; - void setLinePen(QPen isoPen); + void setLinePen(const QPen& isoPen); void setSource(TechDraw::SourceType source) { m_source = source; } TechDraw::SourceType getSource() const { return m_source;} @@ -65,15 +65,15 @@ protected: bool multiselectEligible() override { return true; } + QColor getHiddenColor(); + +private: int projIndex; //index of edge in Projection. must exist. bool isCosmetic; bool isHiddenEdge; bool isSmoothEdge; - QColor getHiddenColor(); - Qt::PenStyle getHiddenStyle(); -private: TechDraw::SourceType m_source{TechDraw::SourceType::GEOMETRY}; };