diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index 27133a1c4..686d43a8b 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -277,16 +277,6 @@ void DialogAlongLine::setPointName(const QString &value) ui->lineEditNamePoint->setText(pointName); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogAlongLine::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getTypeLine return type of line diff --git a/src/app/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h index 591603fa0..e8122473a 100644 --- a/src/app/dialogs/tools/dialogalongline.h +++ b/src/app/dialogs/tools/dialogalongline.h @@ -48,7 +48,6 @@ public: DialogAlongLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogAlongLine(); - QString getPointName() const; void setPointName(const QString &value); QString getTypeLine() const; diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index 2952d0c48..ed1c31ec0 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -299,16 +299,6 @@ void DialogBisector::closeEvent(QCloseEvent *event) DialogTool::closeEvent(event); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogBisector::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getTypeLine return type of line diff --git a/src/app/dialogs/tools/dialogbisector.h b/src/app/dialogs/tools/dialogbisector.h index 36f09da07..ee26a8a0c 100644 --- a/src/app/dialogs/tools/dialogbisector.h +++ b/src/app/dialogs/tools/dialogbisector.h @@ -49,7 +49,6 @@ public: DialogBisector(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogBisector(); - QString getPointName() const; void setPointName(const QString &value); QString getTypeLine() const; diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp index 85728e8a1..59081bed3 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.cpp @@ -80,12 +80,6 @@ DialogCurveIntersectAxis::~DialogCurveIntersectAxis() delete ui; } -//--------------------------------------------------------------------------------------------------------------------- -QString DialogCurveIntersectAxis::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- void DialogCurveIntersectAxis::setPointName(const QString &value) { diff --git a/src/app/dialogs/tools/dialogcurveintersectaxis.h b/src/app/dialogs/tools/dialogcurveintersectaxis.h index 9ab667062..b2b927dbc 100644 --- a/src/app/dialogs/tools/dialogcurveintersectaxis.h +++ b/src/app/dialogs/tools/dialogcurveintersectaxis.h @@ -45,7 +45,6 @@ public: DialogCurveIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogCurveIntersectAxis(); - QString getPointName() const; void setPointName(const QString &value); QString getTypeLine() const; diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index ed12ca626..5948de364 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -197,16 +197,6 @@ QString DialogCutArc::getFormula() const return qApp->FormulaFromUser(formula); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name point on arc - * @return name - */ -QString DialogCutArc::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getArcId return id of arc diff --git a/src/app/dialogs/tools/dialogcutarc.h b/src/app/dialogs/tools/dialogcutarc.h index 375642524..acc788103 100644 --- a/src/app/dialogs/tools/dialogcutarc.h +++ b/src/app/dialogs/tools/dialogcutarc.h @@ -49,7 +49,6 @@ public: DialogCutArc(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogCutArc(); - QString getPointName() const; void setPointName(const QString &value); QString getFormula() const; diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index 5894681b3..7e9961295 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -180,16 +180,6 @@ void DialogCutSpline::ShowVisualization() } } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogCutSpline::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getFormula return string of formula diff --git a/src/app/dialogs/tools/dialogcutspline.h b/src/app/dialogs/tools/dialogcutspline.h index 4eb871fa9..d4f5c0142 100644 --- a/src/app/dialogs/tools/dialogcutspline.h +++ b/src/app/dialogs/tools/dialogcutspline.h @@ -48,7 +48,6 @@ public: DialogCutSpline(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogCutSpline(); - QString getPointName() const; void setPointName(const QString &value); QString getFormula() const; diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index 5eb72b3f9..c8b2386a5 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -180,16 +180,6 @@ void DialogCutSplinePath::ShowVisualization() } } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogCutSplinePath::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getFormula return string of formula diff --git a/src/app/dialogs/tools/dialogcutsplinepath.h b/src/app/dialogs/tools/dialogcutsplinepath.h index c9cb2fca9..57d2e2800 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.h +++ b/src/app/dialogs/tools/dialogcutsplinepath.h @@ -48,7 +48,6 @@ public: DialogCutSplinePath(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogCutSplinePath(); - QString getPointName() const; void setPointName(const QString &value); QString getFormula() const; diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 62770a73f..b403d94ea 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -310,16 +310,6 @@ DialogEndLine::~DialogEndLine() delete ui; } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogEndLine::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getTypeLine return type of line diff --git a/src/app/dialogs/tools/dialogendline.h b/src/app/dialogs/tools/dialogendline.h index 5ef3cd6ca..d6b938d6c 100644 --- a/src/app/dialogs/tools/dialogendline.h +++ b/src/app/dialogs/tools/dialogendline.h @@ -48,7 +48,6 @@ public: DialogEndLine(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogEndLine(); - QString getPointName() const; void setPointName(const QString &value); QString getTypeLine() const; diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index 95acb0c79..2b68e9a47 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -264,16 +264,6 @@ void DialogHeight::ShowVisualization() } } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogHeight::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getTypeLine return type of line diff --git a/src/app/dialogs/tools/dialogheight.h b/src/app/dialogs/tools/dialogheight.h index 03950da35..78538a776 100644 --- a/src/app/dialogs/tools/dialogheight.h +++ b/src/app/dialogs/tools/dialogheight.h @@ -48,7 +48,6 @@ public: DialogHeight(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogHeight(); - QString getPointName() const; void setPointName(const QString &value); QString getTypeLine() const; diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp index 25cf95713..a1038cc07 100644 --- a/src/app/dialogs/tools/dialoglineintersect.cpp +++ b/src/app/dialogs/tools/dialoglineintersect.cpp @@ -430,13 +430,3 @@ quint32 DialogLineIntersect::getP2Line2() const { return p2Line2; } - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name of point - */ -QString DialogLineIntersect::getPointName() const -{ - return pointName; -} diff --git a/src/app/dialogs/tools/dialoglineintersect.h b/src/app/dialogs/tools/dialoglineintersect.h index 2f470c120..dd21b2319 100644 --- a/src/app/dialogs/tools/dialoglineintersect.h +++ b/src/app/dialogs/tools/dialoglineintersect.h @@ -60,7 +60,6 @@ public: quint32 getP2Line2() const; void setP2Line2(const quint32 &value); - QString getPointName() const; void setPointName(const QString &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.cpp b/src/app/dialogs/tools/dialoglineintersectaxis.cpp index 9e62e943b..19b068f7a 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/app/dialogs/tools/dialoglineintersectaxis.cpp @@ -89,12 +89,6 @@ DialogLineIntersectAxis::~DialogLineIntersectAxis() delete ui; } -//--------------------------------------------------------------------------------------------------------------------- -QString DialogLineIntersectAxis::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- void DialogLineIntersectAxis::setPointName(const QString &value) { diff --git a/src/app/dialogs/tools/dialoglineintersectaxis.h b/src/app/dialogs/tools/dialoglineintersectaxis.h index 73115d278..6e9fff414 100644 --- a/src/app/dialogs/tools/dialoglineintersectaxis.h +++ b/src/app/dialogs/tools/dialoglineintersectaxis.h @@ -45,7 +45,6 @@ public: DialogLineIntersectAxis(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogLineIntersectAxis(); - QString getPointName() const; void setPointName(const QString &value); QString getTypeLine() const; diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 109c38d37..6736f3a6b 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -270,16 +270,6 @@ void DialogNormal::setPointName(const QString &value) ui->lineEditNamePoint->setText(pointName); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogNormal::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getTypeLine return type of line diff --git a/src/app/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h index cdeb8d5b2..935a6f06f 100644 --- a/src/app/dialogs/tools/dialognormal.h +++ b/src/app/dialogs/tools/dialognormal.h @@ -48,7 +48,6 @@ public: DialogNormal(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogNormal(); - QString getPointName() const; void setPointName(const QString &value); QString getTypeLine() const; diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index 862989aa2..d118c5678 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -297,16 +297,6 @@ void DialogPointOfContact::setPointName(const QString &value) ui->lineEditNamePoint->setText(pointName); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogPointOfContact::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getRadius return formula radius of arc diff --git a/src/app/dialogs/tools/dialogpointofcontact.h b/src/app/dialogs/tools/dialogpointofcontact.h index 2fef8c4fc..c773cca40 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.h +++ b/src/app/dialogs/tools/dialogpointofcontact.h @@ -49,7 +49,6 @@ public: DialogPointOfContact(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); virtual ~DialogPointOfContact(); - QString getPointName() const; void setPointName(const QString &value); QString getRadius() const; diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp index 11420fa44..fdcbcbe15 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.cpp +++ b/src/app/dialogs/tools/dialogpointofintersection.cpp @@ -201,16 +201,6 @@ void DialogPointOfIntersection::setPointName(const QString &value) ui->lineEditNamePoint->setText(pointName); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogPointOfIntersection::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getFirstPointId return id of first point diff --git a/src/app/dialogs/tools/dialogpointofintersection.h b/src/app/dialogs/tools/dialogpointofintersection.h index 3ca3b4f8f..8ef0a9795 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.h +++ b/src/app/dialogs/tools/dialogpointofintersection.h @@ -48,7 +48,6 @@ public: DialogPointOfIntersection(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogPointOfIntersection(); - QString getPointName() const; void setPointName(const QString &value); quint32 getFirstPointId() const; diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index 359ddd072..8a9855733 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -298,16 +298,6 @@ void DialogShoulderPoint::setPointName(const QString &value) ui->lineEditNamePoint->setText(pointName); } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogShoulderPoint::getPointName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getTypeLine return type of line diff --git a/src/app/dialogs/tools/dialogshoulderpoint.h b/src/app/dialogs/tools/dialogshoulderpoint.h index 66dd2f0d4..c3989b984 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.h +++ b/src/app/dialogs/tools/dialogshoulderpoint.h @@ -48,7 +48,6 @@ public: DialogShoulderPoint(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogShoulderPoint(); - QString getPointName() const; void setPointName(const QString &value); QString getTypeLine() const; diff --git a/src/app/dialogs/tools/dialogsinglepoint.cpp b/src/app/dialogs/tools/dialogsinglepoint.cpp index 23a0f4ba4..ab7d0012a 100644 --- a/src/app/dialogs/tools/dialogsinglepoint.cpp +++ b/src/app/dialogs/tools/dialogsinglepoint.cpp @@ -108,16 +108,6 @@ DialogSinglePoint::~DialogSinglePoint() delete ui; } -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getName return name - * @return name - */ -QString DialogSinglePoint::getName() const -{ - return pointName; -} - //--------------------------------------------------------------------------------------------------------------------- /** * @brief getPoint return point diff --git a/src/app/dialogs/tools/dialogsinglepoint.h b/src/app/dialogs/tools/dialogsinglepoint.h index 80b6ee226..b92fe136f 100644 --- a/src/app/dialogs/tools/dialogsinglepoint.h +++ b/src/app/dialogs/tools/dialogsinglepoint.h @@ -46,7 +46,6 @@ public: DialogSinglePoint(const VContainer *data, const quint32 &toolId, QWidget *parent = nullptr); ~DialogSinglePoint(); void setData(const QString &name, const QPointF &point); - QString getName()const; QPointF getPoint()const; public slots: void mousePress(const QPointF &scenePos); diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index ba346bc1a..c89503a6d 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -1187,6 +1187,12 @@ void DialogTool::SetToolId(const quint32 &value) toolId = value; } +//--------------------------------------------------------------------------------------------------------------------- +QString DialogTool::getPointName() const +{ + return pointName; +} + //--------------------------------------------------------------------------------------------------------------------- /** * @brief ShowVariable show variables in list diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index a488b3db2..0927c7595 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -69,6 +69,8 @@ public: quint32 GetToolId() const; void SetToolId(const quint32 &value); + + QString getPointName() const; signals: /** * @brief DialogClosed signal dialog closed diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp index e61fced17..875b66a8f 100644 --- a/src/app/dialogs/tools/dialogtriangle.cpp +++ b/src/app/dialogs/tools/dialogtriangle.cpp @@ -315,13 +315,3 @@ quint32 DialogTriangle::getSecondPointId() const { return secondPointId; } - -//--------------------------------------------------------------------------------------------------------------------- -/** - * @brief getPointName return name of point - * @return name - */ -QString DialogTriangle::getPointName() const -{ - return pointName; -} diff --git a/src/app/dialogs/tools/dialogtriangle.h b/src/app/dialogs/tools/dialogtriangle.h index 8b1577b37..df5df7ca2 100644 --- a/src/app/dialogs/tools/dialogtriangle.h +++ b/src/app/dialogs/tools/dialogtriangle.h @@ -60,7 +60,6 @@ public: quint32 getSecondPointId() const; void setSecondPointId(const quint32 &value); - QString getPointName() const; void setPointName(const QString &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); diff --git a/src/app/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp index a90ed60da..1320132b6 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/app/tools/drawTools/vtoolsinglepoint.cpp @@ -195,7 +195,7 @@ void VToolSinglePoint::SaveDialog(QDomElement &domElement) DialogSinglePoint *dialogTool = qobject_cast(dialog); SCASSERT(dialogTool != nullptr); QPointF p = dialogTool->getPoint(); - QString name = dialogTool->getName(); + QString name = dialogTool->getPointName(); doc->SetAttribute(domElement, AttrName, name); doc->SetAttribute(domElement, AttrX, QString().setNum(qApp->fromPixel(p.x()))); doc->SetAttribute(domElement, AttrY, QString().setNum(qApp->fromPixel(p.y())));