From 4b9e40175a19ce0e9e5b944332c172d6484b4d34 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 15 Jul 2014 17:42:41 +0300 Subject: [PATCH] No need get chosen object for dialog anymore for just showing options. --HG-- branch : develop --- src/app/dialogs/tools/dialogalongline.cpp | 2 +- src/app/dialogs/tools/dialogalongline.h | 2 +- src/app/dialogs/tools/dialogarc.cpp | 2 +- src/app/dialogs/tools/dialogarc.h | 2 +- src/app/dialogs/tools/dialogbisector.cpp | 2 +- src/app/dialogs/tools/dialogbisector.h | 2 +- src/app/dialogs/tools/dialogcutarc.cpp | 2 +- src/app/dialogs/tools/dialogcutarc.h | 2 +- src/app/dialogs/tools/dialogcutspline.cpp | 2 +- src/app/dialogs/tools/dialogcutspline.h | 2 +- src/app/dialogs/tools/dialogcutsplinepath.cpp | 2 +- src/app/dialogs/tools/dialogcutsplinepath.h | 2 +- src/app/dialogs/tools/dialogdetail.cpp | 2 +- src/app/dialogs/tools/dialogdetail.h | 2 +- src/app/dialogs/tools/dialogendline.cpp | 2 +- src/app/dialogs/tools/dialogendline.h | 2 +- src/app/dialogs/tools/dialogheight.cpp | 2 +- src/app/dialogs/tools/dialogheight.h | 2 +- src/app/dialogs/tools/dialogline.cpp | 2 +- src/app/dialogs/tools/dialogline.h | 2 +- src/app/dialogs/tools/dialoglineintersect.cpp | 2 +- src/app/dialogs/tools/dialoglineintersect.h | 2 +- src/app/dialogs/tools/dialognormal.cpp | 2 +- src/app/dialogs/tools/dialognormal.h | 2 +- src/app/dialogs/tools/dialogpointofcontact.cpp | 2 +- src/app/dialogs/tools/dialogpointofcontact.h | 2 +- src/app/dialogs/tools/dialogpointofintersection.cpp | 2 +- src/app/dialogs/tools/dialogpointofintersection.h | 2 +- src/app/dialogs/tools/dialogshoulderpoint.cpp | 2 +- src/app/dialogs/tools/dialogshoulderpoint.h | 2 +- src/app/dialogs/tools/dialogspline.cpp | 2 +- src/app/dialogs/tools/dialogspline.h | 2 +- src/app/dialogs/tools/dialogsplinepath.cpp | 2 +- src/app/dialogs/tools/dialogsplinepath.h | 2 +- src/app/dialogs/tools/dialogtool.cpp | 4 ++-- src/app/dialogs/tools/dialogtool.h | 2 +- src/app/dialogs/tools/dialogtriangle.cpp | 2 +- src/app/dialogs/tools/dialogtriangle.h | 2 +- src/app/dialogs/tools/dialoguniondetails.cpp | 2 +- src/app/dialogs/tools/dialoguniondetails.h | 2 +- src/app/mainwindow.cpp | 4 ++-- src/app/tools/drawTools/vdrawtool.h | 2 -- src/app/tools/vtooldetail.cpp | 2 +- 43 files changed, 44 insertions(+), 46 deletions(-) diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index 63c606799..49f00fa86 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -112,7 +112,7 @@ DialogAlongLine::~DialogAlongLine() * @param id id of point or detail * @param type type of object */ -void DialogAlongLine::ChoosedObject(quint32 id, const SceneObject &type) +void DialogAlongLine::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h index f2b7a1db2..337814546 100644 --- a/src/app/dialogs/tools/dialogalongline.h +++ b/src/app/dialogs/tools/dialogalongline.h @@ -60,7 +60,7 @@ public: quint32 getSecondPointId() const; void setSecondPointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp index 6a0ad3d27..4163bbd20 100644 --- a/src/app/dialogs/tools/dialogarc.cpp +++ b/src/app/dialogs/tools/dialogarc.cpp @@ -176,7 +176,7 @@ void DialogArc::SetRadius(const QString &value) * @param id id of point or detail * @param type type of object */ -void DialogArc::ChoosedObject(quint32 id, const SceneObject &type) +void DialogArc::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogarc.h b/src/app/dialogs/tools/dialogarc.h index 74e1c9ee6..e61b16026 100644 --- a/src/app/dialogs/tools/dialogarc.h +++ b/src/app/dialogs/tools/dialogarc.h @@ -58,7 +58,7 @@ public: QString GetF2() const; void SetF2(const QString &value); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index b4a418a81..2bac1951c 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -123,7 +123,7 @@ DialogBisector::~DialogBisector() * @param id id of point or detail * @param type type of object */ -void DialogBisector::ChoosedObject(quint32 id, const SceneObject &type) +void DialogBisector::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogbisector.h b/src/app/dialogs/tools/dialogbisector.h index 110e7fdbc..50f81b405 100644 --- a/src/app/dialogs/tools/dialogbisector.h +++ b/src/app/dialogs/tools/dialogbisector.h @@ -65,7 +65,7 @@ public: quint32 getThirdPointId() const; void setThirdPointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index fd9075b8f..02d4b35bf 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -88,7 +88,7 @@ DialogCutArc::~DialogCutArc() * @param id id of point or detail * @param type type of object */ -void DialogCutArc::ChoosedObject(quint32 id, const SceneObject &type) +void DialogCutArc::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Arc) { diff --git a/src/app/dialogs/tools/dialogcutarc.h b/src/app/dialogs/tools/dialogcutarc.h index 02cb79b66..b429900ea 100644 --- a/src/app/dialogs/tools/dialogcutarc.h +++ b/src/app/dialogs/tools/dialogcutarc.h @@ -56,7 +56,7 @@ public: quint32 getArcId() const; void setArcId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index 89f02a4d5..9d1b44daf 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -114,7 +114,7 @@ void DialogCutSpline::setSplineId(const quint32 &value, const quint32 &id) * @param id id of point or detail * @param type type of object */ -void DialogCutSpline::ChoosedObject(quint32 id, const SceneObject &type) +void DialogCutSpline::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Spline) { diff --git a/src/app/dialogs/tools/dialogcutspline.h b/src/app/dialogs/tools/dialogcutspline.h index 810658c39..55fa71024 100644 --- a/src/app/dialogs/tools/dialogcutspline.h +++ b/src/app/dialogs/tools/dialogcutspline.h @@ -55,7 +55,7 @@ public: quint32 getSplineId() const; void setSplineId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index a338a6e9d..57330a59c 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -114,7 +114,7 @@ void DialogCutSplinePath::setSplinePathId(const quint32 &value, const quint32 &i * @param id id of point or detail * @param type type of object */ -void DialogCutSplinePath::ChoosedObject(quint32 id, const SceneObject &type) +void DialogCutSplinePath::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::SplinePath) { diff --git a/src/app/dialogs/tools/dialogcutsplinepath.h b/src/app/dialogs/tools/dialogcutsplinepath.h index 8bd39f888..ae0ceb93f 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.h +++ b/src/app/dialogs/tools/dialogcutsplinepath.h @@ -55,7 +55,7 @@ public: quint32 getSplinePathId() const; void setSplinePathId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogdetail.cpp b/src/app/dialogs/tools/dialogdetail.cpp index 2b49a603e..4ac6f265d 100644 --- a/src/app/dialogs/tools/dialogdetail.cpp +++ b/src/app/dialogs/tools/dialogdetail.cpp @@ -80,7 +80,7 @@ DialogDetail::DialogDetail(const VContainer *data, QWidget *parent) * @param id id of objects (points, arcs, splines, spline paths) * @param type type of object */ -void DialogDetail::ChoosedObject(quint32 id, const SceneObject &type) +void DialogDetail::ChosenObject(quint32 id, const SceneObject &type) { if (type != SceneObject::Line && type != SceneObject::Detail) { diff --git a/src/app/dialogs/tools/dialogdetail.h b/src/app/dialogs/tools/dialogdetail.h index 086af98ab..b9ebc8c74 100644 --- a/src/app/dialogs/tools/dialogdetail.h +++ b/src/app/dialogs/tools/dialogdetail.h @@ -45,7 +45,7 @@ public: VDetail getDetails() const; void setDetails(const VDetail &value); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index 78cffba34..2d6b3a2c8 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -84,7 +84,7 @@ void DialogEndLine::DeployFormulaTextEdit() * @param id id of point or detail * @param type type of object */ -void DialogEndLine::ChoosedObject(quint32 id, const SceneObject &type) +void DialogEndLine::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogendline.h b/src/app/dialogs/tools/dialogendline.h index 5e53bfe5c..b462cd128 100644 --- a/src/app/dialogs/tools/dialogendline.h +++ b/src/app/dialogs/tools/dialogendline.h @@ -61,7 +61,7 @@ public: quint32 getBasePointId() const; void setBasePointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index b0fce30d4..92c75c8bd 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -130,7 +130,7 @@ void DialogHeight::setP2LineId(const quint32 &value, const quint32 &id) * @param id id of point or detail * @param type type of object */ -void DialogHeight::ChoosedObject(quint32 id, const SceneObject &type) +void DialogHeight::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogheight.h b/src/app/dialogs/tools/dialogheight.h index 7f3ffbaa4..b6ab8bbf8 100644 --- a/src/app/dialogs/tools/dialogheight.h +++ b/src/app/dialogs/tools/dialogheight.h @@ -61,7 +61,7 @@ public: quint32 getP2LineId() const; void setP2LineId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp index d314df17c..e11a0bfdc 100644 --- a/src/app/dialogs/tools/dialogline.cpp +++ b/src/app/dialogs/tools/dialogline.cpp @@ -157,7 +157,7 @@ void DialogLine::ShowVisualization() * @param id id of point or detail * @param type type of object */ -void DialogLine::ChoosedObject(quint32 id, const SceneObject &type) +void DialogLine::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogline.h b/src/app/dialogs/tools/dialogline.h index 162238aa7..170fefeec 100644 --- a/src/app/dialogs/tools/dialogline.h +++ b/src/app/dialogs/tools/dialogline.h @@ -57,7 +57,7 @@ public: QString getTypeLine() const; void setTypeLine(const QString &value); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp index 95464253c..653f2c6ab 100644 --- a/src/app/dialogs/tools/dialoglineintersect.cpp +++ b/src/app/dialogs/tools/dialoglineintersect.cpp @@ -76,7 +76,7 @@ DialogLineIntersect::~DialogLineIntersect() * @param id id of point or detail * @param type type of object */ -void DialogLineIntersect::ChoosedObject(quint32 id, const SceneObject &type) +void DialogLineIntersect::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialoglineintersect.h b/src/app/dialogs/tools/dialoglineintersect.h index ab590d0f0..937268449 100644 --- a/src/app/dialogs/tools/dialoglineintersect.h +++ b/src/app/dialogs/tools/dialoglineintersect.h @@ -61,7 +61,7 @@ public: QString getPointName() const; void setPointName(const QString &value); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 6091db725..344a30046 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -112,7 +112,7 @@ DialogNormal::~DialogNormal() * @param id id of point or detail * @param type type of object */ -void DialogNormal::ChoosedObject(quint32 id, const SceneObject &type) +void DialogNormal::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h index 6431faae5..b27f78fd0 100644 --- a/src/app/dialogs/tools/dialognormal.h +++ b/src/app/dialogs/tools/dialognormal.h @@ -64,7 +64,7 @@ public: quint32 getSecondPointId() const; void setSecondPointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index a9e43363a..cc66f70a1 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -130,7 +130,7 @@ void DialogPointOfContact::DeployFormulaTextEdit() * @param id id of point or detail * @param type type of object */ -void DialogPointOfContact::ChoosedObject(quint32 id, const SceneObject &type) +void DialogPointOfContact::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogpointofcontact.h b/src/app/dialogs/tools/dialogpointofcontact.h index 9f7ac6691..1931ea2dc 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.h +++ b/src/app/dialogs/tools/dialogpointofcontact.h @@ -60,7 +60,7 @@ public: quint32 getSecondPoint() const; void setSecondPoint(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp index 73c04f2cf..1ca31a278 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.cpp +++ b/src/app/dialogs/tools/dialogpointofintersection.cpp @@ -82,7 +82,7 @@ void DialogPointOfIntersection::setSecondPointId(const quint32 &value, const qui * @param id id of point or detail * @param type type of object */ -void DialogPointOfIntersection::ChoosedObject(quint32 id, const SceneObject &type) +void DialogPointOfIntersection::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogpointofintersection.h b/src/app/dialogs/tools/dialogpointofintersection.h index 777044385..9e20fb92f 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.h +++ b/src/app/dialogs/tools/dialogpointofintersection.h @@ -55,7 +55,7 @@ public: quint32 getSecondPointId() const; void setSecondPointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index 3b3ec9533..22d6507df 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -121,7 +121,7 @@ DialogShoulderPoint::~DialogShoulderPoint() * @param id id of point or detail * @param type type of object */ -void DialogShoulderPoint::ChoosedObject(quint32 id, const SceneObject &type) +void DialogShoulderPoint::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogshoulderpoint.h b/src/app/dialogs/tools/dialogshoulderpoint.h index 99b4eea1e..ce2ac4d8c 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.h +++ b/src/app/dialogs/tools/dialogshoulderpoint.h @@ -64,7 +64,7 @@ public: quint32 getPShoulder() const; void setPShoulder(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp index 90656107a..918aed19c 100644 --- a/src/app/dialogs/tools/dialogspline.cpp +++ b/src/app/dialogs/tools/dialogspline.cpp @@ -75,7 +75,7 @@ quint32 DialogSpline::getP1() const * @param id id of point or detail * @param type type of object */ -void DialogSpline::ChoosedObject(quint32 id, const SceneObject &type) +void DialogSpline::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogspline.h b/src/app/dialogs/tools/dialogspline.h index 447181872..3940d683d 100644 --- a/src/app/dialogs/tools/dialogspline.h +++ b/src/app/dialogs/tools/dialogspline.h @@ -67,7 +67,7 @@ public: qreal getKCurve() const; void setKCurve(const qreal &value); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogsplinepath.cpp b/src/app/dialogs/tools/dialogsplinepath.cpp index 4adf5a0e6..ea3e0696a 100644 --- a/src/app/dialogs/tools/dialogsplinepath.cpp +++ b/src/app/dialogs/tools/dialogsplinepath.cpp @@ -88,7 +88,7 @@ void DialogSplinePath::SetPath(const VSplinePath &value) * @param id id of point or detail * @param type don't show this id in list */ -void DialogSplinePath::ChoosedObject(quint32 id, const SceneObject &type) +void DialogSplinePath::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogsplinepath.h b/src/app/dialogs/tools/dialogsplinepath.h index d0ec30141..21405fc06 100644 --- a/src/app/dialogs/tools/dialogsplinepath.h +++ b/src/app/dialogs/tools/dialogsplinepath.h @@ -50,7 +50,7 @@ public: VSplinePath GetPath() const; void SetPath(const VSplinePath &value); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index f3329367e..a8065e5e2 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -642,11 +642,11 @@ void DialogTool::CheckState() //--------------------------------------------------------------------------------------------------------------------- /** - * @brief ChoosedObject gets id and type of selected object. Save right data and ignore wrong. + * @brief ChosenObject gets id and type of selected object. Save right data and ignore wrong. * @param id id of point or detail * @param type type of object */ -void DialogTool::ChoosedObject(quint32 id, const SceneObject &type) +void DialogTool::ChosenObject(quint32 id, const SceneObject &type) { Q_UNUSED(id); Q_UNUSED(type); diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index f9bc00f3d..6105c1428 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -75,7 +75,7 @@ signals: */ void ToolTip(const QString &toolTip); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); void NamePointChanged(); virtual void DialogAccepted(); /** diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp index 972f67326..a5924b5f3 100644 --- a/src/app/dialogs/tools/dialogtriangle.cpp +++ b/src/app/dialogs/tools/dialogtriangle.cpp @@ -76,7 +76,7 @@ DialogTriangle::~DialogTriangle() * @param id id of point or detail * @param type type of object */ -void DialogTriangle::ChoosedObject(quint32 id, const SceneObject &type) +void DialogTriangle::ChosenObject(quint32 id, const SceneObject &type) { if (type == SceneObject::Point) { diff --git a/src/app/dialogs/tools/dialogtriangle.h b/src/app/dialogs/tools/dialogtriangle.h index 8e8d78177..406a22cc8 100644 --- a/src/app/dialogs/tools/dialogtriangle.h +++ b/src/app/dialogs/tools/dialogtriangle.h @@ -61,7 +61,7 @@ public: QString getPointName() const; void setPointName(const QString &value); public slots: - virtual void ChoosedObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialoguniondetails.cpp b/src/app/dialogs/tools/dialoguniondetails.cpp index b9acd6065..1fc05b387 100644 --- a/src/app/dialogs/tools/dialoguniondetails.cpp +++ b/src/app/dialogs/tools/dialoguniondetails.cpp @@ -57,7 +57,7 @@ DialogUnionDetails::~DialogUnionDetails() * @param id id of point or detail * @param type type of object */ -void DialogUnionDetails::ChoosedObject(quint32 id, const SceneObject &type) +void DialogUnionDetails::ChosenObject(quint32 id, const SceneObject &type) { if (numberD == 0) { diff --git a/src/app/dialogs/tools/dialoguniondetails.h b/src/app/dialogs/tools/dialoguniondetails.h index ca8f92cd8..6766ad651 100644 --- a/src/app/dialogs/tools/dialoguniondetails.h +++ b/src/app/dialogs/tools/dialoguniondetails.h @@ -51,7 +51,7 @@ public: ptrdiff_t getIndexD1() const; ptrdiff_t getIndexD2() const; public slots: - void ChoosedObject(quint32 id, const SceneObject &type); + void ChosenObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index e60130448..ea1a4f2c9 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -264,7 +264,7 @@ void MainWindow::SetToolButton(bool checked, Tool t, const QString &cursor, cons view->setCursor(cur); helpLabel->setText(toolTip); dialogTool = new Dialog(pattern, this); - connect(currentScene, &VMainGraphicsScene::ChoosedObject, dialogTool, &DialogTool::ChoosedObject); + connect(currentScene, &VMainGraphicsScene::ChoosedObject, dialogTool, &DialogTool::ChosenObject); connect(dialogTool, &DialogTool::DialogClosed, this, closeDialogSlot); connect(dialogTool, &DialogTool::ToolTip, this, &MainWindow::ShowToolTip); connect(doc, &VPattern::FullUpdateFromFile, dialogTool, &DialogTool::UpdateList); @@ -302,7 +302,7 @@ void MainWindow::SetToolButtonWithApply(bool checked, Tool t, const QString &cur view->setCursor(cur); helpLabel->setText(toolTip); dialogTool = new Dialog(pattern, this); - connect(currentScene, &VMainGraphicsScene::ChoosedObject, dialogTool, &DialogTool::ChoosedObject); + connect(currentScene, &VMainGraphicsScene::ChoosedObject, dialogTool, &DialogTool::ChosenObject); connect(dialogTool, &DialogTool::DialogClosed, this, closeDialogSlot); connect(dialogTool, &DialogTool::DialogApplied, this, applyDialogSlot); connect(dialogTool, &DialogTool::ToolTip, this, &MainWindow::ShowToolTip); diff --git a/src/app/tools/drawTools/vdrawtool.h b/src/app/tools/drawTools/vdrawtool.h index 06db5b2e4..ea63f156a 100644 --- a/src/app/tools/drawTools/vdrawtool.h +++ b/src/app/tools/drawTools/vdrawtool.h @@ -121,8 +121,6 @@ protected: dialog = new Dialog(getData(), qApp->getMainWindow()); dialog->setModal(true); - connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), - &VMainGraphicsScene::ChoosedObject, dialog, &DialogTool::ChoosedObject); connect(dialog, &DialogTool::DialogClosed, tool, &Tool::FullUpdateFromGuiOk); connect(dialog, &DialogTool::DialogApplied, tool, &Tool::FullUpdateFromGuiApply); if (ignoreFullUpdate == false) diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp index fc9076d7a..edc65d882 100644 --- a/src/app/tools/vtooldetail.cpp +++ b/src/app/tools/vtooldetail.cpp @@ -408,7 +408,7 @@ void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) dialog = new DialogDetail(getData(), qApp->getMainWindow()); dialog->setModal(true); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, - dialog, &DialogTool::ChoosedObject); + dialog, &DialogTool::ChosenObject); connect(dialog, &DialogTool::DialogClosed, this, &VToolDetail::FullUpdateFromGuiOk); setDialog(); dialog->show();