From 1a4953ad73d46b24be9c29f3fdef2d0abad9e546 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 29 Jul 2014 16:08:38 +0300 Subject: [PATCH] Use another way get tool's id for filtering tool from lists. --HG-- branch : develop --- src/app/dialogs/tools/dialogalongline.cpp | 10 ++-- src/app/dialogs/tools/dialogalongline.h | 4 +- src/app/dialogs/tools/dialogbisector.cpp | 15 +++--- src/app/dialogs/tools/dialogbisector.h | 6 +-- src/app/dialogs/tools/dialogcutarc.cpp | 5 +- src/app/dialogs/tools/dialogcutarc.h | 2 +- src/app/dialogs/tools/dialogcutspline.cpp | 5 +- src/app/dialogs/tools/dialogcutspline.h | 2 +- src/app/dialogs/tools/dialogcutsplinepath.cpp | 5 +- src/app/dialogs/tools/dialogcutsplinepath.h | 2 +- src/app/dialogs/tools/dialogendline.cpp | 5 +- src/app/dialogs/tools/dialogendline.h | 2 +- src/app/dialogs/tools/dialogheight.cpp | 15 +++--- src/app/dialogs/tools/dialogheight.h | 6 +-- src/app/dialogs/tools/dialogline.cpp | 4 +- src/app/dialogs/tools/dialoglineintersect.cpp | 8 +-- src/app/dialogs/tools/dialognormal.cpp | 10 ++-- src/app/dialogs/tools/dialognormal.h | 4 +- .../dialogs/tools/dialogpointofcontact.cpp | 15 +++--- src/app/dialogs/tools/dialogpointofcontact.h | 6 +-- .../tools/dialogpointofintersection.cpp | 10 ++-- .../dialogs/tools/dialogpointofintersection.h | 4 +- src/app/dialogs/tools/dialogshoulderpoint.cpp | 15 +++--- src/app/dialogs/tools/dialogshoulderpoint.h | 6 +-- src/app/dialogs/tools/dialogspline.cpp | 4 +- src/app/dialogs/tools/dialogtool.cpp | 49 ++++++++----------- src/app/dialogs/tools/dialogtool.h | 21 ++++---- src/app/dialogs/tools/dialogtriangle.cpp | 20 +++----- src/app/dialogs/tools/dialogtriangle.h | 8 +-- src/app/tools/drawTools/vtoolalongline.cpp | 4 +- src/app/tools/drawTools/vtoolbisector.cpp | 6 +-- src/app/tools/drawTools/vtoolcutarc.cpp | 2 +- src/app/tools/drawTools/vtoolcutspline.cpp | 2 +- .../tools/drawTools/vtoolcutsplinepath.cpp | 2 +- src/app/tools/drawTools/vtoolendline.cpp | 2 +- src/app/tools/drawTools/vtoolheight.cpp | 6 +-- src/app/tools/drawTools/vtoolnormal.cpp | 4 +- .../tools/drawTools/vtoolpointofcontact.cpp | 6 +-- .../drawTools/vtoolpointofintersection.cpp | 4 +- .../tools/drawTools/vtoolshoulderpoint.cpp | 6 +-- src/app/tools/drawTools/vtooltriangle.cpp | 8 +-- 41 files changed, 142 insertions(+), 178 deletions(-) diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index 63ba47dfc..bd34dda20 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -208,11 +208,10 @@ void DialogAlongLine::SaveData() /** * @brief setSecondPointId set id second point of line * @param value id - * @param id id of current point */ -void DialogAlongLine::setSecondPointId(const quint32 &value, const quint32 &id) +void DialogAlongLine::setSecondPointId(const quint32 &value) { - setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); + setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value); line->setPoint2Id(value); } @@ -220,11 +219,10 @@ void DialogAlongLine::setSecondPointId(const quint32 &value, const quint32 &id) /** * @brief setFirstPointId set id first point of line * @param value id - * @param id id of current point */ -void DialogAlongLine::setFirstPointId(const quint32 &value, const quint32 &id) +void DialogAlongLine::setFirstPointId(const quint32 &value) { - setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); + setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value); line->setPoint1Id(value); } diff --git a/src/app/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h index 87fa5a017..a3d43a5e8 100644 --- a/src/app/dialogs/tools/dialogalongline.h +++ b/src/app/dialogs/tools/dialogalongline.h @@ -57,10 +57,10 @@ public: void setFormula(const QString &value); quint32 getFirstPointId() const; - void setFirstPointId(const quint32 &value, const quint32 &id); + void setFirstPointId(const quint32 &value); quint32 getSecondPointId() const; - void setSecondPointId(const quint32 &value, const quint32 &id); + void setSecondPointId(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index ed44ead31..995a5920a 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -244,11 +244,10 @@ void DialogBisector::setFormula(const QString &value) /** * @brief setFirstPointId set id of first point * @param value id - * @param id don't show this id in list */ -void DialogBisector::setFirstPointId(const quint32 &value, const quint32 &id) +void DialogBisector::setFirstPointId(const quint32 &value) { - setPointId(ui->comboBoxFirstPoint, firstPointId, value, id); + setPointId(ui->comboBoxFirstPoint, firstPointId, value); line->setPoint1Id(firstPointId); } @@ -256,11 +255,10 @@ void DialogBisector::setFirstPointId(const quint32 &value, const quint32 &id) /** * @brief setSecondPointId set id of second point * @param value id - * @param id don't show this id in list */ -void DialogBisector::setSecondPointId(const quint32 &value, const quint32 &id) +void DialogBisector::setSecondPointId(const quint32 &value) { - setPointId(ui->comboBoxSecondPoint, secondPointId, value, id); + setPointId(ui->comboBoxSecondPoint, secondPointId, value); line->setPoint2Id(secondPointId); } @@ -268,11 +266,10 @@ void DialogBisector::setSecondPointId(const quint32 &value, const quint32 &id) /** * @brief setThirdPointId set id of third point * @param value id - * @param id don't show this id in list */ -void DialogBisector::setThirdPointId(const quint32 &value, const quint32 &id) +void DialogBisector::setThirdPointId(const quint32 &value) { - setPointId(ui->comboBoxThirdPoint, thirdPointId, value, id); + setPointId(ui->comboBoxThirdPoint, thirdPointId, value); line->setPoint3Id(thirdPointId); } diff --git a/src/app/dialogs/tools/dialogbisector.h b/src/app/dialogs/tools/dialogbisector.h index 4ca0d8320..1c8727a42 100644 --- a/src/app/dialogs/tools/dialogbisector.h +++ b/src/app/dialogs/tools/dialogbisector.h @@ -59,13 +59,13 @@ public: void setFormula(const QString &value); quint32 getFirstPointId() const; - void setFirstPointId(const quint32 &value, const quint32 &id); + void setFirstPointId(const quint32 &value); quint32 getSecondPointId() const; - void setSecondPointId(const quint32 &value, const quint32 &id); + void setSecondPointId(const quint32 &value); quint32 getThirdPointId() const; - void setThirdPointId(const quint32 &value, const quint32 &id); + void setThirdPointId(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index 8b0d6249c..01e22926f 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -129,11 +129,10 @@ void DialogCutArc::SaveData() /** * @brief setArcId set id of arc * @param value id - * @param id don't show this id in list */ -void DialogCutArc::setArcId(const quint32 &value, const quint32 &id) +void DialogCutArc::setArcId(const quint32 &value) { - setCurrentArcId(ui->comboBoxArc, arcId, value, id, ComboBoxCutArc::CutArc); + setCurrentArcId(ui->comboBoxArc, arcId, value, ComboBoxCutArc::CutArc); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcutarc.h b/src/app/dialogs/tools/dialogcutarc.h index 00aa81a0d..193ba586a 100644 --- a/src/app/dialogs/tools/dialogcutarc.h +++ b/src/app/dialogs/tools/dialogcutarc.h @@ -54,7 +54,7 @@ public: void setFormula(const QString &value); quint32 getArcId() const; - void setArcId(const quint32 &value, const quint32 &id); + void setArcId(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index bad101f75..932be7619 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -101,11 +101,10 @@ void DialogCutSpline::setFormula(const QString &value) /** * @brief setSplineId set id spline * @param value id - * @param id don't show this id in list */ -void DialogCutSpline::setSplineId(const quint32 &value, const quint32 &id) +void DialogCutSpline::setSplineId(const quint32 &value) { - setCurrentSplineId(ui->comboBoxSpline, splineId, value, id, ComboBoxCutSpline::CutSpline); + setCurrentSplineId(ui->comboBoxSpline, splineId, value, ComboBoxCutSpline::CutSpline); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcutspline.h b/src/app/dialogs/tools/dialogcutspline.h index cbb0e1ad2..a334d42ab 100644 --- a/src/app/dialogs/tools/dialogcutspline.h +++ b/src/app/dialogs/tools/dialogcutspline.h @@ -53,7 +53,7 @@ public: void setFormula(const QString &value); quint32 getSplineId() const; - void setSplineId(const quint32 &value, const quint32 &id); + void setSplineId(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index 47c98819b..73aec2f85 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -101,11 +101,10 @@ void DialogCutSplinePath::setFormula(const QString &value) /** * @brief setSplineId set id spline * @param value id - * @param id don't show this id in list */ -void DialogCutSplinePath::setSplinePathId(const quint32 &value, const quint32 &id) +void DialogCutSplinePath::setSplinePathId(const quint32 &value) { - setCurrentSplinePathId(ui->comboBoxSplinePath, splinePathId, value, id, ComboBoxCutSpline::CutSpline); + setCurrentSplinePathId(ui->comboBoxSplinePath, splinePathId, value, ComboBoxCutSpline::CutSpline); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcutsplinepath.h b/src/app/dialogs/tools/dialogcutsplinepath.h index d38fd00c6..4b7e79c10 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.h +++ b/src/app/dialogs/tools/dialogcutsplinepath.h @@ -53,7 +53,7 @@ public: void setFormula(const QString &value); quint32 getSplinePathId() const; - void setSplinePathId(const quint32 &value, const quint32 &id); + void setSplinePathId(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index ab5179705..8a2647184 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -173,11 +173,10 @@ void DialogEndLine::setAngle(const qreal &value) /** * @brief setBasePointId set id base point of line * @param value id - * @param id don't show this id in list */ -void DialogEndLine::setBasePointId(const quint32 &value, const quint32 &id) +void DialogEndLine::setBasePointId(const quint32 &value) { - setCurrentPointId(ui->comboBoxBasePoint, basePointId, value, id); + setCurrentPointId(ui->comboBoxBasePoint, basePointId, value); line->setPoint1Id(value); } diff --git a/src/app/dialogs/tools/dialogendline.h b/src/app/dialogs/tools/dialogendline.h index c645a6acc..648ee33e1 100644 --- a/src/app/dialogs/tools/dialogendline.h +++ b/src/app/dialogs/tools/dialogendline.h @@ -61,7 +61,7 @@ public: void setAngle(const qreal &value); quint32 getBasePointId() const; - void setBasePointId(const quint32 &value, const quint32 &id); + void setBasePointId(const quint32 &value); virtual void ShowDialog(bool click); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index 5c4497c80..e8ca1c118 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -95,33 +95,30 @@ void DialogHeight::setTypeLine(const QString &value) /** * @brief setBasePointId set id base point of height * @param value id - * @param id don't show this id in list */ -void DialogHeight::setBasePointId(const quint32 &value, const quint32 &id) +void DialogHeight::setBasePointId(const quint32 &value) { - setPointId(ui->comboBoxBasePoint, basePointId, value, id); + setPointId(ui->comboBoxBasePoint, basePointId, value); } //--------------------------------------------------------------------------------------------------------------------- /** * @brief setP1LineId set id first point of line * @param value id - * @param id don't show this id in list */ -void DialogHeight::setP1LineId(const quint32 &value, const quint32 &id) +void DialogHeight::setP1LineId(const quint32 &value) { - setPointId(ui->comboBoxP1Line, p1LineId, value, id); + setPointId(ui->comboBoxP1Line, p1LineId, value); } //--------------------------------------------------------------------------------------------------------------------- /** * @brief setP2LineId set id second point of line * @param value id - * @param id don't show this id in list */ -void DialogHeight::setP2LineId(const quint32 &value, const quint32 &id) +void DialogHeight::setP2LineId(const quint32 &value) { - setPointId(ui->comboBoxP2Line, p2LineId, value, id); + setPointId(ui->comboBoxP2Line, p2LineId, value); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogheight.h b/src/app/dialogs/tools/dialogheight.h index c627124ed..5b28c782b 100644 --- a/src/app/dialogs/tools/dialogheight.h +++ b/src/app/dialogs/tools/dialogheight.h @@ -53,13 +53,13 @@ public: void setTypeLine(const QString &value); quint32 getBasePointId() const; - void setBasePointId(const quint32 &value, const quint32 &id); + void setBasePointId(const quint32 &value); quint32 getP1LineId() const; - void setP1LineId(const quint32 &value, const quint32 &id); + void setP1LineId(const quint32 &value); quint32 getP2LineId() const; - void setP2LineId(const quint32 &value, const quint32 &id); + void setP2LineId(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp index 81ff0240c..c3e2eb682 100644 --- a/src/app/dialogs/tools/dialogline.cpp +++ b/src/app/dialogs/tools/dialogline.cpp @@ -77,7 +77,7 @@ DialogLine::~DialogLine() */ void DialogLine::setSecondPoint(const quint32 &value) { - setPointId(ui->comboBoxSecondPoint, secondPoint, value, 0); + setPointId(ui->comboBoxSecondPoint, secondPoint, value); line->setPoint2Id(value); } @@ -100,7 +100,7 @@ void DialogLine::setTypeLine(const QString &value) */ void DialogLine::setFirstPoint(const quint32 &value) { - setPointId(ui->comboBoxFirstPoint, firstPoint, value, 0); + setPointId(ui->comboBoxFirstPoint, firstPoint, value); line->setPoint1Id(value); } diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp index 8b8390d67..3cc7d83a5 100644 --- a/src/app/dialogs/tools/dialoglineintersect.cpp +++ b/src/app/dialogs/tools/dialoglineintersect.cpp @@ -306,7 +306,7 @@ bool DialogLineIntersect::CheckIntersecion() */ void DialogLineIntersect::setP2Line2(const quint32 &value) { - setPointId(ui->comboBoxP2Line2, p2Line2, value, 0); + setPointId(ui->comboBoxP2Line2, p2Line2, value); } //--------------------------------------------------------------------------------------------------------------------- @@ -316,7 +316,7 @@ void DialogLineIntersect::setP2Line2(const quint32 &value) */ void DialogLineIntersect::setP1Line2(const quint32 &value) { - setPointId(ui->comboBoxP1Line2, p1Line2, value, 0); + setPointId(ui->comboBoxP1Line2, p1Line2, value); } //--------------------------------------------------------------------------------------------------------------------- @@ -326,7 +326,7 @@ void DialogLineIntersect::setP1Line2(const quint32 &value) */ void DialogLineIntersect::setP2Line1(const quint32 &value) { - setPointId(ui->comboBoxP2Line1, p2Line1, value, 0); + setPointId(ui->comboBoxP2Line1, p2Line1, value); } //--------------------------------------------------------------------------------------------------------------------- @@ -336,7 +336,7 @@ void DialogLineIntersect::setP2Line1(const quint32 &value) */ void DialogLineIntersect::setP1Line1(const quint32 &value) { - setPointId(ui->comboBoxP1Line1, p1Line1, value, 0); + setPointId(ui->comboBoxP1Line1, p1Line1, value); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 168e41559..eb8204e23 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -171,22 +171,20 @@ void DialogNormal::SaveData() /** * @brief setSecondPointId set id of second point * @param value id - * @param id don't show this id in list */ -void DialogNormal::setSecondPointId(const quint32 &value, const quint32 &id) +void DialogNormal::setSecondPointId(const quint32 &value) { - setPointId(ui->comboBoxSecondPoint, secondPointId, value, id); + setPointId(ui->comboBoxSecondPoint, secondPointId, value); } //--------------------------------------------------------------------------------------------------------------------- /** * @brief setFirstPointId set id of first point * @param value id - * @param id don't show this id in list */ -void DialogNormal::setFirstPointId(const quint32 &value, const quint32 &id) +void DialogNormal::setFirstPointId(const quint32 &value) { - setPointId(ui->comboBoxFirstPoint, firstPointId, value, id); + setPointId(ui->comboBoxFirstPoint, firstPointId, value); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h index ca7c29d86..76c5ed87d 100644 --- a/src/app/dialogs/tools/dialognormal.h +++ b/src/app/dialogs/tools/dialognormal.h @@ -59,10 +59,10 @@ public: void setAngle(const qreal &value); quint32 getFirstPointId() const; - void setFirstPointId(const quint32 &value, const quint32 &id); + void setFirstPointId(const quint32 &value); quint32 getSecondPointId() const; - void setSecondPointId(const quint32 &value, const quint32 &id); + void setSecondPointId(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index 66588a248..f8fbad7ed 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -206,33 +206,30 @@ void DialogPointOfContact::SaveData() /** * @brief setSecondPoint set id second point * @param value id - * @param id don't show this id in list. */ -void DialogPointOfContact::setSecondPoint(const quint32 &value, const quint32 &id) +void DialogPointOfContact::setSecondPoint(const quint32 &value) { - setPointId(ui->comboBoxSecondPoint, secondPoint, value, id); + setPointId(ui->comboBoxSecondPoint, secondPoint, value); } //--------------------------------------------------------------------------------------------------------------------- /** * @brief setFirstPoint set id first point * @param value id - * @param id don't show this id in list. */ -void DialogPointOfContact::setFirstPoint(const quint32 &value, const quint32 &id) +void DialogPointOfContact::setFirstPoint(const quint32 &value) { - setPointId(ui->comboBoxFirstPoint, firstPoint, value, id); + setPointId(ui->comboBoxFirstPoint, firstPoint, value); } //--------------------------------------------------------------------------------------------------------------------- /** * @brief SetCenter set id of center point * @param value id - * @param id don't show this id in list. */ -void DialogPointOfContact::setCenter(const quint32 &value, const quint32 &id) +void DialogPointOfContact::setCenter(const quint32 &value) { - setPointId(ui->comboBoxCenter, center, value, id); + setPointId(ui->comboBoxCenter, center, value); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogpointofcontact.h b/src/app/dialogs/tools/dialogpointofcontact.h index 58869cedf..15bac0b97 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.h +++ b/src/app/dialogs/tools/dialogpointofcontact.h @@ -52,13 +52,13 @@ public: void setRadius(const QString &value); quint32 getCenter() const; - void setCenter(const quint32 &value, const quint32 &id); + void setCenter(const quint32 &value); quint32 getFirstPoint() const; - void setFirstPoint(const quint32 &value, const quint32 &id); + void setFirstPoint(const quint32 &value); quint32 getSecondPoint() const; - void setSecondPoint(const quint32 &value, const quint32 &id); + void setSecondPoint(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp index 9ede6d9d0..81fd815d9 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.cpp +++ b/src/app/dialogs/tools/dialogpointofintersection.cpp @@ -69,11 +69,10 @@ DialogPointOfIntersection::~DialogPointOfIntersection() /** * @brief setSecondPointId set id of second point * @param value id - * @param id don't show this id in list. */ -void DialogPointOfIntersection::setSecondPointId(const quint32 &value, const quint32 &id) +void DialogPointOfIntersection::setSecondPointId(const quint32 &value) { - setPointId(ui->comboBoxSecondPoint, secondPointId, value, id); + setPointId(ui->comboBoxSecondPoint, secondPointId, value); } //--------------------------------------------------------------------------------------------------------------------- @@ -160,11 +159,10 @@ void DialogPointOfIntersection::UpdateList() /** * @brief setFirstPointId set id of first point * @param value id - * @param id don't show this id in list. */ -void DialogPointOfIntersection::setFirstPointId(const quint32 &value, const quint32 &id) +void DialogPointOfIntersection::setFirstPointId(const quint32 &value) { - setPointId(ui->comboBoxFirstPoint, firstPointId, value, id); + setPointId(ui->comboBoxFirstPoint, firstPointId, value); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogpointofintersection.h b/src/app/dialogs/tools/dialogpointofintersection.h index 3460ab146..8862a1fe8 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.h +++ b/src/app/dialogs/tools/dialogpointofintersection.h @@ -50,10 +50,10 @@ public: void setPointName(const QString &value); quint32 getFirstPointId() const; - void setFirstPointId(const quint32 &value, const quint32 &id); + void setFirstPointId(const quint32 &value); quint32 getSecondPointId() const; - void setSecondPointId(const quint32 &value, const quint32 &id); + void setSecondPointId(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index 0288353f5..f9a96ed4a 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -240,11 +240,10 @@ void DialogShoulderPoint::SaveData() /** * @brief setPShoulder set id shoulder point * @param value id - * @param id don't show this id in list */ -void DialogShoulderPoint::setPShoulder(const quint32 &value, const quint32 &id) +void DialogShoulderPoint::setPShoulder(const quint32 &value) { - setPointId(ui->comboBoxPShoulder, pShoulder, value, id); + setPointId(ui->comboBoxPShoulder, pShoulder, value); line->setPoint1Id(pShoulder); } @@ -252,11 +251,10 @@ void DialogShoulderPoint::setPShoulder(const quint32 &value, const quint32 &id) /** * @brief setP2Line set id second point of line * @param value id - * @param id don't show this id in list */ -void DialogShoulderPoint::setP2Line(const quint32 &value, const quint32 &id) +void DialogShoulderPoint::setP2Line(const quint32 &value) { - setPointId(ui->comboBoxP2Line, p2Line, value, id); + setPointId(ui->comboBoxP2Line, p2Line, value); line->setLineP2Id(p2Line); } @@ -264,11 +262,10 @@ void DialogShoulderPoint::setP2Line(const quint32 &value, const quint32 &id) /** * @brief setP1Line set id first point of line * @param value id - * @param id don't show this id in list */ -void DialogShoulderPoint::setP1Line(const quint32 &value, const quint32 &id) +void DialogShoulderPoint::setP1Line(const quint32 &value) { - setPointId(ui->comboBoxP1Line, p1Line, value, id); + setPointId(ui->comboBoxP1Line, p1Line, value); line->setLineP1Id(p1Line); } diff --git a/src/app/dialogs/tools/dialogshoulderpoint.h b/src/app/dialogs/tools/dialogshoulderpoint.h index bf90cae69..c07739c38 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.h +++ b/src/app/dialogs/tools/dialogshoulderpoint.h @@ -58,13 +58,13 @@ public: void setFormula(const QString &value); quint32 getP1Line() const; - void setP1Line(const quint32 &value, const quint32 &id); + void setP1Line(const quint32 &value); quint32 getP2Line() const; - void setP2Line(const quint32 &value, const quint32 &id); + void setP2Line(const quint32 &value); quint32 getPShoulder() const; - void setPShoulder(const quint32 &value, const quint32 &id); + void setPShoulder(const quint32 &value); public slots: virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); diff --git a/src/app/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp index d9416500c..9c63165bf 100644 --- a/src/app/dialogs/tools/dialogspline.cpp +++ b/src/app/dialogs/tools/dialogspline.cpp @@ -227,7 +227,7 @@ void DialogSpline::setAngle1(const qreal &value) */ void DialogSpline::setP4(const quint32 &value) { - setPointId(ui->comboBoxP4, p4, value, 0); + setPointId(ui->comboBoxP4, p4, value); } //--------------------------------------------------------------------------------------------------------------------- @@ -237,7 +237,7 @@ void DialogSpline::setP4(const quint32 &value) */ void DialogSpline::setP1(const quint32 &value) { - setPointId(ui->comboBoxP1, p1, value, 0); + setPointId(ui->comboBoxP1, p1, value); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index d752667d8..4a38ef5ea 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -106,9 +106,8 @@ void DialogTool::showEvent(QShowEvent *event) /** * @brief FillComboBoxPoints fill comboBox list of points * @param box comboBox - * @param id don't show this id in list */ -void DialogTool::FillComboBoxPoints(QComboBox *box, const quint32 &id) const +void DialogTool::FillComboBoxPoints(QComboBox *box) const { SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); @@ -117,7 +116,7 @@ void DialogTool::FillComboBoxPoints(QComboBox *box, const quint32 &id) const while (i.hasNext()) { i.next(); - if (i.key() != id) + if (i.key() != toolId) { VGObject *obj = i.value(); if (obj->getType() == GOType::Point && obj->getMode() == Draw::Calculation) @@ -131,7 +130,7 @@ void DialogTool::FillComboBoxPoints(QComboBox *box, const quint32 &id) const } //--------------------------------------------------------------------------------------------------------------------- -void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboBoxCutArc cut) const +void DialogTool::FillComboBoxArcs(QComboBox *box, ComboBoxCutArc cut) const { SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); @@ -142,7 +141,7 @@ void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboBoxCut i.next(); if (cut == ComboBoxCutArc::CutArc) { - if (i.key() != id + 1 && i.key() != id + 2) + if (i.key() != toolId + 1 && i.key() != toolId + 2) { VGObject *obj = i.value(); if (obj->getType() == GOType::Arc && obj->getMode() == Draw::Calculation) @@ -154,7 +153,7 @@ void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboBoxCut } else { - if (i.key() != id) + if (i.key() != toolId) { VGObject *obj = i.value(); if (obj->getType() == GOType::Arc && obj->getMode() == Draw::Calculation) @@ -172,10 +171,9 @@ void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboBoxCut /** * @brief FillComboBoxSplines fill comboBox list of splines * @param box comboBox - * @param id don't show id in list * @param cut if set to ComboMode::CutSpline don't show id+1 and id+2 */ -void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboBoxCutSpline cut) const +void DialogTool::FillComboBoxSplines(QComboBox *box, ComboBoxCutSpline cut) const { SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); @@ -186,7 +184,7 @@ void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboBox i.next(); if (cut == ComboBoxCutSpline::CutSpline) { - if (i.key() != id + 1 && i.key() != id + 2) + if (i.key() != toolId + 1 && i.key() != toolId + 2) { VGObject *obj = i.value(); if (obj->getType() == GOType::Spline && obj->getMode() == Draw::Calculation) @@ -198,7 +196,7 @@ void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboBox } else { - if (i.key() != id) + if (i.key() != toolId) { VGObject *obj = i.value(); if (obj->getType() == GOType::Spline && obj->getMode() == Draw::Calculation) @@ -216,10 +214,9 @@ void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboBox /** * @brief FillComboBoxSplinesPath * @param box comboBox - * @param id don't show id in list * @param cut if set to ComboMode::CutSpline don't show id+1 and id+2 */ -void DialogTool::FillComboBoxSplinesPath(QComboBox *box, const quint32 &id, ComboBoxCutSpline cut) const +void DialogTool::FillComboBoxSplinesPath(QComboBox *box, ComboBoxCutSpline cut) const { SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); @@ -230,7 +227,7 @@ void DialogTool::FillComboBoxSplinesPath(QComboBox *box, const quint32 &id, Comb i.next(); if (cut == ComboBoxCutSpline::CutSpline) { - if (i.key() != id + 1 && i.key() != id + 2) + if (i.key() != toolId + 1 && i.key() != toolId + 2) { VGObject *obj = i.value(); if (obj->getType() == GOType::SplinePath && obj->getMode() == Draw::Calculation) @@ -242,7 +239,7 @@ void DialogTool::FillComboBoxSplinesPath(QComboBox *box, const quint32 &id, Comb } else { - if (i.key() != id) + if (i.key() != toolId) { VGObject *obj = i.value(); if (obj->getType() == GOType::SplinePath && obj->getMode() == Draw::Calculation) @@ -492,10 +489,10 @@ void DialogTool::Eval(const QString &text, bool &flag, QTimer *timer, QLabel *la } //--------------------------------------------------------------------------------------------------------------------- -void DialogTool::setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value, const quint32 &id) const +void DialogTool::setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value) const { SCASSERT(box != nullptr); - FillComboBoxPoints(box, id); + FillComboBoxPoints(box); pointId = value; ChangeCurrentData(box, value); } @@ -506,14 +503,13 @@ void DialogTool::setCurrentPointId(QComboBox *box, quint32 &pointId, const quint * @param box combobox * @param splineId save current spline id * @param value spline id - * @param id don't show this id in list * @param cut if set to ComboMode::CutSpline don't show id+1 and id+2 */ -void DialogTool::setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, const quint32 &id, +void DialogTool::setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, ComboBoxCutSpline cut) const { SCASSERT(box != nullptr); - FillComboBoxSplines(box, id, cut); + FillComboBoxSplines(box, cut); splineId = value; ChangeCurrentData(box, value); } @@ -524,14 +520,12 @@ void DialogTool::setCurrentSplineId(QComboBox *box, quint32 &splineId, const qui * @param box combobox * @param arcId save current arc id * @param value arc id - * @param id don't show this id in list * @param cut if set to ComboMode::CutArc don't show id+1 and id+2 */ -void DialogTool::setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 &value, const quint32 &id, - ComboBoxCutArc cut) const +void DialogTool::setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 &value, ComboBoxCutArc cut) const { SCASSERT(box != nullptr); - FillComboBoxArcs(box, id, cut); + FillComboBoxArcs(box, cut); arcId = value; ChangeCurrentData(box, value); } @@ -542,14 +536,13 @@ void DialogTool::setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 & * @param box combobox * @param splinePathId save current splinePath id * @param value splinePath id - * @param id don't show this id in list * @param cut if set to ComboMode::CutSpline don't show id+1 and id+2 */ void DialogTool::setCurrentSplinePathId(QComboBox *box, quint32 &splinePathId, const quint32 &value, - const quint32 &id, ComboBoxCutSpline cut) const + ComboBoxCutSpline cut) const { SCASSERT(box != nullptr); - FillComboBoxSplinesPath(box, id, cut); + FillComboBoxSplinesPath(box, cut); splinePathId = value; ChangeCurrentData(box, value); } @@ -692,13 +685,13 @@ void DialogTool::ChangeColor(QWidget *widget, const QColor &color) } //--------------------------------------------------------------------------------------------------------------------- -void DialogTool::setPointId(QComboBox *box, quint32 &pointId, const quint32 &value, const quint32 &id) +void DialogTool::setPointId(QComboBox *box, quint32 &pointId, const quint32 &value) { SCASSERT(box != nullptr); disconnect(box, static_cast(&QComboBox::currentIndexChanged), this, &DialogTool::PointNameChanged); - setCurrentPointId(box, pointId, value, id); + setCurrentPointId(box, pointId, value); connect(box, static_cast(&QComboBox::currentIndexChanged), this, &DialogTool::PointNameChanged); diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index 3cd351772..2735a9039 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -196,12 +196,10 @@ protected: virtual void closeEvent ( QCloseEvent * event ); virtual void showEvent( QShowEvent *event ); - void FillComboBoxPoints(QComboBox *box, const quint32 &id = 0)const; - void FillComboBoxArcs(QComboBox *box, const quint32 &id = 0, - ComboBoxCutArc cut = ComboBoxCutArc::NoCutArc)const; - void FillComboBoxSplines(QComboBox *box, const quint32 &id = 0, - ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline)const; - void FillComboBoxSplinesPath(QComboBox *box, const quint32 &id = 0, + void FillComboBoxPoints(QComboBox *box)const; + void FillComboBoxArcs(QComboBox *box, ComboBoxCutArc cut = ComboBoxCutArc::NoCutArc)const; + void FillComboBoxSplines(QComboBox *box, ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline)const; + void FillComboBoxSplinesPath(QComboBox *box, ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline)const; void FillComboBoxTypeLine(QComboBox *box) const; virtual void CheckState(); @@ -216,13 +214,12 @@ protected: void ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer * timer); void ValFormulaChanged(bool &flag, QPlainTextEdit *edit, QTimer * timer); void Eval(const QString &text, bool &flag, QTimer *timer, QLabel *label); - void setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value, const quint32 &id) const; - void setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, const quint32 &id, + void setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value) const; + void setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline) const; - void setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 &value, const quint32 &id, - ComboBoxCutArc cut = ComboBoxCutArc::NoCutArc) const; + void setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 &value, + ComboBoxCutArc cut = ComboBoxCutArc::NoCutArc) const; void setCurrentSplinePathId(QComboBox *box, quint32 &splinePathId, const quint32 &value, - const quint32 &id, ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline) const; quint32 getCurrentObjectId(QComboBox *box) const; bool ChoosedPoint(const quint32 &id, QComboBox *box, const QString &toolTip); @@ -312,7 +309,7 @@ protected: } void ChangeColor(QWidget *widget, const QColor &color); - void setPointId(QComboBox *box, quint32 &pointId, const quint32 &value, const quint32 &id); + void setPointId(QComboBox *box, quint32 &pointId, const quint32 &value); virtual void ShowVisualization(){} private: void FillList(QComboBox *box, const QMap &list)const; diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp index 4d7fbc04d..aaa060f40 100644 --- a/src/app/dialogs/tools/dialogtriangle.cpp +++ b/src/app/dialogs/tools/dialogtriangle.cpp @@ -170,42 +170,38 @@ void DialogTriangle::setPointName(const QString &value) /** * @brief setSecondPointId set id of second point * @param value id - * @param id don't show this point in list */ -void DialogTriangle::setSecondPointId(const quint32 &value, const quint32 &id) +void DialogTriangle::setSecondPointId(const quint32 &value) { - setPointId(ui->comboBoxSecondPoint, secondPointId, value, id); + setPointId(ui->comboBoxSecondPoint, secondPointId, value); } //--------------------------------------------------------------------------------------------------------------------- /** * @brief setFirstPointId set id of first point * @param value id - * @param id don't show this point in list */ -void DialogTriangle::setFirstPointId(const quint32 &value, const quint32 &id) +void DialogTriangle::setFirstPointId(const quint32 &value) { - setPointId(ui->comboBoxFirstPoint, firstPointId, value, id); + setPointId(ui->comboBoxFirstPoint, firstPointId, value); } //--------------------------------------------------------------------------------------------------------------------- /** * @brief setAxisP2Id set id second point of axis * @param value id - * @param id don't show this point in list */ -void DialogTriangle::setAxisP2Id(const quint32 &value, const quint32 &id) +void DialogTriangle::setAxisP2Id(const quint32 &value) { - setPointId(ui->comboBoxAxisP2, axisP2Id, value, id); + setPointId(ui->comboBoxAxisP2, axisP2Id, value); } //--------------------------------------------------------------------------------------------------------------------- /** * @brief setAxisP1Id set id first point of axis * @param value id - * @param id don't show this point in list */ -void DialogTriangle::setAxisP1Id(const quint32 &value, const quint32 &id) +void DialogTriangle::setAxisP1Id(const quint32 &value) { - setPointId(ui->comboBoxAxisP1, axisP1Id, value, id); + setPointId(ui->comboBoxAxisP1, axisP1Id, value); } diff --git a/src/app/dialogs/tools/dialogtriangle.h b/src/app/dialogs/tools/dialogtriangle.h index ff4f14595..44d69cf69 100644 --- a/src/app/dialogs/tools/dialogtriangle.h +++ b/src/app/dialogs/tools/dialogtriangle.h @@ -47,16 +47,16 @@ public: ~DialogTriangle(); quint32 getAxisP1Id() const; - void setAxisP1Id(const quint32 &value, const quint32 &id); + void setAxisP1Id(const quint32 &value); quint32 getAxisP2Id() const; - void setAxisP2Id(const quint32 &value, const quint32 &id); + void setAxisP2Id(const quint32 &value); quint32 getFirstPointId() const; - void setFirstPointId(const quint32 &value, const quint32 &id); + void setFirstPointId(const quint32 &value); quint32 getSecondPointId() const; - void setSecondPointId(const quint32 &value, const quint32 &id); + void setSecondPointId(const quint32 &value); QString getPointName() const; void setPointName(const QString &value); diff --git a/src/app/tools/drawTools/vtoolalongline.cpp b/src/app/tools/drawTools/vtoolalongline.cpp index cc37bf935..a3285adca 100644 --- a/src/app/tools/drawTools/vtoolalongline.cpp +++ b/src/app/tools/drawTools/vtoolalongline.cpp @@ -194,8 +194,8 @@ void VToolAlongLine::setDialog() const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); - dialogTool->setFirstPointId(basePointId, id); - dialogTool->setSecondPointId(secondPointId, id); + dialogTool->setFirstPointId(basePointId); + dialogTool->setSecondPointId(secondPointId); dialogTool->setPointName(p->name()); } diff --git a/src/app/tools/drawTools/vtoolbisector.cpp b/src/app/tools/drawTools/vtoolbisector.cpp index 2dfe5a3e1..ffdf4714b 100644 --- a/src/app/tools/drawTools/vtoolbisector.cpp +++ b/src/app/tools/drawTools/vtoolbisector.cpp @@ -112,9 +112,9 @@ void VToolBisector::setDialog() const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); - dialogTool->setFirstPointId(firstPointId, id); - dialogTool->setSecondPointId(basePointId, id); - dialogTool->setThirdPointId(thirdPointId, id); + dialogTool->setFirstPointId(firstPointId); + dialogTool->setSecondPointId(basePointId); + dialogTool->setThirdPointId(thirdPointId); dialogTool->setPointName(p->name()); } diff --git a/src/app/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp index c483ab478..d38a348e3 100644 --- a/src/app/tools/drawTools/vtoolcutarc.cpp +++ b/src/app/tools/drawTools/vtoolcutarc.cpp @@ -77,7 +77,7 @@ void VToolCutArc::setDialog() SCASSERT(dialogTool != nullptr); const VPointF *point = VAbstractTool::data.GeometricObject(id); dialogTool->setFormula(formula); - dialogTool->setArcId(curveCutId, id); + dialogTool->setArcId(curveCutId); dialogTool->setPointName(point->name()); } diff --git a/src/app/tools/drawTools/vtoolcutspline.cpp b/src/app/tools/drawTools/vtoolcutspline.cpp index a25fa0961..46db85a02 100644 --- a/src/app/tools/drawTools/vtoolcutspline.cpp +++ b/src/app/tools/drawTools/vtoolcutspline.cpp @@ -76,7 +76,7 @@ void VToolCutSpline::setDialog() SCASSERT(dialogTool != nullptr); const VPointF *point = VAbstractTool::data.GeometricObject(id); dialogTool->setFormula(formula); - dialogTool->setSplineId(curveCutId, id); + dialogTool->setSplineId(curveCutId); dialogTool->setPointName(point->name()); } diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp index 7de3c9161..dde0a50f4 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolcutsplinepath.cpp @@ -79,7 +79,7 @@ void VToolCutSplinePath::setDialog() SCASSERT(dialogTool != nullptr); const VPointF *point = VAbstractTool::data.GeometricObject(id); dialogTool->setFormula(formula); - dialogTool->setSplinePathId(curveCutId, id); + dialogTool->setSplinePathId(curveCutId); dialogTool->setPointName(point->name()); } diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index 1325f0326..ffb95d236 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -78,7 +78,7 @@ void VToolEndLine::setDialog() dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); dialogTool->setAngle(angle); - dialogTool->setBasePointId(basePointId, id); + dialogTool->setBasePointId(basePointId); dialogTool->setPointName(p->name()); } diff --git a/src/app/tools/drawTools/vtoolheight.cpp b/src/app/tools/drawTools/vtoolheight.cpp index 0009826cf..350588912 100644 --- a/src/app/tools/drawTools/vtoolheight.cpp +++ b/src/app/tools/drawTools/vtoolheight.cpp @@ -72,9 +72,9 @@ void VToolHeight::setDialog() SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); - dialogTool->setBasePointId(basePointId, id); - dialogTool->setP1LineId(p1LineId, id); - dialogTool->setP2LineId(p2LineId, id); + dialogTool->setBasePointId(basePointId); + dialogTool->setP1LineId(p1LineId); + dialogTool->setP2LineId(p2LineId); dialogTool->setPointName(p->name()); } diff --git a/src/app/tools/drawTools/vtoolnormal.cpp b/src/app/tools/drawTools/vtoolnormal.cpp index 743e75c80..2b00143d8 100644 --- a/src/app/tools/drawTools/vtoolnormal.cpp +++ b/src/app/tools/drawTools/vtoolnormal.cpp @@ -77,8 +77,8 @@ void VToolNormal::setDialog() dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); dialogTool->setAngle(angle); - dialogTool->setFirstPointId(basePointId, id); - dialogTool->setSecondPointId(secondPointId, id); + dialogTool->setFirstPointId(basePointId); + dialogTool->setSecondPointId(secondPointId); dialogTool->setPointName(p->name()); } diff --git a/src/app/tools/drawTools/vtoolpointofcontact.cpp b/src/app/tools/drawTools/vtoolpointofcontact.cpp index 328186e80..b52ce5ef6 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.cpp +++ b/src/app/tools/drawTools/vtoolpointofcontact.cpp @@ -74,9 +74,9 @@ void VToolPointOfContact::setDialog() SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setRadius(arcRadius); - dialogTool->setCenter(center, id); - dialogTool->setFirstPoint(firstPointId, id); - dialogTool->setSecondPoint(secondPointId, id); + dialogTool->setCenter(center); + dialogTool->setFirstPoint(firstPointId); + dialogTool->setSecondPoint(secondPointId); dialogTool->setPointName(p->name()); } diff --git a/src/app/tools/drawTools/vtoolpointofintersection.cpp b/src/app/tools/drawTools/vtoolpointofintersection.cpp index a9ec943ba..affb53783 100644 --- a/src/app/tools/drawTools/vtoolpointofintersection.cpp +++ b/src/app/tools/drawTools/vtoolpointofintersection.cpp @@ -69,8 +69,8 @@ void VToolPointOfIntersection::setDialog() DialogPointOfIntersection *dialogTool = qobject_cast(dialog); SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); - dialogTool->setFirstPointId(firstPointId, id); - dialogTool->setSecondPointId(secondPointId, id); + dialogTool->setFirstPointId(firstPointId); + dialogTool->setSecondPointId(secondPointId); dialogTool->setPointName(p->name()); } diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.cpp b/src/app/tools/drawTools/vtoolshoulderpoint.cpp index 00e38760f..5d332e4e3 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.cpp +++ b/src/app/tools/drawTools/vtoolshoulderpoint.cpp @@ -75,9 +75,9 @@ void VToolShoulderPoint::setDialog() const VPointF *p = VAbstractTool::data.GeometricObject(id); dialogTool->setTypeLine(typeLine); dialogTool->setFormula(formula); - dialogTool->setP1Line(basePointId, id); - dialogTool->setP2Line(p2Line, id); - dialogTool->setPShoulder(pShoulder, id); + dialogTool->setP1Line(basePointId); + dialogTool->setP2Line(p2Line); + dialogTool->setPShoulder(pShoulder); dialogTool->setPointName(p->name()); } diff --git a/src/app/tools/drawTools/vtooltriangle.cpp b/src/app/tools/drawTools/vtooltriangle.cpp index 1d82f20a8..3bb91e32a 100644 --- a/src/app/tools/drawTools/vtooltriangle.cpp +++ b/src/app/tools/drawTools/vtooltriangle.cpp @@ -72,10 +72,10 @@ void VToolTriangle::setDialog() DialogTriangle *dialogTool = qobject_cast(dialog); SCASSERT(dialogTool != nullptr); const VPointF *p = VAbstractTool::data.GeometricObject(id); - dialogTool->setAxisP1Id(axisP1Id, id); - dialogTool->setAxisP2Id(axisP2Id, id); - dialogTool->setFirstPointId(firstPointId, id); - dialogTool->setSecondPointId(secondPointId, id); + dialogTool->setAxisP1Id(axisP1Id); + dialogTool->setAxisP2Id(axisP2Id); + dialogTool->setFirstPointId(firstPointId); + dialogTool->setSecondPointId(secondPointId); dialogTool->setPointName(p->name()); }