From b8e7cbd1acf3f054c2cc36d4c2b67cd134b56624 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 6 Feb 2015 16:25:04 +0200 Subject: [PATCH] Use for each tool correct method Disable. --HG-- branch : feature --- src/app/tools/drawTools/vtoolbisector.cpp | 2 +- src/app/tools/drawTools/vtoolcurveintersectaxis.cpp | 4 ++-- src/app/tools/drawTools/vtoolcutarc.cpp | 2 +- src/app/tools/drawTools/vtoolcutspline.cpp | 2 +- src/app/tools/drawTools/vtoolcutsplinepath.cpp | 4 ++-- src/app/tools/drawTools/vtoolendline.cpp | 4 ++-- src/app/tools/drawTools/vtoolheight.cpp | 4 ++-- src/app/tools/drawTools/vtoollineintersect.cpp | 2 +- src/app/tools/drawTools/vtoollineintersectaxis.cpp | 4 ++-- src/app/tools/drawTools/vtoolnormal.cpp | 2 +- src/app/tools/drawTools/vtoolpointofcontact.cpp | 2 +- src/app/tools/drawTools/vtoolpointofintersection.cpp | 2 +- src/app/tools/drawTools/vtoolshoulderpoint.cpp | 2 +- src/app/tools/drawTools/vtooltriangle.cpp | 2 +- src/app/xml/vpattern.cpp | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/app/tools/drawTools/vtoolbisector.cpp b/src/app/tools/drawTools/vtoolbisector.cpp index 0052b60af..81d9011af 100644 --- a/src/app/tools/drawTools/vtoolbisector.cpp +++ b/src/app/tools/drawTools/vtoolbisector.cpp @@ -205,7 +205,7 @@ VToolBisector* VToolBisector::Create(const quint32 _id, QString &formula, const scene->addItem(point); connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolBisector::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolBisector::Disable); doc->AddTool(id, point); doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); diff --git a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp index a33b1bca7..e3cce5d22 100644 --- a/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoolcurveintersectaxis.cpp @@ -131,8 +131,8 @@ VToolCurveIntersectAxis *VToolCurveIntersectAxis::Create(const quint32 _id, cons curveId, typeCreation); scene->addItem(point); connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPoint::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolCurveIntersectAxis::SetFactor); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolCurveIntersectAxis::Disable); doc->AddTool(id, point); doc->IncrementReferens(basePointId); doc->IncrementReferens(curveId); diff --git a/src/app/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp index e5d475aa2..b99bad029 100644 --- a/src/app/tools/drawTools/vtoolcutarc.cpp +++ b/src/app/tools/drawTools/vtoolcutarc.cpp @@ -171,7 +171,7 @@ VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QS scene->addItem(point); connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolCutArc::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolCutArc::Disable); doc->AddTool(id, point); doc->AddTool(arc1id, point); doc->AddTool(arc2id, point); diff --git a/src/app/tools/drawTools/vtoolcutspline.cpp b/src/app/tools/drawTools/vtoolcutspline.cpp index afd15db56..edab6ce3e 100644 --- a/src/app/tools/drawTools/vtoolcutspline.cpp +++ b/src/app/tools/drawTools/vtoolcutspline.cpp @@ -178,7 +178,7 @@ VToolCutSpline* VToolCutSpline::Create(const quint32 _id, const QString &pointNa scene->addItem(point); connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolCutSpline::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolCutSpline::Disable); doc->AddTool(id, point); doc->AddTool(spl1id, point); doc->AddTool(spl2id, point); diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp index 7f8b1a005..98f1d820f 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolcutsplinepath.cpp @@ -226,8 +226,8 @@ VToolCutSplinePath* VToolCutSplinePath::Create(const quint32 _id, const QString splPath2id, typeCreation); scene->addItem(point); connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPoint::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolCutSplinePath::SetFactor); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolCutSplinePath::Disable); doc->AddTool(id, point); doc->AddTool(splPath1id, point); doc->AddTool(splPath2id, point); diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index 6476e145d..05dd4b4f3 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -166,8 +166,8 @@ VToolEndLine* VToolEndLine::Create(const quint32 _id, const QString &pointName, typeCreation); scene->addItem(point); connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPoint::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolEndLine::SetFactor); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolEndLine::Disable); doc->AddTool(id, point); doc->IncrementReferens(basePointId); return point; diff --git a/src/app/tools/drawTools/vtoolheight.cpp b/src/app/tools/drawTools/vtoolheight.cpp index 6b3acfdab..583d5e136 100644 --- a/src/app/tools/drawTools/vtoolheight.cpp +++ b/src/app/tools/drawTools/vtoolheight.cpp @@ -164,8 +164,8 @@ VToolHeight* VToolHeight::Create(const quint32 _id, const QString &pointName, co typeCreation); scene->addItem(point); connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPoint::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolHeight::SetFactor); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolHeight::Disable); doc->AddTool(id, point); doc->IncrementReferens(basePointId); doc->IncrementReferens(p1LineId); diff --git a/src/app/tools/drawTools/vtoollineintersect.cpp b/src/app/tools/drawTools/vtoollineintersect.cpp index fcb27fcde..e87b4df57 100644 --- a/src/app/tools/drawTools/vtoollineintersect.cpp +++ b/src/app/tools/drawTools/vtoollineintersect.cpp @@ -175,7 +175,7 @@ VToolLineIntersect* VToolLineIntersect::Create(const quint32 _id, const quint32 scene->addItem(point); connect(point, &VToolLineIntersect::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolLineIntersect::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolLineIntersect::Disable); doc->AddTool(id, point); doc->IncrementReferens(p1Line1Id); doc->IncrementReferens(p2Line1Id); diff --git a/src/app/tools/drawTools/vtoollineintersectaxis.cpp b/src/app/tools/drawTools/vtoollineintersectaxis.cpp index 00b0b6dd4..4290f5007 100644 --- a/src/app/tools/drawTools/vtoollineintersectaxis.cpp +++ b/src/app/tools/drawTools/vtoollineintersectaxis.cpp @@ -143,8 +143,8 @@ VToolLineIntersectAxis *VToolLineIntersectAxis::Create(const quint32 _id, const typeCreation); scene->addItem(point); connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPoint::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolLineIntersectAxis::SetFactor); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolLineIntersectAxis::Disable); doc->AddTool(id, point); doc->IncrementReferens(basePointId); doc->IncrementReferens(firstPointId); diff --git a/src/app/tools/drawTools/vtoolnormal.cpp b/src/app/tools/drawTools/vtoolnormal.cpp index 117519d46..c09472e2a 100644 --- a/src/app/tools/drawTools/vtoolnormal.cpp +++ b/src/app/tools/drawTools/vtoolnormal.cpp @@ -166,7 +166,7 @@ VToolNormal* VToolNormal::Create(const quint32 _id, QString &formula, const quin scene->addItem(point); connect(point, &VToolNormal::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolNormal::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolNormal::Disable); doc->AddTool(id, point); doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); diff --git a/src/app/tools/drawTools/vtoolpointofcontact.cpp b/src/app/tools/drawTools/vtoolpointofcontact.cpp index cc56bf460..9e1575d03 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.cpp +++ b/src/app/tools/drawTools/vtoolpointofcontact.cpp @@ -209,7 +209,7 @@ VToolPointOfContact* VToolPointOfContact::Create(const quint32 _id, QString &rad scene->addItem(point); connect(point, &VToolPointOfContact::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPointOfContact::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPointOfContact::Disable); doc->AddTool(id, point); doc->IncrementReferens(center); doc->IncrementReferens(firstPointId); diff --git a/src/app/tools/drawTools/vtoolpointofintersection.cpp b/src/app/tools/drawTools/vtoolpointofintersection.cpp index f8f771723..3e7efe603 100644 --- a/src/app/tools/drawTools/vtoolpointofintersection.cpp +++ b/src/app/tools/drawTools/vtoolpointofintersection.cpp @@ -150,7 +150,7 @@ VToolPointOfIntersection *VToolPointOfIntersection::Create(const quint32 _id, co scene->addItem(point); connect(point, &VToolPointOfIntersection::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPointOfIntersection::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPointOfIntersection::Disable); doc->AddTool(id, point); doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.cpp b/src/app/tools/drawTools/vtoolshoulderpoint.cpp index 338ae3e75..bc9e5cbeb 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.cpp +++ b/src/app/tools/drawTools/vtoolshoulderpoint.cpp @@ -209,7 +209,7 @@ VToolShoulderPoint* VToolShoulderPoint::Create(const quint32 _id, QString &formu scene->addItem(point); connect(point, &VToolShoulderPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolShoulderPoint::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolShoulderPoint::Disable); doc->AddTool(id, point); doc->IncrementReferens(p1Line); doc->IncrementReferens(p2Line); diff --git a/src/app/tools/drawTools/vtooltriangle.cpp b/src/app/tools/drawTools/vtooltriangle.cpp index bf7d99bdd..5d01d3202 100644 --- a/src/app/tools/drawTools/vtooltriangle.cpp +++ b/src/app/tools/drawTools/vtooltriangle.cpp @@ -161,7 +161,7 @@ VToolTriangle* VToolTriangle::Create(const quint32 _id, const QString &pointName scene->addItem(point); connect(point, &VToolTriangle::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolTriangle::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolTriangle::Disable); doc->AddTool(id, point); doc->IncrementReferens(axisP1Id); doc->IncrementReferens(axisP2Id); diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index 02b401175..a163d7653 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -1161,7 +1161,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem scene->addItem(spoint); connect(spoint, &VToolSinglePoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, spoint, &VToolSinglePoint::SetFactor); - connect(scene, &VMainGraphicsScene::DisableItem, spoint, &VToolPoint::Disable); + connect(scene, &VMainGraphicsScene::DisableItem, spoint, &VToolSinglePoint::Disable); tools[id] = spoint; } }