From 4d104a789ed501a411162770c244e08242e02306 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 22 Aug 2022 10:23:51 +0300 Subject: [PATCH] Refactoring. --- .../flipping/vtoolflippingbyaxis.cpp | 2 +- .../flipping/vtoolflippingbyline.cpp | 2 +- .../tools/drawTools/operation/vtoolmove.cpp | 15 +++++++-------- .../drawTools/operation/vtoolrotation.cpp | 2 +- .../tools/drawTools/toolcurve/vtoolarc.cpp | 11 +++++------ .../toolcurve/vtoolarcwithlength.cpp | 11 +++++------ .../toolcurve/vtoolellipticalarc.cpp | 19 ++++++++----------- .../tools/drawTools/toolcurve/vtoolspline.cpp | 2 +- .../drawTools/toolcurve/vtoolsplinepath.cpp | 2 +- .../tooldoublepoint/vtooltruedarts.cpp | 2 +- .../toolsinglepoint/toolcut/vtoolcutarc.cpp | 2 +- .../toolcut/vtoolcutsplinepath.cpp | 2 +- .../toollinepoint/vtoolbisector.cpp | 2 +- .../toollinepoint/vtoolendline.cpp | 11 ++++++----- .../toollinepoint/vtoolheight.cpp | 2 +- .../toollinepoint/vtoollineintersectaxis.cpp | 2 +- .../toollinepoint/vtoolnormal.cpp | 2 +- .../toollinepoint/vtoolshoulderpoint.cpp | 2 +- .../toolsinglepoint/vtoollineintersect.cpp | 2 +- .../vtoolpointfromarcandtangent.cpp | 2 +- .../vtoolpointfromcircleandtangent.cpp | 2 +- .../toolsinglepoint/vtoolpointofcontact.cpp | 2 +- .../vtoolpointofintersection.cpp | 2 +- .../vtoolpointofintersectionarcs.cpp | 2 +- .../vtoolpointofintersectioncircles.cpp | 10 +++++++--- .../toolsinglepoint/vtooltriangle.cpp | 2 +- src/libs/vtools/tools/drawTools/vtoolline.cpp | 2 +- .../line/vistoolpointofintersectioncircles.h | 2 +- 28 files changed, 60 insertions(+), 61 deletions(-) diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp index d51c9637a..9f7bae9a9 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp @@ -204,7 +204,7 @@ void VToolFlippingByAxis::SetVisualization() { if (not vis.isNull()) { - VisToolFlippingByAxis *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->SetObjects(SourceToObjects(source)); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp index e3ff528b6..698fcb063 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp @@ -189,7 +189,7 @@ void VToolFlippingByLine::SetVisualization() { if (not vis.isNull()) { - VisToolFlippingByLine *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->SetObjects(SourceToObjects(source)); diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp index ba778f1a4..7e18864be 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp @@ -457,17 +457,16 @@ void VToolMove::SetVisualization() { if (not vis.isNull()) { - VisToolMove *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) + const bool osSeparator = VAbstractApplication::VApp()->Settings()->GetOsSeparator(); + const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars(); + visual->SetObjects(SourceToObjects(source)); - visual->SetAngle(VAbstractApplication::VApp()->TrVars() - ->FormulaToUser(formulaAngle, VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->SetRotationAngle(VAbstractApplication::VApp()->TrVars() - ->FormulaToUser(formulaRotationAngle, - VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->SetLength(VAbstractApplication::VApp()->TrVars() - ->FormulaToUser(formulaLength, VAbstractApplication::VApp()->Settings()->GetOsSeparator())); + visual->SetAngle(trVars->FormulaToUser(formulaAngle, osSeparator)); + visual->SetRotationAngle(trVars->FormulaToUser(formulaRotationAngle, osSeparator)); + visual->SetLength(trVars->FormulaToUser(formulaLength, osSeparator)); visual->SetRotationOriginPointId(origPointId); visual->RefreshGeometry(); } diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp index aa3784c06..08b02c6b2 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp @@ -339,7 +339,7 @@ void VToolRotation::SetVisualization() { if (not vis.isNull()) { - VisToolRotation *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->SetObjects(SourceToObjects(source)); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index cdc9fe328..64dd758ab 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp @@ -371,14 +371,13 @@ void VToolArc::SetVisualization() auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) + const bool osSeparator = VAbstractApplication::VApp()->Settings()->GetOsSeparator(); const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars(); + visual->setObject1Id(arc->GetCenter().id()); - visual->setRadius(trVars->FormulaToUser( - arc->GetFormulaRadius(), VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->setF1(trVars->FormulaToUser( - arc->GetFormulaF1(), VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->setF2(trVars->FormulaToUser( - arc->GetFormulaF2(), VAbstractApplication::VApp()->Settings()->GetOsSeparator())); + visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius(), osSeparator)); + visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1(), osSeparator)); + visual->setF2(trVars->FormulaToUser(arc->GetFormulaF2(), osSeparator)); visual->setLineStyle(LineStyleToPenStyle(arc->GetPenStyle())); visual->setApproximationScale(arc->GetApproximationScale()); visual->SetMode(Mode::Show); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index 2f772779f..49c3529e1 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -350,14 +350,13 @@ void VToolArcWithLength::SetVisualization() auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) + const bool osSeparator = VAbstractApplication::VApp()->Settings()->GetOsSeparator(); const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars(); + visual->setObject1Id(arc->GetCenter().id()); - visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius(), - VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1(), - VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->setLength(trVars->FormulaToUser(arc->GetFormulaLength(), - VAbstractApplication::VApp()->Settings()->GetOsSeparator())); + visual->setRadius(trVars->FormulaToUser(arc->GetFormulaRadius(), osSeparator)); + visual->setF1(trVars->FormulaToUser(arc->GetFormulaF1(), osSeparator)); + visual->setLength(trVars->FormulaToUser(arc->GetFormulaLength(), osSeparator)); visual->setLineStyle(LineStyleToPenStyle(arc->GetPenStyle())); visual->setApproximationScale(arc->GetApproximationScale()); visual->SetMode(Mode::Show); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp index d08b760b8..2a58f4035 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp @@ -417,21 +417,18 @@ void VToolEllipticalArc::SetVisualization() if (not vis.isNull()) { const QSharedPointer elArc = VAbstractTool::data.GeometricObject(m_id); - VisToolEllipticalArc *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) + const bool osSeparator = VAbstractApplication::VApp()->Settings()->GetOsSeparator(); const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars(); + visual->setObject1Id(elArc->GetCenter().id()); - visual->setRadius1(trVars->FormulaToUser(elArc->GetFormulaRadius1(), - VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->setRadius2(trVars->FormulaToUser(elArc->GetFormulaRadius2(), - VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->setF1(trVars->FormulaToUser(elArc->GetFormulaF1(), - VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->setF2(trVars->FormulaToUser(elArc->GetFormulaF2(), - VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->setRotationAngle(trVars->FormulaToUser(elArc->GetFormulaRotationAngle(), - VAbstractApplication::VApp()->Settings()->GetOsSeparator())); + visual->setRadius1(trVars->FormulaToUser(elArc->GetFormulaRadius1(), osSeparator)); + visual->setRadius2(trVars->FormulaToUser(elArc->GetFormulaRadius2(), osSeparator)); + visual->setF1(trVars->FormulaToUser(elArc->GetFormulaF1(), osSeparator)); + visual->setF2(trVars->FormulaToUser(elArc->GetFormulaF2(), osSeparator)); + visual->setRotationAngle(trVars->FormulaToUser(elArc->GetFormulaRotationAngle(), osSeparator)); visual->setLineStyle(LineStyleToPenStyle(elArc->GetPenStyle())); visual->RefreshGeometry(); } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index 7895b8e36..f1dcbb15f 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -539,7 +539,7 @@ void VToolSpline::SetVisualization() { if (not vis.isNull()) { - VisToolSpline *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) const QSharedPointer spl = VAbstractTool::data.GeometricObject(m_id); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 6190c4f41..3c869ba92 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -748,7 +748,7 @@ void VToolSplinePath::SetVisualization() { if (not vis.isNull()) { - VisToolSplinePath *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) QSharedPointer splPath = VAbstractTool::data.GeometricObject(m_id); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index 4eddfcaa6..57ba0c1d7 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -324,7 +324,7 @@ void VToolTrueDarts::SetVisualization() { if (not vis.isNull()) { - VisToolTrueDarts *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(baseLineP1Id); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp index cbdb152d3..ca10fa76e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp @@ -267,7 +267,7 @@ void VToolCutArc::SetVisualization() { if (not vis.isNull()) { - VisToolCutArc *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(baseCurveId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index 5d417a110..09a0488b8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp @@ -360,7 +360,7 @@ void VToolCutSplinePath::SetVisualization() { if (not vis.isNull()) { - VisToolCutSplinePath *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(baseCurveId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp index f7ed50056..31535c4c1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp @@ -298,7 +298,7 @@ void VToolBisector::SetVisualization() { if (not vis.isNull()) { - VisToolBisector *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(firstPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index 1193e3b44..5c9a5188d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp @@ -225,14 +225,15 @@ void VToolEndLine::SetVisualization() { if (not vis.isNull()) { - VisToolEndLine *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) + const bool osSeparator = VAbstractApplication::VApp()->Settings()->GetOsSeparator(); + const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars(); + visual->setObject1Id(basePointId); - visual->setLength(VAbstractApplication::VApp()->TrVars() - ->FormulaToUser(formulaLength, VAbstractApplication::VApp()->Settings()->GetOsSeparator())); - visual->SetAngle(VAbstractApplication::VApp()->TrVars() - ->FormulaToUser(formulaAngle, VAbstractApplication::VApp()->Settings()->GetOsSeparator())); + visual->setLength(trVars->FormulaToUser(formulaLength, osSeparator)); + visual->SetAngle(trVars->FormulaToUser(formulaAngle, osSeparator)); visual->setLineStyle(LineStyleToPenStyle(m_lineType)); visual->SetMode(Mode::Show); visual->RefreshGeometry(); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index 0308bd4e1..8ca92e30d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp @@ -257,7 +257,7 @@ void VToolHeight::SetVisualization() { if (not vis.isNull()) { - VisToolHeight *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(basePointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index 9d9940471..0856d8a1e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -315,7 +315,7 @@ void VToolLineIntersectAxis::SetVisualization() { if (not vis.isNull()) { - VisToolLineIntersectAxis *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(firstPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp index 005c1a8c3..0fa6add25 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp @@ -268,7 +268,7 @@ void VToolNormal::SetVisualization() { if (not vis.isNull()) { - VisToolNormal *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(basePointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index 5772a4ed3..f6aad771e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -318,7 +318,7 @@ void VToolShoulderPoint::SetVisualization() { if (not vis.isNull()) { - VisToolShoulderPoint *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(pShoulder); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index 3c96220ec..68b8026d7 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -293,7 +293,7 @@ void VToolLineIntersect::SetVisualization() { if (not vis.isNull()) { - VisToolLineIntersect *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(p1Line1); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index 46fc89a0e..fe331315e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -331,7 +331,7 @@ void VToolPointFromArcAndTangent::SetVisualization() { if (not vis.isNull()) { - VisToolPointFromArcAndTangent *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(tangentPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp index 725bb32e4..c7a14be52 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp @@ -325,7 +325,7 @@ void VToolPointFromCircleAndTangent::SetVisualization() { if (not vis.isNull()) { - VisToolPointFromCircleAndTangent *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(tangentPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index f6bea010b..3087ad865 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -348,7 +348,7 @@ void VToolPointOfContact::SetVisualization() { if (not vis.isNull()) { - VisToolPointOfContact *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(firstPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp index f1c2f79e6..6284bedc1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp @@ -237,7 +237,7 @@ void VToolPointOfIntersection::SetVisualization() { if (not vis.isNull()) { - VisToolPointOfIntersection *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(firstPointId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index a452ee7f9..ef5303aa8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -351,7 +351,7 @@ void VToolPointOfIntersectionArcs::SetVisualization() { if (not vis.isNull()) { - VisToolPointOfIntersectionArcs *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setArc1Id(firstArcId); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index 02dea7eaf..ca156c68e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp @@ -367,13 +367,17 @@ void VToolPointOfIntersectionCircles::SetVisualization() { if (not vis.isNull()) { - VisToolPointOfIntersectionCircles *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(firstCircleCenterId); visual->setObject2Id(secondCircleCenterId); - visual->setC1Radius(firstCircleRadius); - visual->setC2Radius(secondCircleRadius); + + const bool osSeparator = VAbstractApplication::VApp()->Settings()->GetOsSeparator(); + const VTranslateVars *trVars = VAbstractApplication::VApp()->TrVars(); + + visual->setC1Radius(trVars->FormulaToUser(firstCircleRadius, osSeparator)); + visual->setC2Radius(trVars->FormulaToUser(secondCircleRadius, osSeparator)); visual->setCrossPoint(crossPoint); visual->RefreshGeometry(); } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index 19e811c81..2e1ecf20a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -338,7 +338,7 @@ void VToolTriangle::SetVisualization() { if (not vis.isNull()) { - VisToolTriangle * visual = qobject_cast(vis); + auto * visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(axisP1Id); diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index 6c52b752b..ddfe41866 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -423,7 +423,7 @@ void VToolLine::SetVisualization() { if (not vis.isNull()) { - VisToolLine *visual = qobject_cast(vis); + auto *visual = qobject_cast(vis); SCASSERT(visual != nullptr) visual->setObject1Id(firstPoint); diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h index df00b9229..0e1dc1bd4 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h @@ -55,7 +55,7 @@ public: void setC2Radius(const QString &value); void setCrossPoint(const CrossCirclesPoint &value); - auto type() const -> int override {return Type;} + auto type() const -> int override {return Type;} enum {Type = UserType + static_cast(Vis::ToolPointOfIntersectionCircles)}; private: // cppcheck-suppress unknownMacro