Use another way get tool's id for filtering tool from lists.

--HG--
branch : develop

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);
 }
 

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();

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);
 }
 

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();

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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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();

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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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();

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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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();

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);
 }
 

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);

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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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();

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);
 }
 

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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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();

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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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();

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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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();

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);
 }
 

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();

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);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

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<quint32, VGObject*> *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<quint32, VGObject *> *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<quint32, VGObject *> *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<quint32, VGObject *> *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,
+void DialogTool::setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 &value, ComboBoxCutArc cut) const
-                                 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<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged), this,
                &DialogTool::PointNameChanged);
 
-    setCurrentPointId(box, pointId, value, id);
+    setCurrentPointId(box, pointId, value);
 
     connect(box, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged), this,
             &DialogTool::PointNameChanged);

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             FillComboBoxPoints(QComboBox *box)const;
-    void             FillComboBoxArcs(QComboBox *box, const quint32 &id = 0,
+    void             FillComboBoxArcs(QComboBox *box, ComboBoxCutArc cut = ComboBoxCutArc::NoCutArc)const;
-                                      ComboBoxCutArc cut = ComboBoxCutArc::NoCutArc)const;
+    void             FillComboBoxSplines(QComboBox *box, ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline)const;
-    void             FillComboBoxSplines(QComboBox *box, const quint32 &id = 0,
+    void             FillComboBoxSplinesPath(QComboBox *box,
-                                         ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline)const;
-    void             FillComboBoxSplinesPath(QComboBox *box, const quint32 &id = 0,
                                              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             setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value) const;
-    void             setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, const quint32 &id,
+    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,
+    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<QString, quint32> &list)const;

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);
 }

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);

src/app/tools/drawTools/vtoolalongline.cpp

@@ -194,8 +194,8 @@ void VToolAlongLine::setDialog()
     const VPointF *p = VAbstractTool::data.GeometricObject<const VPointF *>(id);
     dialogTool->setTypeLine(typeLine);
     dialogTool->setFormula(formula);
-    dialogTool->setFirstPointId(basePointId, id);
+    dialogTool->setFirstPointId(basePointId);
-    dialogTool->setSecondPointId(secondPointId, id);
+    dialogTool->setSecondPointId(secondPointId);
     dialogTool->setPointName(p->name());
 }
 

src/app/tools/drawTools/vtoolbisector.cpp

@@ -112,9 +112,9 @@ void VToolBisector::setDialog()
     const VPointF *p = VAbstractTool::data.GeometricObject<const VPointF *>(id);
     dialogTool->setTypeLine(typeLine);
     dialogTool->setFormula(formula);
-    dialogTool->setFirstPointId(firstPointId, id);
+    dialogTool->setFirstPointId(firstPointId);
-    dialogTool->setSecondPointId(basePointId, id);
+    dialogTool->setSecondPointId(basePointId);
-    dialogTool->setThirdPointId(thirdPointId, id);
+    dialogTool->setThirdPointId(thirdPointId);
     dialogTool->setPointName(p->name());
 }
 

src/app/tools/drawTools/vtoolcutarc.cpp

@@ -77,7 +77,7 @@ void VToolCutArc::setDialog()
     SCASSERT(dialogTool != nullptr);
     const VPointF *point = VAbstractTool::data.GeometricObject<const VPointF *>(id);
     dialogTool->setFormula(formula);
-    dialogTool->setArcId(curveCutId, id);
+    dialogTool->setArcId(curveCutId);
     dialogTool->setPointName(point->name());
 }
 

src/app/tools/drawTools/vtoolcutspline.cpp

@@ -76,7 +76,7 @@ void VToolCutSpline::setDialog()
     SCASSERT(dialogTool != nullptr);
     const VPointF *point = VAbstractTool::data.GeometricObject<const VPointF *>(id);
     dialogTool->setFormula(formula);
-    dialogTool->setSplineId(curveCutId, id);
+    dialogTool->setSplineId(curveCutId);
     dialogTool->setPointName(point->name());
 }
 

src/app/tools/drawTools/vtoolcutsplinepath.cpp

@@ -79,7 +79,7 @@ void VToolCutSplinePath::setDialog()
     SCASSERT(dialogTool != nullptr);
     const VPointF *point = VAbstractTool::data.GeometricObject<const VPointF *>(id);
     dialogTool->setFormula(formula);
-    dialogTool->setSplinePathId(curveCutId, id);
+    dialogTool->setSplinePathId(curveCutId);
     dialogTool->setPointName(point->name());
 }
 

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());
 }
 

src/app/tools/drawTools/vtoolheight.cpp

@@ -72,9 +72,9 @@ void VToolHeight::setDialog()
     SCASSERT(dialogTool != nullptr);
     const VPointF *p = VAbstractTool::data.GeometricObject<const VPointF *>(id);
     dialogTool->setTypeLine(typeLine);
-    dialogTool->setBasePointId(basePointId, id);
+    dialogTool->setBasePointId(basePointId);
-    dialogTool->setP1LineId(p1LineId, id);
+    dialogTool->setP1LineId(p1LineId);
-    dialogTool->setP2LineId(p2LineId, id);
+    dialogTool->setP2LineId(p2LineId);
     dialogTool->setPointName(p->name());
 }
 

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->setFirstPointId(basePointId);
-    dialogTool->setSecondPointId(secondPointId, id);
+    dialogTool->setSecondPointId(secondPointId);
     dialogTool->setPointName(p->name());
 }
 

src/app/tools/drawTools/vtoolpointofcontact.cpp

@@ -74,9 +74,9 @@ void VToolPointOfContact::setDialog()
     SCASSERT(dialogTool != nullptr);
     const VPointF *p = VAbstractTool::data.GeometricObject<const VPointF *>(id);
     dialogTool->setRadius(arcRadius);
-    dialogTool->setCenter(center, id);
+    dialogTool->setCenter(center);
-    dialogTool->setFirstPoint(firstPointId, id);
+    dialogTool->setFirstPoint(firstPointId);
-    dialogTool->setSecondPoint(secondPointId, id);
+    dialogTool->setSecondPoint(secondPointId);
     dialogTool->setPointName(p->name());
 }
 

src/app/tools/drawTools/vtoolpointofintersection.cpp

@@ -69,8 +69,8 @@ void VToolPointOfIntersection::setDialog()
     DialogPointOfIntersection *dialogTool = qobject_cast<DialogPointOfIntersection*>(dialog);
     SCASSERT(dialogTool != nullptr);
     const VPointF *p = VAbstractTool::data.GeometricObject<const VPointF *>(id);
-    dialogTool->setFirstPointId(firstPointId, id);
+    dialogTool->setFirstPointId(firstPointId);
-    dialogTool->setSecondPointId(secondPointId, id);
+    dialogTool->setSecondPointId(secondPointId);
     dialogTool->setPointName(p->name());
 }
 

src/app/tools/drawTools/vtoolshoulderpoint.cpp

@@ -75,9 +75,9 @@ void VToolShoulderPoint::setDialog()
     const VPointF *p = VAbstractTool::data.GeometricObject<const VPointF *>(id);
     dialogTool->setTypeLine(typeLine);
     dialogTool->setFormula(formula);
-    dialogTool->setP1Line(basePointId, id);
+    dialogTool->setP1Line(basePointId);
-    dialogTool->setP2Line(p2Line, id);
+    dialogTool->setP2Line(p2Line);
-    dialogTool->setPShoulder(pShoulder, id);
+    dialogTool->setPShoulder(pShoulder);
     dialogTool->setPointName(p->name());
 }
 

src/app/tools/drawTools/vtooltriangle.cpp

@@ -72,10 +72,10 @@ void VToolTriangle::setDialog()
     DialogTriangle *dialogTool = qobject_cast<DialogTriangle*>(dialog);
     SCASSERT(dialogTool != nullptr);
     const VPointF *p = VAbstractTool::data.GeometricObject<const VPointF *>(id);
-    dialogTool->setAxisP1Id(axisP1Id, id);
+    dialogTool->setAxisP1Id(axisP1Id);
-    dialogTool->setAxisP2Id(axisP2Id, id);
+    dialogTool->setAxisP2Id(axisP2Id);
-    dialogTool->setFirstPointId(firstPointId, id);
+    dialogTool->setFirstPointId(firstPointId);
-    dialogTool->setSecondPointId(secondPointId, id);
+    dialogTool->setSecondPointId(secondPointId);
     dialogTool->setPointName(p->name());
 }