From 147ff0d50539cba9927499cef42b39acc0ef846a Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 24 Oct 2014 19:53:13 +0300 Subject: [PATCH] Fild additional angle for tool normal did not work. --HG-- branch : develop --- src/app/dialogs/tools/dialognormal.ui | 3 +++ src/app/widgets/vtooloptionspropertybrowser.cpp | 17 ++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/app/dialogs/tools/dialognormal.ui b/src/app/dialogs/tools/dialognormal.ui index 0e620c525..4352b93e8 100644 --- a/src/app/dialogs/tools/dialognormal.ui +++ b/src/app/dialogs/tools/dialognormal.ui @@ -458,6 +458,9 @@ 0 + + -360.000000000000000 + 360.000000000000000 diff --git a/src/app/widgets/vtooloptionspropertybrowser.cpp b/src/app/widgets/vtooloptionspropertybrowser.cpp index 2832c54a0..95965b7fc 100644 --- a/src/app/widgets/vtooloptionspropertybrowser.cpp +++ b/src/app/widgets/vtooloptionspropertybrowser.cpp @@ -709,7 +709,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolNormal(VProperty *property) case 0: // VAbstractTool::AttrName SetPointName(value.toString()); break; - case 22: // VAbstractTool::AttrAngle + case 5: // VAbstractTool::AttrAngle i->setAngle(value.toDouble()); break; case 3: // VAbstractTool::AttrTypeLine @@ -803,7 +803,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolSpline(VProperty *property) SCASSERT(i != nullptr); switch (PropertiesList().indexOf(id)) { - case 26: // VAbstractTool::AttrKCurve + case 25: // VAbstractTool::AttrKCurve { VSpline spl = i->getSpline(); spl.SetKcurve(value.toDouble()); @@ -828,7 +828,7 @@ void VToolOptionsPropertyBrowser::ChangeDataToolSplinePath(VProperty *property) SCASSERT(i != nullptr); switch (PropertiesList().indexOf(id)) { - case 26: // VAbstractTool::AttrKCurve + case 25: // VAbstractTool::AttrKCurve { VSplinePath splPath = i->getSplinePath(); splPath.setKCurve(value.toDouble()); @@ -1054,7 +1054,7 @@ void VToolOptionsPropertyBrowser::ShowOptionsToolNormal(QGraphicsItem *item) VDoubleProperty* itemAngle = new VDoubleProperty(tr("Additional angle degrees")); itemAngle->setValue(i->getAngle()); - itemAngle->setSetting("Min", 0); + itemAngle->setSetting("Min", -360); itemAngle->setSetting("Max", 360); itemAngle->setSetting("Precision", 3); AddProperty(itemAngle, VAbstractTool::AttrAngle); @@ -1439,10 +1439,9 @@ QStringList VToolOptionsPropertyBrowser::PropertiesList() const << VAbstractTool::AttrP2Line1 /* 19 */ << VAbstractTool::AttrP1Line2 /* 20 */ << VAbstractTool::AttrP2Line2 /* 21 */ - << VAbstractTool::AttrAngle /* 22 */ - << VAbstractTool::AttrPShoulder /* 23 */ - << VAbstractTool::AttrAxisP1 /* 24 */ - << VAbstractTool::AttrAxisP2 /* 25 */ - << VAbstractTool::AttrKCurve; /* 26 */ + << VAbstractTool::AttrPShoulder /* 22 */ + << VAbstractTool::AttrAxisP1 /* 23 */ + << VAbstractTool::AttrAxisP2 /* 24 */ + << VAbstractTool::AttrKCurve; /* 25 */ return attr; }