Fixed issue #673. The Insert Node tool changes Label.

--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2017-04-28 09:38:09 +03:00
parent 677ef71626
commit 03a9b07eff
20 changed files with 20 additions and 20 deletions

View File

@ -62,7 +62,7 @@ public:
#endif
void Swap(VAbstractArc &arc) Q_DECL_NOTHROW
{ std::swap(d, arc.d); }
{ VAbstractCurve::Swap(arc); std::swap(d, arc.d); }
QString GetFormulaF1 () const;
void SetFormulaF1 (const QString &formula, qreal value);

View File

@ -61,7 +61,7 @@ public:
#endif
void Swap(VAbstractCurve &curve) Q_DECL_NOTHROW
{ std::swap(d, curve.d); }
{ VGObject::Swap(curve); std::swap(d, curve.d); }
virtual QVector<QPointF> GetPoints() const =0;
static QVector<QPointF> GetSegmentPoints(const QVector<QPointF> &points, const QPointF &begin, const QPointF &end,

View File

@ -70,7 +70,7 @@ public:
#endif
void Swap(VArc &arc) Q_DECL_NOTHROW
{ std::swap(d, arc.d); }
{ VAbstractArc::Swap(arc); std::swap(d, arc.d); }
QString GetFormulaRadius () const;
void SetFormulaRadius (const QString &formula, qreal value);

View File

@ -61,7 +61,7 @@ public:
#endif
void Swap(VCubicBezier &curve) Q_DECL_NOTHROW
{ std::swap(d, curve.d); }
{ VAbstractCubicBezier::Swap(curve); std::swap(d, curve.d); }
virtual VPointF GetP1() const Q_DECL_OVERRIDE;
void SetP1(const VPointF &p);

View File

@ -62,7 +62,7 @@ public:
#endif
void Swap(VCubicBezierPath &curve) Q_DECL_NOTHROW
{ std::swap(d, curve.d); }
{ VAbstractCubicBezierPath::Swap(curve); std::swap(d, curve.d); }
VPointF &operator[](int indx);

View File

@ -73,7 +73,7 @@ public:
#endif
void Swap(VEllipticalArc &arc) Q_DECL_NOTHROW
{ std::swap(d, arc.d); }
{ VAbstractArc::Swap(arc); std::swap(d, arc.d); }
QString GetFormulaRotationAngle () const;
void SetFormulaRotationAngle (const QString &formula, qreal value);

View File

@ -66,7 +66,7 @@ public:
#endif
void Swap(VPointF &point) Q_DECL_NOTHROW
{ std::swap(d, point.d); }
{ VGObject::Swap(point); std::swap(d, point.d); }
explicit operator QPointF() const;
VPointF Rotate(const QPointF &originPoint, qreal degrees, const QString &prefix = QString()) const;

View File

@ -71,7 +71,7 @@ public:
#endif
void Swap(VSpline &spline) Q_DECL_NOTHROW
{ std::swap(d, spline.d); }
{ VAbstractCubicBezier::Swap(spline); std::swap(d, spline.d); }
virtual VPointF GetP1 () const Q_DECL_OVERRIDE;
void SetP1 (const VPointF &p);

View File

@ -71,7 +71,7 @@ public:
#endif
void Swap(VSplinePath &path) Q_DECL_NOTHROW
{ std::swap(d, path.d); }
{ VAbstractCubicBezierPath::Swap(path); std::swap(d, path.d); }
void append(const VSplinePoint &point);

View File

@ -68,7 +68,7 @@ public:
#endif
void Swap(VLayoutPiece &detail) Q_DECL_NOTHROW
{ std::swap(d, detail.d); }
{ VAbstractPiece::Swap(detail); std::swap(d, detail.d); }
static VLayoutPiece Create(const VPiece &piece, const VContainer *pattern);

View File

@ -55,7 +55,7 @@ public:
#endif
void Swap(VGrainlineData &data) Q_DECL_NOTHROW
{ std::swap(d, data.d); }
{ VAbstractFloatItemData::Swap(data); std::swap(d, data.d); }
// methods, which set and return values of different parameters
QString GetLength() const;

View File

@ -52,7 +52,7 @@ public:
#endif
void Swap(VPatternLabelData &data) Q_DECL_NOTHROW
{ std::swap(d, data.d); }
{ VAbstractFloatItemData::Swap(data); std::swap(d, data.d); }
// methods, which set up label parameters
QString GetLabelWidth() const;

View File

@ -54,7 +54,7 @@ public:
#endif
void Swap(VPieceLabelData &data) Q_DECL_NOTHROW
{ std::swap(d, data.d); }
{ VPatternLabelData::Swap(data); std::swap(d, data.d); }
// methods, which operate on MaterialCutPlacement container
void Append(const MaterialCutPlacement& rMCP);

View File

@ -53,7 +53,7 @@ public:
#endif
void Swap(VCurveVariable &var) Q_DECL_NOTHROW
{ std::swap(d, var.d); }
{ VInternalVariable::Swap(var); std::swap(d, var.d); }
virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;

View File

@ -59,7 +59,7 @@ public:
#endif
void Swap(VIncrement &incr) Q_DECL_NOTHROW
{ std::swap(d, incr.d); }
{ VVariable::Swap(incr); std::swap(d, incr.d); }
quint32 getIndex() const;
QString GetFormula() const;

View File

@ -54,7 +54,7 @@ public:
#endif
void Swap(VLineAngle &var) Q_DECL_NOTHROW
{ std::swap(d, var.d); }
{ VInternalVariable::Swap(var); std::swap(d, var.d); }
virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
void SetValue(const VPointF *p1, const VPointF *p2);

View File

@ -56,7 +56,7 @@ public:
#endif
void Swap(VLengthLine &var) Q_DECL_NOTHROW
{ std::swap(d, var.d); }
{ VInternalVariable::Swap(var); std::swap(d, var.d); }
virtual bool Filter(quint32 id) Q_DECL_OVERRIDE;
void SetValue(const VPointF *p1, const VPointF *p2);

View File

@ -66,7 +66,7 @@ public:
#endif
void Swap(VMeasurement &m) Q_DECL_NOTHROW
{ std::swap(d, m.d); }
{ VVariable::Swap(m); std::swap(d, m.d); }
QString GetGuiText() const;

View File

@ -58,7 +58,7 @@ public:
#endif
void Swap(VVariable &var) Q_DECL_NOTHROW
{ std::swap(d, var.d); }
{ VInternalVariable::Swap(var); std::swap(d, var.d); }
qreal GetBase() const;
void SetBase(const qreal &value);

View File

@ -60,7 +60,7 @@ public:
#endif
void Swap(VPiece &piece) Q_DECL_NOTHROW
{ std::swap(d, piece.d); }
{ VAbstractPiece::Swap(piece); std::swap(d, piece.d); }
VPiecePath GetPath() const;
VPiecePath &GetPath();