From 62f573ec555c629a69d25a041d271c2c7ff69888 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 15 Aug 2014 20:27:30 +0300 Subject: [PATCH] Renamed classes to more correct names. --HG-- branch : develop --- src/app/container/container.pri | 16 +++++----- .../{vlengtharc.cpp => varclength.cpp} | 26 +++++++-------- .../container/{vlengtharc.h => varclength.h} | 22 ++++++------- src/app/container/variables.h | 6 ++-- src/app/container/vcontainer.cpp | 20 ++++++------ src/app/container/vcontainer.h | 4 +-- .../{vlengthcurve.cpp => vcurvelength.cpp} | 16 +++++----- .../{vlengthcurve.h => vcurvelength.h} | 24 +++++++------- src/app/container/vinternalvariable.h | 2 +- .../{vlengthline.cpp => vlinelength.cpp} | 8 ++--- .../{vlengthline.h => vlinelength.h} | 8 ++--- .../{vlengthspline.cpp => vsplinelength.cpp} | 32 +++++++++---------- .../{vlengthspline.h => vsplinelength.h} | 24 +++++++------- src/app/dialogs/tools/dialogtool.cpp | 4 +-- src/app/tools/drawTools/vtoolarc.cpp | 4 +-- src/app/tools/drawTools/vtoolcutarc.cpp | 8 ++--- src/app/tools/drawTools/vtoolcutspline.cpp | 8 ++--- .../tools/drawTools/vtoolcutsplinepath.cpp | 8 ++--- src/app/tools/drawTools/vtoolspline.cpp | 4 +-- src/app/tools/drawTools/vtoolsplinepath.cpp | 4 +-- 20 files changed, 124 insertions(+), 124 deletions(-) rename src/app/container/{vlengtharc.cpp => varclength.cpp} (81%) rename src/app/container/{vlengtharc.h => varclength.h} (77%) rename src/app/container/{vlengthcurve.cpp => vcurvelength.cpp} (89%) rename src/app/container/{vlengthcurve.h => vcurvelength.h} (79%) rename src/app/container/{vlengthline.cpp => vlinelength.cpp} (96%) rename src/app/container/{vlengthline.h => vlinelength.h} (95%) rename src/app/container/{vlengthspline.cpp => vsplinelength.cpp} (78%) rename src/app/container/{vlengthspline.h => vsplinelength.h} (73%) diff --git a/src/app/container/container.pri b/src/app/container/container.pri index c9c1c2a80..a9e5de22f 100644 --- a/src/app/container/container.pri +++ b/src/app/container/container.pri @@ -5,11 +5,11 @@ SOURCES += \ container/vincrement.cpp \ container/vvariable.cpp \ container/vinternalvariable.cpp \ - container/vlengthline.cpp \ - container/vlengthspline.cpp \ - container/vlengtharc.cpp \ container/vlineangle.cpp \ - container/vlengthcurve.cpp + container/varclength.cpp \ + container/vcurvelength.cpp \ + container/vlinelength.cpp \ + container/vsplinelength.cpp HEADERS += \ container/vcontainer.h \ @@ -18,9 +18,9 @@ HEADERS += \ container/vincrement.h \ container/vvariable.h \ container/vinternalvariable.h \ - container/vlengthline.h \ - container/vlengthspline.h \ - container/vlengtharc.h \ container/vlineangle.h \ container/variables.h \ - container/vlengthcurve.h + container/vcurvelength.h \ + container/varclength.h \ + container/vlinelength.h \ + container/vsplinelength.h diff --git a/src/app/container/vlengtharc.cpp b/src/app/container/varclength.cpp similarity index 81% rename from src/app/container/vlengtharc.cpp rename to src/app/container/varclength.cpp index bf74d0e1c..f05805c86 100644 --- a/src/app/container/vlengtharc.cpp +++ b/src/app/container/varclength.cpp @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vlengtharc.cpp + ** @file varclength.cpp ** @author Roman Telezhynskyi ** @date 28 7, 2014 ** @@ -26,40 +26,40 @@ ** *************************************************************************/ -#include "vlengtharc.h" +#include "varclength.h" #include "../geometry/vabstractcurve.h" #include "../widgets/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- -VLengthArc::VLengthArc() - :VLengthCurve() +VArcLength::VArcLength() + :VCurveLength() { - type = VarType::LengthArc; + type = VarType::ArcLength; } //--------------------------------------------------------------------------------------------------------------------- -VLengthArc::VLengthArc(const quint32 &id, const quint32 &parentId, const VAbstractCurve *arc) - :VLengthCurve(id, parentId, arc) +VArcLength::VArcLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *arc) + :VCurveLength(id, parentId, arc) { - type = VarType::LengthArc; + type = VarType::ArcLength; } //--------------------------------------------------------------------------------------------------------------------- -VLengthArc::VLengthArc(const VLengthArc &var) - :VLengthCurve(var) +VArcLength::VArcLength(const VArcLength &var) + :VCurveLength(var) {} //--------------------------------------------------------------------------------------------------------------------- -VLengthArc &VLengthArc::operator=(const VLengthArc &var) +VArcLength &VArcLength::operator=(const VArcLength &var) { if ( &var == this ) { return *this; } - VLengthCurve::operator=(var); + VCurveLength::operator=(var); return *this; } //--------------------------------------------------------------------------------------------------------------------- -VLengthArc::~VLengthArc() +VArcLength::~VArcLength() {} diff --git a/src/app/container/vlengtharc.h b/src/app/container/varclength.h similarity index 77% rename from src/app/container/vlengtharc.h rename to src/app/container/varclength.h index 608fd42e2..f56d7ddf3 100644 --- a/src/app/container/vlengtharc.h +++ b/src/app/container/varclength.h @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vlengtharc.h + ** @file varclength.h ** @author Roman Telezhynskyi ** @date 28 7, 2014 ** @@ -26,21 +26,21 @@ ** *************************************************************************/ -#ifndef VLENGTHARC_H -#define VLENGTHARC_H +#ifndef VARCLENGTH_H +#define VARCLENGTH_H -#include "vlengthcurve.h" +#include "vcurvelength.h" class VAbstractCurve; -class VLengthArc :public VLengthCurve +class VArcLength :public VCurveLength { public: - VLengthArc(); - VLengthArc(const quint32 &id, const quint32 &parentId, const VAbstractCurve *arc); - VLengthArc(const VLengthArc &var); - VLengthArc &operator=(const VLengthArc &var); - virtual ~VLengthArc(); + VArcLength(); + VArcLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *arc); + VArcLength(const VArcLength &var); + VArcLength &operator=(const VArcLength &var); + virtual ~VArcLength(); }; -#endif // VLENGTHARC_H +#endif // VARCLENGTH_H diff --git a/src/app/container/variables.h b/src/app/container/variables.h index 0dc78df57..24a3ee606 100644 --- a/src/app/container/variables.h +++ b/src/app/container/variables.h @@ -32,9 +32,9 @@ #include "vinternalvariable.h" #include "vmeasurement.h" #include "vincrement.h" -#include "vlengtharc.h" -#include "vlengthline.h" -#include "vlengthspline.h" +#include "varclength.h" +#include "vsplinelength.h" +#include "vlinelength.h" #include "vlineangle.h" #endif // VARIABLES_H diff --git a/src/app/container/vcontainer.cpp b/src/app/container/vcontainer.cpp index ab1859ea0..21cfe73c0 100644 --- a/src/app/container/vcontainer.cpp +++ b/src/app/container/vcontainer.cpp @@ -139,14 +139,14 @@ void VContainer::setData(const VContainer &data) case (VarType::Increment): CopyVar(data, i.key()); break; - case (VarType::LengthLine): + case (VarType::LineLength): CopyVar(data, i.key()); break; - case (VarType::LengthSpline): - CopyVar(data, i.key()); + case (VarType::SplineLength): + CopyVar(data, i.key()); break; - case (VarType::LengthArc): - CopyVar(data, i.key()); + case (VarType::ArcLength): + CopyVar(data, i.key()); break; case (VarType::LineAngle): CopyVar(data, i.key()); @@ -446,19 +446,19 @@ const QMap VContainer::DataIncrements() const //--------------------------------------------------------------------------------------------------------------------- const QMap VContainer::DataLengthLines() const { - return DataVar(VarType::LengthLine); + return DataVar(VarType::LineLength); } //--------------------------------------------------------------------------------------------------------------------- -const QMap VContainer::DataLengthSplines() const +const QMap VContainer::DataLengthSplines() const { - return DataVar(VarType::LengthSpline); + return DataVar(VarType::SplineLength); } //--------------------------------------------------------------------------------------------------------------------- -const QMap VContainer::DataLengthArcs() const +const QMap VContainer::DataLengthArcs() const { - return DataVar(VarType::LengthArc); + return DataVar(VarType::ArcLength); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/container/vcontainer.h b/src/app/container/vcontainer.h index eccd8c4cb..f511d51a0 100644 --- a/src/app/container/vcontainer.h +++ b/src/app/container/vcontainer.h @@ -187,8 +187,8 @@ public: const QMap DataMeasurements() const; const QMap DataIncrements() const; const QMap DataLengthLines() const; - const QMap DataLengthSplines() const; - const QMap DataLengthArcs() const; + const QMap DataLengthSplines() const; + const QMap DataLengthArcs() const; const QMap DataAngleLines() const; diff --git a/src/app/container/vlengthcurve.cpp b/src/app/container/vcurvelength.cpp similarity index 89% rename from src/app/container/vlengthcurve.cpp rename to src/app/container/vcurvelength.cpp index 1f27760a4..4dc282544 100644 --- a/src/app/container/vlengthcurve.cpp +++ b/src/app/container/vcurvelength.cpp @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vlengthcurve.cpp + ** @file vcurvelength.cpp ** @author Roman Telezhynskyi ** @date 15 8, 2014 ** @@ -26,19 +26,19 @@ ** *************************************************************************/ -#include "vlengthcurve.h" +#include "vcurvelength.h" #include "../widgets/vapplication.h" #include "../geometry/vabstractcurve.h" //--------------------------------------------------------------------------------------------------------------------- -VLengthCurve::VLengthCurve() +VCurveLength::VCurveLength() :VInternalVariable(), id(0), parentId(0) { type = VarType::Unknown; } //--------------------------------------------------------------------------------------------------------------------- -VLengthCurve::VLengthCurve(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve) +VCurveLength::VCurveLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve) :VInternalVariable(), id(id), parentId(parentId) { type = VarType::Unknown; @@ -48,12 +48,12 @@ VLengthCurve::VLengthCurve(const quint32 &id, const quint32 &parentId, const VAb } //--------------------------------------------------------------------------------------------------------------------- -VLengthCurve::VLengthCurve(const VLengthCurve &var) +VCurveLength::VCurveLength(const VCurveLength &var) :VInternalVariable(var), id(var.GetId()), parentId(var.GetParentId()) {} //--------------------------------------------------------------------------------------------------------------------- -VLengthCurve &VLengthCurve::operator=(const VLengthCurve &var) +VCurveLength &VCurveLength::operator=(const VCurveLength &var) { if ( &var == this ) { @@ -66,11 +66,11 @@ VLengthCurve &VLengthCurve::operator=(const VLengthCurve &var) } //--------------------------------------------------------------------------------------------------------------------- -VLengthCurve::~VLengthCurve() +VCurveLength::~VCurveLength() {} //--------------------------------------------------------------------------------------------------------------------- -bool VLengthCurve::Filter(quint32 id) +bool VCurveLength::Filter(quint32 id) { if (parentId != 0)//Do not check if value zero {// Not all curves have parents. Only those who was created after cutting the parent curve. diff --git a/src/app/container/vlengthcurve.h b/src/app/container/vcurvelength.h similarity index 79% rename from src/app/container/vlengthcurve.h rename to src/app/container/vcurvelength.h index 763ba0d11..ab4b97e3b 100644 --- a/src/app/container/vlengthcurve.h +++ b/src/app/container/vcurvelength.h @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vlengthcurve.h + ** @file vcurvelength.h ** @author Roman Telezhynskyi ** @date 15 8, 2014 ** @@ -26,21 +26,21 @@ ** *************************************************************************/ -#ifndef VLENGTHCURVE_H -#define VLENGTHCURVE_H +#ifndef VCURVELENGTH_H +#define VCURVELENGTH_H #include "vinternalvariable.h" class VAbstractCurve; -class VLengthCurve : public VInternalVariable +class VCurveLength : public VInternalVariable { public: - VLengthCurve(); - VLengthCurve(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve); - VLengthCurve(const VLengthCurve &var); - VLengthCurve &operator=(const VLengthCurve &var); - virtual ~VLengthCurve(); + VCurveLength(); + VCurveLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *curve); + VCurveLength(const VCurveLength &var); + VCurveLength &operator=(const VCurveLength &var); + virtual ~VCurveLength(); virtual bool Filter(quint32 id); quint32 GetId() const; @@ -51,15 +51,15 @@ protected: }; //--------------------------------------------------------------------------------------------------------------------- -inline quint32 VLengthCurve::GetId() const +inline quint32 VCurveLength::GetId() const { return id; } //--------------------------------------------------------------------------------------------------------------------- -inline quint32 VLengthCurve::GetParentId() const +inline quint32 VCurveLength::GetParentId() const { return parentId; } -#endif // VLENGTHCURVE_H +#endif // VCURVELENGTH_H diff --git a/src/app/container/vinternalvariable.h b/src/app/container/vinternalvariable.h index a2d7b04f6..cc34ff963 100644 --- a/src/app/container/vinternalvariable.h +++ b/src/app/container/vinternalvariable.h @@ -31,7 +31,7 @@ #include -enum class VarType : char { Measurement, Increment, LengthLine, LengthSpline, LengthArc, LineAngle, Unknown }; +enum class VarType : char { Measurement, Increment, LineLength, SplineLength, ArcLength, LineAngle, Unknown }; class VInternalVariable { diff --git a/src/app/container/vlengthline.cpp b/src/app/container/vlinelength.cpp similarity index 96% rename from src/app/container/vlengthline.cpp rename to src/app/container/vlinelength.cpp index cb36ca80d..0b6713a63 100644 --- a/src/app/container/vlengthline.cpp +++ b/src/app/container/vlinelength.cpp @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vlengthline.cpp + ** @file vlinelength.cpp ** @author Roman Telezhynskyi ** @date 28 7, 2014 ** @@ -26,7 +26,7 @@ ** *************************************************************************/ -#include "vlengthline.h" +#include "vlinelength.h" #include "../geometry/vpointf.h" #include "../widgets/vapplication.h" @@ -36,7 +36,7 @@ VLengthLine::VLengthLine() :VInternalVariable(), p1Id(0), p2Id(0) { - type = VarType::LengthLine; + type = VarType::LineLength; } //--------------------------------------------------------------------------------------------------------------------- @@ -46,7 +46,7 @@ VLengthLine::VLengthLine(const VPointF *p1, const quint32 &p1Id, const VPointF * SCASSERT(p1 != nullptr); SCASSERT(p2 != nullptr); - type = VarType::LengthLine; + type = VarType::LineLength; name = QString(line_+"%1_%2").arg(p1->name(), p2->name()); SetValue(p1, p2); } diff --git a/src/app/container/vlengthline.h b/src/app/container/vlinelength.h similarity index 95% rename from src/app/container/vlengthline.h rename to src/app/container/vlinelength.h index f65894442..c698a273c 100644 --- a/src/app/container/vlengthline.h +++ b/src/app/container/vlinelength.h @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vlengthline.h + ** @file vlinelength.h ** @author Roman Telezhynskyi ** @date 28 7, 2014 ** @@ -26,8 +26,8 @@ ** *************************************************************************/ -#ifndef VLENGTHLINE_H -#define VLENGTHLINE_H +#ifndef VLINELENGTH_H +#define VLINELENGTH_H #include "vinternalvariable.h" @@ -63,4 +63,4 @@ inline quint32 VLengthLine::GetP2Id() const return p2Id; } -#endif // VLENGTHLINE_H +#endif // VLINELENGTH_H diff --git a/src/app/container/vlengthspline.cpp b/src/app/container/vsplinelength.cpp similarity index 78% rename from src/app/container/vlengthspline.cpp rename to src/app/container/vsplinelength.cpp index 1d8f38dd2..de7af7520 100644 --- a/src/app/container/vlengthspline.cpp +++ b/src/app/container/vsplinelength.cpp @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vlengthsplines.cpp + ** @file vsplinelength.cpp ** @author Roman Telezhynskyi ** @date 28 7, 2014 ** @@ -26,21 +26,21 @@ ** *************************************************************************/ -#include "vlengthspline.h" +#include "vsplinelength.h" #include "../geometry/vabstractcurve.h" #include "../widgets/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- -VLengthSpline::VLengthSpline() - :VLengthCurve() +VSplineLength::VSplineLength() + :VCurveLength() { - type = VarType::LengthSpline; + type = VarType::SplineLength; } -VLengthSpline::VLengthSpline(const quint32 &id, const quint32 &parentId, const QString &name, const qreal &value) - :VLengthCurve() +VSplineLength::VSplineLength(const quint32 &id, const quint32 &parentId, const QString &name, const qreal &value) + :VCurveLength() { - type = VarType::LengthSpline; + type = VarType::SplineLength; this->name = name; this->value = value; this->id = id; @@ -48,28 +48,28 @@ VLengthSpline::VLengthSpline(const quint32 &id, const quint32 &parentId, const Q } //--------------------------------------------------------------------------------------------------------------------- -VLengthSpline::VLengthSpline(const quint32 &id, const quint32 &parentId, const VAbstractCurve *path) - :VLengthCurve(id, parentId, path) +VSplineLength::VSplineLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *path) + :VCurveLength(id, parentId, path) { - type = VarType::LengthSpline; + type = VarType::SplineLength; } //--------------------------------------------------------------------------------------------------------------------- -VLengthSpline::VLengthSpline(const VLengthSpline &var) - :VLengthCurve(var) +VSplineLength::VSplineLength(const VSplineLength &var) + :VCurveLength(var) {} //--------------------------------------------------------------------------------------------------------------------- -VLengthSpline &VLengthSpline::operator=(const VLengthSpline &var) +VSplineLength &VSplineLength::operator=(const VSplineLength &var) { if ( &var == this ) { return *this; } - VLengthCurve::operator=(var); + VCurveLength::operator=(var); return *this; } //--------------------------------------------------------------------------------------------------------------------- -VLengthSpline::~VLengthSpline() +VSplineLength::~VSplineLength() {} diff --git a/src/app/container/vlengthspline.h b/src/app/container/vsplinelength.h similarity index 73% rename from src/app/container/vlengthspline.h rename to src/app/container/vsplinelength.h index bc2771486..10b6448d2 100644 --- a/src/app/container/vlengthspline.h +++ b/src/app/container/vsplinelength.h @@ -1,6 +1,6 @@ /************************************************************************ ** - ** @file vlengthsplines.h + ** @file vlengthspline.h ** @author Roman Telezhynskyi ** @date 28 7, 2014 ** @@ -26,22 +26,22 @@ ** *************************************************************************/ -#ifndef VLENGTHSPLINES_H -#define VLENGTHSPLINES_H +#ifndef VSPLINESLENGTH_H +#define VSPLINESLENGTH_H -#include "vlengthcurve.h" +#include "vcurvelength.h" class VAbstractCurve; -class VLengthSpline :public VLengthCurve +class VSplineLength :public VCurveLength { public: - VLengthSpline(); - VLengthSpline(const quint32 &id, const quint32 &parentId, const QString &name, const qreal &value); - VLengthSpline(const quint32 &id, const quint32 &parentId, const VAbstractCurve *path); - VLengthSpline(const VLengthSpline &var); - VLengthSpline &operator=(const VLengthSpline &var); - virtual ~VLengthSpline(); + VSplineLength(); + VSplineLength(const quint32 &id, const quint32 &parentId, const QString &name, const qreal &value); + VSplineLength(const quint32 &id, const quint32 &parentId, const VAbstractCurve *path); + VSplineLength(const VSplineLength &var); + VSplineLength &operator=(const VSplineLength &var); + virtual ~VSplineLength(); }; -#endif // VLENGTHSPLINES_H +#endif // VSPLINELENGTH_H diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index 4e371573d..8f88813d2 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -1004,7 +1004,7 @@ void DialogTool::ValChenged(int row) if (radioButtonLengthArc->isChecked()) { QString desc = QString("%1(%2) - %3").arg(item->text()) - .arg(*data->GetVariable(qApp->VarFromUser(item->text()))->GetValue()) + .arg(*data->GetVariable(qApp->VarFromUser(item->text()))->GetValue()) .arg(tr("Arc length")); labelDescription->setText(desc); return; @@ -1012,7 +1012,7 @@ void DialogTool::ValChenged(int row) if (radioButtonLengthCurve->isChecked()) { QString desc = QString("%1(%2) - %3").arg(item->text()) - .arg(*data->GetVariable(qApp->VarFromUser(item->text()))->GetValue()) + .arg(*data->GetVariable(qApp->VarFromUser(item->text()))->GetValue()) .arg(tr("Curve length")); labelDescription->setText(desc); return; diff --git a/src/app/tools/drawTools/vtoolarc.cpp b/src/app/tools/drawTools/vtoolarc.cpp index 959aff5c5..480df5ddd 100644 --- a/src/app/tools/drawTools/vtoolarc.cpp +++ b/src/app/tools/drawTools/vtoolarc.cpp @@ -140,12 +140,12 @@ VToolArc* VToolArc::Create(const quint32 _id, const quint32 ¢er, QString &ra if (typeCreation == Source::FromGui) { id = data->AddGObject(arc); - data->AddCurveLength(id); + data->AddCurveLength(id); } else { data->UpdateGObject(id, arc); - data->AddCurveLength(id); + data->AddCurveLength(id); if (parse != Document::FullParse) { doc->UpdateToolData(id, data); diff --git a/src/app/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp index 1555f0040..90ed9861c 100644 --- a/src/app/tools/drawTools/vtoolcutarc.cpp +++ b/src/app/tools/drawTools/vtoolcutarc.cpp @@ -142,8 +142,8 @@ VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QS arc1id = data->AddGObject(new VArc(arc1)); arc2id = data->AddGObject(new VArc(arc2)); - data->AddCurveLength(arc1id, id); - data->AddCurveLength(arc2id, id); + data->AddCurveLength(arc1id, id); + data->AddCurveLength(arc2id, id); } else { @@ -155,8 +155,8 @@ VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QS data->UpdateGObject(arc1id, new VArc(arc1)); data->UpdateGObject(arc2id, new VArc(arc2)); - data->AddCurveLength(arc1id, id); - data->AddCurveLength(arc2id, id); + data->AddCurveLength(arc1id, id); + data->AddCurveLength(arc2id, id); if (parse != Document::FullParse) { diff --git a/src/app/tools/drawTools/vtoolcutspline.cpp b/src/app/tools/drawTools/vtoolcutspline.cpp index d6596e3ab..a07c49836 100644 --- a/src/app/tools/drawTools/vtoolcutspline.cpp +++ b/src/app/tools/drawTools/vtoolcutspline.cpp @@ -136,11 +136,11 @@ void VToolCutSpline::Create(const quint32 _id, const QString &pointName, QString VSpline *spline1 = new VSpline(spl->GetP1(), spl1p2, spl1p3, *p, spl->GetKcurve()); spl1id = data->AddGObject(spline1); - data->AddCurveLength(spl1id, id); + data->AddCurveLength(spl1id, id); VSpline *spline2 = new VSpline(*p, spl2p2, spl2p3, spl->GetP4(), spl->GetKcurve()); spl2id = data->AddGObject(spline2); - data->AddCurveLength(spl2id, id); + data->AddCurveLength(spl2id, id); } else { @@ -152,11 +152,11 @@ void VToolCutSpline::Create(const quint32 _id, const QString &pointName, QString VSpline *spline1 = new VSpline(spl->GetP1(), spl1p2, spl1p3, *p, spl->GetKcurve()); data->UpdateGObject(spl1id, spline1); - data->AddCurveLength(spl1id, id); + data->AddCurveLength(spl1id, id); VSpline *spline2 = new VSpline(*p, spl2p2, spl2p3, spl->GetP4(), spl->GetKcurve()); data->UpdateGObject(spl2id, spline2); - data->AddCurveLength(spl2id, id); + data->AddCurveLength(spl2id, id); if (parse != Document::FullParse) { diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp index de1e706b6..398744132 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolcutsplinepath.cpp @@ -198,18 +198,18 @@ void VToolCutSplinePath::Create(const quint32 _id, const QString &pointName, QSt if (typeCreation == Source::FromGui) { splPath1id = data->AddGObject(splPath1); - data->AddCurveLength(splPath1id, id); + data->AddCurveLength(splPath1id, id); splPath2id = data->AddGObject(splPath2); - data->AddCurveLength(splPath2id, id); + data->AddCurveLength(splPath2id, id); } else { data->UpdateGObject(splPath1id, splPath1); - data->AddCurveLength(splPath1id, id); + data->AddCurveLength(splPath1id, id); data->UpdateGObject(splPath2id, splPath2); - data->AddCurveLength(splPath2id, id); + data->AddCurveLength(splPath2id, id); if (parse != Document::FullParse) { diff --git a/src/app/tools/drawTools/vtoolspline.cpp b/src/app/tools/drawTools/vtoolspline.cpp index 482182d66..7fae8d253 100644 --- a/src/app/tools/drawTools/vtoolspline.cpp +++ b/src/app/tools/drawTools/vtoolspline.cpp @@ -154,12 +154,12 @@ void VToolSpline::Create(const quint32 _id, const quint32 &p1, const quint32 &p4 if (typeCreation == Source::FromGui) { id = data->AddGObject(spline); - data->AddCurveLength(id); + data->AddCurveLength(id); } else { data->UpdateGObject(id, spline); - data->AddCurveLength(id); + data->AddCurveLength(id); if (parse != Document::FullParse) { doc->UpdateToolData(id, data); diff --git a/src/app/tools/drawTools/vtoolsplinepath.cpp b/src/app/tools/drawTools/vtoolsplinepath.cpp index c02f37dad..b6a51a28a 100644 --- a/src/app/tools/drawTools/vtoolsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolsplinepath.cpp @@ -136,12 +136,12 @@ void VToolSplinePath::Create(const quint32 _id, VSplinePath *path, VMainGraphics if (typeCreation == Source::FromGui) { id = data->AddGObject(path); - data->AddCurveLength(id); + data->AddCurveLength(id); } else { data->UpdateGObject(id, path); - data->AddCurveLength(id); + data->AddCurveLength(id); if (parse != Document::FullParse) { doc->UpdateToolData(id, data);