add formula to grainline arrows

Author: DSCaskey

src/app/seamly2d/xml/vpattern.cpp

@@ -1076,6 +1076,7 @@ void VPattern::ParsePieceGrainline(const QDomElement &domElement, VPiece &piece)
     gGeometry.setLength(GetParametrString(domElement, AttrLength, "1"));
     gGeometry.setRotation(GetParametrString(domElement, AttrRotation, "90"));
     gGeometry.setArrowType(static_cast<ArrowType>(GetParametrUInt(domElement, AttrArrows, "0")));
+    gGeometry.setArrowLength(GetParametrString(domElement, AttrArrowLength, ".5"));
     gGeometry.setCenterAnchorPoint(GetParametrUInt(domElement, PatternPieceTool::AttrCenterAnchor, NULL_ID_STR));
     gGeometry.setTopAnchorPoint(GetParametrUInt(domElement, PatternPieceTool::AttrTopAnchorPoint, NULL_ID_STR));
     gGeometry.setBottomAnchorPoint(GetParametrUInt(domElement, PatternPieceTool::AttrBottomAnchorPoint, NULL_ID_STR));

src/libs/ifc/schema.qrc

@@ -61,5 +61,6 @@
         <file>schema/pattern/v0.7.0.xsd</file>
         <file>schema/pattern/v0.7.1.xsd</file>
         <file>schema/pattern/v0.7.2.xsd</file>
+        <file>schema/pattern/v0.7.3.xsd</file>
     </qresource>
 </RCC>

src/libs/ifc/schema/pattern/v0.7.3.xsd

@@ -162,6 +162,7 @@ const QString VAbstractPattern::AttrOnFold              = QStringLiteral("onFold
 const QString VAbstractPattern::AttrDateFormat          = QStringLiteral("dateFormat");
 const QString VAbstractPattern::AttrTimeFormat          = QStringLiteral("timeFormat");
 const QString VAbstractPattern::AttrArrows              = QStringLiteral("arrows");
+const QString VAbstractPattern::AttrArrowLength         = QStringLiteral("arrowLength");
 const QString VAbstractPattern::AttrNodeReverse         = QStringLiteral("reverse");
 const QString VAbstractPattern::AttrNodeExcluded        = QStringLiteral("excluded");
 const QString VAbstractPattern::AttrNodeIsNotch         = QStringLiteral("notch");

src/libs/ifc/xml/vabstractpattern.cpp

@@ -358,6 +358,7 @@ class VAbstractPattern : public QObject, public VDomDocument
     static const QString AttrDateFormat;
     static const QString AttrTimeFormat;
     static const QString AttrArrows;
+    static const QString AttrArrowLength;
     static const QString AttrNodeReverse;
     static const QString AttrNodeExcluded;
     static const QString AttrNodeIsNotch;

src/libs/ifc/xml/vabstractpattern.h

@@ -81,8 +81,8 @@ Q_LOGGING_CATEGORY(PatternConverter, "patternConverter")
  */
 
 const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0");
-const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.7.2");
-const QString VPatternConverter::CurrentSchema    = QStringLiteral("://schema/pattern/v0.7.2.xsd");
+const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.7.3");
+const QString VPatternConverter::CurrentSchema    = QStringLiteral("://schema/pattern/v0.7.3.xsd");
 
 //VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!!
 //VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!!
@@ -341,7 +341,9 @@ QString VPatternConverter::getSchema(int ver) const
         case (0x000701):
             return QStringLiteral("://schema/pattern/v0.7.1.xsd");;
         case (0x000702):
-            qCDebug(PatternConverter, "Current schema - ://schema/pattern/v0.7.2.xsd");
+            return QStringLiteral("://schema/pattern/v0.7.2.xsd");;
+        case (0x000703):
+            qCDebug(PatternConverter, "Current schema - ://schema/pattern/v0.7.3.xsd");
             return CurrentSchema;
         default:
             InvalidVersion(ver);
@@ -540,6 +542,10 @@ void VPatternConverter::applyPatches()
             ValidateXML(getSchema(0x000702), m_convertedFileName);
             V_FALLTHROUGH
         case (0x000702):
+            toVersion0_7_3();
+            ValidateXML(getSchema(0x000703), m_convertedFileName);
+            V_FALLTHROUGH
+        case (0x000703):
             break;
         default:
             InvalidVersion(m_ver);
@@ -558,7 +564,7 @@ void VPatternConverter::downgradeToCurrentMaxVersion()
 bool VPatternConverter::isReadOnly() const
 {
     // Check if attribute readOnly was not changed in file format
-    Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == CONVERTER_VERSION_CHECK(0, 7, 2),
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMaxVer == CONVERTER_VERSION_CHECK(0, 7, 3),
                       "Check attribute readOnly.");
 
     // Possibly in future attribute readOnly will change position etc.
@@ -1414,6 +1420,16 @@ void VPatternConverter::toVersion0_7_2()
     Save();
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VPatternConverter::toVersion0_7_3()
+{
+    // TODO. Delete if minimal supported version is 0.7.3
+    Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < CONVERTER_VERSION_CHECK(0, 7, 3),
+                      "Time to refactor the code.");
+    setVersion(QStringLiteral("0.7.3"));
+    Save();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VPatternConverter::TagUnitToV0_2_0()
 {

src/libs/ifc/xml/vpatternconverter.cpp

@@ -75,7 +75,7 @@ class VPatternConverter : public VAbstractConverter
     static const QString PatternMaxVerStr;
     static const QString CurrentSchema;
     static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0);
-    static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 7, 2);
+    static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 7, 3);
 
 protected:
     virtual int     minVer() const override;
@@ -140,6 +140,7 @@ class VPatternConverter : public VAbstractConverter
     void          toVersion0_7_0();
     void          toVersion0_7_1();
     void          toVersion0_7_2();
+    void          toVersion0_7_3();
 
     void          TagUnitToV0_2_0();
     void          TagIncrementToV0_2_0();

src/libs/ifc/xml/vpatternconverter.h

@@ -193,7 +193,7 @@ bool findLabelGeometry(const VPatternLabelData &labelData, const VContainer *pat
 
 //---------------------------------------------------------------------------------------------------------------------
 bool findGrainlineGeometry(const VGrainlineData& data, const VContainer *pattern, qreal &length, qreal &rotationAngle,
-                           QPointF &pos)
+                           qreal &arrowLength, QPointF &pos)
 {
     SCASSERT(pattern != nullptr)
 
@@ -211,6 +211,10 @@ bool findGrainlineGeometry(const VGrainlineData& data, const VContainer *pattern
             length = grainline.length();
             rotationAngle = grainline.angle();
 
+            Calculator cal3;
+            arrowLength = cal3.EvalFormula(pattern->DataVariables(), data.getArrowLength());
+            arrowLength = ToPixel(arrowLength, *pattern->GetPatternUnit());
+
             if (!VFuzzyComparePossibleNulls(rotationAngle, 0))
             {
                 grainline.setAngle(0);
@@ -236,6 +240,10 @@ bool findGrainlineGeometry(const VGrainlineData& data, const VContainer *pattern
         Calculator cal2;
         length = cal2.EvalFormula(pattern->DataVariables(), data.getLength());
         length = ToPixel(length, *pattern->GetPatternUnit());
+
+        Calculator cal3;
+        arrowLength = cal3.EvalFormula(pattern->DataVariables(), data.getArrowLength());
+        arrowLength = ToPixel(arrowLength, *pattern->GetPatternUnit());
     }
     catch(qmu::QmuParserError &error)
     {
@@ -438,20 +446,20 @@ VLayoutPiece VLayoutPiece::Create(const VPiece &piece, const VContainer *pattern
     }
 
     const VPieceLabelData& pieceLabelData = piece.GetPatternPieceData();
-    if (pieceLabelData.IsVisible() == true)
+    if (pieceLabelData.IsVisible() & qApp->Settings()->showLabels())
     {
         layoutPiece.SetPieceText(piece.GetName(), pieceLabelData, qApp->Settings()->getLabelFont(), pattern);
     }
 
     const VPatternLabelData& patternLabelData = piece.GetPatternInfo();
-    if (patternLabelData.IsVisible() == true)
+    if (patternLabelData.IsVisible() & qApp->Settings()->showLabels())
     {
         VAbstractPattern* pDoc = qApp->getCurrentDocument();
         layoutPiece.SetPatternInfo(pDoc, patternLabelData, qApp->Settings()->getLabelFont(), pattern);
     }
 
     const VGrainlineData& grainlineGeom = piece.GetGrainlineGeometry();
-    if (grainlineGeom.IsVisible() == true)
+    if (grainlineGeom.IsVisible() & qApp->Settings()->showGrainlines())
     {
         layoutPiece.setGrainline(grainlineGeom, pattern);
     }
@@ -633,47 +641,39 @@ void VLayoutPiece::setGrainline(const VGrainlineData& data, const VContainer* pa
     QPointF pt1;
     qreal rotationAngle = 0;
     qreal length = 0;
-    if (!findGrainlineGeometry(data, pattern, length, rotationAngle, pt1))
+    qreal arrowLength = 0;
+    if (!findGrainlineGeometry(data, pattern, length, rotationAngle, arrowLength, pt1))
     {
         return;
     }
 
-    const qreal arrowLength = 45;
-    const qreal arrowAngle = M_PI/9;
-
-    QPointF pt2(pt1.x() + arrowLength * qCos(rotationAngle),
-                pt1.y() - arrowLength * qSin(rotationAngle));
-    QPointF pt3(pt1.x() + length * qCos(rotationAngle),
+    QPointF pt2(pt1.x() + length * qCos(rotationAngle),
                 pt1.y() - length * qSin(rotationAngle));
-    QPointF pt4(pt1.x() + (length - arrowLength) * qCos(rotationAngle),
-                pt1.y() - (length - arrowLength) * qSin(rotationAngle));
 
-    QVector<QPointF> v;
-    v << pt2;
+    QVector<QPointF> path;
+    path << pt1;
     if (data.getArrowType() != ArrowType::Top)
     {
-        v << QPointF(pt1.x() + arrowLength * qCos(rotationAngle + arrowAngle),
-                     pt1.y() - arrowLength * qSin(rotationAngle + arrowAngle));
-        v << pt1;
-        v << QPointF(pt1.x() + arrowLength * qCos(rotationAngle - arrowAngle),
-                     pt1.y() - arrowLength * qSin(rotationAngle - arrowAngle));
-        v << pt2;
+        path << QPointF(pt1.x() + arrowLength * cos(rotationAngle + M_PI / 9),
+                        pt1.y() - arrowLength * sin(rotationAngle + M_PI / 9));
+
+        path << QPointF(pt1.x() + arrowLength * cos(rotationAngle - M_PI / 9),
+                        pt1.y() - arrowLength * sin(rotationAngle - M_PI / 9));
     }
+    path << pt1 << pt2;
 
-    v << pt4;
     if (data.getArrowType() != ArrowType::Bottom)
     {
-        rotationAngle += M_PI;
-        v << QPointF(pt3.x() + arrowLength * qCos(rotationAngle + arrowAngle),
-                     pt3.y() - arrowLength * qSin(rotationAngle + arrowAngle));
-        v << pt3;
-        v << QPointF(pt3.x() + arrowLength * qCos(rotationAngle - arrowAngle),
-                     pt3.y() - arrowLength * qSin(rotationAngle - arrowAngle));
-        v << pt4;
+        path << QPointF(pt2.x() + arrowLength * cos(M_PI + rotationAngle + M_PI / 9),
+                        pt2.y() - arrowLength * sin(M_PI + rotationAngle + M_PI / 9));
+
+        path << QPointF(pt2.x() + arrowLength * cos(M_PI + rotationAngle - M_PI / 9),
+                        pt2.y() - arrowLength * sin(M_PI + rotationAngle - M_PI / 9));
     }
+    path << pt2;
 
     QScopedPointer<QGraphicsItem> item(getMainPathItem());
-    d->grainlinePoints = CorrectPosition(item->boundingRect(), v);
+    d->grainlinePoints = CorrectPosition(item->boundingRect(), path);
 }
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vlayout/vlayoutpiece.cpp

@@ -1,53 +1,52 @@
-/***************************************************************************
- *                                                                         *
- *   Copyright (C) 2017  Seamly, LLC                                       *
- *                                                                         *
- *   https://github.com/fashionfreedom/seamly2d                            *
- *                                                                         *
- ***************************************************************************
- **
- **  Seamly2D is free software: you can redistribute it and/or modify
- **  it under the terms of the GNU General Public License as published by
- **  the Free Software Foundation, either version 3 of the License, or
- **  (at your option) any later version.
- **
- **  Seamly2D is distributed in the hope that it will be useful,
- **  but WITHOUT ANY WARRANTY; without even the implied warranty of
- **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- **  GNU General Public License for more details.
- **
- **  You should have received a copy of the GNU General Public License
- **  along with Seamly2D.  If not, see <http://www.gnu.org/licenses/>.
- **
- **************************************************************************
-
- ************************************************************************
- **
- **  @file   vlayoutdetail.h
- **  @author Roman Telezhynskyi <dismine(at)gmail.com>
- **  @date   2 1, 2015
- **
- **  @brief
- **  @copyright
- **  This source code is part of the Valentine project, a pattern making
- **  program, whose allow create and modeling patterns of clothing.
- **  Copyright (C) 2013-2015 Seamly2D project
- **  <https://github.com/fashionfreedom/seamly2d> All Rights Reserved.
- **
- **  Seamly2D is free software: you can redistribute it and/or modify
- **  it under the terms of the GNU General Public License as published by
- **  the Free Software Foundation, either version 3 of the License, or
- **  (at your option) any later version.
- **
- **  Seamly2D is distributed in the hope that it will be useful,
- **  but WITHOUT ANY WARRANTY; without even the implied warranty of
- **  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- **  GNU General Public License for more details.
- **
- **  You should have received a copy of the GNU General Public License
- **  along with Seamly2D.  If not, see <http://www.gnu.org/licenses/>.
- **
- *************************************************************************/
+//---------------------------------------------------------------------------------------------------------------------
+//  @file   vlayoutpiece.h
+//  @author Douglas S Caskey
+//  @date   Dec 27, 2022
+//
+//  @copyright
+//  Copyright (C) 2017 - 2025 Seamly, LLC
+//  https://github.com/fashionfreedom/seamly2d
+//
+//  @brief
+//  Seamly2D is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Seamly2D is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with Seamly2D. If not, see <http://www.gnu.org/licenses/>.
+//---------------------------------------------------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------------------------------------------------
+//  @file   vlayoutdetail.cpp
+//  @author Roman Telezhynskyi <dismine(at)gmail.com>
+//  @date   2 1, 2015
+//
+//  @brief
+//  @copyright
+//  This source code is part of the Valentina project, a pattern making
+//  program, whose allow create and modeling patterns of clothing.
+//  Copyright (C) 2016 Valentina project
+//  <https://bitbucket.org/dismine/valentina> All Rights Reserved.
+//
+//  Valentina is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  Valentina is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with Valentina.  If not, see <http://www.gnu.org/licenses/>.
+//---------------------------------------------------------------------------------------------------------------------
 
 #ifndef VLAYOUTDETAIL_H
 #define VLAYOUTDETAIL_H