From 98baf57e185604f29c14b795a986a2301be2a131 Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Wed, 22 Feb 2017 22:38:29 +0100 Subject: [PATCH] Sketcher: Elements widget external geometry identification fix --- src/Mod/Sketcher/Gui/TaskSketcherElements.cpp | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index 242b6ca67e..7df2d79156 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -768,6 +768,23 @@ void TaskSketcherElements::slotElementsChanged(void) (type == Part::GeomArcOfCircle::getClassTypeId() && element==3) ? Sketcher_Element_Arc_MidPoint : (type == Part::GeomCircle::getClassTypeId() && element==0) ? Sketcher_Element_Circle_Edge : (type == Part::GeomCircle::getClassTypeId() && element==3) ? Sketcher_Element_Circle_MidPoint : + (type == Part::GeomEllipse::getClassTypeId() && element==0) ? Sketcher_Element_Ellipse_Edge : + (type == Part::GeomEllipse::getClassTypeId() && element==3) ? Sketcher_Element_Ellipse_MidPoint : + (type == Part::GeomArcOfEllipse::getClassTypeId() && element==0) ? Sketcher_Element_ArcOfEllipse_Edge : + (type == Part::GeomArcOfEllipse::getClassTypeId() && element==1) ? Sketcher_Element_ArcOfEllipse_StartingPoint : + (type == Part::GeomArcOfEllipse::getClassTypeId() && element==2) ? Sketcher_Element_ArcOfEllipse_EndPoint : + (type == Part::GeomArcOfEllipse::getClassTypeId() && element==3) ? Sketcher_Element_ArcOfEllipse_MidPoint : + (type == Part::GeomArcOfHyperbola::getClassTypeId() && element==0) ? Sketcher_Element_ArcOfHyperbola_Edge : + (type == Part::GeomArcOfHyperbola::getClassTypeId() && element==1) ? Sketcher_Element_ArcOfHyperbola_StartingPoint : + (type == Part::GeomArcOfHyperbola::getClassTypeId() && element==2) ? Sketcher_Element_ArcOfHyperbola_EndPoint : + (type == Part::GeomArcOfHyperbola::getClassTypeId() && element==3) ? Sketcher_Element_ArcOfHyperbola_MidPoint : + (type == Part::GeomArcOfParabola::getClassTypeId() && element==0) ? Sketcher_Element_ArcOfParabola_Edge : + (type == Part::GeomArcOfParabola::getClassTypeId() && element==1) ? Sketcher_Element_ArcOfParabola_StartingPoint : + (type == Part::GeomArcOfParabola::getClassTypeId() && element==2) ? Sketcher_Element_ArcOfParabola_EndPoint : + (type == Part::GeomArcOfParabola::getClassTypeId() && element==3) ? Sketcher_Element_ArcOfParabola_MidPoint : + (type == Part::GeomBSplineCurve::getClassTypeId() && element==0) ? Sketcher_Element_BSpline_Edge : + (type == Part::GeomBSplineCurve::getClassTypeId() && element==1) ? Sketcher_Element_BSpline_StartingPoint : + (type == Part::GeomBSplineCurve::getClassTypeId() && element==2) ? Sketcher_Element_BSpline_EndPoint : none, type == Part::GeomPoint::getClassTypeId() ? ( isNamingBoxChecked ? (tr("Point") + QString::fromLatin1("(ExternalEdge%1)").arg(j-2)): @@ -781,6 +798,21 @@ void TaskSketcherElements::slotElementsChanged(void) type == Part::GeomCircle::getClassTypeId() ? ( isNamingBoxChecked ? (tr("Circle") + QString::fromLatin1("(ExternalEdge%1)").arg(j-2)): (QString::fromLatin1("%1-").arg(i)+tr("Circle"))) : + type == Part::GeomEllipse::getClassTypeId() ? ( isNamingBoxChecked ? + (tr("Ellipse") + QString::fromLatin1("(ExternalEdge%1)").arg(j-2)): + (QString::fromLatin1("%1-").arg(i)+tr("Ellipse"))) : + type == Part::GeomArcOfEllipse::getClassTypeId() ? ( isNamingBoxChecked ? + (tr("Elliptical Arc") + QString::fromLatin1("(ExternalEdge%1)").arg(j-2)): + (QString::fromLatin1("%1-").arg(i)+tr("Elliptical Arc"))) : + type == Part::GeomArcOfHyperbola::getClassTypeId() ? ( isNamingBoxChecked ? + (tr("Hyperbolic Arc") + QString::fromLatin1("(ExternalEdge%1)").arg(j-2)): + (QString::fromLatin1("%1-").arg(i)+tr("Hyperbolic Arc"))) : + type == Part::GeomArcOfParabola::getClassTypeId() ? ( isNamingBoxChecked ? + (tr("Parabolic Arc") + QString::fromLatin1("(ExternalEdge%1)").arg(j-2)): + (QString::fromLatin1("%1-").arg(i)+tr("Parabolic Arc"))) : + type == Part::GeomBSplineCurve::getClassTypeId() ? ( isNamingBoxChecked ? + (tr("BSpline") + QString::fromLatin1("(ExternalEdge%1)").arg(j-2)): + (QString::fromLatin1("%1-").arg(i)+tr("BSpline"))) : ( isNamingBoxChecked ? (tr("Other") + QString::fromLatin1("(ExternalEdge%1)").arg(j-2)): (QString::fromLatin1("%1-").arg(i)+tr("Other"))),