From 10c9ace112e9cfa972e21a0fab2edf9e4d0eb93d Mon Sep 17 00:00:00 2001 From: Abdullah Tahiri Date: Sun, 16 Apr 2017 23:43:58 +0200 Subject: [PATCH] Sketcher: Elements Widget add construction information --- src/Mod/Sketcher/Gui/TaskSketcherElements.cpp | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index a74896bba6..3c0b678445 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -686,7 +686,8 @@ void TaskSketcherElements::slotElementsChanged(void) int i=1; for(std::vector< Part::Geometry * >::const_iterator it= vals.begin();it!=vals.end();++it,++i){ - Base::Type type = (*it)->getTypeId(); + Base::Type type = (*it)->getTypeId(); + bool construction = (*it)->Construction; ui->listWidgetElements->addItem(new ElementItem( (type == Part::GeomPoint::getClassTypeId() && element==1) ? Sketcher_Element_Point_StartingPoint : @@ -721,31 +722,40 @@ void TaskSketcherElements::slotElementsChanged(void) (tr("Point") + QString::fromLatin1("(Edge%1)").arg(i)): (QString::fromLatin1("%1-").arg(i)+tr("Point"))) : type == Part::GeomLineSegment::getClassTypeId() ? ( isNamingBoxChecked ? - (tr("Line") + QString::fromLatin1("(Edge%1)").arg(i)): + (tr("Line") + QString::fromLatin1("(Edge%1)").arg(i)) + + (construction?(QString::fromLatin1("-")+tr("Construction")):QString::fromLatin1("")): (QString::fromLatin1("%1-").arg(i)+tr("Line"))) : type == Part::GeomArcOfCircle::getClassTypeId() ? ( isNamingBoxChecked ? - (tr("Arc") + QString::fromLatin1("(Edge%1)").arg(i)): + (tr("Arc") + QString::fromLatin1("(Edge%1)").arg(i)) + + (construction?(QString::fromLatin1("-")+tr("Construction")):QString::fromLatin1("")): (QString::fromLatin1("%1-").arg(i)+tr("Arc"))) : type == Part::GeomCircle::getClassTypeId() ? ( isNamingBoxChecked ? - (tr("Circle") + QString::fromLatin1("(Edge%1)").arg(i)): + (tr("Circle") + QString::fromLatin1("(Edge%1)").arg(i)) + + (construction?(QString::fromLatin1("-")+tr("Construction")):QString::fromLatin1("")): (QString::fromLatin1("%1-").arg(i)+tr("Circle"))) : type == Part::GeomEllipse::getClassTypeId() ? ( isNamingBoxChecked ? - (tr("Ellipse") + QString::fromLatin1("(Edge%1)").arg(i)): + (tr("Ellipse") + QString::fromLatin1("(Edge%1)").arg(i)) + + (construction?(QString::fromLatin1("-")+tr("Construction")):QString::fromLatin1("")): (QString::fromLatin1("%1-").arg(i)+tr("Ellipse"))) : type == Part::GeomArcOfEllipse::getClassTypeId() ? ( isNamingBoxChecked ? - (tr("Elliptical Arc") + QString::fromLatin1("(Edge%1)").arg(i)): + (tr("Elliptical Arc") + QString::fromLatin1("(Edge%1)").arg(i)) + + (construction?(QString::fromLatin1("-")+tr("Construction")):QString::fromLatin1("")): (QString::fromLatin1("%1-").arg(i)+tr("Elliptical Arc"))) : type == Part::GeomArcOfHyperbola::getClassTypeId() ? ( isNamingBoxChecked ? - (tr("Hyperbolic Arc") + QString::fromLatin1("(Edge%1)").arg(i)): + (tr("Hyperbolic Arc") + QString::fromLatin1("(Edge%1)").arg(i)) + + (construction?(QString::fromLatin1("-")+tr("Construction")):QString::fromLatin1("")): (QString::fromLatin1("%1-").arg(i)+tr("Hyperbolic Arc"))) : type == Part::GeomArcOfParabola::getClassTypeId() ? ( isNamingBoxChecked ? - (tr("Parabolic Arc") + QString::fromLatin1("(Edge%1)").arg(i)): + (tr("Parabolic Arc") + QString::fromLatin1("(Edge%1)").arg(i)) + + (construction?(QString::fromLatin1("-")+tr("Construction")):QString::fromLatin1("")): (QString::fromLatin1("%1-").arg(i)+tr("Parabolic Arc"))) : type == Part::GeomBSplineCurve::getClassTypeId() ? ( isNamingBoxChecked ? - (tr("BSpline") + QString::fromLatin1("(Edge%1)").arg(i)): + (tr("BSpline") + QString::fromLatin1("(Edge%1)").arg(i)) + + (construction?(QString::fromLatin1("-")+tr("Construction")):QString::fromLatin1("")): (QString::fromLatin1("%1-").arg(i)+tr("BSpline"))) : ( isNamingBoxChecked ? - (tr("Other") + QString::fromLatin1("(Edge%1)").arg(i)): + (tr("Other") + QString::fromLatin1("(Edge%1)").arg(i)) + + (construction?(QString::fromLatin1("-")+tr("Construction")):QString::fromLatin1("")): (QString::fromLatin1("%1-").arg(i)+tr("Other"))), i-1, sketchView->getSketchObject()->getVertexIndexGeoPos(i-1,Sketcher::start),