diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 0edf3d62b..502b46ca7 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -896,7 +896,7 @@ void VPattern::ParsePieceDataTag(const QDomElement &domElement, VPiece &detail) ppData.SetLetter(GetParametrEmptyString(domElement, AttrLetter)); ppData.SetAnnotation(GetParametrEmptyString(domElement, AttrAnnotation)); ppData.SetOrientation(GetParametrEmptyString(domElement, AttrOrientation)); - ppData.SetRotation(GetParametrEmptyString(domElement, AttrRotation)); + ppData.SetRotationWay(GetParametrEmptyString(domElement, AttrRotationWay)); ppData.SetTilt(GetParametrEmptyString(domElement, AttrTilt)); ppData.SetFoldPosition(GetParametrEmptyString(domElement, AttrFoldPosition)); ppData.SetQuantity(static_cast(GetParametrUInt(domElement, AttrQuantity, "1"))); diff --git a/src/libs/ifc/schema/pattern/v0.6.0.xsd b/src/libs/ifc/schema/pattern/v0.6.0.xsd index 9cb509919..6fa074688 100644 --- a/src/libs/ifc/schema/pattern/v0.6.0.xsd +++ b/src/libs/ifc/schema/pattern/v0.6.0.xsd @@ -518,7 +518,7 @@ - + diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index e36b0e88d..ae61d21a8 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -99,7 +99,7 @@ const QString VAbstractPattern::AttrType = QStringLiteral("type"); const QString VAbstractPattern::AttrLetter = QStringLiteral("letter"); const QString VAbstractPattern::AttrAnnotation = QStringLiteral("annotation"); const QString VAbstractPattern::AttrOrientation = QStringLiteral("orientation"); -const QString VAbstractPattern::AttrRotation = QStringLiteral("rotation"); +const QString VAbstractPattern::AttrRotationWay = QStringLiteral("rotationWay"); const QString VAbstractPattern::AttrTilt = QStringLiteral("tilt"); const QString VAbstractPattern::AttrFoldPosition = QStringLiteral("foldPosition"); const QString VAbstractPattern::AttrQuantity = QStringLiteral("quantity"); @@ -120,6 +120,7 @@ const QString VAbstractPattern::AttrPath = QStringLiteral("path"); const QString VAbstractPattern::AttrEnd = QStringLiteral("end"); const QString VAbstractPattern::AttrIncludeAs = QStringLiteral("includeAs"); const QString VAbstractPattern::AttrWidth = QStringLiteral("width"); +const QString VAbstractPattern::AttrRotation = QStringLiteral("rotation"); const QString VAbstractPattern::AttrAll = QStringLiteral("all"); diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h index 1ce307b00..c70afa71e 100644 --- a/src/libs/ifc/xml/vabstractpattern.h +++ b/src/libs/ifc/xml/vabstractpattern.h @@ -229,7 +229,7 @@ public: static const QString AttrLetter; static const QString AttrAnnotation; static const QString AttrOrientation; - static const QString AttrRotation; + static const QString AttrRotationWay; static const QString AttrTilt; static const QString AttrFoldPosition; static const QString AttrQuantity; @@ -250,6 +250,7 @@ public: static const QString AttrEnd; static const QString AttrIncludeAs; static const QString AttrWidth; + static const QString AttrRotation; static const QString AttrAll; diff --git a/src/libs/vlayout/vtextmanager.cpp b/src/libs/vlayout/vtextmanager.cpp index c5e21c952..f16c9a717 100644 --- a/src/libs/vlayout/vtextmanager.cpp +++ b/src/libs/vlayout/vtextmanager.cpp @@ -127,7 +127,7 @@ void InitPiecePlaceholders(QMap &placeholders, const QString & placeholders[pl_pLetter] = data.GetLetter(); placeholders[pl_pAnnotation] = data.GetAnnotation(); placeholders[pl_pOrientation] = data.GetOrientation(); - placeholders[pl_pRotation] = data.GetRotation(); + placeholders[pl_pRotation] = data.GetRotationWay(); placeholders[pl_pTilt] = data.GetTilt(); placeholders[pl_pFoldPosition] = data.GetFoldPosition(); placeholders[pl_pName] = name; diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp index 6b5da058d..a72996faf 100644 --- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp +++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp @@ -102,15 +102,15 @@ void VPieceLabelData::SetOrientation(const QString &val) } //--------------------------------------------------------------------------------------------------------------------- -QString VPieceLabelData::GetRotation() const +QString VPieceLabelData::GetRotationWay() const { - return d->m_rotation; + return d->m_rotationWay; } //--------------------------------------------------------------------------------------------------------------------- -void VPieceLabelData::SetRotation(const QString &val) +void VPieceLabelData::SetRotationWay(const QString &val) { - d->m_rotation = val; + d->m_rotationWay = val; } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h index 087184d30..592cb0810 100644 --- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h +++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata.h @@ -69,8 +69,8 @@ public: QString GetOrientation() const; void SetOrientation(const QString &val); - QString GetRotation() const; - void SetRotation(const QString &val); + QString GetRotationWay() const; + void SetRotationWay(const QString &val); QString GetTilt() const; void SetTilt(const QString &val); diff --git a/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h b/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h index 23ff02908..a9ac02143 100644 --- a/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h +++ b/src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h @@ -48,7 +48,7 @@ public: : m_qsLetter(), m_annotation(), m_orientation(), - m_rotation(), + m_rotationWay(), m_tilt(), m_foldPosition(), m_quantity(1), @@ -61,7 +61,7 @@ public: m_qsLetter(data.m_qsLetter), m_annotation(data.m_annotation), m_orientation(data.m_orientation), - m_rotation(data.m_rotation), + m_rotationWay(data.m_rotationWay), m_tilt(data.m_tilt), m_foldPosition(data.m_foldPosition), m_quantity(data.m_quantity), @@ -75,7 +75,7 @@ public: QString m_qsLetter; QString m_annotation; QString m_orientation; - QString m_rotation; + QString m_rotationWay; QString m_tilt; QString m_foldPosition; diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp index c59ad9733..332e444f7 100644 --- a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp @@ -599,7 +599,7 @@ void DialogEditLabel::SetPiece(const VPiece &piece) m_placeholders[pl_pLetter].second = pieceData.GetLetter(); m_placeholders[pl_pAnnotation].second = pieceData.GetAnnotation(); m_placeholders[pl_pOrientation].second = pieceData.GetOrientation(); - m_placeholders[pl_pRotation].second = pieceData.GetRotation(); + m_placeholders[pl_pRotation].second = pieceData.GetRotationWay(); m_placeholders[pl_pTilt].second = pieceData.GetTilt(); m_placeholders[pl_pFoldPosition].second = pieceData.GetFoldPosition(); m_placeholders[pl_pName].second = piece.GetName(); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index cdfb3186a..1511103c7 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -248,7 +248,7 @@ void DialogSeamAllowance::SetPiece(const VPiece &piece) uiTabLabels->lineEditLetter->setText(m_oldData.GetLetter()); uiTabLabels->lineEditAnnotation->setText(m_oldData.GetAnnotation()); uiTabLabels->lineEditOrientation->setText(m_oldData.GetOrientation()); - uiTabLabels->lineEditRotation->setText(m_oldData.GetRotation()); + uiTabLabels->lineEditRotation->setText(m_oldData.GetRotationWay()); uiTabLabels->lineEditTilt->setText(m_oldData.GetTilt()); uiTabLabels->lineEditFoldPosition->setText(m_oldData.GetFoldPosition()); uiTabLabels->spinBoxQuantity->setValue(m_oldData.GetQuantity()); @@ -1978,7 +1978,7 @@ VPiece DialogSeamAllowance::CreatePiece() const piece.GetPatternPieceData().SetLetter(uiTabLabels->lineEditLetter->text()); piece.GetPatternPieceData().SetAnnotation(uiTabLabels->lineEditAnnotation->text()); piece.GetPatternPieceData().SetOrientation(uiTabLabels->lineEditOrientation->text()); - piece.GetPatternPieceData().SetRotation(uiTabLabels->lineEditRotation->text()); + piece.GetPatternPieceData().SetRotationWay(uiTabLabels->lineEditRotation->text()); piece.GetPatternPieceData().SetTilt(uiTabLabels->lineEditTilt->text()); piece.GetPatternPieceData().SetFoldPosition(uiTabLabels->lineEditFoldPosition->text()); piece.GetPatternPieceData().SetQuantity(uiTabLabels->spinBoxQuantity->value()); diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index 69c1b9368..5ac438b1e 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -304,7 +304,7 @@ void VToolSeamAllowance::AddPatternPieceData(VAbstractPattern *doc, QDomElement doc->SetAttribute(domData, VAbstractPattern::AttrLetter, data.GetLetter()); doc->SetAttribute(domData, VAbstractPattern::AttrAnnotation, data.GetAnnotation()); doc->SetAttribute(domData, VAbstractPattern::AttrOrientation, data.GetOrientation()); - doc->SetAttribute(domData, VAbstractPattern::AttrRotation, data.GetRotation()); + doc->SetAttribute(domData, VAbstractPattern::AttrRotationWay, data.GetRotationWay()); doc->SetAttribute(domData, VAbstractPattern::AttrTilt, data.GetTilt()); doc->SetAttribute(domData, VAbstractPattern::AttrFoldPosition, data.GetFoldPosition()); doc->SetAttribute(domData, VAbstractPattern::AttrQuantity, data.GetQuantity()); @@ -668,7 +668,7 @@ void VToolSeamAllowance::SaveRotationDetail(qreal dRot) // Tranform angle to anticlockwise QLineF line(0, 0, 100, 0); line.setAngle(-dRot); - newDet.GetPatternPieceData().SetRotation(QString().setNum(line.angle())); + newDet.GetPatternPieceData().SetRotationWay(QString().setNum(line.angle())); SavePieceOptions* rotateCommand = new SavePieceOptions(oldDet, newDet, doc, id); rotateCommand->setText(tr("rotate pattern piece label"));