diff -Nru valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/ChangeLog.txt valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/ChangeLog.txt --- valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/ChangeLog.txt 2019-09-09 09:26:52.000000000 +0000 +++ valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/ChangeLog.txt 2019-09-10 12:16:36.000000000 +0000 @@ -64,7 +64,6 @@ - Changing settings for move and rotate tools through property browser does not take in count previous change for label point and Show label option. - Fix locking file after double save as. - Key --ignoremargins still required margins. -- Fix inverse trigonometric functions. Wrong work with degrees. # Version 0.6.1 October 23, 2018 - [#885] Regression. Broken support for multi size measurements. diff -Nru valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/debian/changelog valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/debian/changelog --- valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/debian/changelog 2019-09-09 09:26:59.000000000 +0000 +++ valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/debian/changelog 2019-09-10 12:16:42.000000000 +0000 @@ -1,8 +1,8 @@ -valentina (0.6.999+60+14+201909090926~ubuntu19.04.1) disco; urgency=low +valentina (0.6.999+60+14+201909101216~ubuntu19.04.1) disco; urgency=low * Auto build. - -- Roman Mon, 09 Sep 2019 09:26:59 +0000 + -- Roman Tue, 10 Sep 2019 12:16:42 +0000 valentina (0.6.999) trusty; urgency=low diff -Nru valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/debian/git-build-recipe.manifest valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/debian/git-build-recipe.manifest --- valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/debian/git-build-recipe.manifest 2019-09-09 09:26:59.000000000 +0000 +++ valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/debian/git-build-recipe.manifest 2019-09-10 12:16:42.000000000 +0000 @@ -1,3 +1,3 @@ -# git-build-recipe format 0.4 deb-version {debupstream}+60+14+201909090926 -lp:valentina git-commit:8becb5aac40514bb1e658de4f0e19364ae388cdb +# git-build-recipe format 0.4 deb-version {debupstream}+60+14+201909101216 +lp:valentina git-commit:384130ea659c38d6e7e95ee9c964dd6a3b1eabc0 merge packaging lp:~dismine/valentina/+git/debian_test git-commit:62d19978f7a7ee31d29764b7d9e811601b41f1b4 diff -Nru valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/src/libs/qmuparser/qmuparser.cpp valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/src/libs/qmuparser/qmuparser.cpp --- valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/src/libs/qmuparser/qmuparser.cpp 2019-09-09 09:26:53.000000000 +0000 +++ valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/src/libs/qmuparser/qmuparser.cpp 2019-09-10 12:16:36.000000000 +0000 @@ -184,7 +184,7 @@ //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::ASinD(qreal v) { - return qAsin(qDegreesToRadians(v)); + return qRadiansToDegrees(qAsin(v)); } //--------------------------------------------------------------------------------------------------------------------- @@ -196,7 +196,7 @@ //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::ACosD(qreal v) { - return qAcos(qDegreesToRadians(v)); + return qRadiansToDegrees(qAcos(v)); } //--------------------------------------------------------------------------------------------------------------------- @@ -208,7 +208,7 @@ //--------------------------------------------------------------------------------------------------------------------- qreal QmuParser::ATanD(qreal v) { - return qAtan(qDegreesToRadians(v)); + return qRadiansToDegrees(qAtan(v)); } //--------------------------------------------------------------------------------------------------------------------- diff -Nru valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/src/libs/vformat/vpatternrecipe.cpp valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/src/libs/vformat/vpatternrecipe.cpp --- valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/src/libs/vformat/vpatternrecipe.cpp 2019-09-09 09:26:53.000000000 +0000 +++ valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/src/libs/vformat/vpatternrecipe.cpp 2019-09-10 12:16:36.000000000 +0000 @@ -139,7 +139,7 @@ // Resore order std::sort(patternMeasurements.begin(), patternMeasurements.end(), [](const QSharedPointer &a, const QSharedPointer &b) - {return a->Index() > b->Index();}); + {return a->Index() < b->Index();}); for(auto &m : patternMeasurements) { @@ -178,7 +178,7 @@ // Resore order std::sort(patternIncrements.begin(), patternIncrements.end(), [](const QSharedPointer &a, const QSharedPointer &b) - {return a->GetIndex() > b->GetIndex();}); + {return a->GetIndex() < b->GetIndex();}); for(auto &incr : patternIncrements) { @@ -201,7 +201,7 @@ // Resore order std::sort(patternIncrements.begin(), patternIncrements.end(), [](const QSharedPointer &a, const QSharedPointer &b) - {return a->GetIndex() > b->GetIndex();}); + {return a->GetIndex() < b->GetIndex();}); for(auto &incr : patternIncrements) { @@ -548,10 +548,10 @@ SetAttribute(step, AttrAngle2Value, spl.GetEndAngle()); SetAttribute(step, AttrLength1, spl.GetC1LengthFormula()); - SetAttribute(step, AttrLength1Value, spl.GetC1Length()); + SetAttribute(step, AttrLength1Value, qApp->fromPixel(spl.GetC1Length())); SetAttribute(step, AttrLength2, spl.GetC2LengthFormula()); - SetAttribute(step, AttrLength2Value, spl.GetC2Length()); + SetAttribute(step, AttrLength2Value, qApp->fromPixel(spl.GetC2Length())); CurveAttributes(step, tool); @@ -646,10 +646,10 @@ SetAttribute(node, AttrAngle2Value, pathNode.Angle2()); SetAttribute(node, AttrLength1, pathNode.Length1Formula()); - SetAttribute(node, AttrLength1Value, pathNode.Length1()); + SetAttribute(node, AttrLength1Value, qApp->fromPixel(pathNode.Length1())); SetAttribute(node, AttrLength2, pathNode.Length2Formula()); - SetAttribute(node, AttrLength2Value, pathNode.Length2()); + SetAttribute(node, AttrLength2Value, qApp->fromPixel(pathNode.Length2())); nodes.appendChild(node); } @@ -841,7 +841,7 @@ ToolAttributes(step, tool); SetAttribute(step, AttrFirstArc, tool->FirstArcName()); - SetAttribute(step, AttrSecondArc, tool->FirstArcName()); + SetAttribute(step, AttrSecondArc, tool->SecondArcName()); SetAttribute(step, AttrCrossPoint, static_cast(tool->GetCrossCirclesPoint())); return step; @@ -873,7 +873,7 @@ ToolAttributes(step, tool); SetAttribute(step, AttrCurve1, tool->FirstCurveName()); - SetAttribute(step, AttrCurve2, tool->FirstCurveName()); + SetAttribute(step, AttrCurve2, tool->SecondCurveName()); SetAttribute(step, AttrVCrossPoint, static_cast(tool->GetVCrossPoint())); SetAttribute(step, AttrHCrossPoint, static_cast(tool->GetHCrossPoint())); diff -Nru valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/src/libs/vlayout/vabstractpiece.h valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/src/libs/vlayout/vabstractpiece.h --- valentina-0.6.999+60+14+201909090926~ubuntu19.04.1/src/libs/vlayout/vabstractpiece.h 2019-09-09 09:26:53.000000000 +0000 +++ valentina-0.6.999+60+14+201909101216~ubuntu19.04.1/src/libs/vlayout/vabstractpiece.h 2019-09-10 12:16:36.000000000 +0000 @@ -205,7 +205,7 @@ } } - if (buf2.first() != buf2.last()) + if (not buf2.isEmpty() && buf2.first() != buf2.last()) { buf2.append(buf2.first()); }