aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict of names.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-08-21 17:10:55 +03:00
parent be83ff5a12
commit ae870b8b2e
11 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/valentina/xml/vpattern.cpp
View File

@ -896,7 +896,7 @@ void VPattern::ParsePieceDataTag(const QDomElement &domElement, VPiece &detail)
ppData.SetLetter(GetParametrEmptyString(domElement, AttrLetter)); ppData.SetLetter(GetParametrEmptyString(domElement, AttrLetter));
ppData.SetAnnotation(GetParametrEmptyString(domElement, AttrAnnotation)); ppData.SetAnnotation(GetParametrEmptyString(domElement, AttrAnnotation));
ppData.SetOrientation(GetParametrEmptyString(domElement, AttrOrientation)); ppData.SetOrientation(GetParametrEmptyString(domElement, AttrOrientation));
ppData.SetRotation(GetParametrEmptyString(domElement, AttrRotation)); ppData.SetRotationWay(GetParametrEmptyString(domElement, AttrRotationWay));
ppData.SetTilt(GetParametrEmptyString(domElement, AttrTilt)); ppData.SetTilt(GetParametrEmptyString(domElement, AttrTilt));
ppData.SetFoldPosition(GetParametrEmptyString(domElement, AttrFoldPosition)); ppData.SetFoldPosition(GetParametrEmptyString(domElement, AttrFoldPosition));
ppData.SetQuantity(static_cast<int>(GetParametrUInt(domElement, AttrQuantity, "1"))); ppData.SetQuantity(static_cast<int>(GetParametrUInt(domElement, AttrQuantity, "1")));

2
src/libs/ifc/schema/pattern/v0.6.0.xsd
View File

@ -518,7 +518,7 @@
<xs:attribute name="letter" type="xs:string"/> <xs:attribute name="letter" type="xs:string"/>
<xs:attribute name="annotation" type="xs:string"/> <xs:attribute name="annotation" type="xs:string"/>
<xs:attribute name="orientation" type="xs:string"/> <xs:attribute name="orientation" type="xs:string"/>
<xs:attribute name="rotation" type="xs:string"/> <xs:attribute name="rotationWay" type="xs:string"/>
<xs:attribute name="tilt" type="xs:string"/> <xs:attribute name="tilt" type="xs:string"/>
<xs:attribute name="foldPosition" type="xs:string"/> <xs:attribute name="foldPosition" type="xs:string"/>
<xs:attribute name="visible" type="xs:boolean"/> <xs:attribute name="visible" type="xs:boolean"/>

3
src/libs/ifc/xml/vabstractpattern.cpp
View File

@ -99,7 +99,7 @@ const QString VAbstractPattern::AttrType = QStringLiteral("type");
const QString VAbstractPattern::AttrLetter = QStringLiteral("letter"); const QString VAbstractPattern::AttrLetter = QStringLiteral("letter");
const QString VAbstractPattern::AttrAnnotation = QStringLiteral("annotation"); const QString VAbstractPattern::AttrAnnotation = QStringLiteral("annotation");
const QString VAbstractPattern::AttrOrientation = QStringLiteral("orientation"); 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::AttrTilt = QStringLiteral("tilt");
const QString VAbstractPattern::AttrFoldPosition = QStringLiteral("foldPosition"); const QString VAbstractPattern::AttrFoldPosition = QStringLiteral("foldPosition");
const QString VAbstractPattern::AttrQuantity = QStringLiteral("quantity"); 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::AttrEnd = QStringLiteral("end");
const QString VAbstractPattern::AttrIncludeAs = QStringLiteral("includeAs"); const QString VAbstractPattern::AttrIncludeAs = QStringLiteral("includeAs");
const QString VAbstractPattern::AttrWidth = QStringLiteral("width"); const QString VAbstractPattern::AttrWidth = QStringLiteral("width");
const QString VAbstractPattern::AttrRotation = QStringLiteral("rotation");
const QString VAbstractPattern::AttrAll = QStringLiteral("all"); const QString VAbstractPattern::AttrAll = QStringLiteral("all");

3
src/libs/ifc/xml/vabstractpattern.h
View File

@ -229,7 +229,7 @@ public:
static const QString AttrLetter; static const QString AttrLetter;
static const QString AttrAnnotation; static const QString AttrAnnotation;
static const QString AttrOrientation; static const QString AttrOrientation;
static const QString AttrRotation; static const QString AttrRotationWay;
static const QString AttrTilt; static const QString AttrTilt;
static const QString AttrFoldPosition; static const QString AttrFoldPosition;
static const QString AttrQuantity; static const QString AttrQuantity;
@ -250,6 +250,7 @@ public:
static const QString AttrEnd; static const QString AttrEnd;
static const QString AttrIncludeAs; static const QString AttrIncludeAs;
static const QString AttrWidth; static const QString AttrWidth;
static const QString AttrRotation;
static const QString AttrAll; static const QString AttrAll;

2
src/libs/vlayout/vtextmanager.cpp
View File

@ -127,7 +127,7 @@ void InitPiecePlaceholders(QMap<QString, QString> &placeholders, const QString &
placeholders[pl_pLetter] = data.GetLetter(); placeholders[pl_pLetter] = data.GetLetter();
placeholders[pl_pAnnotation] = data.GetAnnotation(); placeholders[pl_pAnnotation] = data.GetAnnotation();
placeholders[pl_pOrientation] = data.GetOrientation(); placeholders[pl_pOrientation] = data.GetOrientation();
placeholders[pl_pRotation] = data.GetRotation(); placeholders[pl_pRotation] = data.GetRotationWay();
placeholders[pl_pTilt] = data.GetTilt(); placeholders[pl_pTilt] = data.GetTilt();
placeholders[pl_pFoldPosition] = data.GetFoldPosition(); placeholders[pl_pFoldPosition] = data.GetFoldPosition();
placeholders[pl_pName] = name; placeholders[pl_pName] = name;

8
src/libs/vpatterndb/floatItemData/vpiecelabeldata.cpp
View File

@ -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;
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

4
src/libs/vpatterndb/floatItemData/vpiecelabeldata.h
View File

@ -69,8 +69,8 @@ public:
QString GetOrientation() const; QString GetOrientation() const;
void SetOrientation(const QString &val); void SetOrientation(const QString &val);
QString GetRotation() const; QString GetRotationWay() const;
void SetRotation(const QString &val); void SetRotationWay(const QString &val);
QString GetTilt() const; QString GetTilt() const;
void SetTilt(const QString &val); void SetTilt(const QString &val);

6
src/libs/vpatterndb/floatItemData/vpiecelabeldata_p.h
View File

@ -48,7 +48,7 @@ public:
: m_qsLetter(), : m_qsLetter(),
m_annotation(), m_annotation(),
m_orientation(), m_orientation(),
m_rotation(), m_rotationWay(),
m_tilt(), m_tilt(),
m_foldPosition(), m_foldPosition(),
m_quantity(1), m_quantity(1),
@ -61,7 +61,7 @@ public:
m_qsLetter(data.m_qsLetter), m_qsLetter(data.m_qsLetter),
m_annotation(data.m_annotation), m_annotation(data.m_annotation),
m_orientation(data.m_orientation), m_orientation(data.m_orientation),
m_rotation(data.m_rotation), m_rotationWay(data.m_rotationWay),
m_tilt(data.m_tilt), m_tilt(data.m_tilt),
m_foldPosition(data.m_foldPosition), m_foldPosition(data.m_foldPosition),
m_quantity(data.m_quantity), m_quantity(data.m_quantity),
@ -75,7 +75,7 @@ public:
QString m_qsLetter; QString m_qsLetter;
QString m_annotation; QString m_annotation;
QString m_orientation; QString m_orientation;
QString m_rotation; QString m_rotationWay;
QString m_tilt; QString m_tilt;
QString m_foldPosition; QString m_foldPosition;

2
src/libs/vtools/dialogs/support/dialogeditlabel.cpp
View File

@ -599,7 +599,7 @@ void DialogEditLabel::SetPiece(const VPiece &piece)
m_placeholders[pl_pLetter].second = pieceData.GetLetter(); m_placeholders[pl_pLetter].second = pieceData.GetLetter();
m_placeholders[pl_pAnnotation].second = pieceData.GetAnnotation(); m_placeholders[pl_pAnnotation].second = pieceData.GetAnnotation();
m_placeholders[pl_pOrientation].second = pieceData.GetOrientation(); 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_pTilt].second = pieceData.GetTilt();
m_placeholders[pl_pFoldPosition].second = pieceData.GetFoldPosition(); m_placeholders[pl_pFoldPosition].second = pieceData.GetFoldPosition();
m_placeholders[pl_pName].second = piece.GetName(); m_placeholders[pl_pName].second = piece.GetName();

4
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
View File

@ -248,7 +248,7 @@ void DialogSeamAllowance::SetPiece(const VPiece &piece)
uiTabLabels->lineEditLetter->setText(m_oldData.GetLetter()); uiTabLabels->lineEditLetter->setText(m_oldData.GetLetter());
uiTabLabels->lineEditAnnotation->setText(m_oldData.GetAnnotation()); uiTabLabels->lineEditAnnotation->setText(m_oldData.GetAnnotation());
uiTabLabels->lineEditOrientation->setText(m_oldData.GetOrientation()); 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->lineEditTilt->setText(m_oldData.GetTilt());
uiTabLabels->lineEditFoldPosition->setText(m_oldData.GetFoldPosition()); uiTabLabels->lineEditFoldPosition->setText(m_oldData.GetFoldPosition());
uiTabLabels->spinBoxQuantity->setValue(m_oldData.GetQuantity()); uiTabLabels->spinBoxQuantity->setValue(m_oldData.GetQuantity());
@ -1978,7 +1978,7 @@ VPiece DialogSeamAllowance::CreatePiece() const
piece.GetPatternPieceData().SetLetter(uiTabLabels->lineEditLetter->text()); piece.GetPatternPieceData().SetLetter(uiTabLabels->lineEditLetter->text());
piece.GetPatternPieceData().SetAnnotation(uiTabLabels->lineEditAnnotation->text()); piece.GetPatternPieceData().SetAnnotation(uiTabLabels->lineEditAnnotation->text());
piece.GetPatternPieceData().SetOrientation(uiTabLabels->lineEditOrientation->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().SetTilt(uiTabLabels->lineEditTilt->text());
piece.GetPatternPieceData().SetFoldPosition(uiTabLabels->lineEditFoldPosition->text()); piece.GetPatternPieceData().SetFoldPosition(uiTabLabels->lineEditFoldPosition->text());
piece.GetPatternPieceData().SetQuantity(uiTabLabels->spinBoxQuantity->value()); piece.GetPatternPieceData().SetQuantity(uiTabLabels->spinBoxQuantity->value());

4
src/libs/vtools/tools/vtoolseamallowance.cpp
View File

@ -304,7 +304,7 @@ void VToolSeamAllowance::AddPatternPieceData(VAbstractPattern *doc, QDomElement
doc->SetAttribute(domData, VAbstractPattern::AttrLetter, data.GetLetter()); doc->SetAttribute(domData, VAbstractPattern::AttrLetter, data.GetLetter());
doc->SetAttribute(domData, VAbstractPattern::AttrAnnotation, data.GetAnnotation()); doc->SetAttribute(domData, VAbstractPattern::AttrAnnotation, data.GetAnnotation());
doc->SetAttribute(domData, VAbstractPattern::AttrOrientation, data.GetOrientation()); 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::AttrTilt, data.GetTilt());
doc->SetAttribute(domData, VAbstractPattern::AttrFoldPosition, data.GetFoldPosition()); doc->SetAttribute(domData, VAbstractPattern::AttrFoldPosition, data.GetFoldPosition());
doc->SetAttribute(domData, VAbstractPattern::AttrQuantity, data.GetQuantity()); doc->SetAttribute(domData, VAbstractPattern::AttrQuantity, data.GetQuantity());
@ -668,7 +668,7 @@ void VToolSeamAllowance::SaveRotationDetail(qreal dRot)
// Tranform angle to anticlockwise // Tranform angle to anticlockwise
QLineF line(0, 0, 100, 0); QLineF line(0, 0, 100, 0);
line.setAngle(-dRot); 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); SavePieceOptions* rotateCommand = new SavePieceOptions(oldDet, newDet, doc, id);
rotateCommand->setText(tr("rotate pattern piece label")); rotateCommand->setText(tr("rotate pattern piece label"));