From fa24b86d324a59398a19fa72d17cd9fd9d3e21d9 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 24 Oct 2014 17:16:31 +0300 Subject: [PATCH] Refactoring. Use everywhere NULL_ID instead 0. --HG-- branch : develop --- src/app/visualization/vistoolalongline.cpp | 4 ++-- src/app/visualization/vistoolarc.cpp | 2 +- src/app/visualization/vistoolbisector.cpp | 6 +++--- src/app/visualization/vistoolcutarc.cpp | 2 +- src/app/visualization/vistoolcutspline.cpp | 2 +- src/app/visualization/vistoolcutsplinepath.cpp | 2 +- src/app/visualization/vistoolheight.cpp | 6 +++--- src/app/visualization/vistoolline.cpp | 2 +- src/app/visualization/vistoollineintersect.cpp | 8 ++++---- src/app/visualization/vistoollineintersectaxis.cpp | 4 ++-- src/app/visualization/vistoolnormal.cpp | 4 ++-- src/app/visualization/vistoolpointofcontact.cpp | 6 +++--- src/app/visualization/vistoolpointofintersection.cpp | 4 ++-- src/app/visualization/vistoolshoulderpoint.cpp | 6 +++--- src/app/visualization/vistoolspline.cpp | 4 ++-- src/app/visualization/vistooltriangle.cpp | 8 ++++---- 16 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/app/visualization/vistoolalongline.cpp b/src/app/visualization/vistoolalongline.cpp index 257dc4b5e..4287bac2e 100644 --- a/src/app/visualization/vistoolalongline.cpp +++ b/src/app/visualization/vistoolalongline.cpp @@ -63,12 +63,12 @@ void VisToolAlongLine::setLength(const QString &expression) //--------------------------------------------------------------------------------------------------------------------- void VisToolAlongLine::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(lineP1, first->toQPointF(), supportColor); - if (point2Id <= 0) + if (point2Id <= NULL_ID) { DrawLine(line, QLineF(first->toQPointF(), Visualization::scenePos), supportColor); } diff --git a/src/app/visualization/vistoolarc.cpp b/src/app/visualization/vistoolarc.cpp index 81dddad2b..dc0ee62b0 100644 --- a/src/app/visualization/vistoolarc.cpp +++ b/src/app/visualization/vistoolarc.cpp @@ -45,7 +45,7 @@ VisToolArc::~VisToolArc() //--------------------------------------------------------------------------------------------------------------------- void VisToolArc::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(arcCenter, first->toQPointF(), supportColor); diff --git a/src/app/visualization/vistoolbisector.cpp b/src/app/visualization/vistoolbisector.cpp index 97c59cd4f..c98bb7fb5 100644 --- a/src/app/visualization/vistoolbisector.cpp +++ b/src/app/visualization/vistoolbisector.cpp @@ -71,12 +71,12 @@ VisToolBisector::~VisToolBisector() //--------------------------------------------------------------------------------------------------------------------- void VisToolBisector::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(line1P1, first->toQPointF(), supportColor); - if (point2Id <= 0) + if (point2Id <= NULL_ID) { DrawLine(line1, QLineF(first->toQPointF(), Visualization::scenePos), supportColor); } @@ -87,7 +87,7 @@ void VisToolBisector::RefreshGeometry() DrawLine(line1, QLineF(first->toQPointF(), second->toQPointF()), supportColor); - if (point3Id <= 0) + if (point3Id <= NULL_ID) { DrawLine(line2, QLineF(second->toQPointF(), Visualization::scenePos), supportColor); } diff --git a/src/app/visualization/vistoolcutarc.cpp b/src/app/visualization/vistoolcutarc.cpp index 5acfd2964..ba770361e 100644 --- a/src/app/visualization/vistoolcutarc.cpp +++ b/src/app/visualization/vistoolcutarc.cpp @@ -51,7 +51,7 @@ VisToolCutArc::~VisToolCutArc() //--------------------------------------------------------------------------------------------------------------------- void VisToolCutArc::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer arc = Visualization::data->GeometricObject(point1Id); DrawPath(this, arc->GetPath(PathDirection::Show), supportColor, Qt::SolidLine, Qt::RoundCap); diff --git a/src/app/visualization/vistoolcutspline.cpp b/src/app/visualization/vistoolcutspline.cpp index 6d41865fa..204d1f740 100644 --- a/src/app/visualization/vistoolcutspline.cpp +++ b/src/app/visualization/vistoolcutspline.cpp @@ -51,7 +51,7 @@ VisToolCutSpline::~VisToolCutSpline() //--------------------------------------------------------------------------------------------------------------------- void VisToolCutSpline::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer spl = Visualization::data->GeometricObject(point1Id); DrawPath(this, spl->GetPath(PathDirection::Show), supportColor, Qt::SolidLine, Qt::RoundCap); diff --git a/src/app/visualization/vistoolcutsplinepath.cpp b/src/app/visualization/vistoolcutsplinepath.cpp index 9bf157428..59566ac58 100644 --- a/src/app/visualization/vistoolcutsplinepath.cpp +++ b/src/app/visualization/vistoolcutsplinepath.cpp @@ -51,7 +51,7 @@ VisToolCutSplinePath::~VisToolCutSplinePath() //--------------------------------------------------------------------------------------------------------------------- void VisToolCutSplinePath::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer splPath = Visualization::data->GeometricObject(point1Id); DrawPath(this, splPath->GetPath(PathDirection::Show), supportColor, Qt::SolidLine, Qt::RoundCap); diff --git a/src/app/visualization/vistoolheight.cpp b/src/app/visualization/vistoolheight.cpp index 26cdbf2b4..60f0456c0 100644 --- a/src/app/visualization/vistoolheight.cpp +++ b/src/app/visualization/vistoolheight.cpp @@ -51,12 +51,12 @@ VisToolHeight::~VisToolHeight() //--------------------------------------------------------------------------------------------------------------------- void VisToolHeight::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(base_point, first->toQPointF(), supportColor); - if (lineP1Id <= 0) + if (lineP1Id <= NULL_ID) { DrawLine(this, QLineF(first->toQPointF(), Visualization::scenePos), mainColor); } @@ -66,7 +66,7 @@ void VisToolHeight::RefreshGeometry() DrawPoint(lineP1, second->toQPointF(), supportColor); QLineF base_line; - if (lineP2Id <= 0) + if (lineP2Id <= NULL_ID) { base_line = QLineF(second->toQPointF(), Visualization::scenePos); DrawLine(line, base_line, supportColor); diff --git a/src/app/visualization/vistoolline.cpp b/src/app/visualization/vistoolline.cpp index 0b782c45d..edcd4e763 100644 --- a/src/app/visualization/vistoolline.cpp +++ b/src/app/visualization/vistoolline.cpp @@ -47,7 +47,7 @@ void VisToolLine::RefreshGeometry() { QLineF line; const QSharedPointer first = Visualization::data->GeometricObject(point1Id); - if (point2Id == 0) + if (point2Id == NULL_ID) { line = QLineF(first->toQPointF(), Visualization::scenePos); } diff --git a/src/app/visualization/vistoollineintersect.cpp b/src/app/visualization/vistoollineintersect.cpp index 3e2b2981b..8b732e55a 100644 --- a/src/app/visualization/vistoollineintersect.cpp +++ b/src/app/visualization/vistoollineintersect.cpp @@ -52,12 +52,12 @@ VisToolLineIntersect::~VisToolLineIntersect() //--------------------------------------------------------------------------------------------------------------------- void VisToolLineIntersect::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(line1P1, first->toQPointF(), supportColor); - if (line1P2Id <= 0) + if (line1P2Id <= NULL_ID) { DrawLine(line1, QLineF(first->toQPointF(), Visualization::scenePos), supportColor); } @@ -68,7 +68,7 @@ void VisToolLineIntersect::RefreshGeometry() DrawLine(line1, QLineF(first->toQPointF(), second->toQPointF()), supportColor); - if (line2P1Id <= 0) + if (line2P1Id <= NULL_ID) { return; } @@ -77,7 +77,7 @@ void VisToolLineIntersect::RefreshGeometry() const QSharedPointer third = Visualization::data->GeometricObject(line2P1Id); DrawPoint(line2P1, third->toQPointF(), supportColor); - if (line2P2Id <= 0) + if (line2P2Id <= NULL_ID) { DrawLine(this, QLineF(third->toQPointF(), Visualization::scenePos), supportColor); diff --git a/src/app/visualization/vistoollineintersectaxis.cpp b/src/app/visualization/vistoollineintersectaxis.cpp index 7bde1a9f1..371d46cad 100644 --- a/src/app/visualization/vistoollineintersectaxis.cpp +++ b/src/app/visualization/vistoollineintersectaxis.cpp @@ -54,12 +54,12 @@ VisToolLineIntersectAxis::~VisToolLineIntersectAxis() //--------------------------------------------------------------------------------------------------------------------- void VisToolLineIntersectAxis::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(lineP1, first->toQPointF(), supportColor); - if (point2Id <= 0) + if (point2Id <= NULL_ID) { DrawLine(baseLine, QLineF(first->toQPointF(), Visualization::scenePos), supportColor); } diff --git a/src/app/visualization/vistoolnormal.cpp b/src/app/visualization/vistoolnormal.cpp index ebaae9da7..e9b5402c5 100644 --- a/src/app/visualization/vistoolnormal.cpp +++ b/src/app/visualization/vistoolnormal.cpp @@ -51,12 +51,12 @@ VisToolNormal::~VisToolNormal() //--------------------------------------------------------------------------------------------------------------------- void VisToolNormal::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(lineP1, first->toQPointF(), supportColor); - if (point2Id <= 0) + if (point2Id <= NULL_ID) { QLineF line_mouse(first->toQPointF(), Visualization::scenePos); DrawLine(line, line_mouse, supportColor); diff --git a/src/app/visualization/vistoolpointofcontact.cpp b/src/app/visualization/vistoolpointofcontact.cpp index 96950dee8..e1db720eb 100644 --- a/src/app/visualization/vistoolpointofcontact.cpp +++ b/src/app/visualization/vistoolpointofcontact.cpp @@ -50,12 +50,12 @@ VisToolPointOfContact::~VisToolPointOfContact() //--------------------------------------------------------------------------------------------------------------------- void VisToolPointOfContact::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(lineP1, first->toQPointF(), supportColor); - if (lineP2Id <= 0) + if (lineP2Id <= NULL_ID) { DrawLine(this, QLineF(first->toQPointF(), Visualization::scenePos), supportColor); } @@ -65,7 +65,7 @@ void VisToolPointOfContact::RefreshGeometry() DrawPoint(lineP2, second->toQPointF(), supportColor); DrawLine(this, QLineF(first->toQPointF(), second->toQPointF()), supportColor); - if (radiusId <= 0) + if (radiusId <= NULL_ID) { return; } diff --git a/src/app/visualization/vistoolpointofintersection.cpp b/src/app/visualization/vistoolpointofintersection.cpp index a2282ab9c..85c84af8a 100644 --- a/src/app/visualization/vistoolpointofintersection.cpp +++ b/src/app/visualization/vistoolpointofintersection.cpp @@ -48,7 +48,7 @@ VisToolPointOfIntersection::~VisToolPointOfIntersection() //--------------------------------------------------------------------------------------------------------------------- void VisToolPointOfIntersection::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(axisP1, first->toQPointF(), supportColor); @@ -57,7 +57,7 @@ void VisToolPointOfIntersection::RefreshGeometry() DrawLine(this, axisL1, supportColor, Qt::DashLine); QLineF axisL2; - if (point2Id <= 0) + if (point2Id <= NULL_ID) { axisL2 = Axis(Visualization::scenePos, 180); } diff --git a/src/app/visualization/vistoolshoulderpoint.cpp b/src/app/visualization/vistoolshoulderpoint.cpp index e5db76083..c6863176a 100644 --- a/src/app/visualization/vistoolshoulderpoint.cpp +++ b/src/app/visualization/vistoolshoulderpoint.cpp @@ -53,12 +53,12 @@ VisToolShoulderPoint::~VisToolShoulderPoint() //--------------------------------------------------------------------------------------------------------------------- void VisToolShoulderPoint::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(line1P1, first->toQPointF(), supportColor); - if (lineP1Id <= 0) + if (lineP1Id <= NULL_ID) { DrawLine(line1, QLineF(first->toQPointF(), Visualization::scenePos), supportColor); } @@ -69,7 +69,7 @@ void VisToolShoulderPoint::RefreshGeometry() DrawLine(line1, QLineF(first->toQPointF(), second->toQPointF()), supportColor); - if (lineP2Id <= 0) + if (lineP2Id <= NULL_ID) { DrawLine(line2, QLineF(second->toQPointF(), Visualization::scenePos), supportColor); } diff --git a/src/app/visualization/vistoolspline.cpp b/src/app/visualization/vistoolspline.cpp index b3f75c724..92562e751 100644 --- a/src/app/visualization/vistoolspline.cpp +++ b/src/app/visualization/vistoolspline.cpp @@ -50,12 +50,12 @@ VisToolSpline::~VisToolSpline() //--------------------------------------------------------------------------------------------------------------------- void VisToolSpline::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(lineP1, first->toQPointF(), supportColor); - if (point4Id <= 0) + if (point4Id <= NULL_ID) { DrawLine(line, QLineF(first->toQPointF(), Visualization::scenePos), mainColor); } diff --git a/src/app/visualization/vistooltriangle.cpp b/src/app/visualization/vistooltriangle.cpp index 0fc8d2815..fbab82124 100644 --- a/src/app/visualization/vistooltriangle.cpp +++ b/src/app/visualization/vistooltriangle.cpp @@ -56,12 +56,12 @@ VisToolTriangle::~VisToolTriangle() //--------------------------------------------------------------------------------------------------------------------- void VisToolTriangle::RefreshGeometry() { - if (point1Id > 0) + if (point1Id > NULL_ID) { const QSharedPointer first = Visualization::data->GeometricObject(point1Id); DrawPoint(axisP1, first->toQPointF(), supportColor); - if (point2Id <= 0) + if (point2Id <= NULL_ID) { DrawAimedAxis(axis, QLineF(first->toQPointF(), Visualization::scenePos), supportColor); } @@ -72,7 +72,7 @@ void VisToolTriangle::RefreshGeometry() DrawAimedAxis(axis, QLineF(first->toQPointF(), second->toQPointF()), supportColor); - if (hypotenuseP1Id <= 0) + if (hypotenuseP1Id <= NULL_ID) { return; } @@ -81,7 +81,7 @@ void VisToolTriangle::RefreshGeometry() const QSharedPointer third = Visualization::data->GeometricObject(hypotenuseP1Id); DrawPoint(hypotenuseP1, third->toQPointF(), supportColor); - if (hypotenuseP2Id <= 0) + if (hypotenuseP2Id <= NULL_ID) { DrawLine(this, QLineF(third->toQPointF(), Visualization::scenePos), supportColor, Qt::DashLine);