Fixed issue #966. Unable to control Approximation scale for arc with length.
--HG-- branch : release
This commit is contained in:
parent
a8ec25caf7
commit
24d414d8ce
|
@ -21,6 +21,7 @@
|
||||||
- [#962] Failed to load LibEGL.
|
- [#962] Failed to load LibEGL.
|
||||||
- [#963] Bug in tool Point intersect curve and axis.
|
- [#963] Bug in tool Point intersect curve and axis.
|
||||||
- [#964] Assign operator crashes math parser.
|
- [#964] Assign operator crashes math parser.
|
||||||
|
- [#966] Unable to control Approximation scale for arc with length.
|
||||||
|
|
||||||
# Version 0.6.1 October 23, 2018
|
# Version 0.6.1 October 23, 2018
|
||||||
- [#885] Regression. Broken support for multi size measurements.
|
- [#885] Regression. Broken support for multi size measurements.
|
||||||
|
|
|
@ -3152,6 +3152,7 @@ void VPattern::ParseToolArcWithLength(VMainGraphicsScene *scene, QDomElement &do
|
||||||
const QString lengthFix = initData.length;//need for saving fixed length;
|
const QString lengthFix = initData.length;//need for saving fixed length;
|
||||||
initData.color = GetParametrString(domElement, AttrColor, ColorBlack);
|
initData.color = GetParametrString(domElement, AttrColor, ColorBlack);
|
||||||
initData.penStyle = GetParametrString(domElement, AttrPenStyle, TypeLineLine);
|
initData.penStyle = GetParametrString(domElement, AttrPenStyle, TypeLineLine);
|
||||||
|
initData.approximationScale = GetParametrDouble(domElement, AttrAScale, QChar('0'));
|
||||||
|
|
||||||
VToolArcWithLength::Create(initData);
|
VToolArcWithLength::Create(initData);
|
||||||
//Rewrite attribute formula. Need for situation when we have wrong formula.
|
//Rewrite attribute formula. Need for situation when we have wrong formula.
|
||||||
|
|
|
@ -128,6 +128,7 @@ VToolArcWithLength *VToolArcWithLength::Create(VToolArcWithLengthInitData &initD
|
||||||
VArc *arc = new VArc(calcLength, initData.length, c, calcRadius, initData.radius, calcF1, initData.f1);
|
VArc *arc = new VArc(calcLength, initData.length, c, calcRadius, initData.radius, calcF1, initData.f1);
|
||||||
arc->SetColor(initData.color);
|
arc->SetColor(initData.color);
|
||||||
arc->SetPenStyle(initData.penStyle);
|
arc->SetPenStyle(initData.penStyle);
|
||||||
|
arc->SetApproximationScale(initData.approximationScale);
|
||||||
|
|
||||||
if (initData.typeCreation == Source::FromGui)
|
if (initData.typeCreation == Source::FromGui)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user