From 4f5526b9e5cc0c9bb39a2ce6f0b37badfe9e8afc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 1 Feb 2016 19:43:32 +0200 Subject: [PATCH 01/21] Fixed issue #442. 'Broken Formula' error when using Intersect Circles tool. --HG-- branch : release --- ChangeLog.txt | 3 +++ .../vtools/dialogs/tools/dialogpointofintersectioncircles.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index a58f74350..8ad11e95e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,6 @@ +# Version 0.4.2 +- [#442] 'Broken Formula' error when using Intersect Circles tool. + # Version 0.4.1 January 29, 2016 - [#438] Broken switching pattern pieces. - Fixed wrong title for dialog "New pattern". diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp index c2d00a8f6..ff8d9a914 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp @@ -245,7 +245,8 @@ void DialogPointOfIntersectionCircles::ChosenObject(quint32 id, const SceneObjec point->setPoint2Id(id); point->RefreshGeometry(); prepare = true; - DialogAccepted(); + this->setModal(true); + this->show(); } } break; From 65d8772a727ea5874e22f650885f5372e38bc41e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 1 Feb 2016 20:02:32 +0200 Subject: [PATCH 02/21] Fixed broken tool dialogs "Intersection arcs" and "Point from arc and tangent". --HG-- branch : release --- ChangeLog.txt | 1 + .../vtools/dialogs/tools/dialogpointfromarcandtangent.cpp | 2 +- .../vtools/dialogs/tools/dialogpointofintersectionarcs.cpp | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 8ad11e95e..37187a83a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- Fixed broken tool dialogs "Intersection arcs" and "Point from arc and tangent". - [#442] 'Broken Formula' error when using Intersect Circles tool. # Version 0.4.1 January 29, 2016 diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index 5f2b35c31..29799755f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -83,7 +83,7 @@ quint32 DialogPointFromArcAndTangent::GetArcId() const //--------------------------------------------------------------------------------------------------------------------- void DialogPointFromArcAndTangent::SetArcId(const quint32 &value) { - setCurrentPointId(ui->comboBoxArc, value); + setCurrentArcId(ui->comboBoxArc, value); VisToolPointFromArcAndTangent *point = qobject_cast(vis); SCASSERT(point != nullptr); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index ac04334a2..ca98d1f5a 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -87,7 +87,7 @@ quint32 DialogPointOfIntersectionArcs::GetFirstArcId() const //--------------------------------------------------------------------------------------------------------------------- void DialogPointOfIntersectionArcs::SetFirstArcId(const quint32 &value) { - setCurrentPointId(ui->comboBoxArc1, value); + setCurrentArcId(ui->comboBoxArc1, value); VisToolPointOfIntersectionArcs *point = qobject_cast(vis); SCASSERT(point != nullptr); @@ -103,7 +103,7 @@ quint32 DialogPointOfIntersectionArcs::GetSecondArcId() const //--------------------------------------------------------------------------------------------------------------------- void DialogPointOfIntersectionArcs::SetSecondArcId(const quint32 &value) { - setCurrentPointId(ui->comboBoxArc2, value); + setCurrentArcId(ui->comboBoxArc2, value); VisToolPointOfIntersectionArcs *point = qobject_cast(vis); SCASSERT(point != nullptr); From 7fd45ded4e91c0c6547eb37c9785bc5550341b3e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 1 Feb 2016 20:59:00 +0200 Subject: [PATCH 03/21] Resolved issue #439. Widen Formula Dialog. --HG-- branch : release --- ChangeLog.txt | 1 + .../dialogs/support/dialogeditwrongformula.cpp | 13 +++++++++++++ .../vtools/dialogs/support/dialogeditwrongformula.h | 1 + 3 files changed, 15 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 37187a83a..0ac01274f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- [#439] Widen Formula Dialog. - Fixed broken tool dialogs "Intersection arcs" and "Point from arc and tangent". - [#442] 'Broken Formula' error when using Intersect Circles tool. diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp index 037eb2227..a523aee33 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp @@ -307,6 +307,19 @@ void DialogEditWrongFormula::closeEvent(QCloseEvent *event) DialogTool::closeEvent(event); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogEditWrongFormula::showEvent(QShowEvent *event) +{ + DialogTool::showEvent( event ); + if ( event->spontaneous() ) + { + return; + } + + setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)); + setMinimumSize(QSize(0, 0)); +} + //--------------------------------------------------------------------------------------------------------------------- void DialogEditWrongFormula::SetFormula(const QString &value) { diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h index 5b64662a5..e127223d7 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h @@ -79,6 +79,7 @@ public slots: protected: virtual void CheckState() Q_DECL_OVERRIDE; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; + virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogEditWrongFormula) Ui::DialogEditWrongFormula *ui; From eb9f8f4b60aba7a532cc1face9356632e677e06b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 2 Feb 2016 15:34:29 +0200 Subject: [PATCH 04/21] Resolved issue #441. Broken reference incrementation for tool "True Dart point". --HG-- branch : release --- ChangeLog.txt | 1 + src/app/valentina/xml/vpattern.cpp | 2 +- src/libs/vgeometry/vgobject.cpp | 20 +++++++++++ src/libs/vgeometry/vgobject.h | 2 ++ .../tools/drawTools/toolcurve/vtoolarc.cpp | 6 ++-- .../toolcurve/vtoolarcwithlength.cpp | 6 ++-- .../tools/drawTools/toolcurve/vtoolspline.cpp | 10 +++--- .../drawTools/toolcurve/vtoolsplinepath.cpp | 6 ++-- .../tooldoublepoint/vtooltruedarts.cpp | 34 +++++++++++-------- .../toolsinglepoint/toolcut/vtoolcut.cpp | 4 ++- .../toolsinglepoint/toolcut/vtoolcutarc.cpp | 2 +- .../toolcut/vtoolcutspline.cpp | 2 +- .../toolcut/vtoolcutsplinepath.cpp | 2 +- .../toollinepoint/vtoolalongline.cpp | 7 ++-- .../toollinepoint/vtoolbisector.cpp | 13 ++++--- .../toollinepoint/vtoolcurveintersectaxis.cpp | 4 +-- .../toollinepoint/vtoolendline.cpp | 2 +- .../toollinepoint/vtoolheight.cpp | 6 ++-- .../toollinepoint/vtoollineintersectaxis.cpp | 6 ++-- .../toollinepoint/vtoollinepoint.cpp | 3 +- .../toollinepoint/vtoolnormal.cpp | 7 ++-- .../toollinepoint/vtoolshoulderpoint.cpp | 13 ++++--- .../toolsinglepoint/vtoollineintersect.cpp | 21 +++++++----- .../vtoolpointfromarcandtangent.cpp | 11 +++--- .../vtoolpointfromcircleandtangent.cpp | 11 +++--- .../toolsinglepoint/vtoolpointofcontact.cpp | 16 +++++---- .../vtoolpointofintersection.cpp | 11 +++--- .../vtoolpointofintersectionarcs.cpp | 11 +++--- .../vtoolpointofintersectioncircles.cpp | 11 +++--- .../toolsinglepoint/vtooltriangle.cpp | 21 +++++++----- src/libs/vtools/tools/drawTools/vtoolline.cpp | 15 +++++--- 31 files changed, 181 insertions(+), 105 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 0ac01274f..66b0a076c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- [#441] Broken reference incrementation for tool "True Dart point". - [#439] Widen Formula Dialog. - Fixed broken tool dialogs "Intersection arcs" and "Point from arc and tangent". - [#442] 'Broken Formula' error when using Intersect Circles tool. diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 0dcbece19..e8f251b61 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -1871,7 +1871,7 @@ void VPattern::ParseToolSplinePath(VMainGraphicsScene *scene, const QDomElement path->append(splPoint); if (parse == Document::FullParse) { - IncrementReferens(pSpline); + IncrementReferens(p.getIdTool()); } } } diff --git a/src/libs/vgeometry/vgobject.cpp b/src/libs/vgeometry/vgobject.cpp index 409c56173..aa4cd848f 100644 --- a/src/libs/vgeometry/vgobject.cpp +++ b/src/libs/vgeometry/vgobject.cpp @@ -180,6 +180,26 @@ void VGObject::setId(const quint32 &id) d->_id = id; } +//--------------------------------------------------------------------------------------------------------------------- +quint32 VGObject::getIdTool() const +{ + if (d->mode == Draw::Calculation) + { + if (d->idObject != NULL_ID) + { + return d->idObject; + } + else + { + return d->_id; + } + } + else + { + return d->_id; + } +} + //--------------------------------------------------------------------------------------------------------------------- QLineF VGObject::BuildLine(const QPointF &p1, const qreal &length, const qreal &angle) { diff --git a/src/libs/vgeometry/vgobject.h b/src/libs/vgeometry/vgobject.h index 58d6a3b1d..9cda0214a 100644 --- a/src/libs/vgeometry/vgobject.h +++ b/src/libs/vgeometry/vgobject.h @@ -68,6 +68,8 @@ public: quint32 id() const; virtual void setId(const quint32 &id); + quint32 getIdTool() const; + static QLineF BuildLine(const QPointF &p1, const qreal& length, const qreal &angle); static QPointF BuildRay(const QPointF &firstPoint, const qreal &angle, const QRectF &scRect); static QLineF BuildAxis(const QPointF &p, const qreal &angle, const QRectF &scRect); diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index f4b82d6e6..6508afcf9 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp @@ -160,7 +160,7 @@ VToolArc* VToolArc::Create(const quint32 _id, const quint32 ¢er, QString &ra connect(scene, &VMainGraphicsScene::NewFactor, toolArc, &VToolArc::SetFactor); connect(scene, &VMainGraphicsScene::DisableItem, toolArc, &VToolArc::Disable); doc->AddTool(id, toolArc); - doc->IncrementReferens(center); + doc->IncrementReferens(c.getIdTool()); return toolArc; } return nullptr; @@ -310,8 +310,8 @@ void VToolArc::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolArc::RemoveReferens() { - const QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - doc->DecrementReferens(arc->GetCenter().id()); + const auto arc = VAbstractTool::data.GeometricObject(id); + doc->DecrementReferens(arc->GetCenter().getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index 3dbfa983a..9f23961e9 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -129,7 +129,7 @@ VToolArcWithLength *VToolArcWithLength::Create(const quint32 _id, const quint32 connect(scene, &VMainGraphicsScene::NewFactor, toolArc, &VToolArcWithLength::SetFactor); connect(scene, &VMainGraphicsScene::DisableItem, toolArc, &VToolArcWithLength::Disable); doc->AddTool(id, toolArc); - doc->IncrementReferens(center); + doc->IncrementReferens(c.getIdTool()); return toolArc; } return nullptr; @@ -269,8 +269,8 @@ void VToolArcWithLength::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) //--------------------------------------------------------------------------------------------------------------------- void VToolArcWithLength::RemoveReferens() { - const QSharedPointer arc = VAbstractTool::data.GeometricObject(id); - doc->DecrementReferens(arc->GetCenter().id()); + const auto arc = VAbstractTool::data.GeometricObject(id); + doc->DecrementReferens(arc->GetCenter().getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index 6af2977e2..6e487eb40 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -201,8 +201,8 @@ VToolSpline* VToolSpline::Create(const quint32 _id, const quint32 &p1, const qui connect(scene, &VMainGraphicsScene::EnableToolMove, spl, &VToolSpline::EnableToolMove); connect(scene, &VMainGraphicsScene::CurveDetailsMode, spl, &VToolSpline::DetailsMode); doc->AddTool(id, spl); - doc->IncrementReferens(p1); - doc->IncrementReferens(p4); + doc->IncrementReferens(point1.getIdTool()); + doc->IncrementReferens(point4.getIdTool()); return spl; } return nullptr; @@ -287,9 +287,9 @@ void VToolSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolSpline::RemoveReferens() { - const QSharedPointer spl = VAbstractTool::data.GeometricObject(id); - doc->DecrementReferens(spl->GetP1().id()); - doc->DecrementReferens(spl->GetP4().id()); + const auto spl = VAbstractTool::data.GeometricObject(id); + doc->DecrementReferens(spl->GetP1().getIdTool()); + doc->DecrementReferens(spl->GetP4().getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 235fe3472..adef7f429 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -130,7 +130,7 @@ VToolSplinePath* VToolSplinePath::Create(DialogTool *dialog, VMainGraphicsScene const QString color = dialogTool->GetColor(); for (qint32 i = 0; i < path->CountPoint(); ++i) { - doc->IncrementReferens((*path)[i].P().id()); + doc->IncrementReferens((*path)[i].P().getIdTool()); } VToolSplinePath* spl = Create(0, path, color, scene, doc, data, Document::FullParse, Source::FromGui); if (spl != nullptr) @@ -371,10 +371,10 @@ void VToolSplinePath::AddPathPoint(VAbstractPattern *doc, QDomElement &domElemen */ void VToolSplinePath::RemoveReferens() { - VSplinePath splPath = *VAbstractTool::data.GeometricObject(id); + const VSplinePath splPath = *VAbstractTool::data.GeometricObject(id); for (qint32 i = 0; i < splPath.Count(); ++i) { - doc->DecrementReferens(splPath.at(i).P().id()); + doc->DecrementReferens(splPath.at(i).P().getIdTool()); } } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index abc78d74d..22fced903 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -159,13 +159,13 @@ VToolTrueDarts *VToolTrueDarts::Create(quint32 _id, if (typeCreation == Source::FromGui) { id = data->getNextId();//Just reserve id for tool - p1id = data->AddGObject(new VPointF(fPoint1, point1Name, mx1, my1)); - p2id = data->AddGObject(new VPointF(fPoint2, point2Name, mx2, my2)); + p1id = data->AddGObject(new VPointF(fPoint1, point1Name, mx1, my1, id)); + p2id = data->AddGObject(new VPointF(fPoint2, point2Name, mx2, my2, id)); } else { - data->UpdateGObject(p1id, new VPointF(fPoint1, point1Name, mx1, my1)); - data->UpdateGObject(p2id, new VPointF(fPoint2, point2Name, mx2, my2)); + data->UpdateGObject(p1id, new VPointF(fPoint1, point1Name, mx1, my1, id)); + data->UpdateGObject(p2id, new VPointF(fPoint2, point2Name, mx2, my2, id)); if (parse != Document::FullParse) { doc->UpdateToolData(id, data); @@ -182,11 +182,11 @@ VToolTrueDarts *VToolTrueDarts::Create(quint32 _id, connect(scene, &VMainGraphicsScene::DisableItem, points, &VToolTrueDarts::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, points, &VToolTrueDarts::EnableToolMove); doc->AddTool(id, points); - doc->IncrementReferens(baseLineP1Id); - doc->IncrementReferens(baseLineP2Id); - doc->IncrementReferens(dartP1Id); - doc->IncrementReferens(dartP2Id); - doc->IncrementReferens(dartP3Id); + doc->IncrementReferens(baseLineP1->getIdTool()); + doc->IncrementReferens(baseLineP2->getIdTool()); + doc->IncrementReferens(dartP1->getIdTool()); + doc->IncrementReferens(dartP2->getIdTool()); + doc->IncrementReferens(dartP3->getIdTool()); return points; } return nullptr; @@ -305,11 +305,17 @@ void VToolTrueDarts::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) //--------------------------------------------------------------------------------------------------------------------- void VToolTrueDarts::RemoveReferens() { - doc->DecrementReferens(baseLineP1Id); - doc->DecrementReferens(baseLineP2Id); - doc->DecrementReferens(dartP1Id); - doc->DecrementReferens(dartP2Id); - doc->DecrementReferens(dartP3Id); + const auto baseLineP1 = VAbstractTool::data.GetGObject(baseLineP1Id); + const auto baseLineP2 = VAbstractTool::data.GetGObject(baseLineP2Id); + const auto dartP1 = VAbstractTool::data.GetGObject(dartP1Id); + const auto dartP2 = VAbstractTool::data.GetGObject(dartP2Id); + const auto dartP3 = VAbstractTool::data.GetGObject(dartP3Id); + + doc->DecrementReferens(baseLineP1->getIdTool()); + doc->DecrementReferens(baseLineP2->getIdTool()); + doc->DecrementReferens(dartP1->getIdTool()); + doc->DecrementReferens(dartP2->getIdTool()); + doc->DecrementReferens(dartP3->getIdTool()); VToolDoublePoint::RemoveReferens(); } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp index 96e04acb5..a5f263011 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp @@ -123,7 +123,9 @@ void VToolCut::RefreshGeometry() */ void VToolCut::RemoveReferens() { - doc->DecrementReferens(curveCutId); + const auto curve = VAbstractTool::data.GetGObject(curveCutId); + + doc->DecrementReferens(curve->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp index fda07b74b..d77f17e50 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp @@ -170,7 +170,7 @@ VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QS doc->AddTool(id, point); doc->AddTool(arc1id, point); doc->AddTool(arc2id, point); - doc->IncrementReferens(arcId); + doc->IncrementReferens(arc->getIdTool()); return point; } return nullptr; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp index fcded45df..aa547566f 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp @@ -178,7 +178,7 @@ VToolCutSpline* VToolCutSpline::Create(const quint32 _id, const QString &pointNa doc->AddTool(id, point); doc->AddTool(spl1id, point); doc->AddTool(spl2id, point); - doc->IncrementReferens(splineId); + doc->IncrementReferens(spl->getIdTool()); return point; } return nullptr; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index 3b659e0c4..8cdb34d6b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp @@ -222,7 +222,7 @@ VToolCutSplinePath* VToolCutSplinePath::Create(const quint32 _id, const QString doc->AddTool(id, point); doc->AddTool(splPath1id, point); doc->AddTool(splPath2id, point); - doc->IncrementReferens(splinePathId); + doc->IncrementReferens(splPath->getIdTool()); return point; } return nullptr; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp index 04aadefcf..a85ff9e73 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp @@ -94,7 +94,8 @@ void VToolAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolAlongLine::RemoveReferens() { - doc->DecrementReferens(secondPointId); + const auto secondPoint = VAbstractTool::data.GetGObject(secondPointId); + doc->DecrementReferens(secondPoint->getIdTool()); VToolLinePoint::RemoveReferens(); } @@ -279,8 +280,8 @@ VToolAlongLine* VToolAlongLine::Create(const quint32 _id, const QString &pointNa connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolAlongLine::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolAlongLine::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(firstPointId); - doc->IncrementReferens(secondPointId); + doc->IncrementReferens(firstPoint->getIdTool()); + doc->IncrementReferens(secondPoint->getIdTool()); return point; } return nullptr; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp index 04522ac5c..ea29546fc 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp @@ -205,9 +205,9 @@ VToolBisector* VToolBisector::Create(const quint32 _id, QString &formula, const connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolBisector::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolBisector::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(firstPointId); - doc->IncrementReferens(secondPointId); - doc->IncrementReferens(thirdPointId); + doc->IncrementReferens(firstPoint->getIdTool()); + doc->IncrementReferens(secondPoint->getIdTool()); + doc->IncrementReferens(thirdPoint->getIdTool()); return point; } return nullptr; @@ -248,8 +248,11 @@ void VToolBisector::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolBisector::RemoveReferens() { - doc->DecrementReferens(firstPointId); - doc->DecrementReferens(thirdPointId); + const auto firstPoint = VAbstractTool::data.GetGObject(firstPointId); + const auto thirdPoint = VAbstractTool::data.GetGObject(thirdPointId); + + doc->DecrementReferens(firstPoint->getIdTool()); + doc->DecrementReferens(thirdPoint->getIdTool()); VToolLinePoint::RemoveReferens(); } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp index 708f53cc4..7fd0239d1 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp @@ -134,8 +134,8 @@ VToolCurveIntersectAxis *VToolCurveIntersectAxis::Create(const quint32 _id, cons connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolCurveIntersectAxis::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolCurveIntersectAxis::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(basePointId); - doc->IncrementReferens(curveId); + doc->IncrementReferens(basePoint->getIdTool()); + doc->IncrementReferens(curve->getIdTool()); return point; } return nullptr; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index 55b6546ea..9ae71332a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp @@ -170,7 +170,7 @@ VToolEndLine* VToolEndLine::Create(const quint32 _id, const QString &pointName, connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolEndLine::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolEndLine::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(basePointId); + doc->IncrementReferens(basePoint->getIdTool()); return point; } return nullptr; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index 4cddc1b2c..029215962 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp @@ -162,9 +162,9 @@ VToolHeight* VToolHeight::Create(const quint32 _id, const QString &pointName, co connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolHeight::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolHeight::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(basePointId); - doc->IncrementReferens(p1LineId); - doc->IncrementReferens(p2LineId); + doc->IncrementReferens(basePoint->getIdTool()); + doc->IncrementReferens(p1Line->getIdTool()); + doc->IncrementReferens(p2Line->getIdTool()); return point; } return nullptr; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index 983c748a9..67c9f72a0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -145,9 +145,9 @@ VToolLineIntersectAxis *VToolLineIntersectAxis::Create(const quint32 _id, const connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolLineIntersectAxis::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolLineIntersectAxis::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(basePointId); - doc->IncrementReferens(firstPointId); - doc->IncrementReferens(secondPointId); + doc->IncrementReferens(basePoint->getIdTool()); + doc->IncrementReferens(firstPoint->getIdTool()); + doc->IncrementReferens(secondPoint->getIdTool()); return point; } return nullptr; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp index c612dc5f9..aa9ca24ab 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp @@ -86,7 +86,8 @@ void VToolLinePoint::RefreshGeometry() */ void VToolLinePoint::RemoveReferens() { - doc->DecrementReferens(basePointId); + const auto basePoint = VAbstractTool::data.GetGObject(basePointId); + doc->DecrementReferens(basePoint->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp index 63573b65f..55de6ab09 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp @@ -165,8 +165,8 @@ VToolNormal* VToolNormal::Create(const quint32 _id, QString &formula, const quin connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolNormal::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolNormal::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(firstPointId); - doc->IncrementReferens(secondPointId); + doc->IncrementReferens(firstPoint->getIdTool()); + doc->IncrementReferens(secondPoint->getIdTool()); return point; } return nullptr; @@ -226,7 +226,8 @@ void VToolNormal::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolNormal::RemoveReferens() { - doc->DecrementReferens(secondPointId); + const auto secondPoint = VAbstractTool::data.GetGObject(secondPointId); + doc->DecrementReferens(secondPoint->getIdTool()); VToolLinePoint::RemoveReferens(); } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index 984850531..14bd4d749 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -209,9 +209,9 @@ VToolShoulderPoint* VToolShoulderPoint::Create(const quint32 _id, QString &formu connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolShoulderPoint::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolShoulderPoint::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(p1Line); - doc->IncrementReferens(p2Line); - doc->IncrementReferens(pShoulder); + doc->IncrementReferens(firstPoint->getIdTool()); + doc->IncrementReferens(secondPoint->getIdTool()); + doc->IncrementReferens(shoulderPoint->getIdTool()); return point; } return nullptr; @@ -252,8 +252,11 @@ void VToolShoulderPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolShoulderPoint::RemoveReferens() { - doc->DecrementReferens(p2Line); - doc->DecrementReferens(pShoulder); + const auto p2 = VAbstractTool::data.GetGObject(p2Line); + const auto pS = VAbstractTool::data.GetGObject(pShoulder); + + doc->DecrementReferens(p2->getIdTool()); + doc->DecrementReferens(pS->getIdTool()); VToolLinePoint::RemoveReferens(); } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index af65be768..fff168ff4 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -169,10 +169,10 @@ VToolLineIntersect* VToolLineIntersect::Create(const quint32 _id, const quint32 connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolLineIntersect::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolLineIntersect::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(p1Line1Id); - doc->IncrementReferens(p2Line1Id); - doc->IncrementReferens(p1Line2Id); - doc->IncrementReferens(p2Line2Id); + doc->IncrementReferens(p1Line1->getIdTool()); + doc->IncrementReferens(p2Line1->getIdTool()); + doc->IncrementReferens(p1Line2->getIdTool()); + doc->IncrementReferens(p2Line2->getIdTool()); return point; } } @@ -214,10 +214,15 @@ void VToolLineIntersect::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) */ void VToolLineIntersect::RemoveReferens() { - doc->DecrementReferens(p1Line1); - doc->DecrementReferens(p2Line1); - doc->DecrementReferens(p1Line2); - doc->DecrementReferens(p2Line2); + const auto p1L1 = VAbstractTool::data.GetGObject(p1Line1); + const auto p2L1 = VAbstractTool::data.GetGObject(p2Line1); + const auto p1L2 = VAbstractTool::data.GetGObject(p1Line2); + const auto p2L2 = VAbstractTool::data.GetGObject(p2Line2); + + doc->DecrementReferens(p1L1->getIdTool()); + doc->DecrementReferens(p2L1->getIdTool()); + doc->DecrementReferens(p1L2->getIdTool()); + doc->DecrementReferens(p2L2->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index 7b8250272..6e7b5c93b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -113,8 +113,8 @@ VToolPointFromArcAndTangent *VToolPointFromArcAndTangent::Create(const quint32 _ connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPointFromArcAndTangent::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolPointFromArcAndTangent::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(arcId); - doc->IncrementReferens(tangentPointId); + doc->IncrementReferens(arc.getIdTool()); + doc->IncrementReferens(tPoint.getIdTool()); return point; } return nullptr; @@ -260,8 +260,11 @@ void VToolPointFromArcAndTangent::ShowVisualization(bool show) //--------------------------------------------------------------------------------------------------------------------- void VToolPointFromArcAndTangent::RemoveReferens() { - doc->DecrementReferens(arcId); - doc->DecrementReferens(tangentPointId); + const auto arc = VAbstractTool::data.GetGObject(arcId); + const auto tP = VAbstractTool::data.GetGObject(tangentPointId); + + doc->DecrementReferens(arc->getIdTool()); + doc->DecrementReferens(tP->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp index 5f33471e2..4799ba0af 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp @@ -123,8 +123,8 @@ VToolPointFromCircleAndTangent *VToolPointFromCircleAndTangent::Create(const qui connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPointFromCircleAndTangent::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolPointFromCircleAndTangent::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(circleCenterId); - doc->IncrementReferens(tangentPointId); + doc->IncrementReferens(cPoint.getIdTool()); + doc->IncrementReferens(tPoint.getIdTool()); return point; } return nullptr; @@ -244,8 +244,11 @@ void VToolPointFromCircleAndTangent::ShowVisualization(bool show) //--------------------------------------------------------------------------------------------------------------------- void VToolPointFromCircleAndTangent::RemoveReferens() { - doc->DecrementReferens(circleCenterId); - doc->DecrementReferens(tangentPointId); + const auto circleCenter = VAbstractTool::data.GetGObject(circleCenterId); + const auto tangentPoint = VAbstractTool::data.GetGObject(tangentPointId); + + doc->DecrementReferens(circleCenter->getIdTool()); + doc->DecrementReferens(tangentPoint->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index c4153c436..05c0086e8 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -225,9 +225,9 @@ VToolPointOfContact* VToolPointOfContact::Create(const quint32 _id, QString &rad connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPointOfContact::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolPointOfContact::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(center); - doc->IncrementReferens(firstPointId); - doc->IncrementReferens(secondPointId); + doc->IncrementReferens(centerP->getIdTool()); + doc->IncrementReferens(firstP->getIdTool()); + doc->IncrementReferens(secondP->getIdTool()); return point; } return nullptr; @@ -268,9 +268,13 @@ void VToolPointOfContact::contextMenuEvent(QGraphicsSceneContextMenuEvent *event */ void VToolPointOfContact::RemoveReferens() { - doc->DecrementReferens(center); - doc->DecrementReferens(firstPointId); - doc->DecrementReferens(secondPointId); + const auto c = VAbstractTool::data.GetGObject(center); + const auto firstPoint = VAbstractTool::data.GetGObject(firstPointId); + const auto secondPoint = VAbstractTool::data.GetGObject(secondPointId); + + doc->DecrementReferens(c->getIdTool()); + doc->DecrementReferens(firstPoint->getIdTool()); + doc->DecrementReferens(secondPoint->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp index 3350ecc8e..cb33d9f3f 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp @@ -146,8 +146,8 @@ VToolPointOfIntersection *VToolPointOfIntersection::Create(const quint32 _id, co connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPointOfIntersection::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolPointOfIntersection::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(firstPointId); - doc->IncrementReferens(secondPointId); + doc->IncrementReferens(firstPoint->getIdTool()); + doc->IncrementReferens(secondPoint->getIdTool()); return point; } return nullptr; @@ -159,8 +159,11 @@ VToolPointOfIntersection *VToolPointOfIntersection::Create(const quint32 _id, co */ void VToolPointOfIntersection::RemoveReferens() { - doc->DecrementReferens(firstPointId); - doc->DecrementReferens(secondPointId); + const auto firstPoint = VAbstractTool::data.GetGObject(firstPointId); + const auto secondPoint = VAbstractTool::data.GetGObject(secondPointId); + + doc->DecrementReferens(firstPoint->getIdTool()); + doc->DecrementReferens(secondPoint->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index e94124f50..b04c5b07f 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -114,8 +114,8 @@ VToolPointOfIntersectionArcs *VToolPointOfIntersectionArcs::Create(const quint32 connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPointOfIntersectionArcs::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolPointOfIntersectionArcs::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(firstArcId); - doc->IncrementReferens(secondArcId); + doc->IncrementReferens(firstArc->getIdTool()); + doc->IncrementReferens(secondArc->getIdTool()); return point; } return nullptr; @@ -267,8 +267,11 @@ void VToolPointOfIntersectionArcs::ShowVisualization(bool show) //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersectionArcs::RemoveReferens() { - doc->DecrementReferens(firstArcId); - doc->DecrementReferens(secondArcId); + const auto firstArc = VAbstractTool::data.GetGObject(firstArcId); + const auto secondArc = VAbstractTool::data.GetGObject(secondArcId); + + doc->DecrementReferens(firstArc->getIdTool()); + doc->DecrementReferens(secondArc->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index 950ee3fa1..107010fc6 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp @@ -135,8 +135,8 @@ VToolPointOfIntersectionCircles *VToolPointOfIntersectionCircles::Create(const q connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolPointOfIntersectionCircles::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolPointOfIntersectionCircles::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(firstCircleCenterId); - doc->IncrementReferens(secondCircleCenterId); + doc->IncrementReferens(c1Point.getIdTool()); + doc->IncrementReferens(c2Point.getIdTool()); return point; } return nullptr; @@ -280,8 +280,11 @@ void VToolPointOfIntersectionCircles::ShowVisualization(bool show) //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersectionCircles::RemoveReferens() { - doc->DecrementReferens(firstCircleCenterId); - doc->DecrementReferens(secondCircleCenterId); + const auto firstCircleCenter = VAbstractTool::data.GetGObject(firstCircleCenterId); + const auto secondCircleCenter = VAbstractTool::data.GetGObject(secondCircleCenterId); + + doc->DecrementReferens(firstCircleCenter->getIdTool()); + doc->DecrementReferens(secondCircleCenter->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index c210f2265..dc5ae275a 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -156,10 +156,10 @@ VToolTriangle* VToolTriangle::Create(const quint32 _id, const QString &pointName connect(scene, &VMainGraphicsScene::DisableItem, point, &VToolTriangle::Disable); connect(scene, &VMainGraphicsScene::EnableToolMove, point, &VToolTriangle::EnableToolMove); doc->AddTool(id, point); - doc->IncrementReferens(axisP1Id); - doc->IncrementReferens(axisP2Id); - doc->IncrementReferens(firstPointId); - doc->IncrementReferens(secondPointId); + doc->IncrementReferens(axisP1->getIdTool()); + doc->IncrementReferens(axisP2->getIdTool()); + doc->IncrementReferens(firstPoint->getIdTool()); + doc->IncrementReferens(secondPoint->getIdTool()); return point; } return nullptr; @@ -213,10 +213,15 @@ QPointF VToolTriangle::FindPoint(const QPointF &axisP1, const QPointF &axisP2, c */ void VToolTriangle::RemoveReferens() { - doc->DecrementReferens(axisP1Id); - doc->DecrementReferens(axisP2Id); - doc->DecrementReferens(firstPointId); - doc->DecrementReferens(secondPointId); + const auto axisP1 = VAbstractTool::data.GetGObject(axisP1Id); + const auto axisP2 = VAbstractTool::data.GetGObject(axisP2Id); + const auto firstPoint = VAbstractTool::data.GetGObject(firstPointId); + const auto secondPoint = VAbstractTool::data.GetGObject(secondPointId); + + doc->DecrementReferens(axisP1->getIdTool()); + doc->DecrementReferens(axisP2->getIdTool()); + doc->DecrementReferens(firstPoint->getIdTool()); + doc->DecrementReferens(secondPoint->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index 59502a302..42c586268 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -155,8 +155,12 @@ VToolLine * VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, con connect(scene, &VMainGraphicsScene::NewFactor, line, &VToolLine::SetFactor); connect(scene, &VMainGraphicsScene::DisableItem, line, &VToolLine::Disable); doc->AddTool(id, line); - doc->IncrementReferens(firstPoint); - doc->IncrementReferens(secondPoint); + + const QSharedPointer first = data->GeometricObject(firstPoint); + const QSharedPointer second = data->GeometricObject(secondPoint); + + doc->IncrementReferens(first->getIdTool()); + doc->IncrementReferens(second->getIdTool()); return line; } return nullptr; @@ -307,8 +311,11 @@ void VToolLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) */ void VToolLine::RemoveReferens() { - doc->DecrementReferens(firstPoint); - doc->DecrementReferens(secondPoint); + const auto p1 = VAbstractTool::data.GetGObject(firstPoint); + const auto p2 = VAbstractTool::data.GetGObject(secondPoint); + + doc->DecrementReferens(p1->getIdTool()); + doc->DecrementReferens(p2->getIdTool()); } //--------------------------------------------------------------------------------------------------------------------- From 3ad10ca5d22d325e7783f618fa11bb541d06492b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 2 Feb 2016 15:37:44 +0200 Subject: [PATCH 05/21] Fixed combobox width in Dialog "Tool True Dart point". --HG-- branch : release --- ChangeLog.txt | 1 + src/libs/vtools/dialogs/tools/dialogtruedarts.ui | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 66b0a076c..750daa9de 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- Fixed combobox width in Dialog "Tool True Dart point". - [#441] Broken reference incrementation for tool "True Dart point". - [#439] Widen Formula Dialog. - Fixed broken tool dialogs "Intersection arcs" and "Point from arc and tangent". diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.ui b/src/libs/vtools/dialogs/tools/dialogtruedarts.ui index a75950742..9c94a1761 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.ui +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.ui @@ -88,7 +88,7 @@ - 80 + 0 0 From 4774a37d432769aef3e666377d4838697356d61e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 9 Feb 2016 14:40:39 +0200 Subject: [PATCH 06/21] Resolved issue #443. Not valid dxf file. - libdxf updated to version 3.12.2.0. - Fixed wrong pen width. - Fixed drawPath() method. Drawing subpaths. --HG-- branch : release --- ChangeLog.txt | 1 + src/libs/vdxf/dxflib/dl_codes.h | 1 + src/libs/vdxf/dxflib/dl_dxf.cpp | 89 ++++++++++++--------- src/libs/vdxf/dxflib/dl_dxf.h | 19 +++-- src/libs/vdxf/dxflib/dl_entities.h | 22 ++---- src/libs/vdxf/dxflib/dl_extrusion.h | 16 +++- src/libs/vdxf/dxflib/dl_writer_ascii.cpp | 11 ++- src/libs/vdxf/dxflib/dl_writer_ascii.h | 13 ++-- src/libs/vdxf/vdxfengine.cpp | 99 ++++++++++++++++++++---- 9 files changed, 189 insertions(+), 82 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 750daa9de..dd61fbef0 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths. - Fixed combobox width in Dialog "Tool True Dart point". - [#441] Broken reference incrementation for tool "True Dart point". - [#439] Widen Formula Dialog. diff --git a/src/libs/vdxf/dxflib/dl_codes.h b/src/libs/vdxf/dxflib/dl_codes.h index 1c567b051..bc03416a6 100644 --- a/src/libs/vdxf/dxflib/dl_codes.h +++ b/src/libs/vdxf/dxflib/dl_codes.h @@ -101,6 +101,7 @@ public: */ enum version { + AC1009_MIN, // R12, minimalistic AC1009, // R12 AC1012, AC1014, diff --git a/src/libs/vdxf/dxflib/dl_dxf.cpp b/src/libs/vdxf/dxflib/dl_dxf.cpp index 8ec088a0b..d4cf1d12d 100644 --- a/src/libs/vdxf/dxflib/dl_dxf.cpp +++ b/src/libs/vdxf/dxflib/dl_dxf.cpp @@ -172,13 +172,16 @@ bool DL_Dxf::in(std::stringstream& stream, */ bool DL_Dxf::readDxfGroups(FILE *fp, DL_CreationInterface* creationInterface) { + static int line = 1; + // Read one group of the DXF file and strip the lines: if (DL_Dxf::getStrippedLine(groupCodeTmp, DL_DXF_MAXLINE, fp) && - DL_Dxf::getStrippedLine(groupValue, DL_DXF_MAXLINE, fp) ) + DL_Dxf::getStrippedLine(groupValue, DL_DXF_MAXLINE, fp, false) ) { groupCode = static_cast(toInt(groupCodeTmp)); creationInterface->processCodeValuePair(groupCode, groupValue); + line+=2; processDXFGroup(creationInterface, static_cast(groupCode), groupValue); } @@ -193,12 +196,16 @@ bool DL_Dxf::readDxfGroups(FILE *fp, DL_CreationInterface* creationInterface) bool DL_Dxf::readDxfGroups(std::stringstream& stream, DL_CreationInterface* creationInterface) { + static int line = 1; + // Read one group of the DXF file and chop the lines: if (DL_Dxf::getStrippedLine(groupCodeTmp, DL_DXF_MAXLINE, stream) && - DL_Dxf::getStrippedLine(groupValue, DL_DXF_MAXLINE, stream) ) + DL_Dxf::getStrippedLine(groupValue, DL_DXF_MAXLINE, stream, false) ) { groupCode = static_cast(toInt(groupCodeTmp)); + + line+=2; processDXFGroup(creationInterface, static_cast(groupCode), groupValue); } return !stream.eof(); @@ -223,7 +230,7 @@ bool DL_Dxf::readDxfGroups(std::stringstream& stream, * @todo Is it a problem if line is blank (i.e., newline only)? * Then, when function returns, (s==NULL). */ -bool DL_Dxf::getStrippedLine(std::string& s, quint32 size, FILE *fp) +bool DL_Dxf::getStrippedLine(std::string& s, quint32 size, FILE *fp, bool stripSpace) { if (!feof(fp)) { @@ -240,7 +247,7 @@ bool DL_Dxf::getStrippedLine(std::string& s, quint32 size, FILE *fp) // Both guaranteed to be NULL terminated. // Strip leading whitespace and trailing CR/LF. - stripWhiteSpace(&line); + stripWhiteSpace(&line, stripSpace); s = line; assert(size > s.length()); @@ -263,7 +270,7 @@ bool DL_Dxf::getStrippedLine(std::string& s, quint32 size, FILE *fp) * Same as above but for stringstreams. */ bool DL_Dxf::getStrippedLine(std::string &s, quint32 size, - std::stringstream& stream) + std::stringstream& stream, bool stripSpace) { if (!stream.eof()) @@ -272,7 +279,7 @@ bool DL_Dxf::getStrippedLine(std::string &s, quint32 size, char* line = new char[size+1]; char* oriLine = line; stream.getline(line, static_cast(size)); - stripWhiteSpace(&line); + stripWhiteSpace(&line, stripSpace); s = line; assert(size > s.length()); delete[] oriLine; @@ -297,33 +304,30 @@ bool DL_Dxf::getStrippedLine(std::string &s, quint32 size, * @retval true if \p s is non-NULL * @retval false if \p s is NULL */ -bool DL_Dxf::stripWhiteSpace(char** s) +bool DL_Dxf::stripWhiteSpace(char** s, bool stripSpace) { - // No need to check if string is null - if (not (*s)) - { - return false; - } - // last non-NULL char: int lastChar = static_cast(strlen(*s) - 1); // Is last character CR or LF? while ( (lastChar >= 0) && (((*s)[lastChar] == 10) || ((*s)[lastChar] == 13) || - ((*s)[lastChar] == ' ' || ((*s)[lastChar] == '\t'))) ) + (stripSpace && ((*s)[lastChar] == ' ' || ((*s)[lastChar] == '\t')))) ) { (*s)[lastChar] = '\0'; lastChar--; } // Skip whitespace, excluding \n, at beginning of line - while ((*s)[0]==' ' || (*s)[0]=='\t') + if (stripSpace) { - ++(*s); + while ((*s)[0]==' ' || (*s)[0]=='\t') + { + ++(*s); + } } - - return true; + + return ((*s) ? true : false); } @@ -1475,9 +1479,9 @@ bool DL_Dxf::handleXRecordData(DL_CreationInterface* creationInterface) // string: if (groupCode<=9 || - groupCode==100 || groupCode==102 || groupCode==105 || - (groupCode>=300 && groupCode<=369) || - (groupCode>=1000 && groupCode<=1009)) + groupCode==100 || groupCode==102 || groupCode==105 || + (groupCode>=300 && groupCode<=369) || + (groupCode>=1000 && groupCode<=1009)) { creationInterface->addXRecordString(static_cast(groupCode), groupValue); @@ -1831,9 +1835,9 @@ void DL_Dxf::addText(DL_CreationInterface* creationInterface) getRealValue(20, 0.0), getRealValue(30, 0.0), // alignment point - getRealValue(11, 0.0), - getRealValue(21, 0.0), - getRealValue(31, 0.0), + getRealValue(11, DL_NANDOUBLE), + getRealValue(21, DL_NANDOUBLE), + getRealValue(31, DL_NANDOUBLE), // height getRealValue(40, 2.5), // x scale @@ -2244,7 +2248,7 @@ bool DL_Dxf::handleHatchData(DL_CreationInterface* creationInterface) } return true; default: - return false; + break; } } else @@ -2268,7 +2272,7 @@ bool DL_Dxf::handleHatchData(DL_CreationInterface* creationInterface) hatchEdge.defined = true; return true; default: - return false; + break; } } @@ -2297,7 +2301,7 @@ bool DL_Dxf::handleHatchData(DL_CreationInterface* creationInterface) hatchEdge.defined = true; return true; default: - return false; + break; } } @@ -2332,7 +2336,7 @@ bool DL_Dxf::handleHatchData(DL_CreationInterface* creationInterface) hatchEdge.defined = true; return true; default: - return false; + break; } } @@ -2414,7 +2418,7 @@ bool DL_Dxf::handleHatchData(DL_CreationInterface* creationInterface) hatchEdge.endTangentY = toReal(groupValue); return true; default: - return false; + break; } } } @@ -2577,6 +2581,9 @@ void DL_Dxf::writeHeader(DL_WriterA& dw) const break; case DL_Codes::AC1015: dw.dxfString(1, "AC1015"); + break; + case DL_Codes::AC1009_MIN: + // minimalistic DXF version is unidentified in file: break; default: break; @@ -3043,7 +3050,14 @@ void DL_Dxf::writeInsert(DL_WriterA& dw, if (version==DL_VERSION_2000) { dw.dxfString(100, "AcDbEntity"); - dw.dxfString(100, "AcDbBlockReference"); + if (data.cols!=1 || data.rows!=1) + { + dw.dxfString(100, "AcDbMInsertBlock"); + } + else + { + dw.dxfString(100, "AcDbBlockReference"); + } } dw.entityAttributes(attrib); dw.dxfString(2, data.name); @@ -3070,7 +3084,6 @@ void DL_Dxf::writeInsert(DL_WriterA& dw, dw.dxfReal(44, data.colSp); dw.dxfReal(45, data.rowSp); } - } @@ -3218,7 +3231,9 @@ void DL_Dxf::writeDimStyleOverrides(DL_WriterA& dw, dw.dxfString(1000, "DSTYLE"); dw.dxfString(1002, "{"); dw.dxfInt(1070, 144); - dw.dxfInt(1040, static_cast(data.linearFactor)); + dw.dxfReal(1040, data.linearFactor); + dw.dxfInt(1070,40); + dw.dxfReal(1040, data.dimScale); dw.dxfString(1002, "}"); } } @@ -3977,9 +3992,10 @@ int DL_Dxf::writeImage(DL_WriterA& dw, const DL_Attributes& attrib) { - /*if (data.file.empty()) { + /*if (data.file.empty()) + { std::cerr << "DL_Dxf::writeImage: " - << "Image file must not be empty\n"; + << "Image file must not be empty\n"; return; }*/ @@ -4039,9 +4055,10 @@ void DL_Dxf::writeImageDef(DL_WriterA& dw, const DL_ImageData& data) const { - /*if (data.file.empty()) { + /*if (data.file.empty()) + { std::cerr << "DL_Dxf::writeImage: " - << "Image file must not be empty\n"; + << "Image file must not be empty\n"; return; }*/ diff --git a/src/libs/vdxf/dxflib/dl_dxf.h b/src/libs/vdxf/dxflib/dl_dxf.h index 49d5eb973..f3e9a1bd4 100644 --- a/src/libs/vdxf/dxflib/dl_dxf.h +++ b/src/libs/vdxf/dxflib/dl_dxf.h @@ -27,6 +27,7 @@ #include "dl_global.h" +#include #include #include #include @@ -50,15 +51,19 @@ #define M_PI 3.1415926535897932384626433832795 #endif +#ifndef DL_NANDOUBLE +#define DL_NANDOUBLE std::numeric_limits::quiet_NaN() +#endif + class DL_CreationInterface; class DL_WriterA; -#define DL_VERSION "3.7.5.0" +#define DL_VERSION "3.12.2.0" #define DL_VERSION_MAJOR 3 -#define DL_VERSION_MINOR 7 -#define DL_VERSION_REV 5 +#define DL_VERSION_MINOR 12 +#define DL_VERSION_REV 2 #define DL_VERSION_BUILD 0 #define DL_UNKNOWN 0 @@ -126,16 +131,16 @@ public: bool readDxfGroups(FILE* fp, DL_CreationInterface* creationInterface); static bool getStrippedLine(std::string& s, quint32 size, - FILE* stream); - + FILE* stream, bool stripSpace = true); + bool readDxfGroups(std::stringstream& stream, DL_CreationInterface* creationInterface); bool in(std::stringstream &stream, DL_CreationInterface* creationInterface); static bool getStrippedLine(std::string& s, quint32 size, - std::stringstream& stream); + std::stringstream& stream, bool stripSpace = true); - static bool stripWhiteSpace(char** s); + static bool stripWhiteSpace(char** s, bool stripSpaces = true); bool processDXFGroup(DL_CreationInterface* creationInterface, int groupCode, const std::string& groupValue); diff --git a/src/libs/vdxf/dxflib/dl_entities.h b/src/libs/vdxf/dxflib/dl_entities.h index 09da277a4..ca2248809 100644 --- a/src/libs/vdxf/dxflib/dl_entities.h +++ b/src/libs/vdxf/dxflib/dl_entities.h @@ -847,18 +847,6 @@ struct DXFLIB_EXPORT DL_TextData virtual ~DL_TextData() {} - DL_TextData(const DL_TextData &data) - :ipx(data.ipx), ipy(data.ipy), ipz(data.ipz), - apx(data.apx), apy(data.apy), apz(data.apz), - height(data.height), xScaleFactor(data.xScaleFactor), - textGenerationFlags(data.textGenerationFlags), - hJustification(data.hJustification), - vJustification(data.vJustification), - text(data.text), - style(data.style), - angle(data.angle) - {} - /*! X Coordinate of insertion point. */ double ipx; /*! Y Coordinate of insertion point. */ @@ -966,7 +954,8 @@ struct DXFLIB_EXPORT DL_DimensionData const std::string& text, const std::string& style, double angle, - double linearFactor = 1.0) : + double linearFactor = 1.0, + double dimScale = 1.0) : dpx(dpx), dpy(dpy), dpz(dpz), mpx(mpx), mpy(mpy), mpz(mpz), type(type), @@ -976,7 +965,8 @@ struct DXFLIB_EXPORT DL_DimensionData text(text), style(style), angle(angle), - linearFactor(linearFactor) + linearFactor(linearFactor), + dimScale(dimScale) { } @@ -1050,6 +1040,10 @@ struct DXFLIB_EXPORT DL_DimensionData * Linear factor style override. */ double linearFactor; + /** + * Dimension scale (dimscale) style override. + */ + double dimScale; }; diff --git a/src/libs/vdxf/dxflib/dl_extrusion.h b/src/libs/vdxf/dxflib/dl_extrusion.h index 718e04def..2ab9ca427 100644 --- a/src/libs/vdxf/dxflib/dl_extrusion.h +++ b/src/libs/vdxf/dxflib/dl_extrusion.h @@ -65,7 +65,12 @@ public: } /** - * @brief DL_Extrusion Constructor for DXF extrusion. + * Constructor for DXF extrusion. + * + * @param direction Vector of axis along which the entity shall be extruded + * this is also the Z axis of the Entity coordinate system + * @param elevation Distance of the entities XY plane from the origin of the + * world coordinate system */ DL_Extrusion(double dx, double dy, double dz, double elevation) : direction(new double[3]), elevation(elevation) @@ -76,7 +81,7 @@ public: /** - * @brief setDirection Sets the direction vector. + * Sets the direction vector. */ void setDirection(double dx, double dy, double dz) { @@ -95,7 +100,12 @@ public: return direction; } - void getDirection(double dir[]) const + + + /** + * @return direction vector. + */ + void getDirection(double dir[]) const { dir[0]=direction[0]; dir[1]=direction[1]; diff --git a/src/libs/vdxf/dxflib/dl_writer_ascii.cpp b/src/libs/vdxf/dxflib/dl_writer_ascii.cpp index 3d5647cea..bb90536e6 100644 --- a/src/libs/vdxf/dxflib/dl_writer_ascii.cpp +++ b/src/libs/vdxf/dxflib/dl_writer_ascii.cpp @@ -64,8 +64,15 @@ bool DL_WriterA::openFailed() const void DL_WriterA::dxfReal(int gc, double value) const { char str[256]; - sprintf(str, "%.16lf", value); - + if (version==DL_Codes::AC1009_MIN) + { + sprintf(str, "%.6lf", value); + } + else + { + sprintf(str, "%.16lf", value); + } + // fix for german locale: strReplace(str, ',', '.'); diff --git a/src/libs/vdxf/dxflib/dl_writer_ascii.h b/src/libs/vdxf/dxflib/dl_writer_ascii.h index 0c87a21d3..3d3b399ca 100644 --- a/src/libs/vdxf/dxflib/dl_writer_ascii.h +++ b/src/libs/vdxf/dxflib/dl_writer_ascii.h @@ -41,17 +41,16 @@ /** * Implements functions defined in DL_Writer for writing low * level DXF constructs to an ASCII format DXF file. + * + * @para fname File name of the file to be created. + * @para version DXF version. Defaults to DL_VERSION_2002. + * + * @todo What if \c fname is NULL? Or \c fname can't be opened for + * another reason? */ class DXFLIB_EXPORT DL_WriterA : public DL_Writer { public: - /** - * @param fname fname File name of the file to be created. - * @param version version DXF version. Defaults to DL_VERSION_2002. - * - * @todo What if \c fname is NULL? Or \c fname can't be opened for - * another reason? - */ explicit DL_WriterA(const char* fname, DL_Codes::version version=DL_VERSION_2000) : DL_Writer(version), m_ofile(fname) {} virtual ~DL_WriterA() {} diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp index cf82f718c..071ded8f0 100644 --- a/src/libs/vdxf/vdxfengine.cpp +++ b/src/libs/vdxf/vdxfengine.cpp @@ -95,7 +95,7 @@ bool VDxfEngine::begin(QPaintDevice *pdev) QByteArray fileNameArray = getFileName().toLocal8Bit(); dw = dxf->out(fileNameArray.data(), exportVersion); - if (dw==NULL) + if (dw==nullptr) { qWarning("VDxfEngine::begin(), can't open file"); return false; @@ -123,10 +123,37 @@ bool VDxfEngine::begin(QPaintDevice *pdev) dw->sectionTables(); dxf->writeVPort(*dw); + + dw->tableLinetypes(25); + dxf->writeLinetype(*dw, DL_LinetypeData("BYBLOCK", "BYBLOCK", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("BYLAYER", "BYLAYER", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("CONTINUOUS", "Continuous", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("ACAD_ISO02W100", "ACAD_ISO02W100", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("ACAD_ISO03W100", "ACAD_ISO03W100", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("ACAD_ISO04W100", "ACAD_ISO04W100", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("ACAD_ISO05W100", "ACAD_ISO05W100", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("BORDER", "BORDER", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("BORDER2", "BORDER2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("BORDERX2", "BORDERX2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("CENTER", "CENTER", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("CENTER2", "CENTER2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("CENTERX2", "CENTERX2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DASHDOT", "DASHDOT", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DASHDOT2", "DASHDOT2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DASHDOTX2", "DASHDOTX2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DASHED", "DASHED", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DASHED2", "DASHED2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DASHEDX2", "DASHEDX2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DIVIDE", "DIVIDE", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DIVIDE2", "DIVIDE2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DIVIDEX2", "DIVIDEX2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DOT", "DOT", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DOT2", "DOT2", 0, 0, 0.0)); + dxf->writeLinetype(*dw, DL_LinetypeData("DOTX2", "DOTX2", 0, 0, 0.0)); dw->tableEnd(); + int numberOfLayers = 1; dw->tableLayers(numberOfLayers); - dxf->writeLayer(*dw, DL_LayerData("0", 0), DL_Attributes( @@ -135,7 +162,46 @@ bool VDxfEngine::begin(QPaintDevice *pdev) 100, // default width "CONTINUOUS", // default line style 1.0)); // default line type scale + dw->tableEnd(); + + dw->tableStyle(1); + DL_StyleData style("Standard", 0, 0.0, 1.0, 0.0, 0, 2.5, "txt", ""); + style.bold = false; + style.italic = false; + dxf->writeStyle(*dw, style); + dw->tableEnd(); + + dxf->writeView(*dw); + dxf->writeUcs(*dw); + dw->tableAppid(1); + dw->tableAppidEntry(0x12); + dw->dxfString(2, "ACAD"); + dw->dxfInt(70, 0); + dw->tableEnd(); + + dxf->writeDimStyle(*dw, 1, 1, 1, 1, 1); + + dxf->writeBlockRecord(*dw); + dxf->writeBlockRecord(*dw, "layout"); + dw->tableEnd(); + + dw->sectionEnd(); + + dw->sectionBlocks(); + dxf->writeBlock(*dw, DL_BlockData("*Model_Space", 0, 0.0, 0.0, 0.0)); + dxf->writeEndBlock(*dw, "*Model_Space"); + dxf->writeBlock(*dw, DL_BlockData("*Paper_Space", 0, 0.0, 0.0, 0.0)); + dxf->writeEndBlock(*dw, "*Paper_Space"); + dxf->writeBlock(*dw, DL_BlockData("*Paper_Space0", 0, 0.0, 0.0, 0.0)); + dxf->writeEndBlock(*dw, "*Paper_Space0"); + + dxf->writeBlock(*dw, DL_BlockData("layout", 0, 0.0, 0.0, 0.0)); + // ... + // write block entities e.g. with dxf->writeLine(), .. + // ... + dxf->writeEndBlock(*dw, "layout"); + dw->sectionEnd(); dw->sectionEntities(); @@ -146,6 +212,8 @@ bool VDxfEngine::begin(QPaintDevice *pdev) bool VDxfEngine::end() { dw->sectionEnd(); + dxf->writeObjects(*dw); + dxf->writeObjectsEnd(*dw); dw->dxfEOF(); dw->close(); delete dw; @@ -172,14 +240,18 @@ void VDxfEngine::updateState(const QPaintEngineState &state) //--------------------------------------------------------------------------------------------------------------------- void VDxfEngine::drawPath(const QPainterPath &path) { - QPolygonF polygon = path.toFillPolygon(matrix); - if (polygon.size() < 3) - { - return; - } + const QList subpaths = path.toSubpathPolygons(matrix); - for (int i=1; i < polygon.count(); i++) + for (int j=0; j < subpaths.size(); ++j) { + const QPolygonF polygon = subpaths.at(j); + if (polygon.size() < 3) + { + return; + } + + for (int i=1; i < polygon.count(); i++) + { dxf->writeLine( *dw, DL_LineData(polygon.at(i-1).x(), // start point @@ -188,7 +260,8 @@ void VDxfEngine::drawPath(const QPainterPath &path) polygon.at(i).x(), // end point getSize().height() - polygon.at(i).y(), 0.0), - DL_Attributes("0", getPenColor(), state->pen().width(), getPenStyle(), 1.0)); + DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); + } } } @@ -208,7 +281,7 @@ void VDxfEngine::drawLines(const QLineF * lines, int lineCount) p2.x(), // end point getSize().height() - p2.y(), 0.0), - DL_Attributes("0", getPenColor(), state->pen().width(), getPenStyle(), 1.0)); + DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); } } @@ -236,7 +309,7 @@ void VDxfEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawM p2.x(), // end point getSize().height() - p2.y(), 0.0), - DL_Attributes("0", getPenColor(), state->pen().width(), getPenStyle(), 1.0)); + DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); } } @@ -281,7 +354,7 @@ void VDxfEngine::drawEllipse(const QRectF & rect) ratio, 0,6.28 // startangle and endangle of ellipse in rad ), - DL_Attributes("0", getPenColor(), state->pen().width(), getPenStyle(), 1.0)); + DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); } //--------------------------------------------------------------------------------------------------------------------- @@ -315,7 +388,7 @@ void VDxfEngine::drawTextItem(const QPointF & p, const QTextItem & textItem) f.family().toUtf8().constData(), // font -rotationAngle ), - DL_Attributes("0", getPenColor(), state->pen().width(), getPenStyle(), 1.0)); + DL_Attributes("0", getPenColor(), -1, getPenStyle(), 1.0)); } //--------------------------------------------------------------------------------------------------------------------- From aee23cf700785d0200162759c1dc349456d16f90 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 9 Feb 2016 14:45:31 +0200 Subject: [PATCH 07/21] Tool line. Block selecting the same point twice. --HG-- branch : release --- ChangeLog.txt | 1 + src/libs/vtools/dialogs/tools/dialogline.cpp | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index dd61fbef0..7b88a3d21 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- Tool line. Block selecting the same point twice. - [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths. - Fixed combobox width in Dialog "Tool True Dart point". - [#441] Broken reference incrementation for tool "True Dart point". diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp index 04545ebf2..e8848e671 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogline.cpp @@ -182,13 +182,16 @@ void DialogLine::ChosenObject(quint32 id, const SceneObject &type) } break; case 1: - if (SetObject(id, ui->comboBoxSecondPoint, "")) + if (getCurrentObjectId(ui->comboBoxFirstPoint) != id) { - if (flagError) + if (SetObject(id, ui->comboBoxSecondPoint, "")) { - number = 0; - prepare = true; - DialogAccepted(); + if (flagError) + { + number = 0; + prepare = true; + DialogAccepted(); + } } } break; From 30adc76bce693253243c0b276f55a08f69abcbb8 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 9 Feb 2016 16:16:04 +0200 Subject: [PATCH 08/21] Fixed broken path to measurements after using Save As option. --HG-- branch : release --- ChangeLog.txt | 1 + src/app/valentina/mainwindow.cpp | 2 +- src/libs/vmisc/def.cpp | 24 +++++++++++------------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7b88a3d21..d0c03dc5c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- Fixed broken path to measurements after using Save As option. - Tool line. Block selecting the same point twice. - [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths. - Fixed combobox width in Dialog "Tool True Dart point". diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 97eafe4ea..852a3a3bf 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -2929,7 +2929,7 @@ bool MainWindow::SavePattern(const QString &fileName, QString &error) qCDebug(vMainWindow, "Saving pattern file %s.", qUtf8Printable(fileName)); QFileInfo tempInfo(fileName); - const QString mPath = doc->MPath(); + const QString mPath = AbsoluteMPath(curFile, doc->MPath()); if (not mPath.isEmpty() && curFile != fileName) { doc->SetPath(RelativeMPath(fileName, mPath)); diff --git a/src/libs/vmisc/def.cpp b/src/libs/vmisc/def.cpp index 23883173c..7ae5c44b3 100644 --- a/src/libs/vmisc/def.cpp +++ b/src/libs/vmisc/def.cpp @@ -33,6 +33,7 @@ #include #include #include +#include // Keep synchronize all names with initialization in VTranslateVars class!!!!! //measurements @@ -1705,38 +1706,35 @@ QString StrippedName(const QString &fullFileName) //--------------------------------------------------------------------------------------------------------------------- QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath) { - if (patternPath.isEmpty()) + if (patternPath.isEmpty() || absoluteMPath.isEmpty()) { return absoluteMPath; } - if (absoluteMPath.isEmpty() || QFileInfo(absoluteMPath).isRelative()) + if (QFileInfo(absoluteMPath).isRelative()) { + qWarning() << QApplication::tr("The path to the measurments is already relative."); return absoluteMPath; } - QDir dir(QFileInfo(patternPath).absoluteDir()); - return dir.relativeFilePath(absoluteMPath); + return QFileInfo(patternPath).absoluteDir().relativeFilePath(absoluteMPath); } //--------------------------------------------------------------------------------------------------------------------- QString AbsoluteMPath(const QString &patternPath, const QString &relativeMPath) { - if (patternPath.isEmpty()) + if (patternPath.isEmpty() || relativeMPath.isEmpty()) { return relativeMPath; } - else - { - if (relativeMPath.isEmpty() || QFileInfo(relativeMPath).isAbsolute()) - { - return relativeMPath; - } - return QFileInfo(QFileInfo(patternPath).absoluteDir(), relativeMPath).absoluteFilePath(); + if (QFileInfo(relativeMPath).isAbsolute()) + { + qWarning() << QApplication::tr("The path to the measurments is already absolute."); + return relativeMPath; } - return QString();// should never reach + return QFileInfo(QFileInfo(patternPath).absoluteDir(), relativeMPath).absoluteFilePath(); } //--------------------------------------------------------------------------------------------------------------------- From e58080ba8116133210a53f7f61d958f6d7f70a9a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 9 Feb 2016 16:26:49 +0200 Subject: [PATCH 09/21] Little fix tools visuzlization. --HG-- branch : release --- .../vtools/visualization/vistoolpointofintersectionarcs.cpp | 2 ++ .../vtools/visualization/vistoolpointofintersectioncircles.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/libs/vtools/visualization/vistoolpointofintersectionarcs.cpp b/src/libs/vtools/visualization/vistoolpointofintersectionarcs.cpp index 08ff5038a..c50770838 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/visualization/vistoolpointofintersectionarcs.cpp @@ -37,6 +37,8 @@ VisToolPointOfIntersectionArcs::VisToolPointOfIntersectionArcs(const VContainer point(nullptr), arc1Path(nullptr), arc2Path(nullptr) { + this->setPen(QPen(Qt::NoPen)); // don't use parent this time + arc1Path = InitItem(Qt::darkGreen, this); arc1Path->setFlag(QGraphicsItem::ItemStacksBehindParent, false); arc2Path = InitItem(Qt::darkRed, this); diff --git a/src/libs/vtools/visualization/vistoolpointofintersectioncircles.cpp b/src/libs/vtools/visualization/vistoolpointofintersectioncircles.cpp index 8c4857355..44645566e 100644 --- a/src/libs/vtools/visualization/vistoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/visualization/vistoolpointofintersectioncircles.cpp @@ -37,6 +37,8 @@ VisToolPointOfIntersectionCircles::VisToolPointOfIntersectionCircles(const VCont crossPoint(CrossCirclesPoint::FirstPoint), point(nullptr), c1Center(nullptr), c2Center(nullptr), c1Path(nullptr), c2Path(nullptr) { + this->setPen(QPen(Qt::NoPen)); // don't use parent this time + c1Path = InitItem(Qt::darkGreen, this); c2Path = InitItem(Qt::darkRed, this); point = InitPoint(mainColor, this); From 5dc2e16e537280540da2ab6a48e880b4ae83c477 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 10 Feb 2016 19:50:16 +0200 Subject: [PATCH 10/21] Lupdate. --HG-- branch : release --- share/translations/valentina.ts | 13 +- share/translations/valentina_cs_CZ.ts | 11 + share/translations/valentina_de_DE.ts | 11 + share/translations/valentina_en_CA.ts | 11 + share/translations/valentina_en_IN.ts | 11 + share/translations/valentina_en_US.ts | 11 + share/translations/valentina_es_ES.ts | 521 +++++++++++++------------- share/translations/valentina_fi_FI.ts | 11 + share/translations/valentina_fr_FR.ts | 11 + share/translations/valentina_he_IL.ts | 11 + share/translations/valentina_id_ID.ts | 11 + share/translations/valentina_it_IT.ts | 11 + share/translations/valentina_nl_NL.ts | 11 + share/translations/valentina_ro_RO.ts | 449 +++++++++++----------- share/translations/valentina_ru_RU.ts | 11 + share/translations/valentina_uk_UA.ts | 11 + 16 files changed, 655 insertions(+), 471 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index 8f876d141..d86971389 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -2459,7 +2459,7 @@ Apply settings anyway? New pattern - New pattern + New pattern @@ -5074,6 +5074,17 @@ Do you want to save your changes? Count steps (0 - no limit): + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index 1bae2c604..754efcc19 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -4942,6 +4942,17 @@ Chcete uložit své změny? + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index 61d82fb7a..95337d030 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -5057,6 +5057,17 @@ Sollen die Änderungen gespeichert werden? Schritte (0 - unbegrenzt): + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 6c98ac305..553b83143 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -5074,6 +5074,17 @@ Do you want to save your changes? Count steps (0 - no limit): + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index a1b20e909..22050bfb0 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -5074,6 +5074,17 @@ Do you want to save your changes? Count steps (0 - no limit): + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 8e8a548c4..67fbc3052 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -5074,6 +5074,17 @@ Do you want to save your changes? Count steps (0 - no limit): + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index 133ce5142..0e7e7e864 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -12,7 +12,7 @@ AddPatternPiece add pattern piece %1 - + añadir pieza de patrón %1 @@ -85,31 +85,31 @@ Server name/IP: - + Nombre del servidor/IP: Proxy address: - + Dirección del Proxy: Proxy port: - + Puerto del Proxy: Proxy user: - + Usuario del Proxy: Proxy pass: - + Contraseña del Proxy: User Name: - + Nombre del usuario: Password: - + Contraseña: @@ -231,72 +231,72 @@ Toolbar - + Barra de herramientas The text appears under the icon. (recommended for beginners.) - + El texto aparece debajo del icono. (recomendado para principiantes) GUI language: - + Idioma de interfaz gráfica de usuario: Decimal separator parts: - + Partes separador decimal: Default unit: - + Unidad por defecto: Label language: - + Idioma de las etiquetas: Pattern making system - + Sistema de creación de patrones Pattern making system: - + Sistema de creación de patrones: Author: - + Autor: Book: - + Libro: The Default unit has been updated and will be used as the default for the next pattern you create. - + La unidad por defecto fue actualizada y va a usarse como valor por defecto para el próximo patrón que cree. After each crash Valentina collects information that may help us fix the problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. - + Después de cada fallo Valentina recoge información que puede ayudar a solucionar un problema. No recogemos ninguna información personal. Encuentre más información sobre que <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">tipo de información</a> recolectamos. DelTool delete tool - + herramienta de borrado DeleteDetail delete tool - + herramienta de borrado DeletePatternPiece delete pattern piece %1 - + borrar pieza %1 de patrón @@ -331,18 +331,18 @@ Built on %1 at %2 - Construido sobre %3 y %2 {1 ?} + Construido el %1 a la %2 DialogAboutTape About Tape - + Sobre Tape Tape version - + Versión de Tape Build revision: @@ -350,11 +350,11 @@ This program is part of Valentina project. - + Este programa es parte del proyecto Valentina. Build revision: %1 - + Revisión de la construcción: %1 Built on %3 at %4 @@ -370,7 +370,7 @@ Built on %1 at %2 - Construido sobre %3 y %2 {1 ?} + Construido el %1 a la %2 @@ -429,15 +429,15 @@ Edit length - + Editar largo Length: - + Longitud: Formula wizard - + Asistente de Fórmula Value @@ -445,43 +445,43 @@ Calculation - + Cálculo Point label: - + Etiqueta de punto: First point: - + Primer punto: First point of the line - + Primer punto de la línea Second point: - + Segundo punto: Second point of the line - + Segundo punto de la línea Type of line: - + Tipo de línea: Line color: - + Color de la línea: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única @@ -544,23 +544,23 @@ Edit radius - + Editar radio Edit first angle - + Editar primer ángulo Edit second angle - + Editar segundo ángulo Radius: - + Radio: Formula wizard - + Asistente de Fórmula Value @@ -568,38 +568,38 @@ Calulation - + Cálculo First angle: - + Primer ángulo: Calculation - + Cálculo Second angle: - + Segundo ángulo: Center point: - + Punto central: Select center point of the arc - + Seleccionar punto central del arco Color: - + Color: DialogArcWithLength Dialog - + Diálogo Radius @@ -643,15 +643,15 @@ Edit radius - + Editar radio Edit the first angle - + Editar primer ángulo Edit the arc length - + Editar longitud del arco Error @@ -663,15 +663,15 @@ Length can't be equal 0 - + Longitud no puede ser 0 Radius: - + Radio: Formula wizard - + Asistente de Fórmula Value @@ -679,23 +679,23 @@ Calculation - + Cálculo First angle: - + Primer ángulo: Length: - + Longitud: Center point: - + Punto central: Color: - + Color: @@ -766,15 +766,15 @@ Edit length - + Editar largo Length: - + Longitud: Formula wizard - + Asistente de Fórmula Value @@ -782,39 +782,39 @@ Calculation - + Cálculo Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única First point: - + Primer punto: Second point: - + Segundo punto: Third point: - + Tercer punto: Type of line: - + Tipo de línea: Line color: - + Color de la línea: @@ -869,15 +869,15 @@ Edit angle - + Editar ángulo Angle: - + Ángulo: Formula wizard - + Asistente de Fórmula Value @@ -885,35 +885,35 @@ Calculation - + Cálculo Axis point: - + Punto del eje: Curve: - + Curva: Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Type of line: - + Tipo de línea: Line color: - + Color de la línea: @@ -952,15 +952,15 @@ Edit length - + Editar largo Length: - + Longitud: Formula wizard - + Asistente de Fórmula Value @@ -968,27 +968,27 @@ Calculation - + Cálculo Arc: - + Arco: Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Color: - + Color: @@ -1027,15 +1027,15 @@ Edit length - + Editar largo Length: - + Longitud: Formula wizard - + Asistente de Fórmula Value @@ -1043,27 +1043,27 @@ Calculation - + Cálculo Curve: - + Curva: Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Color: - + Color: @@ -1102,15 +1102,15 @@ Edit length - + Editar largo Length: - + Longitud: Formula wizard - + Asistente de Fórmula Value @@ -1118,27 +1118,27 @@ Calculation - + Cálculo Curve: - + Curva: Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Color: - + Color: @@ -1197,11 +1197,11 @@ All objects in path should follow in clockwise direction. - + Todos los objetos en la ruta deben seguir en la direccion de las agujas del reloj. Scroll down the list - + Desplazar hacia abajo la lista ... @@ -1209,35 +1209,39 @@ Scroll up the list - + Desplazar hacia arriba la lista Ready! - + ¡Listo! You need more points! - + ¡Necesita más puntos! + + + First point can not equal the last point! + ¡El primer punto no puede ser igual al último punto! You have double points! - + ¡Tiene puntos dobles! You have to choose points in a clockwise direction! - + ¡Tiene que elegir los puntos en una dirección en sentido horario! Bias X: - + Sesgo X: Bias Y: - + Sesgo Y: Name of detail: - + Nombre del detalle: Width: @@ -1245,7 +1249,7 @@ First point cannot be equal to the last point! - + ¡El primer punto no puede ser igual al último punto! @@ -1308,7 +1312,7 @@ Double click for add to formula - + Doble click para agregar una formula Height @@ -1336,31 +1340,31 @@ Radius of arcs - + Radio de los arcos Angles of arcs - + Ángulos de los arcos Angles of curves - + Ángulos de las curvas Arc radius - + Radio del arco Arc angle - + Ángulo del arco Curve angle - + Ángulo de la curva Formula: - + Fórmula: Value @@ -1368,7 +1372,7 @@ Calculation - + Cálculo @@ -1423,19 +1427,19 @@ Edit angle - + Editar ángulo Edit length - + Editar largo Length: - + Longitud: Formula wizard - + Asistente de Fórmula Value @@ -1443,35 +1447,35 @@ Calculation - + Cálculo Angle: - + Ángulo: Base point: - + Punto base: Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Type of line: - + Tipo de línea: Line color: - + Color de la línea: @@ -1522,35 +1526,35 @@ Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Base point: - + Punto base: First point of line: - + Primer punto de la línea: Second point of line: - + Segundo punto de la línea: Type of line: - + Tipo de línea: Line color: - + Color de la línea: @@ -1649,11 +1653,11 @@ %1 - point of arcs intersection - + %1 - punto de intersección de arcos %1 - point of circles intersection - + %1 - punto de intersección de círculos %1 - point from circle and tangent @@ -1764,7 +1768,7 @@ Formula: - + Fórmula: <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -1808,11 +1812,11 @@ Calculation - + Cálculo Formula wizard - + Asistente de Fórmula @@ -2050,19 +2054,19 @@ Apply settings anyway? First point: - + Primer punto: Second point: - + Segundo punto: Type of line: - + Tipo de línea: Line color: - + Color de la línea: @@ -2105,23 +2109,23 @@ Apply settings anyway? Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única First point: - + Primer punto: Second point: - + Segundo punto: @@ -2192,15 +2196,15 @@ Apply settings anyway? Edit angle - + Editar ángulo Angle: - + Ángulo: Formula wizard - + Asistente de Fórmula Value @@ -2208,11 +2212,11 @@ Apply settings anyway? Calculation - + Cálculo Axis point: - + Punto del eje: First line point: @@ -2224,23 +2228,23 @@ Apply settings anyway? Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Type of line: - + Tipo de línea: Line color: - + Color de la línea: @@ -2501,15 +2505,15 @@ Apply settings anyway? Edit length - + Editar largo Length: - + Longitud: Formula wizard - + Asistente de Fórmula Value @@ -2517,27 +2521,27 @@ Apply settings anyway? Calculation - + Cálculo Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única First point: - + Primer punto: Second point: - + Segundo punto: Additional angle degrees: @@ -2545,11 +2549,11 @@ Apply settings anyway? Type of line: - + Tipo de línea: Line color: - + Color de la línea: @@ -2770,15 +2774,15 @@ Apply settings anyway? Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Tangent point: @@ -2786,7 +2790,7 @@ Apply settings anyway? Arc: - + Arco: Take: @@ -2821,7 +2825,7 @@ Apply settings anyway? Edit radius - + Editar radio Error @@ -2833,11 +2837,11 @@ Apply settings anyway? Radius: - + Radio: Formula wizard - + Asistente de Fórmula Value @@ -2845,19 +2849,19 @@ Apply settings anyway? Calculation - + Cálculo Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Center of the circle: @@ -2916,15 +2920,15 @@ Apply settings anyway? Edit radius - + Editar radio Radius: - + Radio: Formula wizard - + Asistente de Fórmula Value @@ -2932,19 +2936,19 @@ Apply settings anyway? Calculation - + Cálculo Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Center of arc: @@ -2991,15 +2995,15 @@ Apply settings anyway? Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única X: vertical point: @@ -3014,7 +3018,7 @@ Apply settings anyway? DialogPointOfIntersectionArcs Dialog - + Diálogo Point label @@ -3030,15 +3034,15 @@ Apply settings anyway? Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única First arc: @@ -3057,7 +3061,7 @@ Apply settings anyway? DialogPointOfIntersectionCircles Dialog - + Diálogo <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -3097,7 +3101,7 @@ Apply settings anyway? Formula wizard - + Asistente de Fórmula Value @@ -3105,7 +3109,7 @@ Apply settings anyway? Calculation - + Cálculo Radius of the second circle: @@ -3113,15 +3117,15 @@ Apply settings anyway? Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Center of the first circle: @@ -3298,15 +3302,15 @@ Apply settings anyway? Edit length - + Editar largo Length: - + Longitud: Formula wizard - + Asistente de Fórmula Value @@ -3314,39 +3318,39 @@ Apply settings anyway? Calculation - + Cálculo Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única First point: - + Primer punto: Second point: - + Segundo punto: Third point: - + Tercer punto: Type of line: - + Tipo de línea: Line color: - + Color de la línea: @@ -3377,11 +3381,11 @@ Apply settings anyway? Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única @@ -3432,7 +3436,7 @@ Apply settings anyway? Color: - + Color: @@ -3483,7 +3487,7 @@ Apply settings anyway? Color: - + Color: @@ -3573,15 +3577,15 @@ Apply settings anyway? Point label: - + Etiqueta de punto: Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única First point of axis: @@ -3593,11 +3597,11 @@ Apply settings anyway? First point: - + Primer punto: Second point: - + Segundo punto: @@ -3664,11 +3668,11 @@ Apply settings anyway? Unique label - + Etiqueta única Choose unique label. - + Seleccione etiqueta única Second new dart point: @@ -4945,6 +4949,17 @@ Quiere guardar los cambios? + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser @@ -5312,7 +5327,7 @@ Quiere guardar los cambios? Formula: - + Fórmula: <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -5452,7 +5467,7 @@ Quiere guardar los cambios? About Tape - + Sobre Tape New @@ -5846,15 +5861,15 @@ Do you want to save your changes? Pattern making system - + Sistema de creación de patrones Author: - + Autor: Book: - + Libro: Decimal separator parts @@ -5866,15 +5881,15 @@ Do you want to save your changes? GUI language: - + Idioma de interfaz gráfica de usuario: Decimal separator parts: - + Partes separador decimal: Pattern making system: - + Sistema de creación de patrones: Default height and size diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index 68e51a882..e27b0a200 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -4942,6 +4942,17 @@ Haluatko tallentaa muutokset? + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 2d550be19..5724f72e3 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -5062,6 +5062,17 @@ Voulez-vous sauvegarder les changements ? + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 9460eef44..1ef93f0a6 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -4593,6 +4593,17 @@ Do you want to save your changes? + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index 132c9821d..91c17ed92 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -5258,6 +5258,17 @@ Apakah anda ingin menyimpan perubahan anda? cm + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index fc11e9880..b8f602ce2 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -5075,6 +5075,17 @@ Vuoi salvare i cambiamenti? Conto passi (0-infinito) + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 41e0e2a66..4c337f1ad 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -5064,6 +5064,17 @@ Do you want to save your changes? + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index e8cc6fd02..0c5f483a2 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -85,31 +85,31 @@ Server name/IP: - + Nume Server/IP: Proxy address: - + Adresă Proxy: Proxy port: - + Port Proxy: Proxy user: - + User Proxy: Proxy pass: - + Permis Proxy: User Name: - + Nume User: Password: - + Parolă: @@ -231,72 +231,72 @@ Toolbar - + Bară de instrumente The text appears under the icon. (recommended for beginners.) - + Textul apare sub pictograma. (Recomandat pentru începători.) GUI language: - + Limbaj GUI: Decimal separator parts: - + Piese separator decimal: Default unit: - + Unitate standard: Label language: - + Limbă etichetă: Pattern making system - + Sistem construire Tipare Pattern making system: - + Sistem construire Tipare: Author: - + Autor: Book: - + Carte: The Default unit has been updated and will be used as the default for the next pattern you create. - + Unitatea standard a fost actualizată și va fi utilizată ca standard pentru modelele viitoare pe care le creați. After each crash Valentina collects information that may help us fix the problem. We do not collect any personal information. Find more about what <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports">kind of information</a> we collect. - + După fiecare prăbușire, Valentina colectează informații care pot ajuta să rezolvăm problema. Noi nu colectăm informații personale. Află mai multe despre ce <a href="https://bitbucket.org/dismine/valentina/wiki/manual/Crash_reports"> fel de informații </a> colectăm noi. DelTool delete tool - + instrument ștergere DeleteDetail delete tool - + instrument ștergere DeletePatternPiece delete pattern piece %1 - + șterge piesa tipar %1 @@ -331,18 +331,18 @@ Built on %1 at %2 - Construit pe %3 la %2 {1 ?} + Construit pe %1 la %2 DialogAboutTape About Tape - + Despre Bandă Tape version - + Varianta cu Bandă Build revision: @@ -350,11 +350,11 @@ This program is part of Valentina project. - + Acest program face parte din proiectul Valentina. Build revision: %1 - + Revizie Versiune: %1 Built on %3 at %4 @@ -370,7 +370,7 @@ Built on %1 at %2 - Construit pe %3 la %2 {1 ?} + Construit pe %1 la %2 @@ -433,11 +433,11 @@ Length: - + Lungime: Formula wizard - + Asistent Formulă Value @@ -445,43 +445,43 @@ Calculation - + Calcul Point label: - + Denumire punct: First point: - + Primul Punct: First point of the line - + Primul punct al liniei Second point: - + Al doilea punct: Second point of the line - + Al doilea punct al liniei Type of line: - + Tip de linie: Line color: - + Culoarea liniei: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică @@ -548,19 +548,19 @@ Edit first angle - + Editează primul unghi Edit second angle - + Editează al doilea unghi Radius: - + Rază: Formula wizard - + Asistent Formulă Value @@ -568,38 +568,38 @@ Calulation - + Calcul First angle: - + Primul unghi: Calculation - + Calcul Second angle: - + Al doilea unghi: Center point: - + Punct central: Select center point of the arc - + Selectează punctul de centru pentru curbură Color: - + Culoare: DialogArcWithLength Dialog - + Dialog Radius @@ -667,11 +667,11 @@ Radius: - + Rază: Formula wizard - + Asistent Formulă Value @@ -679,23 +679,23 @@ Calculation - + Calcul First angle: - + Primul unghi: Length: - + Lungime: Center point: - + Punct central: Color: - + Culoare: @@ -770,11 +770,11 @@ Length: - + Lungime: Formula wizard - + Asistent Formulă Value @@ -782,39 +782,39 @@ Calculation - + Calcul Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică First point: - + Primul Punct: Second point: - + Al doilea punct: Third point: - + Al treilea punct: Type of line: - + Tip de linie: Line color: - + Culoarea liniei: @@ -873,11 +873,11 @@ Angle: - + Unghi: Formula wizard - + Asistent Formulă Value @@ -885,35 +885,35 @@ Calculation - + Calcul Axis point: - + Punct de axă: Curve: - + Curbă: Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Type of line: - + Tip de linie: Line color: - + Culoarea liniei: @@ -956,11 +956,11 @@ Length: - + Lungime: Formula wizard - + Asistent Formulă Value @@ -968,27 +968,27 @@ Calculation - + Calcul Arc: - + Arc: Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Color: - + Culoare: @@ -1031,11 +1031,11 @@ Length: - + Lungime: Formula wizard - + Asistent Formulă Value @@ -1043,27 +1043,27 @@ Calculation - + Calcul Curve: - + Curbă: Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Color: - + Culoare: @@ -1106,11 +1106,11 @@ Length: - + Lungime: Formula wizard - + Asistent Formulă Value @@ -1118,27 +1118,27 @@ Calculation - + Calcul Curve: - + Curbă: Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Color: - + Culoare: @@ -1201,7 +1201,7 @@ Scroll down the list - + Derulați în jos lista ... @@ -1209,35 +1209,39 @@ Scroll up the list - + Derula în sus lista Ready! - + Gata! You need more points! - + Ai nevoie de mai multe puncte! + + + First point can not equal the last point! + Primul punct nu poate fii la fel cu ultimul punct! You have double points! - + Ai puncte duble! You have to choose points in a clockwise direction! - + Trebuie să alegi punctele în sensul acelor de ceasornic! Bias X: - + Bias X: Bias Y: - + Bias Y: Name of detail: - + Nume detaliu: Width: @@ -1245,7 +1249,7 @@ First point cannot be equal to the last point! - + Primul punct nu poate fi la fel cu ultimul punct! @@ -1368,7 +1372,7 @@ Calculation - + Calcul @@ -1431,11 +1435,11 @@ Length: - + Lungime: Formula wizard - + Asistent Formulă Value @@ -1443,11 +1447,11 @@ Calculation - + Calcul Angle: - + Unghi: Base point: @@ -1455,23 +1459,23 @@ Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Type of line: - + Tip de linie: Line color: - + Culoarea liniei: @@ -1522,15 +1526,15 @@ Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Base point: @@ -1546,11 +1550,11 @@ Type of line: - + Tip de linie: Line color: - + Culoarea liniei: @@ -1808,11 +1812,11 @@ Calculation - + Calcul Formula wizard - + Asistent Formulă @@ -2050,19 +2054,19 @@ Apply settings anyway? First point: - + Primul Punct: Second point: - + Al doilea punct: Type of line: - + Tip de linie: Line color: - + Culoarea liniei: @@ -2105,23 +2109,23 @@ Apply settings anyway? Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică First point: - + Primul Punct: Second point: - + Al doilea punct: @@ -2196,11 +2200,11 @@ Apply settings anyway? Angle: - + Unghi: Formula wizard - + Asistent Formulă Value @@ -2208,11 +2212,11 @@ Apply settings anyway? Calculation - + Calcul Axis point: - + Punct de axă: First line point: @@ -2224,23 +2228,23 @@ Apply settings anyway? Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Type of line: - + Tip de linie: Line color: - + Culoarea liniei: @@ -2505,11 +2509,11 @@ Apply settings anyway? Length: - + Lungime: Formula wizard - + Asistent Formulă Value @@ -2517,27 +2521,27 @@ Apply settings anyway? Calculation - + Calcul Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică First point: - + Primul Punct: Second point: - + Al doilea punct: Additional angle degrees: @@ -2545,11 +2549,11 @@ Apply settings anyway? Type of line: - + Tip de linie: Line color: - + Culoarea liniei: @@ -2766,15 +2770,15 @@ Apply settings anyway? Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Tangent point: @@ -2782,7 +2786,7 @@ Apply settings anyway? Arc: - + Arc: Take: @@ -2829,11 +2833,11 @@ Apply settings anyway? Radius: - + Rază: Formula wizard - + Asistent Formulă Value @@ -2841,19 +2845,19 @@ Apply settings anyway? Calculation - + Calcul Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Center of the circle: @@ -2904,11 +2908,11 @@ Apply settings anyway? Radius: - + Rază: Formula wizard - + Asistent Formulă Value @@ -2916,19 +2920,19 @@ Apply settings anyway? Calculation - + Calcul Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Center of arc: @@ -2967,15 +2971,15 @@ Apply settings anyway? Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică X: vertical point: @@ -2990,7 +2994,7 @@ Apply settings anyway? DialogPointOfIntersectionArcs Dialog - + Dialog Point label @@ -3006,15 +3010,15 @@ Apply settings anyway? Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică First arc: @@ -3033,7 +3037,7 @@ Apply settings anyway? DialogPointOfIntersectionCircles Dialog - + Dialog <html><head/><body><p>Show full calculation in message box</p></body></html> @@ -3073,7 +3077,7 @@ Apply settings anyway? Formula wizard - + Asistent Formulă Value @@ -3081,7 +3085,7 @@ Apply settings anyway? Calculation - + Calcul Radius of the second circle: @@ -3089,15 +3093,15 @@ Apply settings anyway? Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Center of the first circle: @@ -3278,11 +3282,11 @@ Apply settings anyway? Length: - + Lungime: Formula wizard - + Asistent Formulă Value @@ -3290,39 +3294,39 @@ Apply settings anyway? Calculation - + Calcul Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică First point: - + Primul Punct: Second point: - + Al doilea punct: Third point: - + Al treilea punct: Type of line: - + Tip de linie: Line color: - + Culoarea liniei: @@ -3353,11 +3357,11 @@ Apply settings anyway? Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică @@ -3408,7 +3412,7 @@ Apply settings anyway? Color: - + Culoare: @@ -3459,7 +3463,7 @@ Apply settings anyway? Color: - + Culoare: @@ -3549,15 +3553,15 @@ Apply settings anyway? Point label: - + Denumire punct: Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică First point of axis: @@ -3569,11 +3573,11 @@ Apply settings anyway? First point: - + Primul Punct: Second point: - + Al doilea punct: @@ -3640,11 +3644,11 @@ Apply settings anyway? Unique label - + Denumire unică Choose unique label. - + Alege o denumire unică Second new dart point: @@ -4916,6 +4920,17 @@ Do you want to save your changes? + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser @@ -5423,7 +5438,7 @@ Do you want to save your changes? About Tape - + Despre Bandă New @@ -5817,15 +5832,15 @@ Do you want to save your changes? Pattern making system - + Sistem construire Tipare Author: - + Autor: Book: - + Carte: Decimal separator parts @@ -5837,15 +5852,15 @@ Do you want to save your changes? GUI language: - + Limbaj GUI: Decimal separator parts: - + Piese separator decimal: Pattern making system: - + Sistem construire Tipare: Default height and size diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 21122b7ad..2785c08d7 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -5074,6 +5074,17 @@ Do you want to save your changes? Количество шагов (0 - без ограничений) + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index f99d6c817..a09e4e381 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -5075,6 +5075,17 @@ Do you want to save your changes? Кількість кроків (0 - без обмежень): + + QApplication + + The path to the measurments is already relative. + + + + The path to the measurments is already absolute. + + + QCommandLineParser From bcd59b90c7973439e1669ebd1bdcb6ba8b9816dc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 10 Feb 2016 21:35:46 +0200 Subject: [PATCH 11/21] Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list has been scrolled. Fixed validation when the list conatains only curve. --HG-- branch : release --- ChangeLog.txt | 1 + src/libs/vtools/dialogs/tools/dialogdetail.cpp | 16 +++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index d0c03dc5c..f66876f85 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list has been scrolled. - Fixed broken path to measurements after using Save As option. - Tool line. Block selecting the same point twice. - [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths. diff --git a/src/libs/vtools/dialogs/tools/dialogdetail.cpp b/src/libs/vtools/dialogs/tools/dialogdetail.cpp index 4ea1f7f0d..b81f76934 100644 --- a/src/libs/vtools/dialogs/tools/dialogdetail.cpp +++ b/src/libs/vtools/dialogs/tools/dialogdetail.cpp @@ -387,6 +387,7 @@ void DialogDetail::ClickedReverse(bool checked) VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); node.setReverse(checked); item->setData(Qt::UserRole, QVariant::fromValue(node)); + ValidObjects(DetailIsValid()); } //--------------------------------------------------------------------------------------------------------------------- @@ -450,6 +451,7 @@ void DialogDetail::ScrollUp() { QListWidgetItem *item = ui.listWidget->takeItem(0); ui.listWidget->addItem(item); + ValidObjects(DetailIsValid()); } } @@ -460,6 +462,7 @@ void DialogDetail::ScrollDown() { QListWidgetItem *item = ui.listWidget->takeItem(ui.listWidget->count()-1); ui.listWidget->insertItem(0, item); + ValidObjects(DetailIsValid()); } } @@ -475,7 +478,7 @@ bool DialogDetail::DetailIsValid() const pixmap.save(&buffer, "PNG"); QString url = QString(" "); - if (ui.listWidget->count() < 3) + if(CreateDetail().ContourPoints(data).count() < 3) { url += tr("You need more points!"); ui.helpLabel->setText(url); @@ -538,17 +541,12 @@ bool DialogDetail::FirstPointEqualLast() const //--------------------------------------------------------------------------------------------------------------------- bool DialogDetail::DetailIsClockwise() const { - if(ui.listWidget->count() < 3) + const QVector points = CreateDetail().ContourPoints(data); + + if(points.count() < 3) { return false; } - VDetail detail; - for (qint32 i = 0; i < ui.listWidget->count(); ++i) - { - QListWidgetItem *item = ui.listWidget->item(i); - detail.append( qvariant_cast(item->data(Qt::UserRole))); - } - const QVector points = detail.ContourPoints(data); const qreal res = VDetail::SumTrapezoids(points); if (res < 0) From 99aea913a8f8cfde56c6c697e00fb27e5fba1be9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 10 Feb 2016 21:38:37 +0200 Subject: [PATCH 12/21] Fixed getting correct reversed segment for single in the list curve. --HG-- branch : release --- ChangeLog.txt | 4 +++- src/libs/vpatterndb/vdetail.cpp | 28 ++++++++++++++++++++-------- src/libs/vpatterndb/vdetail.h | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index f66876f85..2edd7bda3 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,7 @@ # Version 0.4.2 -- Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list has been scrolled. +- Fixed getting correct reversed segment for single in the list curve. +- Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list +has been scrolled. Fixed validation when the list conatains only curve. - Fixed broken path to measurements after using Save As option. - Tool line. Block selecting the same point twice. - [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths. diff --git a/src/libs/vpatterndb/vdetail.cpp b/src/libs/vpatterndb/vdetail.cpp index 05d123893..3c09862e0 100644 --- a/src/libs/vpatterndb/vdetail.cpp +++ b/src/libs/vpatterndb/vdetail.cpp @@ -371,8 +371,8 @@ QVector VDetail::ContourPoints(const VContainer *data) const { const QSharedPointer curve = data->GeometricObject(at(i).getId()); - const QPointF begin = StartSegment(data, i); - const QPointF end = EndSegment(data, i); + const QPointF begin = StartSegment(data, i, at(i).getReverse()); + const QPointF end = EndSegment(data, i, at(i).getReverse()); points << curve->GetSegmentPoints(begin, end, at(i).getReverse()); } @@ -415,8 +415,8 @@ QVector VDetail::SeamAllowancePoints(const VContainer *data) const { const QSharedPointer curve = data->GeometricObject(at(i).getId()); - const QPointF begin = StartSegment(data, i); - const QPointF end = EndSegment(data, i); + const QPointF begin = StartSegment(data, i, at(i).getReverse()); + const QPointF end = EndSegment(data, i, at(i).getReverse()); const QVector nodePoints = curve->GetSegmentPoints(begin, end, at(i).getReverse()); pointsEkv << biasPoints(nodePoints, at(i).getMx(), at(i).getMy()); @@ -524,7 +524,7 @@ int VDetail::indexOfNode(const QVector &list, const quint32 &id) } //--------------------------------------------------------------------------------------------------------------------- -QPointF VDetail::StartSegment(const VContainer *data, const int &i) const +QPointF VDetail::StartSegment(const VContainer *data, const int &i, bool reverse) const { if (i < 0 && i > CountNode()-1) { @@ -533,7 +533,13 @@ QPointF VDetail::StartSegment(const VContainer *data, const int &i) const const QSharedPointer curve = data->GeometricObject(at(i).getId()); - QPointF begin = curve->GetPoints().first(); + QVector points = curve->GetPoints(); + if (reverse) + { + points = VGObject::GetReversePoints(points); + } + + QPointF begin = points.first(); if (CountNode() > 1) { if (i == 0) @@ -555,7 +561,7 @@ QPointF VDetail::StartSegment(const VContainer *data, const int &i) const } //--------------------------------------------------------------------------------------------------------------------- -QPointF VDetail::EndSegment(const VContainer *data, const int &i) const +QPointF VDetail::EndSegment(const VContainer *data, const int &i, bool reverse) const { if (i < 0 && i > CountNode()-1) { @@ -564,7 +570,13 @@ QPointF VDetail::EndSegment(const VContainer *data, const int &i) const const QSharedPointer curve = data->GeometricObject(at(i).getId()); - QPointF end = curve->GetPoints().last(); + QVector points = curve->GetPoints(); + if (reverse) + { + points = VGObject::GetReversePoints(points); + } + + QPointF end = points.last(); if (CountNode() > 2) { if (i == CountNode() - 1) diff --git a/src/libs/vpatterndb/vdetail.h b/src/libs/vpatterndb/vdetail.h index aa7262342..ae72e2b94 100644 --- a/src/libs/vpatterndb/vdetail.h +++ b/src/libs/vpatterndb/vdetail.h @@ -89,8 +89,8 @@ private: static int indexOfNode(const QVector &list, const quint32 &id); - QPointF StartSegment(const VContainer *data, const int &i) const; - QPointF EndSegment(const VContainer *data, const int &i) const; + QPointF StartSegment(const VContainer *data, const int &i, bool reverse) const; + QPointF EndSegment(const VContainer *data, const int &i, bool reverse) const; static QVector biasPoints(const QVector &points, const qreal &mx, const qreal &my); }; From dfd89778e32a27c950feac342b4d0760fd7b2189 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 17:25:47 +0200 Subject: [PATCH 13/21] Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. --HG-- branch : release --- ChangeLog.txt | 1 + src/libs/vtools/dialogs/tools/dialogspline.ui | 308 ++++++++++++------ .../vtools/dialogs/tools/dialogsplinepath.ui | 195 ++++++----- 3 files changed, 309 insertions(+), 195 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 2edd7bda3..0f0b8c710 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. - Fixed getting correct reversed segment for single in the list curve. - Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list has been scrolled. Fixed validation when the list conatains only curve. diff --git a/src/libs/vtools/dialogs/tools/dialogspline.ui b/src/libs/vtools/dialogs/tools/dialogspline.ui index 52c4af988..1ce2f1fe6 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.ui +++ b/src/libs/vtools/dialogs/tools/dialogspline.ui @@ -6,8 +6,8 @@ 0 0 - 540 - 233 + 459 + 256 @@ -20,76 +20,133 @@ - + - + + + 6 + - + - + + + + 89 + 0 + + First point - - - - - - - - - - Length ratio of the first control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 + + + + 0 + 0 + - - - - - The angle of the first control point - - - true - - - - - - - 360 - - - - + + + Control point + + + + + + + + + 0 + 0 + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Angle + + + true + + + + + + + + 0 + 0 + + + + 360 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Length ratio + + + true + + + + + + + - + @@ -98,54 +155,102 @@ - - - - - - - - - - Length ratio of the second control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 + + + + 0 + 0 + - - - - - The angle of the second control point - - - true - - - - - - - 360 - - - - + + + Control point + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Length ratio + + + true + + + + + + + + 0 + 0 + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Angle + + + true + + + + + + + + 0 + 0 + + + + 360 + + + + + + + @@ -178,7 +283,7 @@ - + 0 0 @@ -205,7 +310,14 @@ - + + + + 0 + 0 + + + @@ -228,6 +340,8 @@ comboBoxP4 doubleSpinBoxKasm2 spinBoxAngle2 + doubleSpinBoxKcurve + comboBoxColor buttonBox @@ -241,8 +355,8 @@ accept() - 248 - 254 + 257 + 246 157 @@ -257,8 +371,8 @@ reject() - 316 - 260 + 325 + 246 286 diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui index 1942bc658..ff0716fe4 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui @@ -6,8 +6,8 @@ 0 0 - 528 - 322 + 519 + 368 @@ -20,17 +20,17 @@ - + - + - + - Point of curve + Point @@ -40,94 +40,99 @@ - - - - - Length ratio of the first control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 - - - - + + + First control point + + + + QFormLayout::AllNonFixedFieldsGrow + + + + + Angle + + + true + + + + + + + 360.000000000000000 + + + + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + Length ratio + + + true + + + + + - - - - - The angle of the first control point - - - true - - - - - - - 360.000000000000000 - - - - - - - - - - - Length ratio of the second control point - - - true - - - - - - - 0.010000000000000 - - - 1.000000000000000 - - - - - - - - - - - The angle of the second control point - - - true - - - - - - - 360.000000000000000 - - - - + + + Second control point + + + + + + Length ratio + + + true + + + + + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + Angle + + + true + + + + + + + 360.000000000000000 + + + + + @@ -211,12 +216,6 @@ - comboBoxPoint - doubleSpinBoxKasm1 - doubleSpinBoxAngle1 - doubleSpinBoxKasm2 - doubleSpinBoxAngle2 - listWidget buttonBox From 98126ff8ac1b016d4323d07162bd66378435b7fb Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 17:29:00 +0200 Subject: [PATCH 14/21] In dialog 'tool Spline Path' fixed broken selecting new point into the list of points. --HG-- branch : release --- ChangeLog.txt | 1 + src/libs/vtools/dialogs/tools/dialogsplinepath.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 0f0b8c710..e7eb037e0 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- In dialog 'tool Spline Path' fixed broken selecting new point into the list of points. - Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. - Fixed getting correct reversed segment for single in the list curve. - Fixed triggering validation a detail. Two new cases: has been changed Reverse option and the list diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 57b9a0bfd..f12e49c5e 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -187,6 +187,7 @@ void DialogSplinePath::currentPointChanged(int index) DataPoint(p.P().id(), p.KAsm1(), p.Angle1(), p.KAsm2(), p.Angle2()); EnableFields(); item->setData(Qt::UserRole, QVariant::fromValue(p)); + item->setText(p.P().name()); } //--------------------------------------------------------------------------------------------------------------------- From 67edc305c1e351b3f5718593314d2f18133da08a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 16 Feb 2016 18:32:08 +0200 Subject: [PATCH 15/21] Lupdate. --HG-- branch : release --- share/translations/valentina.ts | 54 ++++++++++++++++----- share/translations/valentina_cs_CZ.ts | 50 ++++++++++++++++---- share/translations/valentina_de_DE.ts | 50 ++++++++++++++++---- share/translations/valentina_en_CA.ts | 50 ++++++++++++++++---- share/translations/valentina_en_IN.ts | 50 ++++++++++++++++---- share/translations/valentina_en_US.ts | 50 ++++++++++++++++---- share/translations/valentina_es_ES.ts | 50 ++++++++++++++++---- share/translations/valentina_fi_FI.ts | 50 ++++++++++++++++---- share/translations/valentina_fr_FR.ts | 50 ++++++++++++++++---- share/translations/valentina_he_IL.ts | 68 +++++++++++++-------------- share/translations/valentina_id_ID.ts | 68 +++++++++++++-------------- share/translations/valentina_it_IT.ts | 50 ++++++++++++++++---- share/translations/valentina_nl_NL.ts | 50 ++++++++++++++++---- share/translations/valentina_ro_RO.ts | 50 ++++++++++++++++---- share/translations/valentina_ru_RU.ts | 50 ++++++++++++++++---- share/translations/valentina_uk_UA.ts | 50 ++++++++++++++++---- 16 files changed, 640 insertions(+), 200 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index d86971389..4e423714a 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -3473,11 +3473,11 @@ Apply settings anyway? Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Second point @@ -3485,11 +3485,11 @@ Apply settings anyway? Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point Coefficient of curvature of the curve @@ -3515,6 +3515,18 @@ Apply settings anyway? Color: Color: + + Control point + + + + Angle + Angle + + + Length ratio + + DialogSplinePath @@ -3524,23 +3536,23 @@ Apply settings anyway? Point of curve - Point of curve + Point of curve Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point List of points @@ -3566,6 +3578,26 @@ Apply settings anyway? Color: Color: + + Point + Point + + + First control point + + + + Angle + Angle + + + Length ratio + + + + Second control point + + DialogTool @@ -5078,11 +5110,11 @@ Do you want to save your changes? QApplication The path to the measurments is already relative. - + The path to the measurments is already relative. The path to the measurments is already absolute. - + The path to the measurments is already absolute. diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index 754efcc19..f2e18456b 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -3385,11 +3385,11 @@ Apply settings anyway? Length ratio of the first control point - Poměr délky prvního ovládacího bodu + Poměr délky prvního ovládacího bodu The angle of the first control point - Úhel prvního ovládacího bodu + Úhel prvního ovládacího bodu Second point @@ -3397,11 +3397,11 @@ Apply settings anyway? Length ratio of the second control point - Poměr délky druhého ovládacího bodu + Poměr délky druhého ovládacího bodu The angle of the second control point - Úhel druhého ovládacího bodu + Úhel druhého ovládacího bodu Coefficient of curvature of the curve @@ -3427,6 +3427,18 @@ Apply settings anyway? Color: + + Control point + + + + Angle + Úhel + + + Length ratio + + DialogSplinePath @@ -3436,23 +3448,23 @@ Apply settings anyway? Point of curve - Bod křivky + Bod křivky Length ratio of the first control point - Poměr délky prvního ovládacího bodu + Poměr délky prvního ovládacího bodu The angle of the first control point - Úhel prvního ovládacího bodu + Úhel prvního ovládacího bodu Length ratio of the second control point - Poměr délky druhého ovládacího bodu + Poměr délky druhého ovládacího bodu The angle of the second control point - Úhel druhého ovládacího bodu + Úhel druhého ovládacího bodu List of points @@ -3478,6 +3490,26 @@ Apply settings anyway? Color: + + Point + Bod + + + First control point + + + + Angle + Úhel + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index 95337d030..671b78230 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -3456,11 +3456,11 @@ Apply settings anyway? Length ratio of the first control point - Längenverhältnis des ersten Kontrollpunktes + Längenverhältnis des ersten Kontrollpunktes The angle of the first control point - Winkel des ersten Kontrollpunktes + Winkel des ersten Kontrollpunktes Second point @@ -3468,11 +3468,11 @@ Apply settings anyway? Length ratio of the second control point - Längenverhältnis des zweiten Kontrollpunktes + Längenverhältnis des zweiten Kontrollpunktes The angle of the second control point - Winkel des zweiten Kontrollpunktes + Winkel des zweiten Kontrollpunktes Coefficient of curvature of the curve @@ -3498,6 +3498,18 @@ Apply settings anyway? Color: Farbe: + + Control point + + + + Angle + Winkel + + + Length ratio + + DialogSplinePath @@ -3507,23 +3519,23 @@ Apply settings anyway? Point of curve - Punkt der Kurve + Punkt der Kurve Length ratio of the first control point - Längenverhältnis des ersten Kontrollpunktes + Längenverhältnis des ersten Kontrollpunktes The angle of the first control point - Winkel des ersten Kontrollpunktes + Winkel des ersten Kontrollpunktes Length ratio of the second control point - Längenverhältnis des zweiten Kontrollpunktes + Längenverhältnis des zweiten Kontrollpunktes The angle of the second control point - Winkel des zweiten Kontrollpunktes + Winkel des zweiten Kontrollpunktes List of points @@ -3549,6 +3561,26 @@ Apply settings anyway? Color: Farbe: + + Point + Punkt + + + First control point + + + + Angle + Winkel + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 553b83143..42448b2bf 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -3473,11 +3473,11 @@ Apply settings anyway? Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Second point @@ -3485,11 +3485,11 @@ Apply settings anyway? Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point Coefficient of curvature of the curve @@ -3515,6 +3515,18 @@ Apply settings anyway? Color: Color: + + Control point + + + + Angle + Angle + + + Length ratio + + DialogSplinePath @@ -3524,23 +3536,23 @@ Apply settings anyway? Point of curve - Point of curve + Point of curve Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point List of points @@ -3566,6 +3578,26 @@ Apply settings anyway? Color: Color: + + Point + Point + + + First control point + + + + Angle + Angle + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index 22050bfb0..42f3dd882 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -3473,11 +3473,11 @@ Apply settings anyway? Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Second point @@ -3485,11 +3485,11 @@ Apply settings anyway? Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point Coefficient of curvature of the curve @@ -3515,6 +3515,18 @@ Apply settings anyway? Color: Color: + + Control point + + + + Angle + Angle + + + Length ratio + + DialogSplinePath @@ -3524,23 +3536,23 @@ Apply settings anyway? Point of curve - Point of curve + Point of curve Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point List of points @@ -3566,6 +3578,26 @@ Apply settings anyway? Color: Color: + + Point + Point + + + First control point + + + + Angle + Angle + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 67fbc3052..172d3a5d7 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -3473,11 +3473,11 @@ Apply settings anyway? Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Second point @@ -3485,11 +3485,11 @@ Apply settings anyway? Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point Coefficient of curvature of the curve @@ -3515,6 +3515,18 @@ Apply settings anyway? Color: Color: + + Control point + + + + Angle + Angle + + + Length ratio + + DialogSplinePath @@ -3524,23 +3536,23 @@ Apply settings anyway? Point of curve - Point of curve + Point of curve Length ratio of the first control point - Length ratio of the first control point + Length ratio of the first control point The angle of the first control point - The angle of the first control point + The angle of the first control point Length ratio of the second control point - Length ratio of the second control point + Length ratio of the second control point The angle of the second control point - The angle of the second control point + The angle of the second control point List of points @@ -3566,6 +3578,26 @@ Apply settings anyway? Color: Color: + + Point + Point + + + First control point + + + + Angle + Angle + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index 0e7e7e864..773a88503 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -3396,11 +3396,11 @@ Apply settings anyway? Length ratio of the first control point - Proporción de la longitud del primer punto de control + Proporción de la longitud del primer punto de control The angle of the first control point - El ángulo del primer punto de control + El ángulo del primer punto de control Second point @@ -3408,11 +3408,11 @@ Apply settings anyway? Length ratio of the second control point - Proporción de la longitud del segundo punto de control + Proporción de la longitud del segundo punto de control The angle of the second control point - El ángulo del segundo punto de control + El ángulo del segundo punto de control Coefficient of curvature of the curve @@ -3438,6 +3438,18 @@ Apply settings anyway? Color: Color: + + Control point + + + + Angle + Ángulo + + + Length ratio + + DialogSplinePath @@ -3447,23 +3459,23 @@ Apply settings anyway? Point of curve - Punto de curva + Punto de curva Length ratio of the first control point - Proporción de la longitud del primer punto de control + Proporción de la longitud del primer punto de control The angle of the first control point - El ángulo del primer punto de control + El ángulo del primer punto de control Length ratio of the second control point - Proporción de la longitud del segundo punto de control + Proporción de la longitud del segundo punto de control The angle of the second control point - El ángulo del segundo punto de control + El ángulo del segundo punto de control List of points @@ -3489,6 +3501,26 @@ Apply settings anyway? Color: Color: + + Point + Punto + + + First control point + + + + Angle + Ángulo + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index e27b0a200..78889df04 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -3385,11 +3385,11 @@ Apply settings anyway? Length ratio of the first control point - Ensimmäisen kontrollipisteen pituussuhde + Ensimmäisen kontrollipisteen pituussuhde The angle of the first control point - Ensimmäisen kontrollipisteen kulma + Ensimmäisen kontrollipisteen kulma Second point @@ -3397,11 +3397,11 @@ Apply settings anyway? Length ratio of the second control point - Toisen kontrollipisteen pituussuhde + Toisen kontrollipisteen pituussuhde The angle of the second control point - Toisen kontrollipisteen kulma + Toisen kontrollipisteen kulma Coefficient of curvature of the curve @@ -3427,6 +3427,18 @@ Apply settings anyway? Color: + + Control point + + + + Angle + Kulma + + + Length ratio + + DialogSplinePath @@ -3436,23 +3448,23 @@ Apply settings anyway? Point of curve - Käyrän piste + Käyrän piste Length ratio of the first control point - Ensimmäisen kontrollipisteen pituussuhde + Ensimmäisen kontrollipisteen pituussuhde The angle of the first control point - Ensimmäisen kontrollipisteen kulma + Ensimmäisen kontrollipisteen kulma Length ratio of the second control point - Toisen kontrollipisteen pituussuhde + Toisen kontrollipisteen pituussuhde The angle of the second control point - Toisen kontrollipisteen kulma + Toisen kontrollipisteen kulma List of points @@ -3478,6 +3490,26 @@ Apply settings anyway? Color: + + Point + Piste + + + First control point + + + + Angle + Kulma + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 5724f72e3..64742f159 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -3464,11 +3464,11 @@ Appliquer les réglages quand-même ? Length ratio of the first control point - Ratio de longueur du premier point de contrôle + Ratio de longueur du premier point de contrôle The angle of the first control point - Angle du premier point de contrôle + Angle du premier point de contrôle Second point @@ -3476,11 +3476,11 @@ Appliquer les réglages quand-même ? Length ratio of the second control point - Ratio de longueur du deuxième point de contrôle + Ratio de longueur du deuxième point de contrôle The angle of the second control point - Angle du deuxième point de contrôle + Angle du deuxième point de contrôle Coefficient of curvature of the curve @@ -3506,6 +3506,18 @@ Appliquer les réglages quand-même ? Color: Couleur: + + Control point + + + + Angle + Angle + + + Length ratio + + DialogSplinePath @@ -3515,23 +3527,23 @@ Appliquer les réglages quand-même ? Point of curve - Point de courbe + Point de courbe Length ratio of the first control point - Ratio de longueur du premier point de contrôle + Ratio de longueur du premier point de contrôle The angle of the first control point - Angle du premier point de contrôle + Angle du premier point de contrôle Length ratio of the second control point - Ratio de longueur du deuxième point de contrôle + Ratio de longueur du deuxième point de contrôle The angle of the second control point - Angle du deuxième point de contrôle + Angle du deuxième point de contrôle List of points @@ -3557,6 +3569,26 @@ Appliquer les réglages quand-même ? Color: Couleur: + + Point + Point + + + First control point + + + + Angle + Angle + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 1ef93f0a6..462dd9cb3 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -3095,26 +3095,10 @@ Apply settings anyway? First point נקודה ראשונה - - Length ratio of the first control point - - - - The angle of the first control point - - Second point נקודה שנייה - - Length ratio of the second control point - - - - The angle of the second control point - - Select last point of curve @@ -3131,6 +3115,18 @@ Apply settings anyway? Color: + + Control point + + + + Angle + + + + Length ratio + + DialogSplinePath @@ -3138,26 +3134,6 @@ Apply settings anyway? Curved path - - Point of curve - - - - Length ratio of the first control point - - - - The angle of the first control point - - - - Length ratio of the second control point - - - - The angle of the second control point - - List of points @@ -3174,6 +3150,26 @@ Apply settings anyway? Color: + + Point + נקודה + + + First control point + + + + Angle + + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index 91c17ed92..db5322459 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -3637,26 +3637,10 @@ Apply settings anyway? First point Titik pertama - - Length ratio of the first control point - - - - The angle of the first control point - - Second point titik kedua - - Length ratio of the second control point - - - - The angle of the second control point - - Select last point of curve @@ -3673,6 +3657,18 @@ Apply settings anyway? Color: + + Control point + + + + Angle + sudut + + + Length ratio + + DialogSplinePath @@ -3680,26 +3676,6 @@ Apply settings anyway? Curved path - - Point of curve - - - - Length ratio of the first control point - - - - The angle of the first control point - - - - Length ratio of the second control point - - - - The angle of the second control point - - List of points @@ -3716,6 +3692,26 @@ Apply settings anyway? Color: + + Point + + + + First control point + + + + Angle + sudut + + + Length ratio + + + + Second control point + + DialogStandardMeasurements diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index b8f602ce2..20bc85b3c 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -3474,11 +3474,11 @@ Applicare le impostazioni comunque? Length ratio of the first control point - Coefficiente di lunghezza del primo punto di controllo + Coefficiente di lunghezza del primo punto di controllo The angle of the first control point - Angolo del primo punto di controllo + Angolo del primo punto di controllo Second point @@ -3486,11 +3486,11 @@ Applicare le impostazioni comunque? Length ratio of the second control point - Coefficiente di lunghezza del secondo punto di controllo + Coefficiente di lunghezza del secondo punto di controllo The angle of the second control point - Angolo del secondo punto di controllo + Angolo del secondo punto di controllo Coefficient of curvature of the curve @@ -3516,6 +3516,18 @@ Applicare le impostazioni comunque? Color: Colore + + Control point + + + + Angle + Angolo + + + Length ratio + + DialogSplinePath @@ -3525,23 +3537,23 @@ Applicare le impostazioni comunque? Point of curve - Punto della curva + Punto della curva Length ratio of the first control point - Coefficiente di lunghezza del primo punto di controllo + Coefficiente di lunghezza del primo punto di controllo The angle of the first control point - Angolo del primo punto di controllo + Angolo del primo punto di controllo Length ratio of the second control point - Coefficiente di lunghezza del secondo punto di controllo + Coefficiente di lunghezza del secondo punto di controllo The angle of the second control point - Angolo del secondo punto di controllo + Angolo del secondo punto di controllo List of points @@ -3567,6 +3579,26 @@ Applicare le impostazioni comunque? Color: Colore + + Point + Punto + + + First control point + + + + Angle + Angolo + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 4c337f1ad..3a0cd6ab7 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -3464,11 +3464,11 @@ Apply settings anyway? Length ratio of the first control point - Lengteverhouding van het eerste controlepunt + Lengteverhouding van het eerste controlepunt The angle of the first control point - De hoek van het eerste controlepunt + De hoek van het eerste controlepunt Second point @@ -3476,11 +3476,11 @@ Apply settings anyway? Length ratio of the second control point - Lengteverhouding van het tweede controlepunt + Lengteverhouding van het tweede controlepunt The angle of the second control point - De hoek van het tweede controlepunt + De hoek van het tweede controlepunt Coefficient of curvature of the curve @@ -3506,6 +3506,18 @@ Apply settings anyway? Color: + + Control point + + + + Angle + Hoek + + + Length ratio + + DialogSplinePath @@ -3515,23 +3527,23 @@ Apply settings anyway? Point of curve - Punt van kromming + Punt van kromming Length ratio of the first control point - Lengteverhouding van het eerste controlepunt + Lengteverhouding van het eerste controlepunt The angle of the first control point - De hoek van het eerste controlepunt + De hoek van het eerste controlepunt Length ratio of the second control point - Lengteverhouding van het tweede controlepunt + Lengteverhouding van het tweede controlepunt The angle of the second control point - De hoek van het tweede controlepunt + De hoek van het tweede controlepunt List of points @@ -3557,6 +3569,26 @@ Apply settings anyway? Color: + + Point + Punt + + + First control point + + + + Angle + Hoek + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 0c5f483a2..531d37630 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -3372,11 +3372,11 @@ Apply settings anyway? Length ratio of the first control point - Raport lungime al primului punct de control + Raport lungime al primului punct de control The angle of the first control point - Unghiul primului punct de control + Unghiul primului punct de control Second point @@ -3384,11 +3384,11 @@ Apply settings anyway? Length ratio of the second control point - Raport lungime al celui de al doilea punct de control + Raport lungime al celui de al doilea punct de control The angle of the second control point - Unghiul celui de al doilea punct de control + Unghiul celui de al doilea punct de control Coefficient of curvature of the curve @@ -3414,6 +3414,18 @@ Apply settings anyway? Color: Culoare: + + Control point + + + + Angle + Unghi + + + Length ratio + + DialogSplinePath @@ -3423,23 +3435,23 @@ Apply settings anyway? Point of curve - Punctul curbei + Punctul curbei Length ratio of the first control point - Raport lungime al primului punct de control + Raport lungime al primului punct de control The angle of the first control point - Unghiul primului punct de control + Unghiul primului punct de control Length ratio of the second control point - Raport lungime al celui de al doilea punct de control + Raport lungime al celui de al doilea punct de control The angle of the second control point - Unghiul celui de al doilea punct de control + Unghiul celui de al doilea punct de control List of points @@ -3465,6 +3477,26 @@ Apply settings anyway? Color: Culoare: + + Point + Punct + + + First control point + + + + Angle + Unghi + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 2785c08d7..211cc7b02 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -3473,11 +3473,11 @@ Apply settings anyway? Length ratio of the first control point - Коэффициент длины первой контрольной точки + Коэффициент длины первой контрольной точки The angle of the first control point - Угол первой контрольной точки + Угол первой контрольной точки Second point @@ -3485,11 +3485,11 @@ Apply settings anyway? Length ratio of the second control point - Коэффициент длины второй контрольной точки + Коэффициент длины второй контрольной точки The angle of the second control point - Угол второй контрольной точки + Угол второй контрольной точки Coefficient of curvature of the curve @@ -3515,6 +3515,18 @@ Apply settings anyway? Color: Цвет: + + Control point + + + + Angle + Угол + + + Length ratio + + DialogSplinePath @@ -3524,23 +3536,23 @@ Apply settings anyway? Point of curve - Точка кривой + Точка кривой Length ratio of the first control point - Коэффициент длины первой контрольной точки + Коэффициент длины первой контрольной точки The angle of the first control point - Угол первой контрольной точки + Угол первой контрольной точки Length ratio of the second control point - Коэффициент длины второй контрольной точки + Коэффициент длины второй контрольной точки The angle of the second control point - Угол второй контрольной точки + Угол второй контрольной точки List of points @@ -3566,6 +3578,26 @@ Apply settings anyway? Color: Цвет: + + Point + Точка + + + First control point + + + + Angle + Угол + + + Length ratio + + + + Second control point + + DialogTool diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index a09e4e381..86440faa0 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -3475,11 +3475,11 @@ Apply settings anyway? Length ratio of the first control point - Коефіцієнт довжини першої контрольної точки + Коефіцієнт довжини першої контрольної точки The angle of the first control point - Кут першої контрольної точки + Кут першої контрольної точки Second point @@ -3487,11 +3487,11 @@ Apply settings anyway? Length ratio of the second control point - Коефіцієнт довжини другої контрольної точки + Коефіцієнт довжини другої контрольної точки The angle of the second control point - Кут другої контрольної точки + Кут другої контрольної точки Coefficient of curvature of the curve @@ -3517,6 +3517,18 @@ Apply settings anyway? Color: Колір: + + Control point + + + + Angle + Кут + + + Length ratio + + DialogSplinePath @@ -3526,23 +3538,23 @@ Apply settings anyway? Point of curve - Точка кривої + Точка кривої Length ratio of the first control point - Коефіцієнт довжини першої контрольної точки + Коефіцієнт довжини першої контрольної точки The angle of the first control point - Кут першої контрольної точки + Кут першої контрольної точки Length ratio of the second control point - Коефіцієнт довжини другої контрольної точки + Коефіцієнт довжини другої контрольної точки The angle of the second control point - Кут другої контрольної точки + Кут другої контрольної точки List of points @@ -3568,6 +3580,26 @@ Apply settings anyway? Color: Колір: + + Point + Точка + + + First control point + + + + Angle + Кут + + + Length ratio + + + + Second control point + + DialogTool From 82e6d271bb39e3368a0bcab0d4feac9a8ca05aa5 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 00:04:43 -0800 Subject: [PATCH 16/21] Measurement Diagram is not shown on Mac OS X. --HG-- branch : release --- src/app/tape/tape.pro | 2 +- src/app/valentina/valentina.pro | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 08a150567..2167b1d88 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -231,7 +231,7 @@ unix{ # Copy to bundle standard measurements files # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually. - forceCopyToDestdir($${OUT_PWD}/$${DESTDIR}/diagrams.rcc, $$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) + QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/$${DESTDIR}/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t) format.path = $$RESOURCES_DIR/ format.files = $$PWD/../../../dist/macx/measurements.icns diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index aa32758a2..f2eafff33 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -293,6 +293,10 @@ unix{ icns_resources.files += $$PWD/../../../dist/macx/measurements.icns icns_resources.files += $$PWD/../../../dist/Tape.icns + # Copy to bundle standard measurements files + # We cannot add none exist files to bundle through QMAKE_BUNDLE_DATA. That's why we must do this manually. + QMAKE_POST_LINK += $$VCOPY $$quote($${OUT_PWD}/../tape/$${DESTDIR}/tape.app/$$RESOURCES_DIR/diagrams.rcc) $$quote($$shell_path($${OUT_PWD}/$$DESTDIR/$${TARGET}.app/$$RESOURCES_DIR/)) $$escape_expand(\\n\\t) + QMAKE_BUNDLE_DATA += \ templates \ standard \ From 07541d5f7b0fe2715cca1f7b07f92a30a4643f1e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 10:11:04 +0200 Subject: [PATCH 17/21] Changelog. --HG-- branch : release --- ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index e7eb037e0..faf33e8bb 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # Version 0.4.2 +- Measurement Diagram is not shown on Mac OS X. - In dialog 'tool Spline Path' fixed broken selecting new point into the list of points. - Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. - Fixed getting correct reversed segment for single in the list curve. From 331c8f25b202bc9e00428cd02372ad03cd163e06 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 12:25:00 +0200 Subject: [PATCH 18/21] Updated changelog. Release 0.4.2. --HG-- branch : release --- ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index faf33e8bb..43609e02d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,4 @@ -# Version 0.4.2 +# Version 0.4.2 February 17, 2016 - Measurement Diagram is not shown on Mac OS X. - In dialog 'tool Spline Path' fixed broken selecting new point into the list of points. - Regesign dialogs tool 'Spline' and 'Spline Path' for avoiding text squeeze. From 79112236c472f40c69b201ed9d43255999c10c13 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 12:28:09 +0200 Subject: [PATCH 19/21] Updated version inside package scripts. --HG-- branch : release --- dist/debian/changelog | 2 +- dist/rpm/_service | 2 +- dist/rpm/valentina.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/debian/changelog b/dist/debian/changelog index 83c961473..c8d384446 100644 --- a/dist/debian/changelog +++ b/dist/debian/changelog @@ -1,4 +1,4 @@ -valentina (0.4.1) trusty; urgency=low +valentina (0.4.2) trusty; urgency=low * Auto build. diff --git a/dist/rpm/_service b/dist/rpm/_service index 1d5fb44f9..eeee9fb2b 100644 --- a/dist/rpm/_service +++ b/dist/rpm/_service @@ -1,7 +1,7 @@ https://github.com/dismine/Valentina.git - 0.4.1 + 0.4.2 valentina git %at diff --git a/dist/rpm/valentina.spec b/dist/rpm/valentina.spec index 039dab584..b48e2036a 100644 --- a/dist/rpm/valentina.spec +++ b/dist/rpm/valentina.spec @@ -45,7 +45,7 @@ BuildRequires: libqt5-qtxmlpatterns-devel Requires: poppler-utils -Version: 0.4.1 +Version: 0.4.2 Release: 0 URL: https://bitbucket.org/dismine/valentina License: GPL-3.0+ From d93092c4b800a2a5e2d0dd3abfabb75d041c4cd9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 12:32:00 +0200 Subject: [PATCH 20/21] Updated version inside the application. --HG-- branch : release --- src/libs/vmisc/projectversion.cpp | 2 +- src/libs/vmisc/projectversion.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/vmisc/projectversion.cpp b/src/libs/vmisc/projectversion.cpp index 941aae52a..51574a5c2 100644 --- a/src/libs/vmisc/projectversion.cpp +++ b/src/libs/vmisc/projectversion.cpp @@ -33,7 +33,7 @@ extern const int MAJOR_VERSION = 0; extern const int MINOR_VERSION = 4; -extern const int DEBUG_VERSION = 1; +extern const int DEBUG_VERSION = 2; extern const QString APP_VERSION_STR(QStringLiteral("%1.%2.%3.%4").arg(MAJOR_VERSION).arg(MINOR_VERSION) .arg(DEBUG_VERSION).arg(LATEST_TAG_DISTANCE)); diff --git a/src/libs/vmisc/projectversion.h b/src/libs/vmisc/projectversion.h index 7193dfc97..bf4048822 100644 --- a/src/libs/vmisc/projectversion.h +++ b/src/libs/vmisc/projectversion.h @@ -45,8 +45,8 @@ extern const QString APP_VERSION_STR; // Change version number in projectversion.cpp too. // Synchronize valentina.nsi -#define VER_FILEVERSION 0,4,1,0 -#define VER_FILEVERSION_STR "0.4.1.0\0" +#define VER_FILEVERSION 0,4,2,0 +#define VER_FILEVERSION_STR "0.4.2.0\0" #define V_PRERELEASE // Mark prerelease builds From 7cb2135e8adea0fe03b86483da343de5b33e9469 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Feb 2016 12:33:42 +0200 Subject: [PATCH 21/21] Updated Info.plist files. --HG-- branch : release --- dist/macx/tape/Info.plist | 6 +++--- dist/macx/valentina/Info.plist | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/macx/tape/Info.plist b/dist/macx/tape/Info.plist index db5d4e103..7c56ba0e4 100755 --- a/dist/macx/tape/Info.plist +++ b/dist/macx/tape/Info.plist @@ -11,7 +11,7 @@ LSMinimumSystemVersion 10.6 NSHumanReadableCopyright - © 2013-2015, Valentina project + © 2013-2016, Valentina project CFBundleSignature @TYPEINFO@ CFBundleExecutable @@ -19,9 +19,9 @@ CFBundleIdentifier org.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.4.1 + 0.4.2 CFBundleVersion - 0.4.1.0 + 0.4.2.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes diff --git a/dist/macx/valentina/Info.plist b/dist/macx/valentina/Info.plist index e381ca187..154b7045d 100755 --- a/dist/macx/valentina/Info.plist +++ b/dist/macx/valentina/Info.plist @@ -11,7 +11,7 @@ LSMinimumSystemVersion 10.6 NSHumanReadableCopyright - © 2013-2015, Valentina project + © 2013-2016, Valentina project CFBundleSignature @TYPEINFO@ CFBundleExecutable @@ -19,9 +19,9 @@ CFBundleIdentifier org.valentinaproject.@EXECUTABLE@ CFBundleShortVersionString - 0.4.1 + 0.4.2 CFBundleVersion - 0.4.1.0 + 0.4.2.0 CFBundleInfoDictionaryVersion 6.0 CFBundleDocumentTypes