From 7b56218e092256592644305eb99373404b325a0b Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 9 Oct 2013 21:11:25 +0300 Subject: [PATCH 01/83] Fixed bug with dialog of arc. --HG-- branch : develop --- container/vcontainer.cpp | 2 +- dialogs/dialogarc.cpp | 16 ++++++++++------ dialogs/dialogarc.h | 4 ++-- dialogs/dialogarc.ui | 6 +++--- tools/drawTools/vdrawtool.h | 2 ++ tools/drawTools/vtoolarc.cpp | 2 +- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 65292950e..947b84551 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -64,7 +64,7 @@ void VContainer::setData(const VContainer &data){ standartTable = *data.DataStandartTable(); incrementTable = *data.DataIncrementTable(); lengthLines = *data.DataLengthLines(); - lineAngles = *data.DataLengthArcs(); + lineAngles = *data.DataLineAngles(); splines = *data.DataSplines(); modelingSplines = *data.DataModelingSplines(); lengthSplines = *data.DataLengthSplines(); diff --git a/dialogs/dialogarc.cpp b/dialogs/dialogarc.cpp index 7b4548ef1..7e02eb74c 100644 --- a/dialogs/dialogarc.cpp +++ b/dialogs/dialogarc.cpp @@ -63,7 +63,7 @@ DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent) connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogArc::StandartTable); connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogArc::Increments); connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogArc::LengthLines); - connect(ui->radioButtonLineAngles, &QRadioButton::clicked, this, &DialogArc::LineArcs); + connect(ui->radioButtonLineAngles, &QRadioButton::clicked, this, &DialogArc::LineAngles); connect(ui->toolButtonEqualRadius, &QPushButton::clicked, this, &DialogArc::EvalRadius); connect(ui->toolButtonEqualF1, &QPushButton::clicked, this, &DialogArc::EvalF1); @@ -173,19 +173,22 @@ void DialogArc::PutF2(){ PutValHere(ui->lineEditF2, ui->listWidget); } -void DialogArc::LineArcs(){ - ShowLineArcs(); +void DialogArc::LineAngles(){ + ShowLineAngles(); } void DialogArc::RadiusChanged(){ + labelEditFormula = ui->labelEditRadius; ValFormulaChanged(flagRadius, ui->lineEditRadius, timerRadius); } void DialogArc::F1Changed(){ + labelEditFormula = ui->labelEditF1; ValFormulaChanged(flagF1, ui->lineEditF1, timerF1); } void DialogArc::F2Changed(){ + labelEditFormula = ui->labelEditF2; ValFormulaChanged(flagF2, ui->lineEditF2, timerF2); } @@ -209,12 +212,13 @@ void DialogArc::EvalF2(){ Eval(ui->lineEditF2, flagF2, timerF2, ui->labelResultF2); } -void DialogArc::ShowLineArcs(){ +void DialogArc::ShowLineAngles(){ disconnect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogArc::ValChenged); ui->listWidget->clear(); connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogArc::ValChenged); - const QHash *lineArcsTable = data->DataLineAngles(); - QHashIterator i(*lineArcsTable); + const QHash *lineAnglesTable = data->DataLineAngles(); + Q_CHECK_PTR(lineAnglesTable); + QHashIterator i(*lineAnglesTable); while (i.hasNext()) { i.next(); QListWidgetItem *item = new QListWidgetItem(i.key()); diff --git a/dialogs/dialogarc.h b/dialogs/dialogarc.h index 00f23e8e5..cb4291a5c 100644 --- a/dialogs/dialogarc.h +++ b/dialogs/dialogarc.h @@ -53,7 +53,7 @@ public slots: void PutRadius(); void PutF1(); void PutF2(); - void LineArcs(); + void LineAngles(); void RadiusChanged(); void F1Changed(); void F2Changed(); @@ -75,7 +75,7 @@ private: void EvalRadius(); void EvalF1(); void EvalF2(); - void ShowLineArcs(); + void ShowLineAngles(); }; #endif // DIALOGARC_H diff --git a/dialogs/dialogarc.ui b/dialogs/dialogarc.ui index 26d4e43bb..3f08b5a41 100644 --- a/dialogs/dialogarc.ui +++ b/dialogs/dialogarc.ui @@ -482,7 +482,7 @@ - true + false Length of arcs @@ -492,10 +492,10 @@ - true + false - Length of arcs + Length of curves diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index 513ca12cd..e96f93816 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -47,6 +47,8 @@ protected: template void ContextMenu(QSharedPointer &dialog, Tool *tool, QGraphicsSceneContextMenuEvent *event, bool showRemove = true){ + Q_CHECK_PTR(tool); + Q_CHECK_PTR(event); if(!ignoreContextMenuEvent){ QMenu menu; QAction *actionOption = menu.addAction(tr("Options")); diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index 84d453f8e..46cc44a5b 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -44,9 +44,9 @@ void VToolArc::setDialog(){ if(!dialogArc.isNull()){ VArc arc = VAbstractTool::data.GetArc(id); dialogArc->SetCenter(arc.GetCenter()); - dialogArc->SetRadius(arc.GetFormulaRadius()); dialogArc->SetF1(arc.GetFormulaF1()); dialogArc->SetF2(arc.GetFormulaF2()); + dialogArc->SetRadius(arc.GetFormulaRadius()); } } From ca61b27599f0d328a3bfd4eec8d870791bef1ebe Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 9 Oct 2013 21:24:53 +0300 Subject: [PATCH 02/83] Fixed bug with bisector. --HG-- branch : develop --- tools/drawTools/vtoolbisector.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 80ee7453d..98c84c867 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -42,8 +42,10 @@ QPointF VToolBisector::FindPoint(const QPointF &firstPoint, const QPointF &secon qreal angle = line1.angleTo(line2); if(angle>180){ angle = 360 - angle; + line1.setAngle(line1.angle()-angle/2); + } else { + line1.setAngle(line1.angle()+angle/2); } - line1.setAngle(line1.angle()-angle/2); line1.setLength(length); return line1.p2(); } From 80b5fe6d5e69b9c4a3de03f7df49d7d75578e66d Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 10 Oct 2013 13:00:04 +0300 Subject: [PATCH 03/83] Fixed bug with change name of drawing. --HG-- branch : develop --- mainwindow.cpp | 8 ++++++-- xml/vdomdocument.cpp | 15 ++++++++++++--- xml/vdomdocument.h | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 2f0fb98b4..84ebd4500 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -198,8 +198,12 @@ void MainWindow::OptionDraw(){ } delete dlg; index = comboBoxDraws->findText(doc->GetNameActivDraw()); - doc->SetNameDraw(nameDraw); - comboBoxDraws->setItemText(index, nameDraw); + if(doc->SetNameDraw(nameDraw)){ + comboBoxDraws->setItemText(index, nameDraw); + } else { + QMessageBox::warning(this, tr("Error saving change!!!"), tr("Can't save new name of drawing")); + } + } template diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index cc8d87e01..f99b846f7 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -169,11 +169,20 @@ void VDomDocument::ChangeActivDraw(const QString& name, Document::Documents pars } } -void VDomDocument::SetNameDraw(const QString& name){ +bool VDomDocument::SetNameDraw(const QString& name){ Q_ASSERT_X(!name.isEmpty(), "SetNameDraw", "name draw is empty"); QString oldName = nameActivDraw; - nameActivDraw = name; - emit ChangedNameDraw(oldName, nameActivDraw); + QDomElement element; + if(GetActivDrawElement(element)){ + nameActivDraw = name; + element.setAttribute("name", nameActivDraw); + emit haveChange(); + emit ChangedNameDraw(oldName, nameActivDraw); + return true; + } else { + qWarning()<<"Can't find activ draw"<* getTools(); QVector *getHistory(); From 7f3b2f76ee0a3feecaff64367ec120da8d28d075 Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 10 Oct 2013 21:45:58 +0300 Subject: [PATCH 04/83] Fixed bugs in VArc and VSpline. Bug in DataPoints. --HG-- branch : develop --- geometry/varc.cpp | 24 ++++++++++++++---------- geometry/varc.h | 6 ++++-- geometry/vspline.cpp | 16 ++++++++-------- geometry/vspline.h | 4 ++-- geometry/vsplinepath.cpp | 22 +++++++++++----------- geometry/vsplinepath.h | 4 ++-- tools/drawTools/vtoolalongline.cpp | 6 ++++-- tools/drawTools/vtoolarc.cpp | 3 ++- tools/drawTools/vtoolbisector.cpp | 3 ++- tools/drawTools/vtoolendline.cpp | 3 ++- tools/drawTools/vtoolline.cpp | 3 ++- tools/drawTools/vtoollineintersect.cpp | 12 ++++++++---- tools/drawTools/vtoolnormal.cpp | 3 ++- tools/drawTools/vtoolpointofcontact.cpp | 6 ++++++ tools/drawTools/vtoolshoulderpoint.cpp | 6 ++++-- tools/drawTools/vtoolspline.cpp | 3 ++- tools/drawTools/vtoolsplinepath.cpp | 3 ++- widgets/vapplication.cpp | 10 ++++++++++ 18 files changed, 87 insertions(+), 50 deletions(-) diff --git a/geometry/varc.cpp b/geometry/varc.cpp index 214a39a51..095ce5bfc 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -21,15 +21,16 @@ #include "varc.h" #include +#include "exception/vexception.h" VArc::VArc () : f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), formulaRadius(QString()), - center(0), points(0), mode(Draw::Calculation), idObject(0){ + center(0), points(QHash()), mode(Draw::Calculation), idObject(0){ } VArc::VArc (const QHash *points, qint64 center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1, qreal f2, QString formulaF2, Draw::Draws mode, qint64 idObject) : f1(f1), formulaF1(formulaF1), f2(f2), formulaF2(formulaF2), radius(radius), formulaRadius(formulaRadius), - center(center), points(points), mode(mode), idObject(idObject){ + center(center), points(*points), mode(mode), idObject(idObject){ } VArc::VArc(const VArc &arc): f1(arc.GetF1()), formulaF1(arc.GetFormulaF1()), f2(arc.GetF2()), @@ -85,11 +86,11 @@ qint64 VArc::GetCenter() const{ } QPointF VArc::GetCenterPoint() const{ - if(points->contains(center)){ - return points->value(center).toQPointF(); + if(points.contains(center)){ + return points.value(center).toQPointF(); } else { - qCritical()<<"Не можу знайти id = "< *VArc::GetDataPoints() const{ +const QHash VArc::GetDataPoints() const{ return points; } @@ -133,9 +134,11 @@ qreal VArc::AngleArc() const{ qint32 VArc::NumberSplOfArc() const{ qint32 angArc = static_cast (AngleArc ()); switch( angArc ){ - case 0: - throw "Кут дуги не може бути 0 градусів."; + case 0:{ + QString error = QString(tr("Angle of arc can't be 0 degree.")); + throw VException(error); break; + } case 90: return 1; case 180: @@ -161,7 +164,8 @@ QVector VArc::GetPoints() const{ QVector VArc::SplOfArc(qint32 number) const{ qint32 n = NumberSplOfArc (); if( number > n ){ - throw "Дуга не складається з такої кількості сплайнів."; + QString error = QString(tr("Arc have not this number of part.")); + throw VException(error); } qreal f1 = GetF1 (); qreal f2 = GetF2 (); diff --git a/geometry/varc.h b/geometry/varc.h index 349083a44..7b8a99fc5 100644 --- a/geometry/varc.h +++ b/geometry/varc.h @@ -23,11 +23,13 @@ #define VARC_H #include "vspline.h" +#include /** * @brief VArc клас, що реалізує дугу. Дуга розраховується за годиниковою стрілкою. */ class VArc{ + Q_DECLARE_TR_FUNCTIONS(VArc) public: /** * @brief VArc конструктор по замовчуванню. @@ -84,7 +86,7 @@ public: * @return точку кінця дуги. */ QPointF GetP2 () const; - const QHash *GetDataPoints() const; + const QHash GetDataPoints() const; /** * @brief GetPath будує шлях по даній дузі. * @return повертає шлях. @@ -119,7 +121,7 @@ private: * @brief center центральна точка дуги. */ qint64 center; - const QHash *points; + QHash points; Draw::Draws mode; qint64 idObject; }; diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index ee19f4a18..3e09422cf 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -23,7 +23,7 @@ #include VSpline::VSpline():p1(0), p2(QPointF()), p3(QPointF()), p4(0), angle1(0), angle2(0), kAsm1(1), kAsm2(1), - kCurve(1), points(0), mode(Draw::Calculation), idObject(0){ + kCurve(1), points(QHash()), mode(Draw::Calculation), idObject(0){ } VSpline::VSpline ( const VSpline & spline ):p1(spline.GetP1 ()), p2(spline.GetP2 ()), p3(spline.GetP3 ()), @@ -34,14 +34,14 @@ VSpline::VSpline ( const VSpline & spline ):p1(spline.GetP1 ()), p2(spline.GetP2 VSpline::VSpline (const QHash *points, qint64 p1, qint64 p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2 , qreal kCurve, Draw::Draws mode, qint64 idObject):p1(p1), p2(QPointF()), p3(QPointF()), - p4(p4), angle1(angle1), angle2(angle2), kAsm1(kAsm1), kAsm2(kAsm2), kCurve(kCurve), points(points), + p4(p4), angle1(angle1), angle2(angle2), kAsm1(kAsm1), kAsm2(kAsm2), kCurve(kCurve), points(*points), mode(mode), idObject(idObject){ ModifiSpl ( p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve ); } VSpline::VSpline (const QHash *points, qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve, Draw::Draws mode, qint64 idObject):p1(p1), p2(p2), p3(p3), p4(p4), angle1(0), - angle2(0), kAsm1(1), kAsm2(1), kCurve(1), points(points), mode(mode), idObject(idObject){ + angle2(0), kAsm1(1), kAsm2(1), kCurve(1), points(*points), mode(mode), idObject(idObject){ ModifiSpl ( p1, p2, p3, p4, kCurve); } @@ -129,8 +129,8 @@ qint64 VSpline::GetP1 () const{ } VPointF VSpline::GetPointP1() const{ - if(points->contains(p1)){ - return points->value(p1); + if(points.contains(p1)){ + return points.value(p1); } else { qCritical()<<"Не можу знайти id = "<contains(p4)){ - return points->value(p4); + if(points.contains(p4)){ + return points.value(p4); } else { qCritical()<<"Не можу знайти id = "< *VSpline::GetDataPoints() const{ +const QHash VSpline::GetDataPoints() const{ return points; } diff --git a/geometry/vspline.h b/geometry/vspline.h index 79ee52fe4..d87260421 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -136,7 +136,7 @@ public: qreal GetKasm1() const; qreal GetKasm2() const; qreal GetKcurve() const; - const QHash *GetDataPoints() const; + const QHash GetDataPoints() const; /** * @brief CrossingSplLine перевіряє перетин сплайну з лінією. * @param line лінія з якою перевіряється перетин. @@ -224,7 +224,7 @@ private: qreal kAsm1; qreal kAsm2; qreal kCurve; - const QHash *points; + QHash points; Draw::Draws mode; qint64 idObject; /** diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index f6b6f1342..bd0a5a8fe 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -22,16 +22,16 @@ #include "vsplinepath.h" #include "exception/vexception.h" -VSplinePath::VSplinePath(): path(QVector()), kCurve(1), mode(Draw::Calculation), points(0), - idObject(0){ +VSplinePath::VSplinePath(): path(QVector()), kCurve(1), mode(Draw::Calculation), + points(QHash()), idObject(0){ } VSplinePath::VSplinePath(const QHash *points, qreal kCurve, Draw::Draws mode, qint64 idObject): path(QVector()), - kCurve(kCurve), mode(mode), points(points), idObject(idObject){ + kCurve(kCurve), mode(mode), points(*points), idObject(idObject){ } VSplinePath::VSplinePath(const VSplinePath &splPath): path(*splPath.GetPoint()), - kCurve(splPath.getKCurve()), mode(splPath.getMode()), points( splPath.GetDataPoints()), + kCurve(splPath.getKCurve()), mode(splPath.getMode()), points(splPath.GetDataPoints()), idObject(splPath.getIdObject()){ } @@ -66,7 +66,7 @@ VSpline VSplinePath::GetSpline(qint32 index) const{ if(index < 1 || index > Count()){ throw VException(tr("This spline is not exist.")); } - VSpline spl(points, path[index-1].P(), path[index].P(), path[index-1].Angle2(), path[index].Angle1(), + VSpline spl(&points, path[index-1].P(), path[index].P(), path[index-1].Angle2(), path[index].Angle1(), path[index-1].KAsm2(), path[index].KAsm1(), this->kCurve); return spl; } @@ -74,8 +74,8 @@ VSpline VSplinePath::GetSpline(qint32 index) const{ QPainterPath VSplinePath::GetPath() const{ QPainterPath painterPath; for(qint32 i = 1; i <= Count(); ++i){ - VSpline spl(points, path[i-1].P(), path[i].P(), path[i-1].Angle2(), path[i].Angle1(), path[i-1].KAsm2(), - path[i].KAsm1(), this->kCurve); + VSpline spl(&points, path[i-1].P(), path[i].P(), path[i-1].Angle2(), path[i].Angle1(), + path[i-1].KAsm2(), path[i].KAsm1(), this->kCurve); painterPath.addPath(spl.GetPath()); } return painterPath; @@ -84,8 +84,8 @@ QPainterPath VSplinePath::GetPath() const{ QVector VSplinePath::GetPathPoints() const{ QVector pathPoints; for(qint32 i = 1; i <= Count(); ++i){ - VSpline spl(points, path[i-1].P(), path[i].P(), path[i-1].Angle2(), path[i].Angle1(), path[i-1].KAsm2(), - path[i].KAsm1(), this->kCurve); + VSpline spl(&points, path[i-1].P(), path[i].P(), path[i-1].Angle2(), path[i].Angle1(), + path[i-1].KAsm2(), path[i].KAsm1(), this->kCurve); QVector splP = spl.GetPoints(); for(qint32 j = 0; j < splP.size(); ++j){ pathPoints.append(splP[j]); @@ -101,14 +101,14 @@ QVector VSplinePath::GetSplinePath() const{ qreal VSplinePath::GetLength() const{ qreal length = 0; for(qint32 i = 1; i <= Count(); ++i){ - VSpline spl(points, path[i-1].P(), path[i].P(), path[i-1].Angle2(), path[i].Angle1(), path[i-1].KAsm2(), + VSpline spl(&points, path[i-1].P(), path[i].P(), path[i-1].Angle2(), path[i].Angle1(), path[i-1].KAsm2(), path[i].KAsm1(), kCurve); length += spl.GetLength(); } return length; } -const QHash *VSplinePath::GetDataPoints() const{ +QHash VSplinePath::GetDataPoints() const{ return points; } diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index 1036154dd..a00be2c9b 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -60,7 +60,7 @@ public: QVector GetPathPoints() const; QVector GetSplinePath() const; qreal GetLength() const; - const QHash *GetDataPoints() const; + QHash GetDataPoints() const; void UpdatePoint(qint32 indexSpline, SplinePoint::Position pos, VSplinePoint point); VSplinePoint GetSplinePoint(qint32 indexSpline, SplinePoint::Position pos) const; /** @@ -85,7 +85,7 @@ protected: QVector path; qreal kCurve; Draw::Draws mode; - const QHash *points; + QHash points; qint64 idObject; }; diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index e0237cbdd..c7e9ee7e4 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -128,15 +128,17 @@ void VToolAlongLine::Create(const qint64 _id, const QString &pointName, const QS qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddPoint(VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); + data->AddLine(firstPointId, id); + data->AddLine(id, secondPointId); } else { data->UpdatePoint(id, VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); + data->AddLine(firstPointId, id); + data->AddLine(id, secondPointId); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::AlongLineTool, doc); - data->AddLine(firstPointId, id); - data->AddLine(id, secondPointId); if(parse == Document::FullParse){ VToolAlongLine *point = new VToolAlongLine(doc, data, id, formula, firstPointId, secondPointId, typeLine, typeCreation); diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index 46cc44a5b..efb705153 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -87,13 +87,14 @@ void VToolArc::Create(const qint64 _id, const qint64 ¢er, const QString &rad qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddArc(arc); + data->AddLengthArc(data->GetNameArc(center,id), arc.GetLength()); } else { data->UpdateArc(id, arc); + data->AddLengthArc(data->GetNameArc(center,id), arc.GetLength()); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } - data->AddLengthArc(data->GetNameArc(center,id), arc.GetLength()); VDrawTool::AddRecord(id, Tool::ArcTool, doc); if(parse == Document::FullParse){ VToolArc *toolArc = new VToolArc(doc, data, id, typeCreation); diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 98c84c867..02e4e5cb2 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -93,13 +93,14 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(firstPointId, id); } else { data->UpdatePoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(firstPointId, id); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } - data->AddLine(firstPointId, id); VDrawTool::AddRecord(id, Tool::BisectorTool, doc); if(parse == Document::FullParse){ VToolBisector *point = new VToolBisector(doc, data, id, typeLine, formula, diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index a118ba707..c65e2ec9a 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -74,13 +74,14 @@ void VToolEndLine::Create(const qint64 _id, const QString &pointName, const QStr qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddPoint(VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); + data->AddLine(basePointId, id); } else { data->UpdatePoint(id, VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); + data->AddLine(basePointId, id); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } - data->AddLine(basePointId, id); VDrawTool::AddRecord(id, Tool::EndLineTool, doc); if(parse == Document::FullParse){ VToolEndLine *point = new VToolEndLine(doc, data, id, typeLine, formula, angle, diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 6280a118d..7c84cf2db 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -60,12 +60,13 @@ void VToolLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->getNextId(); + data->AddLine(firstPoint, secondPoint); } else { + data->AddLine(firstPoint, secondPoint); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } - data->AddLine(firstPoint, secondPoint); VDrawTool::AddRecord(id, Tool::LineTool, doc); if(parse == Document::FullParse){ VToolLine *line = new VToolLine(doc, data, id, firstPoint, secondPoint, typeCreation); diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index e1a0abbd0..35067c399 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -72,16 +72,20 @@ void VToolLineIntersect::Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(p1Line1Id, id); + data->AddLine(id, p2Line1Id); + data->AddLine(p1Line2Id, id); + data->AddLine(id, p2Line2Id); } else { data->UpdatePoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(p1Line1Id, id); + data->AddLine(id, p2Line1Id); + data->AddLine(p1Line2Id, id); + data->AddLine(id, p2Line2Id); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } - data->AddLine(p1Line1Id, id); - data->AddLine(id, p2Line1Id); - data->AddLine(p1Line2Id, id); - data->AddLine(id, p2Line2Id); VDrawTool::AddRecord(id, Tool::LineIntersectTool, doc); if(parse == Document::FullParse){ VToolLineIntersect *point = new VToolLineIntersect(doc, data, id, p1Line1Id, diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 2fd033e3c..b742c3fe7 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -74,13 +74,14 @@ void VToolNormal::Create(const qint64 _id, const QString &formula, const qint64 qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(firstPointId, id); } else { data->UpdatePoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(firstPointId, id); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } - data->AddLine(firstPointId, id); VDrawTool::AddRecord(id, Tool::NormalTool, doc); if(parse == Document::FullParse){ VToolNormal *point = new VToolNormal(doc, data, id, typeLine, formula, angle, diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index a87391f74..9cc003477 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -96,8 +96,14 @@ void VToolPointOfContact::Create(const qint64 _id, const QString &radius, const qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(firstPointId, id); + data->AddLine(secondPointId, id); + data->AddLine(center, id); } else { data->UpdatePoint(id,VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(firstPointId, id); + data->AddLine(secondPointId, id); + data->AddLine(center, id); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index 3b41fe3ef..9e01ff4ec 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -99,14 +99,16 @@ void VToolShoulderPoint::Create(const qint64 _id, const QString &formula, const qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(p1Line, id); + data->AddLine(p2Line, id); } else { data->UpdatePoint(id,VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + data->AddLine(p1Line, id); + data->AddLine(p2Line, id); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } - data->AddLine(p1Line, id); - data->AddLine(p2Line, id); VDrawTool::AddRecord(id, Tool::ShoulderPointTool, doc); if(parse == Document::FullParse){ VToolShoulderPoint *point = new VToolShoulderPoint(doc, data, id, typeLine, formula, diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 85d80d197..77575cce6 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -94,13 +94,14 @@ void VToolSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, c qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddSpline(spline); + data->AddLengthSpline(data->GetNameSpline(p1, p4), spline.GetLength()); } else { data->UpdateSpline(id, spline); + data->AddLengthSpline(data->GetNameSpline(p1, p4), spline.GetLength()); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } - data->AddLengthSpline(data->GetNameSpline(p1, p4), spline.GetLength()); VDrawTool::AddRecord(id, Tool::SplineTool, doc); if(parse == Document::FullParse){ VToolSpline *spl = new VToolSpline(doc, data, id, typeCreation); diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index b862f6815..00de5a672 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -82,13 +82,14 @@ void VToolSplinePath::Create(const qint64 _id, const VSplinePath &path, VMainGra qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddSplinePath(path); + data->AddLengthSpline(data->GetNameSplinePath(path), path.GetLength()); } else { data->UpdateSplinePath(id, path); + data->AddLengthSpline(data->GetNameSplinePath(path), path.GetLength()); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } } - data->AddLengthSpline(data->GetNameSplinePath(path), path.GetLength()); VDrawTool::AddRecord(id, Tool::SplinePathTool, doc); if(parse == Document::FullParse){ VToolSplinePath *spl = new VToolSplinePath(doc, data, id, typeCreation); diff --git a/widgets/vapplication.cpp b/widgets/vapplication.cpp index b8f658bcc..c522e8636 100644 --- a/widgets/vapplication.cpp +++ b/widgets/vapplication.cpp @@ -95,6 +95,16 @@ bool VApplication::notify(QObject *receiver, QEvent *event){ msgBox.exec(); abort(); } + catch(const VException &e){ + QMessageBox msgBox; + msgBox.setWindowTitle(tr("Error!")); + msgBox.setText(tr("Something wrong!!")); + msgBox.setInformativeText(e.ErrorMessage()); + msgBox.setStandardButtons(QMessageBox::Ok); + msgBox.setDefaultButton(QMessageBox::Ok); + msgBox.setIcon(QMessageBox::Critical); + msgBox.exec(); + } catch(std::exception& e) { qCritical() << "Exception thrown:" << e.what(); } From 8e715bf71f75441ca5ef905c24ace309d97eb6eb Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 13 Oct 2013 10:11:09 +0300 Subject: [PATCH 05/83] Fixed bug with context menu of single point. --HG-- branch : develop --- .hgignore | 3 + Valentina.pro | 4 +- geometry/varc.cpp | 1 - tools/drawTools/vdrawtool.h | 30 +++--- translations/valentina_ru.ts | 188 ++++++++++++++++++++++------------- translations/valentina_uk.ts | 188 ++++++++++++++++++++++------------- 6 files changed, 256 insertions(+), 158 deletions(-) diff --git a/.hgignore b/.hgignore index 6f58ef173..2e058acbc 100644 --- a/.hgignore +++ b/.hgignore @@ -22,3 +22,6 @@ latex/ # Ignore file used QtCreator for user profile. *.pro.user + +# Ignore file Qt translation. +*.qm diff --git a/Valentina.pro b/Valentina.pro index f94c2e337..a85cc4a65 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -247,7 +247,7 @@ CONFIG(debug, debug|release){ QMAKE_EXTRA_COMPILERS += lrelease lrelease.input = TRANSLATIONS lrelease.output = ${QMAKE_FILE_BASE}.qm - lrelease.commands = $$[QT_INSTALL_BINS]/lrelease ${QMAKE_FILE_IN} -qm ${DESTDIR}${QMAKE_FILE_BASE}.qm + lrelease.commands = $$[QT_INSTALL_BINS]/lrelease ${QMAKE_FILE_IN} -qm "bin/"${QMAKE_FILE_BASE}.qm lrelease.CONFIG += no_link target_predeps } @@ -263,5 +263,3 @@ message(Data files: $$[QT_INSTALL_DATA]) message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) message(Settings: $$[QT_INSTALL_SETTINGS]) message(Examples: $$[QT_INSTALL_EXAMPLES]) - - diff --git a/geometry/varc.cpp b/geometry/varc.cpp index 095ce5bfc..607cef99e 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -137,7 +137,6 @@ qint32 VArc::NumberSplOfArc() const{ case 0:{ QString error = QString(tr("Angle of arc can't be 0 degree.")); throw VException(error); - break; } case 90: return 1; diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index e96f93816..5235452f1 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -75,20 +75,22 @@ protected: dialog->show(); } - if(selectedAction == actionRemove){ - //deincrement referens - RemoveReferens(); - //remove form xml file - QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ - QDomElement element; - bool ok = doc->GetActivCalculationElement(element); - if(ok){ - element.removeChild(domElement); - //update xml file - emit FullUpdateTree(); - //remove form scene - emit RemoveTool(tool); + if(showRemove){ + if(selectedAction == actionRemove){ + //deincrement referens + RemoveReferens(); + //remove form xml file + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + QDomElement element; + bool ok = doc->GetActivCalculationElement(element); + if(ok){ + element.removeChild(domElement); + //update xml file + emit FullUpdateTree(); + //remove form scene + emit RemoveTool(tool); + } } } } diff --git a/translations/valentina_ru.ts b/translations/valentina_ru.ts index e3489ae30..a6b0c678c 100644 --- a/translations/valentina_ru.ts +++ b/translations/valentina_ru.ts @@ -245,10 +245,14 @@ - Length of arcs Длина дуг + + + Length of curves + Длина кривых + Angle of lines @@ -1565,7 +1569,7 @@ - + Save as Сохранить как @@ -1643,13 +1647,13 @@ - + About Qt - + About Valentina @@ -1691,127 +1695,137 @@ Введите новое имя для чертежа. - - + + Error saving change!!! + + + + + Can't save new name of drawing + + + + + Select point - + Select first point - - - + + + Select first point of line - + Select first point of angle - + Select first point of first line - + Select first point curve - + Select point of center of arc - + Select point of curve path - + Valentina v.0.1.0 - + The pattern has been modified. - + Do you want to save your changes? - + Growth: Рост: - + Size: Размер: - + Drawing: Чертеж: - + Lekalo files (*.xml);;All files (*.*) - - + + Lekalo files (*.xml) Файл лекала (*.xml) - + Error saving file. Can't save file. - + Open file Открыть файл - + Got empty file name. - + Could not copy temp file to pattern file - + Could not remove pattern file - + Can't open pattern file. File name empty Не могу открыть файл лекала. Пустое имя файла - - - - - - - + + + + + + + Error! Ошибка! @@ -1821,42 +1835,42 @@ - + Select points, arcs, curves clockwise. - + Error parsing file. Ошибка парсинга файла. - + Error can't convert value. Ошибка, не могу конвертовать значение. - + Error empty parameter. Ошибка, пустой параметр. - + Error wrong id. Ошибка, неправильный id. - + Error don't unique id. - + Error parsing pattern file. Ошибка парсинга файла лекала. - + Error in line %1 column %2 Ошибка в линии %1 столбец %2 @@ -1970,6 +1984,7 @@ + Error! Ошибка! @@ -1998,6 +2013,29 @@ Error wrong id. Program will be terminated. Ошибка неправельный id. Програма будет закрыта. + + + Something wrong!! + + + + + VArc + + + Can't find id = %1 in table. + + + + + Angle of arc can't be 0 degree. + + + + + Arc have not this number of part. + + VContainer @@ -2010,115 +2048,125 @@ VDomDocument - + Got wrong parameter id. Need only id > 0. Получен неправельный параметр id. Допустимы только id > 0. - + Can't convert toLongLong parameter Не могу конвертировать toLongLong параметр - + Got empty parameter Получен пустой параметр - + Can't convert toDouble parameter Не могу конвертировать toDouble параметр - + This id is not unique. - + Error creating or updating detail Ошибка создания или обновления детали - + Error creating or updating single point Ошибка создания или обновления базовой точки - + Error creating or updating point of end line Ошибка создания или обновления точки на конце линии - + Error creating or updating point along line Ошибка создания или обновления точки вдоль линии - + Error creating or updating point of shoulder Ошибка создания или обновления точки плеча - + Error creating or updating point of normal Ошибка создания или обновления точки нормали - + Error creating or updating point of bisector Ошибка создания или обновления точки бисектрисы - + Error creating or updating point of lineintersection Ошибка создания или обновления точки пересичения линий - + Error creating or updating point of contact Ошибка создания или обновления точки прикосновения - + Error creating or updating modeling point Ошибка создания или обновления точки - + Error creating or updating line Ошибка создания или обновления линии - + Error creating or updating simple curve Ошибка создания или обновления кривой - + Error creating or updating curve path Ошибка создания или обновления сложной кривой - + Error creating or updating modeling simple curve Ошибка создания или обновления модельной кривой - + Error creating or updating modeling curve path Ошибка создания или обновления сложной модельной кривой - + Error creating or updating simple arc Ошибка создания или обновления дуги - + Error creating or updating modeling arc Ошибка создания или обновления модельной дуги + + + Error! + Ошибка! + + + + Error parsing file. + Ошибка парсинга файла. + Can't get parent for object id = %1 Не могу получить родителя объекта id = %1 @@ -2127,12 +2175,12 @@ VDrawTool - + Options Параметры - + Delete Удалить @@ -2155,7 +2203,7 @@ VToolDetail - + Delete Удалить diff --git a/translations/valentina_uk.ts b/translations/valentina_uk.ts index 9040a6444..dbbfe8910 100644 --- a/translations/valentina_uk.ts +++ b/translations/valentina_uk.ts @@ -245,10 +245,14 @@ - Length of arcs Довжина дуг + + + Length of curves + + Angle of lines @@ -1565,7 +1569,7 @@ - + Save as Зберегти як @@ -1643,13 +1647,13 @@ - + About Qt Про Qt - + About Valentina Про Valentina @@ -1691,45 +1695,55 @@ Введіть нове ім'я креслення. - - + + Error saving change!!! + + + + + Can't save new name of drawing + + + + + Select point Виберість точку - + Select first point Виберість першу точку - - - + + + Select first point of line Виберість першу точку лінії - + Select first point of angle Виберіть першу точку кута - + Select first point of first line Виберіть першу точку першої лінії - + Select first point curve Виберіть першу точку кривої - + Select point of center of arc Виберіть точку центру дуги - + Select point of curve path Виберіть точку складної кривої @@ -1738,84 +1752,84 @@ Виберіть точки, дуги, криві і д - + Valentina v.0.1.0 Valentina v.0.1.0 - + The pattern has been modified. Лекало було зміненно. - + Do you want to save your changes? Ви хочете зберегти зміни? - + Growth: Зріст: - + Size: Розмір: - + Drawing: Креслення: - + Lekalo files (*.xml);;All files (*.*) Файли лекала (*.xml);;Всі файли (*.*) - - + + Lekalo files (*.xml) Файл лекала (*.xml) - + Error saving file. Can't save file. Помилка збереження файлу. Не можу зберегти файл. - + Open file Відкрити файл - + Got empty file name. Отримано пусте імя файлу. - + Could not copy temp file to pattern file Не можу копіювати тимчасовий файл до файлу лекала - + Could not remove pattern file Не можу видалити файл лекала - + Can't open pattern file. File name empty Не можу відкрити файл лекала. Пусте ім'я файлу - - - - - - - + + + + + + + Error! Помилка! @@ -1825,42 +1839,42 @@ Створіть нове креслення для початку роботи. - + Select points, arcs, curves clockwise. Виберіть точки, дуги, криві загодинниковою стрілкою. - + Error parsing file. Помилка парсингу файла. - + Error can't convert value. Помилка, не можу конвертувати значення. - + Error empty parameter. Помилка, пустий параметр. - + Error wrong id. Помикла, неправильний id. - + Error don't unique id. Помилка, не унікальний id. - + Error parsing pattern file. Помилка парсінгу файлу лекала. - + Error in line %1 column %2 Помилка в лінії %1 стовпчик %2 @@ -1974,6 +1988,7 @@ + Error! Помилка! @@ -2002,6 +2017,29 @@ Error wrong id. Program will be terminated. Помилка неправильний id. Програма буде закрита. + + + Something wrong!! + + + + + VArc + + + Can't find id = %1 in table. + + + + + Angle of arc can't be 0 degree. + + + + + Arc have not this number of part. + + VContainer @@ -2014,115 +2052,125 @@ VDomDocument - + Got wrong parameter id. Need only id > 0. Отримано неправильний id. Допускаються тільки id > 0. - + Can't convert toLongLong parameter Не можу конвертувати toLongLong параметру - + Got empty parameter Отримано пустий параметр - + Can't convert toDouble parameter Не можу конвертувати toDouble параметру - + This id is not unique. Цей id не унікальний. - + Error creating or updating detail Помилка створення чи оновлення деталі - + Error creating or updating single point Помилка створення чи оновлення простої точки - + Error creating or updating point of end line Помилка створення чи оновлення точки кінця відрізку - + Error creating or updating point along line Помилка створення чи оновлення точки вздовж лінії - + Error creating or updating point of shoulder Помилка створення чи оновлення точки плеча - + Error creating or updating point of normal Помилка створення чи оновлення точки нормалі - + Error creating or updating point of bisector Помилка створення чи оновлення точки бісектриси - + Error creating or updating point of lineintersection Помилка створення чи оновлення точки перетину ліній - + Error creating or updating point of contact Помилка створення чи оновлення точки дотику - + Error creating or updating modeling point Помилка створення чи оновлення модельної точки - + Error creating or updating line Помилка створення чи оновлення лінії - + Error creating or updating simple curve Помилка створення чи оновлення кривої - + Error creating or updating curve path Помилка створення чи оновлення шляху кривих - + Error creating or updating modeling simple curve Помилка створення чи оновлення модельної кривої - + Error creating or updating modeling curve path Помилка створення чи оновлення модельного шляху кривих - + Error creating or updating simple arc Помилка створення чи оновлення дуги - + Error creating or updating modeling arc Помилка створення чи оновлення модельної дуги + + + Error! + Помилка! + + + + Error parsing file. + Помилка парсингу файла. + Can't get parent for object id = %1 Не можу отримати батька для об'єкту id = %1 @@ -2131,12 +2179,12 @@ VDrawTool - + Options Параметри - + Delete Видалити @@ -2159,7 +2207,7 @@ VToolDetail - + Delete Видалити From d0ce7e5d105904aae5a397a63ebb624065af12b7 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 13 Oct 2013 13:32:49 +0300 Subject: [PATCH 06/83] Precompiled header for qt and ccache. --HG-- branch : develop --- Valentina.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Valentina.pro b/Valentina.pro index a85cc4a65..ee7b1ec2b 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -11,7 +11,8 @@ QT += core gui widgets xml svg TARGET = Valentina TEMPLATE = app CONFIG -= debug_and_release debug_and_release_target -CONFIG += c++11 +CONFIG += c++11 precompile_header +QMAKE_CXX = ccache g++ SOURCES += main.cpp\ mainwindow.cpp \ From 3407961b6572a4bb699c23d72a9a45399b0e0e8a Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 13 Oct 2013 14:04:26 +0300 Subject: [PATCH 07/83] Alphabetic sorting for variables. --HG-- branch : develop --- dialogs/dialogtool.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index ccb701f24..100343c3c 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -396,15 +396,23 @@ void DialogTool::ShowVariable(const QHash *var){ Q_CHECK_PTR(listWidget); disconnect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); listWidget->clear(); - connect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); + QHashIterator i(*var); + QMap map; while (i.hasNext()) { i.next(); - QListWidgetItem *item = new QListWidgetItem(i.key()); + map.insert(i.key(), i.value()); + } + + QMapIterator iMap(map); + while (iMap.hasNext()) { + iMap.next(); + QListWidgetItem *item = new QListWidgetItem(iMap.key()); item->setFont(QFont("Times", 12, QFont::Bold)); listWidget->addItem(item); } listWidget->setCurrentRow (0); + connect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); } qint64 DialogTool::getIdDetail() const{ From b31002df673f46691cc897abb1dea89d308dd3c5 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 13 Oct 2013 18:31:42 +0300 Subject: [PATCH 08/83] Enabled variables lengths of lines and lengths of arcs. Fixed wrong calculation of length line and curve. --HG-- branch : develop --- container/vcontainer.cpp | 18 ++++++++++-- container/vcontainer.h | 4 ++- dialogs/dialogalongline.cpp | 4 +++ dialogs/dialogalongline.ui | 4 +-- dialogs/dialogarc.cpp | 6 +++- dialogs/dialogarc.ui | 4 +-- dialogs/dialogbisector.cpp | 4 +++ dialogs/dialogbisector.ui | 4 +-- dialogs/dialogendline.cpp | 4 +++ dialogs/dialogendline.ui | 4 +-- dialogs/dialognormal.cpp | 4 +++ dialogs/dialognormal.ui | 4 +-- dialogs/dialogpointofcontact.cpp | 4 +++ dialogs/dialogpointofcontact.ui | 4 +-- dialogs/dialogshoulderpoint.cpp | 4 +++ dialogs/dialogshoulderpoint.ui | 4 +-- dialogs/dialogtool.cpp | 47 ++++++++++++++++++++++++++++---- dialogs/dialogtool.h | 4 +++ geometry/vspline.cpp | 22 ++------------- 19 files changed, 109 insertions(+), 44 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 947b84551..b9b6e4ccc 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -108,7 +108,17 @@ qreal VContainer::GetLine(const QString &name) const{ return GetObject(lengthLines, name); } -qreal VContainer::GetLineArc(const QString &name) const{ +qreal VContainer::GetLengthArc(const QString &name) const{ + Q_ASSERT(!name.isEmpty()); + return GetObject(lengthArcs, name); +} + +qreal VContainer::GetLengthSpline(const QString &name) const{ + Q_ASSERT(!name.isEmpty()); + return GetObject(lengthSplines, name); +} + +qreal VContainer::GetLineAngle(const QString &name) const{ Q_ASSERT(!name.isEmpty()); return GetObject(lineAngles, name); } @@ -562,6 +572,10 @@ qreal VContainer::FindVar(const QString &name, bool *ok)const{ *ok = true; return lineAngles.value(name); } + if(lengthSplines.contains(name)){ + *ok = true; + return lengthSplines.value(name); + } *ok = false; return 0; } @@ -778,7 +792,7 @@ void VContainer::AddLengthSpline(const qint64 &firstPointId, const qint64 &secon first = GetModelingPoint(firstPointId); second = GetModelingPoint(secondPointId); } - AddLengthSpline(nameLine, QLineF(first.toQPointF(), second.toQPointF()).length()); + AddLengthSpline(nameLine, toMM(QLineF(first.toQPointF(), second.toQPointF()).length())); } void VContainer::CreateManTableIGroup (){ diff --git a/container/vcontainer.h b/container/vcontainer.h index c7582b89d..ee2df1ba2 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -55,7 +55,9 @@ public: VStandartTableCell GetStandartTableCell(const QString& name) const; VIncrementTableRow GetIncrementTableRow(const QString& name) const; qreal GetLine(const QString &name) const; - qreal GetLineArc(const QString &name) const; + qreal GetLengthArc(const QString &name) const; + qreal GetLengthSpline(const QString &name) const; + qreal GetLineAngle(const QString &name) const; VSpline GetSpline(qint64 id) const; VSpline GetModelingSpline(qint64 id) const; VArc GetArc(qint64 id) const; diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index 4d522963a..3765cde10 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -33,6 +33,8 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, Draw::Draws mode, QWidg radioButtonStandartTable = ui->radioButtonStandartTable; radioButtonIncrements = ui->radioButtonIncrements; radioButtonLengthLine = ui->radioButtonLengthLine; + radioButtonLengthArc = ui->radioButtonLengthArc; + radioButtonLengthCurve = ui->radioButtonLengthSpline; lineEditFormula = ui->lineEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; @@ -56,6 +58,8 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, Draw::Draws mode, QWidg connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogAlongLine::StandartTable); connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogAlongLine::Increments); connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogAlongLine::LengthLines); + connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogAlongLine::LengthArcs); + connect(ui->radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogAlongLine::LengthCurves); connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogAlongLine::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogAlongLine::NamePointChanged); connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogAlongLine::FormulaChanged); diff --git a/dialogs/dialogalongline.ui b/dialogs/dialogalongline.ui index acfb90561..3030f22ba 100644 --- a/dialogs/dialogalongline.ui +++ b/dialogs/dialogalongline.ui @@ -302,7 +302,7 @@ - false + true Length of arcs @@ -312,7 +312,7 @@ - false + true Length of curves diff --git a/dialogs/dialogarc.cpp b/dialogs/dialogarc.cpp index 7e02eb74c..739e4e76e 100644 --- a/dialogs/dialogarc.cpp +++ b/dialogs/dialogarc.cpp @@ -52,6 +52,8 @@ DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent) radioButtonStandartTable = ui->radioButtonStandartTable; radioButtonIncrements = ui->radioButtonIncrements; radioButtonLengthLine = ui->radioButtonLengthLine; + radioButtonLengthArc = ui->radioButtonLengthArc; + radioButtonLengthCurve = ui->radioButtonLengthSpline; connect(ui->toolButtonPutHereRadius, &QPushButton::clicked, this, &DialogArc::PutRadius); connect(ui->toolButtonPutHereF1, &QPushButton::clicked, this, &DialogArc::PutF1); @@ -64,6 +66,8 @@ DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent) connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogArc::Increments); connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogArc::LengthLines); connect(ui->radioButtonLineAngles, &QRadioButton::clicked, this, &DialogArc::LineAngles); + connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogArc::LengthArcs); + connect(ui->radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogArc::LengthCurves); connect(ui->toolButtonEqualRadius, &QPushButton::clicked, this, &DialogArc::EvalRadius); connect(ui->toolButtonEqualF1, &QPushButton::clicked, this, &DialogArc::EvalF1); @@ -153,7 +157,7 @@ void DialogArc::ValChenged(int row){ } QListWidgetItem *item = ui->listWidget->item( row ); if(ui->radioButtonLineAngles->isChecked()){ - QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLineArc(item->text())) + QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLineAngle(item->text())) .arg(tr("Value angle of line.")); ui->labelDescription->setText(desc); return; diff --git a/dialogs/dialogarc.ui b/dialogs/dialogarc.ui index 3f08b5a41..65ab8d07b 100644 --- a/dialogs/dialogarc.ui +++ b/dialogs/dialogarc.ui @@ -482,7 +482,7 @@ - false + true Length of arcs @@ -492,7 +492,7 @@ - false + true Length of curves diff --git a/dialogs/dialogbisector.cpp b/dialogs/dialogbisector.cpp index 6f6e785ce..0296b71a3 100644 --- a/dialogs/dialogbisector.cpp +++ b/dialogs/dialogbisector.cpp @@ -33,6 +33,8 @@ DialogBisector::DialogBisector(const VContainer *data, Draw::Draws mode, QWidget radioButtonStandartTable = ui->radioButtonStandartTable; radioButtonIncrements = ui->radioButtonIncrements; radioButtonLengthLine = ui->radioButtonLengthLine; + radioButtonLengthArc = ui->radioButtonLengthArc; + radioButtonLengthCurve = ui->radioButtonLengthSpline; lineEditFormula = ui->lineEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; @@ -57,6 +59,8 @@ DialogBisector::DialogBisector(const VContainer *data, Draw::Draws mode, QWidget connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogBisector::StandartTable); connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogBisector::Increments); connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogBisector::LengthLines); + connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogBisector::LengthArcs); + connect(ui->radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogBisector::LengthCurves); connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogBisector::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogBisector::NamePointChanged); connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogBisector::FormulaChanged); diff --git a/dialogs/dialogbisector.ui b/dialogs/dialogbisector.ui index a4253118a..c33b41537 100644 --- a/dialogs/dialogbisector.ui +++ b/dialogs/dialogbisector.ui @@ -344,7 +344,7 @@ - false + true Length of arcs @@ -354,7 +354,7 @@ - false + true Length of curves diff --git a/dialogs/dialogendline.cpp b/dialogs/dialogendline.cpp index fc0530c0a..1251ce77a 100644 --- a/dialogs/dialogendline.cpp +++ b/dialogs/dialogendline.cpp @@ -38,6 +38,8 @@ DialogEndLine::DialogEndLine(const VContainer *data, Draw::Draws mode, QWidget * radioButtonStandartTable = ui->radioButtonStandartTable; radioButtonIncrements = ui->radioButtonIncrements; radioButtonLengthLine = ui->radioButtonLengthLine; + radioButtonLengthArc = ui->radioButtonLengthArc; + radioButtonLengthCurve = ui->radioButtonLengthSpline; lineEditFormula = ui->lineEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; @@ -76,6 +78,8 @@ DialogEndLine::DialogEndLine(const VContainer *data, Draw::Draws mode, QWidget * connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogEndLine::StandartTable); connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogEndLine::Increments); connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogEndLine::LengthLines); + connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogEndLine::LengthArcs); + connect(ui->radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogEndLine::LengthCurves); connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogEndLine::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogEndLine::NamePointChanged); connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogEndLine::FormulaChanged); diff --git a/dialogs/dialogendline.ui b/dialogs/dialogendline.ui index 2b4c079ee..ad99685ca 100644 --- a/dialogs/dialogendline.ui +++ b/dialogs/dialogendline.ui @@ -500,7 +500,7 @@ - false + true Length of arcs @@ -510,7 +510,7 @@ - false + true Length of curves diff --git a/dialogs/dialognormal.cpp b/dialogs/dialognormal.cpp index 11cb6805d..ef60bcb91 100644 --- a/dialogs/dialognormal.cpp +++ b/dialogs/dialognormal.cpp @@ -35,6 +35,8 @@ DialogNormal::DialogNormal(const VContainer *data, Draw::Draws mode, QWidget *pa radioButtonStandartTable = ui->radioButtonStandartTable; radioButtonIncrements = ui->radioButtonIncrements; radioButtonLengthLine = ui->radioButtonLengthLine; + radioButtonLengthArc = ui->radioButtonLengthArc; + radioButtonLengthCurve = ui->radioButtonLengthSpline; lineEditFormula = ui->lineEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; @@ -74,6 +76,8 @@ DialogNormal::DialogNormal(const VContainer *data, Draw::Draws mode, QWidget *pa connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogNormal::StandartTable); connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogNormal::Increments); connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogNormal::LengthLines); + connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogNormal::LengthArcs); + connect(ui->radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogNormal::LengthCurves); connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogNormal::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogNormal::NamePointChanged); connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogNormal::FormulaChanged); diff --git a/dialogs/dialognormal.ui b/dialogs/dialognormal.ui index 26d182650..2283dbe55 100644 --- a/dialogs/dialognormal.ui +++ b/dialogs/dialognormal.ui @@ -519,7 +519,7 @@ - false + true Length of arcs @@ -529,7 +529,7 @@ - false + true Length of curves diff --git a/dialogs/dialogpointofcontact.cpp b/dialogs/dialogpointofcontact.cpp index 67148bb50..21a03227f 100644 --- a/dialogs/dialogpointofcontact.cpp +++ b/dialogs/dialogpointofcontact.cpp @@ -32,6 +32,8 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, Draw::Draws m radioButtonStandartTable = ui.radioButtonStandartTable; radioButtonIncrements = ui.radioButtonIncrements; radioButtonLengthLine = ui.radioButtonLengthLine; + radioButtonLengthArc = ui.radioButtonLengthArc; + radioButtonLengthCurve = ui.radioButtonLengthSpline; lineEditFormula = ui.lineEditFormula; labelEditFormula = ui.labelEditFormula; labelEditNamePoint = ui.labelEditNamePoint; @@ -55,6 +57,8 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, Draw::Draws m connect(ui.radioButtonStandartTable, &QRadioButton::clicked, this, &DialogPointOfContact::StandartTable); connect(ui.radioButtonIncrements, &QRadioButton::clicked, this, &DialogPointOfContact::Increments); connect(ui.radioButtonLengthLine, &QRadioButton::clicked, this, &DialogPointOfContact::LengthLines); + connect(ui.radioButtonLengthArc, &QRadioButton::clicked, this, &DialogPointOfContact::LengthArcs); + connect(ui.radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogPointOfContact::LengthCurves); connect(ui.toolButtonEqual, &QPushButton::clicked, this, &DialogPointOfContact::EvalFormula); connect(ui.lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointOfContact::NamePointChanged); connect(ui.lineEditFormula, &QLineEdit::textChanged, this, &DialogPointOfContact::FormulaChanged); diff --git a/dialogs/dialogpointofcontact.ui b/dialogs/dialogpointofcontact.ui index 4e28260b2..e4f1fba75 100644 --- a/dialogs/dialogpointofcontact.ui +++ b/dialogs/dialogpointofcontact.ui @@ -359,7 +359,7 @@ - false + true Length of arcs @@ -369,7 +369,7 @@ - false + true Length of curves diff --git a/dialogs/dialogshoulderpoint.cpp b/dialogs/dialogshoulderpoint.cpp index 28201e968..f1a5fff82 100644 --- a/dialogs/dialogshoulderpoint.cpp +++ b/dialogs/dialogshoulderpoint.cpp @@ -34,6 +34,8 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, Draw::Draws mod radioButtonStandartTable = ui->radioButtonStandartTable; radioButtonIncrements = ui->radioButtonIncrements; radioButtonLengthLine = ui->radioButtonLengthLine; + radioButtonLengthArc = ui->radioButtonLengthArc; + radioButtonLengthCurve = ui->radioButtonLengthSpline; lineEditFormula = ui->lineEditFormula; labelEditFormula = ui->labelEditFormula; labelEditNamePoint = ui->labelEditNamePoint; @@ -58,6 +60,8 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, Draw::Draws mod connect(ui->radioButtonStandartTable, &QRadioButton::clicked, this, &DialogShoulderPoint::StandartTable); connect(ui->radioButtonIncrements, &QRadioButton::clicked, this, &DialogShoulderPoint::Increments); connect(ui->radioButtonLengthLine, &QRadioButton::clicked, this, &DialogShoulderPoint::LengthLines); + connect(ui->radioButtonLengthArc, &QRadioButton::clicked, this, &DialogShoulderPoint::LengthArcs); + connect(ui->radioButtonLengthSpline, &QRadioButton::clicked, this, &DialogShoulderPoint::LengthCurves); connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogShoulderPoint::EvalFormula); connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogShoulderPoint::NamePointChanged); connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogShoulderPoint::FormulaChanged); diff --git a/dialogs/dialogshoulderpoint.ui b/dialogs/dialogshoulderpoint.ui index f0b4d9e27..b1865211e 100644 --- a/dialogs/dialogshoulderpoint.ui +++ b/dialogs/dialogshoulderpoint.ui @@ -380,7 +380,7 @@ - false + true Length of lines @@ -390,7 +390,7 @@ - false + true Length of curves diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index 100343c3c..a347196d3 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -30,7 +30,7 @@ DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent isInitialized(false), flagName(true), flagFormula(true), timerFormula(0), bOk(0), spinBoxAngle(0), lineEditFormula(0), listWidget(0), labelResultCalculation(0), labelDescription(0), labelEditNamePoint(0), labelEditFormula(0), radioButtonSizeGrowth(0), radioButtonStandartTable(0), radioButtonIncrements(0), - radioButtonLengthLine(0), idDetail(0), mode(mode){ + radioButtonLengthLine(0), radioButtonLengthArc(0), radioButtonLengthCurve(0), idDetail(0), mode(mode){ Q_CHECK_PTR(data); timerFormula = new QTimer(this); connect(timerFormula, &QTimer::timeout, this, &DialogTool::EvalFormula); @@ -309,6 +309,14 @@ void DialogTool::LengthLines(){ ShowVariable(data->DataLengthLines()); } +void DialogTool::LengthArcs(){ + ShowVariable(data->DataLengthArcs()); +} + +void DialogTool::LengthCurves(){ + ShowVariable(data->DataLengthSplines()); +} + void DialogTool::Increments(){ ShowVariable(data->DataIncrementTable()); } @@ -331,17 +339,19 @@ void DialogTool::ValChenged(int row){ Q_CHECK_PTR(radioButtonStandartTable); Q_CHECK_PTR(radioButtonIncrements); Q_CHECK_PTR(radioButtonLengthLine); + Q_CHECK_PTR(radioButtonLengthArc); + Q_CHECK_PTR(radioButtonLengthCurve); if(listWidget->count() == 0){ return; } QListWidgetItem *item = listWidget->item( row ); if(radioButtonSizeGrowth->isChecked()){ if(item->text()=="Р"){ - QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->growth()).arg("Зріст"); + QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->growth()).arg(tr("Growth")); labelDescription->setText(desc); } if(item->text()=="Сг"){ - QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->size()).arg("Розмір"); + QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->size()).arg(tr("Size")); labelDescription->setText(desc); } return; @@ -366,12 +376,28 @@ void DialogTool::ValChenged(int row){ labelDescription->setText(desc); return; } + if(radioButtonLengthArc->isChecked()){ + QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLengthArc(item->text())) + .arg(tr("Arc length")); + labelDescription->setText(desc); + return; + } + if(radioButtonLengthCurve->isChecked()){ + QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLengthSpline(item->text())) + .arg(tr("Curve length")); + labelDescription->setText(desc); + return; + } } void DialogTool::UpdateList(){ - if(radioButtonSizeGrowth == 0 || radioButtonStandartTable == 0 || radioButtonIncrements == 0){ - return; - } + Q_CHECK_PTR(radioButtonSizeGrowth); + Q_CHECK_PTR(radioButtonStandartTable); + Q_CHECK_PTR(radioButtonIncrements); + Q_CHECK_PTR(radioButtonLengthLine); + Q_CHECK_PTR(radioButtonLengthArc); + Q_CHECK_PTR(radioButtonLengthCurve); + if(radioButtonSizeGrowth->isChecked()){ ShowVariable(data->DataBase()); } @@ -381,6 +407,15 @@ void DialogTool::UpdateList(){ if(radioButtonIncrements->isChecked()){ ShowVariable(data->DataIncrementTable()); } + if(radioButtonLengthLine->isChecked()){ + ShowVariable(data->DataLengthLines()); + } + if(radioButtonLengthArc->isChecked()){ + ShowVariable(data->DataLengthArcs()); + } + if(radioButtonLengthCurve->isChecked()){ + ShowVariable(data->DataLengthSplines()); + } } bool DialogTool::CheckObject(const qint64 &id){ diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index 630582144..dbe0b4730 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -62,6 +62,8 @@ public slots: void SizeGrowth(); void StandartTable(); void LengthLines(); + void LengthArcs(); + void LengthCurves(); void Increments(); void PutHere(); void PutVal(QListWidgetItem * item); @@ -86,6 +88,8 @@ protected: QRadioButton *radioButtonStandartTable; QRadioButton *radioButtonIncrements; QRadioButton *radioButtonLengthLine; + QRadioButton *radioButtonLengthArc; + QRadioButton *radioButtonLengthCurve; qint64 idDetail; Draw::Draws mode; bool CheckObject(const qint64 &id); diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 3e09422cf..e3dc49c3c 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -320,32 +320,14 @@ QVector VSpline::GetPoints (QPointF p1, QPointF p2, QPointF p3, QPointF } qreal VSpline::LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const{ - /*QVector px; - QVector py; - QVector& wpx = px; - QVector& wpy = py; - px.append ( p1.x () ); - py.append ( p1.y () ); - PointBezier_r ( p1.x (), p1.y (), p2.x (), p2.y (), - p3.x (), p3.y (), p4.x (), p4.y (), 0, wpx, wpy); - px.append ( p4.x () ); - py.append ( p4.y () ); - qint32 i = 0; - qreal length = 0.0; - * - * Наприклад маємо 10 точок. Від 0 до 9 і останню точку не опрацьовуємо. - * Тому від 0 до 8(<10-1). - * - for ( i = 0; i < px.count() - 1; ++i ){ - length += QLineF ( QPointF ( px[i], py[i] ), QPointF ( px[i+1], py[i+1] ) ).length (); - }*/ QPainterPath splinePath; QVector points = GetPoints (p1, p2, p3, p4); splinePath.moveTo(points[0]); for (qint32 i = 1; i < points.count(); ++i){ splinePath.lineTo(points[i]); } - return splinePath.length(); + qreal length = toMM(splinePath.length()); + return length; } void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, From 1e70aea0db0fa277218154f38962a9ba59c2dfc1 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 13 Oct 2013 21:51:59 +0300 Subject: [PATCH 09/83] Fixed wrong value of arc length. Fixed wrong spline length. --HG-- branch : develop --- container/vcontainer.cpp | 20 +++----------------- container/vcontainer.h | 2 -- geometry/vspline.cpp | 3 +-- tools/drawTools/vtoolarc.cpp | 6 +++--- tools/drawTools/vtoolspline.cpp | 4 ++-- tools/drawTools/vtoolsplinepath.cpp | 4 ++-- tools/modelingTools/vmodelingarc.cpp | 2 +- tools/modelingTools/vmodelingspline.cpp | 2 +- tools/modelingTools/vmodelingsplinepath.cpp | 2 +- xml/vdomdocument.cpp | 4 ++++ 10 files changed, 18 insertions(+), 31 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index b9b6e4ccc..9d89dd1b6 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -454,7 +454,7 @@ void VContainer::AddLengthSpline(const QString &name, const qreal &value){ } void VContainer::AddLengthArc(const qint64 ¢er, const qint64 &id){ - AddLengthArc(GetNameArc(center, id), GetArc(id).GetLength()); + AddLengthArc(GetNameArc(center, id), toMM(GetArc(id).GetLength())); } void VContainer::AddLengthArc(const QString &name, const qreal &value){ @@ -655,7 +655,7 @@ void VContainer::AddLine(const qint64 &firstPointId, const qint64 &secondPointId first = GetModelingPoint(firstPointId); second = GetModelingPoint(secondPointId); } - AddLengthLine(nameLine, QLineF(first.toQPointF(), second.toQPointF()).length()/PrintDPI*25.4); + AddLengthLine(nameLine, toMM(QLineF(first.toQPointF(), second.toQPointF()).length())); nameLine = GetNameLineAngle(firstPointId, secondPointId, mode); AddLineAngle(nameLine, QLineF(first.toQPointF(), second.toQPointF()).angle()); } @@ -773,7 +773,7 @@ QString VContainer::GetNameArc(const qint64 ¢er, const qint64 &id, Draw::Dra } else { centerPoint = GetModelingPoint(center); } - return QString ("Arc(%1)%2").arg(centerPoint.name()).arg(id); + return QString ("Arc_%1_%2").arg(centerPoint.name()).arg(id); } void VContainer::AddLengthLine(const QString &name, const qreal &value){ @@ -781,20 +781,6 @@ void VContainer::AddLengthLine(const QString &name, const qreal &value){ lengthLines[name] = value; } -void VContainer::AddLengthSpline(const qint64 &firstPointId, const qint64 &secondPointId, Draw::Draws mode){ - QString nameLine = GetNameSpline(firstPointId, secondPointId, mode); - VPointF first; - VPointF second; - if(mode == Draw::Calculation){ - first = GetPoint(firstPointId); - second = GetPoint(secondPointId); - } else { - first = GetModelingPoint(firstPointId); - second = GetModelingPoint(secondPointId); - } - AddLengthSpline(nameLine, toMM(QLineF(first.toQPointF(), second.toQPointF()).length())); -} - void VContainer::CreateManTableIGroup (){ AddStandartTableCell("Pkor", VStandartTableCell(84, 0, 3)); AddStandartTableCell("Pkor", VStandartTableCell(84, 0, 3)); diff --git a/container/vcontainer.h b/container/vcontainer.h index ee2df1ba2..235a4243a 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -72,8 +72,6 @@ public: void AddStandartTableCell(const QString& name, const VStandartTableCell& cell); void AddIncrementTableRow(const QString& name, const VIncrementTableRow &cell); void AddLengthLine(const QString &name, const qreal &value); - void AddLengthSpline(const qint64 &firstPointId, const qint64 &secondPointId, - Draw::Draws mode = Draw::Calculation); void AddLengthSpline(const QString &name, const qreal &value); void AddLengthArc(const qint64 ¢er, const qint64 &id); void AddLengthArc(const QString &name, const qreal &value); diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index e3dc49c3c..4e6ac988c 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -326,8 +326,7 @@ qreal VSpline::LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) c for (qint32 i = 1; i < points.count(); ++i){ splinePath.lineTo(points[i]); } - qreal length = toMM(splinePath.length()); - return length; + return splinePath.length(); } void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index efb705153..c85aba0da 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -68,7 +68,7 @@ void VToolArc::Create(const qint64 _id, const qint64 ¢er, const QString &rad QString errorMsg; qreal result = cal.eval(radius, &errorMsg); if(errorMsg.isEmpty()){ - calcRadius = result*PrintDPI/25.4; + calcRadius = toPixel(result); } errorMsg.clear(); @@ -87,10 +87,10 @@ void VToolArc::Create(const qint64 _id, const qint64 ¢er, const QString &rad qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddArc(arc); - data->AddLengthArc(data->GetNameArc(center,id), arc.GetLength()); + data->AddLengthArc(data->GetNameArc(center,id), toMM(arc.GetLength())); } else { data->UpdateArc(id, arc); - data->AddLengthArc(data->GetNameArc(center,id), arc.GetLength()); + data->AddLengthArc(data->GetNameArc(center,id), toMM(arc.GetLength())); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 77575cce6..71535e5f1 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -94,10 +94,10 @@ void VToolSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, c qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddSpline(spline); - data->AddLengthSpline(data->GetNameSpline(p1, p4), spline.GetLength()); + data->AddLengthSpline(data->GetNameSpline(p1, p4), toMM(spline.GetLength())); } else { data->UpdateSpline(id, spline); - data->AddLengthSpline(data->GetNameSpline(p1, p4), spline.GetLength()); + data->AddLengthSpline(data->GetNameSpline(p1, p4), toMM(spline.GetLength())); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index 00de5a672..399367688 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -82,10 +82,10 @@ void VToolSplinePath::Create(const qint64 _id, const VSplinePath &path, VMainGra qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddSplinePath(path); - data->AddLengthSpline(data->GetNameSplinePath(path), path.GetLength()); + data->AddLengthSpline(data->GetNameSplinePath(path), toMM(path.GetLength())); } else { data->UpdateSplinePath(id, path); - data->AddLengthSpline(data->GetNameSplinePath(path), path.GetLength()); + data->AddLengthSpline(data->GetNameSplinePath(path), toMM(path.GetLength())); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); } diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index a04ed9310..372cb7fef 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -94,7 +94,7 @@ VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const doc->UpdateToolData(id, data); } } - data->AddLengthArc(data->GetNameArc(center,id, Draw::Modeling), arc.GetLength()); + data->AddLengthArc(data->GetNameArc(center,id, Draw::Modeling), toMM(arc.GetLength())); if(parse == Document::FullParse){ toolArc = new VModelingArc(doc, data, id, typeCreation); doc->AddTool(id, toolArc); diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index ddefbc81d..17467591b 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -102,7 +102,7 @@ VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, con doc->UpdateToolData(id, data); } } - data->AddLengthSpline(data->GetNameSpline(p1, p4, Draw::Modeling), spline.GetLength()); + data->AddLengthSpline(data->GetNameSpline(p1, p4, Draw::Modeling), toMM(spline.GetLength())); if(parse == Document::FullParse){ spl = new VModelingSpline(doc, data, id, typeCreation); doc->AddTool(id, spl); diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 2b024389a..6756e0d4c 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -89,7 +89,7 @@ VModelingSplinePath * VModelingSplinePath::Create(const qint64 _id, const VSplin doc->UpdateToolData(id, data); } } - data->AddLengthSpline(data->GetNameSplinePath(path), path.GetLength()); + data->AddLengthSpline(data->GetNameSplinePath(path), toMM(path.GetLength())); if(parse == Document::FullParse){ spl = new VModelingSplinePath(doc, data, id, typeCreation); doc->AddTool(id, spl); diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index f99b846f7..d31f9b486 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -444,15 +444,19 @@ void VDomDocument::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsSce if(!domElement.isNull()){ if(domElement.tagName() == "point"){ ParsePointElement(scene, domElement, parse, domElement.attribute("type", ""), mode); + continue; } if(domElement.tagName() == "line"){ ParseLineElement(scene, domElement, parse, mode); + continue; } if(domElement.tagName() == "spline"){ ParseSplineElement(scene, domElement, parse, domElement.attribute("type", ""), mode); + continue; } if(domElement.tagName() == "arc"){ ParseArcElement(scene, domElement, parse, domElement.attribute("type", ""), mode); + continue; } } } From 244756cb0664f46861c4c9c2426d3d03be32fe08 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 11:40:01 +0300 Subject: [PATCH 10/83] Fixed Issue #3. --HG-- branch : develop --- widgets/vmaingraphicsview.cpp | 48 +++++++++++++++++++++++++---------- widgets/vmaingraphicsview.h | 20 +++++---------- 2 files changed, 40 insertions(+), 28 deletions(-) diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index 694a12984..ddb07efe5 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -23,30 +23,50 @@ #include #include #include +#include VMainGraphicsView::VMainGraphicsView(QWidget *parent) : - QGraphicsView(parent){ + QGraphicsView(parent), _numScheduledScalings(0){ QGraphicsView::setResizeAnchor(QGraphicsView::AnchorUnderMouse); setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); } void VMainGraphicsView::wheelEvent(QWheelEvent *event){ + // If you press CTRL this code will execute + int numDegrees = event->delta() / 8; + int numSteps = numDegrees / 15; // see QWheelEvent documentation + _numScheduledScalings += numSteps; + if (_numScheduledScalings * numSteps < 0){ // if user moved the wheel in another direction, we reset + _numScheduledScalings = numSteps; // previously scheduled scalings + } + + QTimeLine *anim = new QTimeLine(350, this); + anim->setUpdateInterval(20); + + connect(anim, &QTimeLine::valueChanged, this, &VMainGraphicsView::scalingTime); + connect(anim, &QTimeLine::finished, this, &VMainGraphicsView::animFinished); + anim->start(); +} + +void VMainGraphicsView::scalingTime(qreal x){ + Q_UNUSED(x); + qreal factor = 1.0 + qreal(_numScheduledScalings) / 300.0; if (QApplication::keyboardModifiers() == Qt::ControlModifier){ - // Если нажата клавиша CTRL этот код выполнится - if ((event->delta())>0){ - ZoomIn(); - } else if ((event->delta())<0){ - ZoomOut(); - } + scale(factor, factor); } else { - verticalScrollBar()->setValue(verticalScrollBar()->value() - event->delta()); + if(_numScheduledScalings < 0){ + verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() + factor*3.5)); + } else { + verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() - factor*3.5)); + } } } -void VMainGraphicsView::ZoomIn(){ - scale(1.1,1.1); -} - -void VMainGraphicsView::ZoomOut(){ - scale(1/1.1,1/1.1); +void VMainGraphicsView::animFinished(){ + if (_numScheduledScalings > 0){ + _numScheduledScalings--; + } else { + _numScheduledScalings++; + } + sender()->~QObject(); } diff --git a/widgets/vmaingraphicsview.h b/widgets/vmaingraphicsview.h index 67cf3f679..099d9f845 100644 --- a/widgets/vmaingraphicsview.h +++ b/widgets/vmaingraphicsview.h @@ -24,30 +24,22 @@ #include -class VMainGraphicsView : public QGraphicsView -{ +class VMainGraphicsView : public QGraphicsView{ Q_OBJECT public: explicit VMainGraphicsView(QWidget *parent = 0); - signals: protected: /** * @brief wheelEvent обробник повороту колеса мишки. * @param event передається подія. */ - void wheelEvent ( QWheelEvent * event ); - + void wheelEvent ( QWheelEvent * event ); public slots: - /** - * @brief ZoomIn збільшує масштаб листа. - */ - void ZoomIn(); - /** - * @brief ZoomOut зменшує масштаб листа. - */ - void ZoomOut(); - + void scalingTime(qreal x); + void animFinished(); +private: + qint32 _numScheduledScalings; }; #endif // VMAINGRAPHICSVIEW_H From 4d6179d3e233a83f02d064d036d25a2d64f0ee11 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 12:31:56 +0300 Subject: [PATCH 11/83] DragMode for scene. --HG-- branch : develop --- widgets/vmaingraphicsview.cpp | 24 ++++++++++++++++++++---- widgets/vmaingraphicsview.h | 8 +++++--- widgets/vtablegraphicsview.cpp | 4 ++-- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index ddb07efe5..d07bcc501 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -27,12 +27,12 @@ VMainGraphicsView::VMainGraphicsView(QWidget *parent) : QGraphicsView(parent), _numScheduledScalings(0){ - QGraphicsView::setResizeAnchor(QGraphicsView::AnchorUnderMouse); - setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); + this->setResizeAnchor(QGraphicsView::AnchorUnderMouse); + this->setTransformationAnchor(QGraphicsView::AnchorUnderMouse); + this->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); } void VMainGraphicsView::wheelEvent(QWheelEvent *event){ - // If you press CTRL this code will execute int numDegrees = event->delta() / 8; int numSteps = numDegrees / 15; // see QWheelEvent documentation _numScheduledScalings += numSteps; @@ -51,7 +51,7 @@ void VMainGraphicsView::wheelEvent(QWheelEvent *event){ void VMainGraphicsView::scalingTime(qreal x){ Q_UNUSED(x); qreal factor = 1.0 + qreal(_numScheduledScalings) / 300.0; - if (QApplication::keyboardModifiers() == Qt::ControlModifier){ + if (QApplication::keyboardModifiers() == Qt::ControlModifier){// If you press CTRL this code will execute scale(factor, factor); } else { if(_numScheduledScalings < 0){ @@ -70,3 +70,19 @@ void VMainGraphicsView::animFinished(){ } sender()->~QObject(); } + +void VMainGraphicsView::mousePressEvent(QMouseEvent *mousePress){ + if(mousePress->button() & Qt::LeftButton){ + switch(QGuiApplication::keyboardModifiers()){ + case Qt::ControlModifier: + QGraphicsView::setDragMode(QGraphicsView::ScrollHandDrag); + QGraphicsView::mousePressEvent(mousePress); + break; + } + } +} + +void VMainGraphicsView::mouseReleaseEvent(QMouseEvent *event){ + QGraphicsView::mouseReleaseEvent ( event ); + QGraphicsView::setDragMode( QGraphicsView::RubberBandDrag ); +} diff --git a/widgets/vmaingraphicsview.h b/widgets/vmaingraphicsview.h index 099d9f845..39d1687ff 100644 --- a/widgets/vmaingraphicsview.h +++ b/widgets/vmaingraphicsview.h @@ -29,15 +29,17 @@ class VMainGraphicsView : public QGraphicsView{ public: explicit VMainGraphicsView(QWidget *parent = 0); signals: +public slots: + void scalingTime(qreal x); + void animFinished(); protected: /** * @brief wheelEvent обробник повороту колеса мишки. * @param event передається подія. */ void wheelEvent ( QWheelEvent * event ); -public slots: - void scalingTime(qreal x); - void animFinished(); + void mousePressEvent(QMouseEvent *mousePress); + void mouseReleaseEvent(QMouseEvent *event); private: qint32 _numScheduledScalings; }; diff --git a/widgets/vtablegraphicsview.cpp b/widgets/vtablegraphicsview.cpp index b2f9d57f1..ce5cd7548 100644 --- a/widgets/vtablegraphicsview.cpp +++ b/widgets/vtablegraphicsview.cpp @@ -35,10 +35,10 @@ VTableGraphicsView::VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent) void VTableGraphicsView::selectionChanged(){ QList listSelectedItems = scene()->selectedItems(); if( listSelectedItems.isEmpty() == true ){ - qDebug() << "деталь не знайдено"; + qDebug() << tr("detail don't find"); emit itemChect(true); } else { - qDebug() << "деталь знайдено"; + qDebug() << tr("detail find"); emit itemChect(false); } } From 3bda5f620801cdea829d8f8368d28f2cbee59a72 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 14:26:42 +0300 Subject: [PATCH 12/83] Connected signal cellChanged to slot cellChanged in table of increments. Before conversion toDouble replace "," to ".". --HG-- branch : develop --- dialogs/dialogincrements.cpp | 16 +++++++++--- dialogs/dialogincrements.h | 49 ++++++++++++++++++------------------ widgets/doubledelegate.cpp | 18 +++++-------- xml/vdomdocument.cpp | 2 +- 4 files changed, 43 insertions(+), 42 deletions(-) diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 7ea38338c..c877ef145 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -26,6 +26,7 @@ #include "widgets/doubledelegate.h" #include "container/vincrementtablerow.h" #include +#include "exception/vexception.h" DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent) : DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogIncrements), data(data), doc(doc){ @@ -41,6 +42,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget FillIncrementTable(); FillLengthLines(); + connect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this, &DialogIncrements::cellChanged); connect(ui->toolButtonAdd, &QPushButton::clicked, this, &DialogIncrements::clickedToolButtonAdd); connect(ui->toolButtonRemove, &QPushButton::clicked, this, &DialogIncrements::clickedToolButtonRemove); @@ -365,8 +367,8 @@ void DialogIncrements::AddIncrementToFile(qint64 id, QString name, qreal base, q } void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ - QTableWidgetItem *item; - QTableWidgetItem *itemName; + QTableWidgetItem *item = 0; + QTableWidgetItem *itemName = 0; qint64 id; QDomElement domElement; switch(column) { @@ -386,8 +388,14 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ id = qvariant_cast(itemName->data(Qt::UserRole)); domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("base", item->text().toDouble()); - emit FullUpdateTree(); + bool ok = false; + qreal value = item->text().toDouble(&ok); + if(ok){ + domElement.setAttribute("base", value); + emit FullUpdateTree(); + } else { + throw VException(tr("Can't convert toDouble value.")); + } } break; case 3: diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h index ed357e92a..7f305494c 100644 --- a/dialogs/dialogincrements.h +++ b/dialogs/dialogincrements.h @@ -29,38 +29,37 @@ namespace Ui { class DialogIncrements; } -class DialogIncrements : public DialogTool -{ +class DialogIncrements : public DialogTool{ Q_OBJECT public: - explicit DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent = 0); - ~DialogIncrements(); + DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent = 0); + ~DialogIncrements(); public slots: - void clickedToolButtonAdd(); - void clickedToolButtonRemove(); - void cellChanged ( qint32 row, qint32 column ); - void FullUpdateFromFile(); - virtual void DialogAccepted(); + void clickedToolButtonAdd(); + void clickedToolButtonRemove(); + void cellChanged ( qint32 row, qint32 column ); + void FullUpdateFromFile(); + virtual void DialogAccepted(); signals: - void FullUpdateTree(); - void haveLiteChange(); + void FullUpdateTree(); + void haveLiteChange(); private: Q_DISABLE_COPY(DialogIncrements) Ui::DialogIncrements *ui; - VContainer *data; // need because we must change data - VDomDocument *doc; - void InitialStandartTable(); - void InitialIncrementTable(); - void InitialLinesTable(); - void InitialSplinesTable(); - void InitialArcsTable(); - void FillStandartTable(); - void FillIncrementTable(); - void FillLengthLines(); - void FillLengthSplines(); - void FillLengthArcs(); - void AddIncrementToFile(qint64 id, QString name, qreal base, qreal ksize, qreal kgrowth, - QString description); + VContainer *data; // need because we must change data + VDomDocument *doc; + void InitialStandartTable(); + void InitialIncrementTable(); + void InitialLinesTable(); + void InitialSplinesTable(); + void InitialArcsTable(); + void FillStandartTable(); + void FillIncrementTable(); + void FillLengthLines(); + void FillLengthSplines(); + void FillLengthArcs(); + void AddIncrementToFile(qint64 id, QString name, qreal base, qreal ksize, qreal kgrowth, + QString description); }; #endif // DIALOGINCREMENTS_H diff --git a/widgets/doubledelegate.cpp b/widgets/doubledelegate.cpp index 3b0932624..0f81b6785 100644 --- a/widgets/doubledelegate.cpp +++ b/widgets/doubledelegate.cpp @@ -53,10 +53,8 @@ { } - QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, - const QStyleOptionViewItem &/* option */, - const QModelIndex &/* index */) const - { + QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, + const QModelIndex &/* index */) const{ QDoubleSpinBox *editor = new QDoubleSpinBox(parent); editor->setMinimum(-1000.0); editor->setMaximum(1000.0); @@ -64,18 +62,15 @@ return editor; } - void DoubleSpinBoxDelegate::setEditorData(QWidget *editor, - const QModelIndex &index) const - { - int value = index.model()->data(index, Qt::EditRole).toInt(); + void DoubleSpinBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const{ + qreal value = index.model()->data(index, Qt::EditRole).toDouble(); QDoubleSpinBox *spinBox = static_cast(editor); spinBox->setValue(value); } void DoubleSpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const - { + const QModelIndex &index) const{ QDoubleSpinBox *spinBox = static_cast(editor); spinBox->interpretText(); qreal value = spinBox->value(); @@ -84,7 +79,6 @@ } void DoubleSpinBoxDelegate::updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, const QModelIndex &/* index */) const - { + const QStyleOptionViewItem &option, const QModelIndex &/* index */) const{ editor->setGeometry(option.rect); } diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index d31f9b486..2de1c97b2 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -374,7 +374,7 @@ qreal VDomDocument::GetParametrDouble(const QDomElement &domElement, const QStri Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); bool ok = false; QString parametr = GetParametrString(domElement, name); - qreal param = parametr.toDouble(&ok); + qreal param = parametr.replace(",", ".").toDouble(&ok); if(ok == false){ throw VExceptionConversionError(tr("Can't convert toDouble parameter"), name); } From 517e754efd8a98db15e8683d8a3e64fac0f73eee Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 14:42:14 +0300 Subject: [PATCH 13/83] List of lengths of arc and curves in table of variables. --HG-- branch : develop --- dialogs/dialogincrements.cpp | 4 ++++ widgets/vmaingraphicsview.cpp | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index c877ef145..19f981d4b 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -34,6 +34,8 @@ DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget InitialStandartTable(); InitialIncrementTable(); InitialLinesTable(); + InitialSplinesTable(); + InitialArcsTable(); DoubleSpinBoxDelegate *doubleDelegate = new DoubleSpinBoxDelegate(ui->tableWidgetIncrement); ui->tableWidgetIncrement->setItemDelegateForColumn(2, doubleDelegate); ui->tableWidgetIncrement->setItemDelegateForColumn(3, doubleDelegate); @@ -41,6 +43,8 @@ DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget FillStandartTable(); FillIncrementTable(); FillLengthLines(); + FillLengthSplines(); + FillLengthArcs(); connect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this, &DialogIncrements::cellChanged); connect(ui->toolButtonAdd, &QPushButton::clicked, this, &DialogIncrements::clickedToolButtonAdd); diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index d07bcc501..ca232aa95 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -78,6 +78,9 @@ void VMainGraphicsView::mousePressEvent(QMouseEvent *mousePress){ QGraphicsView::setDragMode(QGraphicsView::ScrollHandDrag); QGraphicsView::mousePressEvent(mousePress); break; + default: + QGraphicsView::mousePressEvent(mousePress); + break; } } } From 23a7efbc6aacef5d2be522fbe711d928f048f807 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 14:49:01 +0300 Subject: [PATCH 14/83] The main window is maximized after start application. --HG-- branch : develop --- main.cpp | 1 + mainwindow.ui | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main.cpp b/main.cpp index 6ed51ac57..5f8fea974 100644 --- a/main.cpp +++ b/main.cpp @@ -60,6 +60,7 @@ int main(int argc, char *argv[]){ app.installTranslator(&appTranslator); MainWindow w; + w.setWindowState(w.windowState() ^ Qt::WindowMaximized); app.setWindowIcon(QIcon(":/icon/64x64/icon64x64.png")); TableWindow table; QObject::connect(&w, &MainWindow::ModelChosen, &table, &TableWindow::ModelChosen); diff --git a/mainwindow.ui b/mainwindow.ui index 5a99c2733..b842a4655 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -303,7 +303,7 @@ 0 0 - 137 + 150 58 @@ -379,7 +379,7 @@ 0 0 - 137 + 150 58 From 1f89b0038a78847fac33deb37d6984c0629a417b Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 15:18:42 +0300 Subject: [PATCH 15/83] Changed max and min value for double spin box in table of variables. --HG-- branch : develop --- widgets/doubledelegate.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/doubledelegate.cpp b/widgets/doubledelegate.cpp index 0f81b6785..c1f5ba564 100644 --- a/widgets/doubledelegate.cpp +++ b/widgets/doubledelegate.cpp @@ -56,8 +56,8 @@ QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, const QModelIndex &/* index */) const{ QDoubleSpinBox *editor = new QDoubleSpinBox(parent); - editor->setMinimum(-1000.0); - editor->setMaximum(1000.0); + editor->setMinimum(-10000.0); + editor->setMaximum(10000.0); return editor; } From 33a98de0d167d9f8630e47612e18977a2b320eaa Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 15:22:19 +0300 Subject: [PATCH 16/83] Send signal haveLiteChange when add or remove row in table. --HG-- branch : develop --- dialogs/dialogincrements.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 19f981d4b..38266a883 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -315,6 +315,7 @@ void DialogIncrements::clickedToolButtonAdd(){ ui->toolButtonRemove->setEnabled(true); connect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this, &DialogIncrements::cellChanged); + emit haveLiteChange(); } void DialogIncrements::clickedToolButtonRemove(){ @@ -336,6 +337,7 @@ void DialogIncrements::clickedToolButtonRemove(){ } connect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this, &DialogIncrements::cellChanged); + emit haveLiteChange(); } void DialogIncrements::AddIncrementToFile(qint64 id, QString name, qreal base, qreal ksize, From 900261cb7f9553737f4c9f8e1e7b1af0c46ac6d4 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 15:57:04 +0300 Subject: [PATCH 17/83] For tool point along line default type of line is "no line". --HG-- branch : develop --- dialogs/dialogalongline.cpp | 1 + dialogs/dialogalongline.h | 2 +- dialogs/dialogtool.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index 3765cde10..aa66b467a 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -46,6 +46,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, Draw::Draws mode, QWidg QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); connect(bCansel, &QPushButton::clicked, this, &DialogAlongLine::DialogRejected); FillComboBoxTypeLine(ui->comboBoxLineType); + ui->comboBoxLineType->setCurrentIndex(1); FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxSecondPoint); diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index 3f004fb52..200d4168a 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -48,7 +48,7 @@ public: void setSecondPointId(const qint64 &value, const qint64 &id); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogAlongLine) Ui::DialogAlongLine *ui; diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index a347196d3..37e459821 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -92,6 +92,7 @@ void DialogTool::FillComboBoxPoints(QComboBox *box, const qint64 &id) const{ } void DialogTool::FillComboBoxTypeLine(QComboBox *box) const{ + Q_ASSERT(box != 0); QStringList list; list<addItems(list); From 4552f887db25fc94bbdb96595dafd3a73fd8cf0b Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 17:44:33 +0300 Subject: [PATCH 18/83] Replaced Q_CHECK_PRT on Q_ASSERT. --HG-- branch : develop --- dialogs/dialogarc.cpp | 4 +- dialogs/dialoglineintersect.cpp | 2 +- dialogs/dialogtool.cpp | 80 +++++++++++++-------------- mainwindow.cpp | 2 +- tablewindow.cpp | 8 +-- tools/drawTools/vdrawtool.h | 4 +- tools/drawTools/vtoolline.cpp | 8 +-- tools/modelingTools/vmodelingline.cpp | 4 +- tools/nodeDetails/vnodearc.cpp | 2 +- tools/nodeDetails/vnodepoint.cpp | 2 +- tools/nodeDetails/vnodesplinepath.cpp | 2 +- tools/vtooldetail.cpp | 32 +++++------ xml/vdomdocument.cpp | 34 ++++++------ 13 files changed, 90 insertions(+), 94 deletions(-) diff --git a/dialogs/dialogarc.cpp b/dialogs/dialogarc.cpp index 739e4e76e..bfefe9037 100644 --- a/dialogs/dialogarc.cpp +++ b/dialogs/dialogarc.cpp @@ -197,7 +197,7 @@ void DialogArc::F2Changed(){ } void DialogArc::CheckState(){ - Q_CHECK_PTR(bOk); + Q_ASSERT(bOk != 0); bOk->setEnabled(flagRadius && flagF1 && flagF2); } @@ -221,7 +221,7 @@ void DialogArc::ShowLineAngles(){ ui->listWidget->clear(); connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogArc::ValChenged); const QHash *lineAnglesTable = data->DataLineAngles(); - Q_CHECK_PTR(lineAnglesTable); + Q_ASSERT(lineAnglesTable != 0); QHashIterator i(*lineAnglesTable); while (i.hasNext()) { i.next(); diff --git a/dialogs/dialoglineintersect.cpp b/dialogs/dialoglineintersect.cpp index 3388a331e..260f4cc7d 100644 --- a/dialogs/dialoglineintersect.cpp +++ b/dialogs/dialoglineintersect.cpp @@ -158,7 +158,7 @@ void DialogLineIntersect::P2Line2Changed(int index){ } void DialogLineIntersect::CheckState(){ - Q_CHECK_PTR(bOk); + Q_ASSERT(bOk != 0); bOk->setEnabled(flagName && flagPoint); } diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index 37e459821..75beca0a6 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -31,7 +31,7 @@ DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent lineEditFormula(0), listWidget(0), labelResultCalculation(0), labelDescription(0), labelEditNamePoint(0), labelEditFormula(0), radioButtonSizeGrowth(0), radioButtonStandartTable(0), radioButtonIncrements(0), radioButtonLengthLine(0), radioButtonLengthArc(0), radioButtonLengthCurve(0), idDetail(0), mode(mode){ - Q_CHECK_PTR(data); + Q_ASSERT(data != 0); timerFormula = new QTimer(this); connect(timerFormula, &QTimer::timeout, this, &DialogTool::EvalFormula); } @@ -136,8 +136,8 @@ void DialogTool::ChangeCurrentData(QComboBox *box, const qint64 &value) const{ } void DialogTool::PutValHere(QLineEdit *lineEdit, QListWidget *listWidget){ - Q_CHECK_PTR(lineEdit); - Q_CHECK_PTR(listWidget); + Q_ASSERT(lineEdit != 0); + Q_ASSERT(listWidget != 0); QListWidgetItem *item = listWidget->currentItem(); QString val = item->text(); lineEdit->setText(lineEdit->text().append(val)); @@ -145,9 +145,9 @@ void DialogTool::PutValHere(QLineEdit *lineEdit, QListWidget *listWidget){ } void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer){ - Q_CHECK_PTR(edit); - Q_CHECK_PTR(timer); - Q_CHECK_PTR(labelEditFormula); + Q_ASSERT(edit != 0); + Q_ASSERT(timer != 0); + Q_ASSERT(labelEditFormula != 0); if(edit->text().isEmpty()){ flag = false; CheckState(); @@ -160,10 +160,10 @@ void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer){ } void DialogTool::Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label){ - Q_CHECK_PTR(edit); - Q_CHECK_PTR(timer); - Q_CHECK_PTR(label); - Q_CHECK_PTR(labelEditFormula); + Q_ASSERT(edit != 0); + Q_ASSERT(timer != 0); + Q_ASSERT(label != 0); + Q_ASSERT(labelEditFormula != 0); QPalette palette = labelEditFormula->palette(); if(edit->text().isEmpty()){ flag = false; @@ -189,14 +189,14 @@ void DialogTool::Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label) void DialogTool::setCurrentPointId(QComboBox *box, qint64 &pointId, const qint64 &value, const qint64 &id) const{ - Q_CHECK_PTR(box); + Q_ASSERT(box != 0); FillComboBoxPoints(box, id); pointId = value; ChangeCurrentData(box, value); } qint64 DialogTool::getCurrentPointId(QComboBox *box) const{ - Q_CHECK_PTR(box); + Q_ASSERT(box != 0); qint32 index = box->currentIndex(); Q_ASSERT(index != -1); if(index != -1){ @@ -207,7 +207,7 @@ qint64 DialogTool::getCurrentPointId(QComboBox *box) const{ } void DialogTool::CheckState(){ - Q_CHECK_PTR(bOk); + Q_ASSERT(bOk != 0); bOk->setEnabled(flagFormula && flagName); } @@ -218,7 +218,7 @@ void DialogTool::ChoosedObject(qint64 id, Scene::Scenes type){ } void DialogTool::NamePointChanged(){ - Q_CHECK_PTR(labelEditNamePoint); + Q_ASSERT(labelEditNamePoint != 0); QLineEdit* edit = qobject_cast(sender()); if (edit){ QString name = edit->text(); @@ -253,48 +253,48 @@ void DialogTool::FormulaChanged(){ } void DialogTool::ArrowUp(){ - Q_CHECK_PTR(spinBoxAngle); + Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(90); } void DialogTool::ArrowDown(){ - Q_CHECK_PTR(spinBoxAngle); + Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(270); } void DialogTool::ArrowLeft(){ - Q_CHECK_PTR(spinBoxAngle); + Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(180); } void DialogTool::ArrowRight(){ - Q_CHECK_PTR(spinBoxAngle); + Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(0); } void DialogTool::ArrowLeftUp(){ - Q_CHECK_PTR(spinBoxAngle); + Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(135); } void DialogTool::ArrowLeftDown(){ - Q_CHECK_PTR(spinBoxAngle); + Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(225); } void DialogTool::ArrowRightUp(){ - Q_CHECK_PTR(spinBoxAngle); + Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(45); } void DialogTool::ArrowRightDown(){ - Q_CHECK_PTR(spinBoxAngle); + Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(315); } void DialogTool::EvalFormula(){ - Q_CHECK_PTR(lineEditFormula); - Q_CHECK_PTR(labelResultCalculation); + Q_ASSERT(lineEditFormula != 0); + Q_ASSERT(labelResultCalculation != 0); Eval(lineEditFormula, flagFormula, timerFormula, labelResultCalculation); } @@ -327,21 +327,21 @@ void DialogTool::PutHere(){ } void DialogTool::PutVal(QListWidgetItem *item){ - Q_CHECK_PTR(lineEditFormula); + Q_ASSERT(lineEditFormula != 0); QString val = item->text(); lineEditFormula->setText(lineEditFormula->text().append(val)); lineEditFormula->setFocus(); } void DialogTool::ValChenged(int row){ - Q_CHECK_PTR(listWidget); - Q_CHECK_PTR(labelDescription); - Q_CHECK_PTR(radioButtonSizeGrowth); - Q_CHECK_PTR(radioButtonStandartTable); - Q_CHECK_PTR(radioButtonIncrements); - Q_CHECK_PTR(radioButtonLengthLine); - Q_CHECK_PTR(radioButtonLengthArc); - Q_CHECK_PTR(radioButtonLengthCurve); + Q_ASSERT(listWidget != 0); + Q_ASSERT(labelDescription != 0); + Q_ASSERT(radioButtonSizeGrowth != 0); + Q_ASSERT(radioButtonStandartTable != 0); + Q_ASSERT(radioButtonIncrements != 0); + Q_ASSERT(radioButtonLengthLine != 0); + Q_ASSERT(radioButtonLengthArc != 0); + Q_ASSERT(radioButtonLengthCurve != 0); if(listWidget->count() == 0){ return; } @@ -392,12 +392,12 @@ void DialogTool::ValChenged(int row){ } void DialogTool::UpdateList(){ - Q_CHECK_PTR(radioButtonSizeGrowth); - Q_CHECK_PTR(radioButtonStandartTable); - Q_CHECK_PTR(radioButtonIncrements); - Q_CHECK_PTR(radioButtonLengthLine); - Q_CHECK_PTR(radioButtonLengthArc); - Q_CHECK_PTR(radioButtonLengthCurve); + Q_ASSERT(radioButtonSizeGrowth != 0); + Q_ASSERT(radioButtonStandartTable != 0); + Q_ASSERT(radioButtonIncrements != 0); + Q_ASSERT(radioButtonLengthLine != 0); + Q_ASSERT(radioButtonLengthArc != 0); + Q_ASSERT(radioButtonLengthCurve != 0); if(radioButtonSizeGrowth->isChecked()){ ShowVariable(data->DataBase()); @@ -429,7 +429,7 @@ bool DialogTool::CheckObject(const qint64 &id){ template void DialogTool::ShowVariable(const QHash *var){ - Q_CHECK_PTR(listWidget); + Q_ASSERT(listWidget != 0); disconnect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); listWidget->clear(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 84ebd4500..1bd08ccd2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -234,7 +234,7 @@ void MainWindow::AddToolToDetail(T *tool, const qint64 &id, Tool::Tools typeTool const qint64 &idDetail){ QHash* tools = doc->getTools(); VToolDetail *det = qobject_cast(tools->value(idDetail)); - Q_CHECK_PTR(det); + Q_ASSERT(det != 0); det->AddTool(tool, id, typeTool); } diff --git a/tablewindow.cpp b/tablewindow.cpp index 3189b9845..bf9c4d9a7 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -141,7 +141,7 @@ void TableWindow::StopTable(){ } void TableWindow::saveScene(){ - QString name = QFileDialog::getSaveFileName(0, "Зберегти розкладку", "", "Images (*.png);;Svg files (*.svg)"); + QString name = QFileDialog::getSaveFileName(0, tr("Save layout"), "", "Images (*.png);;Svg files (*.svg)"); if(name.isNull()){ return; } @@ -149,12 +149,11 @@ void TableWindow::saveScene(){ QBrush *brush = new QBrush(); brush->setColor( QColor( Qt::white ) ); currentScene->setBackgroundBrush( *brush ); - currentScene->clearSelection(); // Selections would also render to the file + currentScene->clearSelection(); // Selections would also render to the file shadowPaper->setBrush(QBrush(Qt::white)); shadowPaper->setPen(QPen(Qt::white, 0.1)); paper->setPen(QPen(Qt::white, 0.1)); paper->setBrush(QBrush(Qt::white)); - currentScene->setSceneRect(QRectF(10,10,590,590)); currentScene->setSceneRect(currentScene->itemsBoundingRect()); QFileInfo fi(name); @@ -163,9 +162,6 @@ void TableWindow::saveScene(){ } else if(fi.suffix() == "png"){ PngFile(name); } -// if(name.indexOf(".svg",name.size()-4)<0){ -// name.append(".svg"); -// } brush->setColor( QColor( Qt::gray ) ); brush->setStyle( Qt::SolidPattern ); diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index 5235452f1..15415bed2 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -47,8 +47,8 @@ protected: template void ContextMenu(QSharedPointer &dialog, Tool *tool, QGraphicsSceneContextMenuEvent *event, bool showRemove = true){ - Q_CHECK_PTR(tool); - Q_CHECK_PTR(event); + Q_ASSERT(tool != 0); + Q_ASSERT(event != 0); if(!ignoreContextMenuEvent){ QMenu menu; QAction *actionOption = menu.addAction(tr("Options")); diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 7c84cf2db..760c273b6 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -54,9 +54,9 @@ void VToolLine::Create(QSharedPointer &dialog, VMainGraphicsScene *s void VToolLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ - Q_CHECK_PTR(scene); - Q_CHECK_PTR(doc); - Q_CHECK_PTR(data); + Q_ASSERT(scene != 0); + Q_ASSERT(doc != 0); + Q_ASSERT(data != 0); qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->getNextId(); @@ -70,7 +70,7 @@ void VToolLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 VDrawTool::AddRecord(id, Tool::LineTool, doc); if(parse == Document::FullParse){ VToolLine *line = new VToolLine(doc, data, id, firstPoint, secondPoint, typeCreation); - Q_CHECK_PTR(line); + Q_ASSERT(line != 0); scene->addItem(line); connect(line, &VToolLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(line, &VToolLine::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index 911906f67..61e8fb159 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -55,8 +55,8 @@ VModelingLine *VModelingLine::Create(const qint64 &_id, const qint64 &firstPoint VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ VModelingLine *line = 0; - Q_CHECK_PTR(doc); - Q_CHECK_PTR(data); + Q_ASSERT(doc != 0); + Q_ASSERT(data != 0); qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->getNextId(); diff --git a/tools/nodeDetails/vnodearc.cpp b/tools/nodeDetails/vnodearc.cpp index ea755e7f5..a7f6913a6 100644 --- a/tools/nodeDetails/vnodearc.cpp +++ b/tools/nodeDetails/vnodearc.cpp @@ -38,7 +38,7 @@ void VNodeArc::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idA Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation){ if(parse == Document::FullParse){ VNodeArc *arc = new VNodeArc(doc, data, id, idArc, typeobject, typeCreation); - Q_CHECK_PTR(arc); + Q_ASSERT(arc != 0); doc->AddTool(id, arc); doc->IncrementReferens(idArc); } else { diff --git a/tools/nodeDetails/vnodepoint.cpp b/tools/nodeDetails/vnodepoint.cpp index 21426313f..0d8355e8f 100644 --- a/tools/nodeDetails/vnodepoint.cpp +++ b/tools/nodeDetails/vnodepoint.cpp @@ -43,7 +43,7 @@ void VNodePoint::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 i Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation){ if(parse == Document::FullParse){ VNodePoint *point = new VNodePoint(doc, data, id, idPoint, typeobject, typeCreation); - Q_CHECK_PTR(point); + Q_ASSERT(point != 0); doc->AddTool(id, point); doc->IncrementReferens(idPoint); } else { diff --git a/tools/nodeDetails/vnodesplinepath.cpp b/tools/nodeDetails/vnodesplinepath.cpp index 493f5a397..f476cb11a 100644 --- a/tools/nodeDetails/vnodesplinepath.cpp +++ b/tools/nodeDetails/vnodesplinepath.cpp @@ -40,7 +40,7 @@ void VNodeSplinePath::Create(VDomDocument *doc, VContainer *data, qint64 id, qin Tool::Sources typeCreation){ if(parse == Document::FullParse){ VNodeSplinePath *splPath = new VNodeSplinePath(doc, data, id, idSpline, typeobject, typeCreation); - Q_CHECK_PTR(splPath); + Q_ASSERT(splPath != 0); doc->AddTool(id, splPath); VSplinePath path = data->GetModelingSplinePath(id); const QVector *points = path.GetPoint(); diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index c69be08b0..8f113e39b 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -31,40 +31,40 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, sceneDetails(scene){ VDetail detail = data->GetDetail(id); QHash* tools = doc->getTools(); - Q_CHECK_PTR(tools); + Q_ASSERT(tools != 0); for(qint32 i = 0; i< detail.CountNode(); ++i){ switch(detail[i].getTypeTool()){ case(Tool::NodePoint):{ VNodePoint *point = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(point); + Q_ASSERT(point != 0); connect(point, &VNodePoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); point->setParentItem(this); break; } case(Tool::NodeArc):{ VNodeArc *arc = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(arc); + Q_ASSERT(arc != 0); connect(arc, &VNodeArc::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); arc->setParentItem(this); break; } case(Tool::NodeSpline):{ VNodeSpline *spl = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(spl); + Q_ASSERT(spl != 0); connect(spl, &VNodeSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); spl->setParentItem(this); break; } case(Tool::NodeSplinePath):{ VNodeSplinePath *splPath = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(splPath); + Q_ASSERT(splPath != 0); connect(splPath, &VNodeSplinePath::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); splPath->setParentItem(this); break; } case(Tool::AlongLineTool):{ VModelingAlongLine *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingAlongLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingAlongLine::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -72,7 +72,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::ArcTool):{ VModelingArc *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingArc::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingArc::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -80,7 +80,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::BisectorTool):{ VModelingBisector *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingBisector::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingBisector::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -88,7 +88,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::EndLineTool):{ VModelingEndLine *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingEndLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingEndLine::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -96,7 +96,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::LineIntersectTool):{ VModelingLineIntersect *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingLineIntersect::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingLineIntersect::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -104,7 +104,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::LineTool):{ VModelingLine *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingLine::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -112,7 +112,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::NormalTool):{ VModelingNormal *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingNormal::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingNormal::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -120,7 +120,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::PointOfContact):{ VModelingPointOfContact *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingPointOfContact::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingPointOfContact::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -128,7 +128,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::ShoulderPointTool):{ VModelingShoulderPoint *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingShoulderPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingShoulderPoint::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -136,7 +136,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::SplinePathTool):{ VModelingSplinePath *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingSplinePath::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingSplinePath::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); @@ -144,7 +144,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, } case(Tool::SplineTool):{ VModelingSpline *tool = qobject_cast(tools->value(detail[i].getId())); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); connect(tool, &VModelingSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(tool, &VModelingSpline::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); tool->setParentItem(this); diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 2de1c97b2..87942ff27 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -262,8 +262,8 @@ bool VDomDocument::GetActivNodeElement(const QString& name, QDomElement &element void VDomDocument::Parse(Document::Documents parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail){ - Q_CHECK_PTR(sceneDraw); - Q_CHECK_PTR(sceneDetail); + Q_ASSERT(sceneDraw != 0); + Q_ASSERT(sceneDetail != 0); if(parse == Document::FullParse){ TestUniqueId(); data->Clear(); @@ -429,8 +429,8 @@ void VDomDocument::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphics void VDomDocument::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, const QDomNode& node, const Document::Documents &parse, Draw::Draws mode){ - Q_CHECK_PTR(sceneDraw); - Q_CHECK_PTR(sceneDetail); + Q_ASSERT(sceneDraw != 0); + Q_ASSERT(sceneDetail != 0); VMainGraphicsScene *scene = 0; if(mode == Draw::Calculation){ scene = sceneDraw; @@ -464,7 +464,7 @@ void VDomDocument::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsSce void VDomDocument::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, const Document::Documents &parse){ - Q_CHECK_PTR(sceneDetail); + Q_ASSERT(sceneDetail != 0); Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try{ VDetail detail; @@ -543,7 +543,7 @@ void VDomDocument::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDo void VDomDocument::ParseDetails(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, const Document::Documents &parse){ - Q_CHECK_PTR(sceneDetail); + Q_ASSERT(sceneDetail != 0); Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); QDomNode domNode = domElement.firstChild(); while(!domNode.isNull()){ @@ -562,7 +562,7 @@ void VDomDocument::ParseDetails(VMainGraphicsScene *sceneDetail, const QDomEleme void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElement& domElement, const Document::Documents &parse, const QString& type, Draw::Draws mode){ - Q_CHECK_PTR(scene); + Q_ASSERT(scene != 0); Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(!type.isEmpty(), Q_FUNC_INFO, "type of point is empty"); if(type == "single"){ @@ -581,7 +581,7 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen } if(parse == Document::FullParse){ VToolSinglePoint *spoint = new VToolSinglePoint(this, data, id, Tool::FromFile); - Q_CHECK_PTR(spoint); + Q_ASSERT(spoint != 0); scene->addItem(spoint); connect(spoint, &VToolSinglePoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); tools[id] = spoint; @@ -809,7 +809,7 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &domElement, const Document::Documents &parse, Draw::Draws mode){ - Q_CHECK_PTR(scene); + Q_ASSERT(scene != 0); Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); try{ qint64 id = GetParametrId(domElement); @@ -833,7 +833,7 @@ void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement &domElement, const Document::Documents &parse, const QString &type, Draw::Draws mode){ - Q_CHECK_PTR(scene); + Q_ASSERT(scene != 0); Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(!type.isEmpty(), Q_FUNC_INFO, "type of spline is empty"); if(type == "simple"){ @@ -956,7 +956,7 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme void VDomDocument::ParseArcElement(VMainGraphicsScene *scene, const QDomElement &domElement, const Document::Documents &parse, const QString &type, Draw::Draws mode){ - Q_CHECK_PTR(scene); + Q_ASSERT(scene != 0); Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); Q_ASSERT_X(!type.isEmpty(), Q_FUNC_INFO, "type of spline is empty"); if(type == "simple"){ @@ -1011,7 +1011,7 @@ void VDomDocument::ParseArcElement(VMainGraphicsScene *scene, const QDomElement void VDomDocument::FullUpdateTree(){ VMainGraphicsScene *scene = new VMainGraphicsScene(); - Q_CHECK_PTR(scene); + Q_ASSERT(scene != 0); try{ data->ClearObject(); Parse(Document::LiteParse, scene, scene); @@ -1088,28 +1088,28 @@ void VDomDocument::setCurrentData(){ void VDomDocument::AddTool(const qint64 &id, VDataTool *tool){ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); tools.insert(id, tool); } void VDomDocument::UpdateToolData(const qint64 &id, VContainer *data){ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); - Q_CHECK_PTR(data); + Q_ASSERT(data != 0); VDataTool *tool = tools.value(id); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); tool->VDataTool::setData(data); } void VDomDocument::IncrementReferens(qint64 id) const{ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); VDataTool *tool = tools.value(id); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); tool->incrementReferens(); } void VDomDocument::DecrementReferens(qint64 id) const{ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); VDataTool *tool = tools.value(id); - Q_CHECK_PTR(tool); + Q_ASSERT(tool != 0); tool->decrementReferens(); } From 90207bd92682219b89e477809b8e07b33c7d1e76 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Oct 2013 19:18:08 +0300 Subject: [PATCH 19/83] Insert value of variable after cursor in line edit. --HG-- branch : develop --- container/vcontainer.cpp | 2 ++ dialogs/dialogtool.cpp | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 9d89dd1b6..f5ef78bc7 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -217,6 +217,8 @@ QPainterPath VContainer::ContourPath(qint64 idDetail) const{ } } break; + case(Tool::SplineTool): + break;//Nothing to do, just ignore. default: qWarning()<<"Get wrong tool type. Ignore."<currentItem(); - QString val = item->text(); - lineEdit->setText(lineEdit->text().append(val)); + int pos = lineEdit->cursorPosition(); + lineEdit->setText(lineEdit->text().insert(lineEdit->cursorPosition(), item->text())); lineEdit->setFocus(); + lineEdit->setCursorPosition(pos + item->text().size()); } void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer){ @@ -328,9 +329,12 @@ void DialogTool::PutHere(){ void DialogTool::PutVal(QListWidgetItem *item){ Q_ASSERT(lineEditFormula != 0); - QString val = item->text(); - lineEditFormula->setText(lineEditFormula->text().append(val)); + Q_ASSERT(item != 0); + int pos = lineEditFormula->cursorPosition(); + lineEditFormula->setText(lineEditFormula->text().insert(lineEditFormula->cursorPosition(), + item->text())); lineEditFormula->setFocus(); + lineEditFormula->setCursorPosition(pos + item->text().size()); } void DialogTool::ValChenged(int row){ From c94e939149e7b2ac8bd2df7069220e2d47d5e013 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 15 Oct 2013 12:26:47 +0300 Subject: [PATCH 20/83] Show value of variable in 0 row of list of variables. --HG-- branch : develop --- dialogs/dialogtool.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index 4d2424539..c0f9012b8 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -451,8 +451,8 @@ void DialogTool::ShowVariable(const QHash *var){ item->setFont(QFont("Times", 12, QFont::Bold)); listWidget->addItem(item); } - listWidget->setCurrentRow (0); connect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); + listWidget->setCurrentRow (0); } qint64 DialogTool::getIdDetail() const{ From 11b7c6a1f0a6a8c3a32815ef2f83e74100a9e8ac Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 15 Oct 2013 13:20:34 +0300 Subject: [PATCH 21/83] In table of increments select next cell in this row after end of editing previous. --HG-- branch : develop --- dialogs/dialogincrements.cpp | 11 ++++++++++- dialogs/dialogincrements.h | 2 ++ dialogs/dialogincrements.ui | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 38266a883..421909f04 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -29,7 +29,8 @@ #include "exception/vexception.h" DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent) : - DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogIncrements), data(data), doc(doc){ + DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogIncrements), data(data), doc(doc), + row(0), column(0){ ui->setupUi(this); InitialStandartTable(); InitialIncrementTable(); @@ -58,6 +59,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget bOk = ui->buttonBox->button(QDialogButtonBox::Ok); connect(bOk, &QPushButton::clicked, this, &DialogIncrements::DialogAccepted); + ui->tabWidget->setCurrentIndex(0); } void DialogIncrements::FillStandartTable(){ @@ -155,6 +157,7 @@ void DialogIncrements::FillIncrementTable(){ ui->tableWidgetIncrement->resizeColumnsToContents(); ui->tableWidgetIncrement->resizeRowsToContents(); ui->tableWidgetIncrement->verticalHeader()->setDefaultSectionSize(20); + ui->tableWidgetIncrement->setCurrentCell( row, column ); } void DialogIncrements::FillLengthLines(){ @@ -377,6 +380,7 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ QTableWidgetItem *itemName = 0; qint64 id; QDomElement domElement; + this->row = row; switch(column) { case 0: item = ui->tableWidgetIncrement->item(row, 0); @@ -385,6 +389,7 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ if(domElement.isElement()){ domElement.setAttribute("name", item->text()); data->ClearIncrementTable(); + this->column = 2; emit FullUpdateTree(); } break; @@ -398,6 +403,7 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ qreal value = item->text().toDouble(&ok); if(ok){ domElement.setAttribute("base", value); + this->column = 3; emit FullUpdateTree(); } else { throw VException(tr("Can't convert toDouble value.")); @@ -411,6 +417,7 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ domElement.setAttribute("ksize", item->text().toDouble()); + this->column = 4; emit FullUpdateTree(); } break; @@ -421,6 +428,7 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ domElement.setAttribute("kgrowth", item->text().toDouble()); + this->column = 5; emit FullUpdateTree(); } break; @@ -434,6 +442,7 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ VIncrementTableRow incr = data->GetIncrementTableRow(itemName->text()); incr.setDescription(item->text()); data->UpdateIncrementTableRow(itemName->text(), incr); + ui->tableWidgetIncrement->setCurrentCell( row, 0 ); emit haveLiteChange(); } break; diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h index 7f305494c..e5ac8262a 100644 --- a/dialogs/dialogincrements.h +++ b/dialogs/dialogincrements.h @@ -48,6 +48,8 @@ private: Ui::DialogIncrements *ui; VContainer *data; // need because we must change data VDomDocument *doc; + qint32 row; + qint32 column; void InitialStandartTable(); void InitialIncrementTable(); void InitialLinesTable(); diff --git a/dialogs/dialogincrements.ui b/dialogs/dialogincrements.ui index a76b4ca69..1917246a3 100644 --- a/dialogs/dialogincrements.ui +++ b/dialogs/dialogincrements.ui @@ -27,7 +27,7 @@ QTabWidget::North - 4 + 0 From eb03e8165e6aabb9b5cb2adde38eb5f6f8339eff Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 15 Oct 2013 14:01:36 +0300 Subject: [PATCH 22/83] Sorting by name for length of lines, curves and arcs. New aligment for name of length of curves. --HG-- branch : develop --- dialogs/dialogincrements.cpp | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 421909f04..b12414859 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -162,8 +162,16 @@ void DialogIncrements::FillIncrementTable(){ void DialogIncrements::FillLengthLines(){ const QHash *linesTable = data->DataLengthLines(); + QHashIterator iHash(*linesTable); + QMap map; + //Sorting QHash by name + while (iHash.hasNext()) { + iHash.next(); + map.insert(iHash.key(), iHash.value()); + } + qint32 currentRow = -1; - QHashIterator i(*linesTable); + QMapIterator i(map); while (i.hasNext()) { i.next(); qreal length = i.value(); @@ -186,8 +194,16 @@ void DialogIncrements::FillLengthLines(){ void DialogIncrements::FillLengthSplines(){ const QHash *splinesTable = data->DataLengthSplines(); + QHashIterator iHash(*splinesTable); + QMap map; + //Sorting QHash by name + while (iHash.hasNext()) { + iHash.next(); + map.insert(iHash.key(), iHash.value()); + } + qint32 currentRow = -1; - QHashIterator i(*splinesTable); + QMapIterator i(map); while (i.hasNext()) { i.next(); qreal length = i.value(); @@ -195,7 +211,7 @@ void DialogIncrements::FillLengthSplines(){ ui->tableWidgetSplines->setRowCount ( splinesTable->size() ); QTableWidgetItem *item = new QTableWidgetItem(QString(i.key())); - item->setTextAlignment(Qt::AlignHCenter); + item->setTextAlignment(Qt::AlignLeft); item->setFont(QFont("Times", 12, QFont::Bold)); ui->tableWidgetSplines->setItem(currentRow, 0, item); @@ -210,8 +226,16 @@ void DialogIncrements::FillLengthSplines(){ void DialogIncrements::FillLengthArcs(){ const QHash *arcsTable = data->DataLengthArcs(); + QHashIterator iHash(*arcsTable); + QMap map; + //Sorting QHash by name + while (iHash.hasNext()) { + iHash.next(); + map.insert(iHash.key(), iHash.value()); + } + qint32 currentRow = -1; - QHashIterator i(*arcsTable); + QMapIterator i(map); while (i.hasNext()) { i.next(); qreal length = i.value(); From 2fffdecc866b1d72da5855879ce14bdede87dbe8 Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 16 Oct 2013 12:17:34 +0300 Subject: [PATCH 23/83] Zooming points, line and label of points after zooming scene. --HG-- branch : develop --- mainwindow.cpp | 2 + options.h | 2 +- tools/drawTools/vdrawtool.cpp | 8 ++++ tools/drawTools/vdrawtool.h | 2 + tools/drawTools/vtoolalongline.cpp | 6 +++ tools/drawTools/vtoolalongline.h | 1 + tools/drawTools/vtoolarc.cpp | 22 +++++++--- tools/drawTools/vtoolarc.h | 41 +++++++++-------- tools/drawTools/vtoolbisector.cpp | 6 +++ tools/drawTools/vtoolbisector.h | 1 + tools/drawTools/vtoolendline.cpp | 3 +- tools/drawTools/vtoolline.cpp | 42 ++++++++++++------ tools/drawTools/vtoolline.h | 18 ++++---- tools/drawTools/vtoollineintersect.cpp | 18 +++++--- tools/drawTools/vtoollineintersect.h | 46 +++++++++----------- tools/drawTools/vtoollinepoint.cpp | 14 ++++-- tools/drawTools/vtoollinepoint.h | 1 + tools/drawTools/vtoolnormal.cpp | 20 ++++++--- tools/drawTools/vtoolnormal.h | 41 ++++++++--------- tools/drawTools/vtoolpoint.cpp | 35 ++++++++++----- tools/drawTools/vtoolpoint.h | 1 + tools/drawTools/vtoolpointofcontact.cpp | 12 +++-- tools/drawTools/vtoolpointofcontact.h | 44 ++++++++++--------- tools/drawTools/vtoolshoulderpoint.cpp | 10 ++++- tools/drawTools/vtoolshoulderpoint.h | 45 +++++++++---------- tools/drawTools/vtoolsinglepoint.cpp | 5 +++ tools/drawTools/vtoolsinglepoint.h | 1 + tools/drawTools/vtoolspline.cpp | 23 +++++++--- tools/drawTools/vtoolspline.h | 53 +++++++++++----------- tools/drawTools/vtoolsplinepath.cpp | 23 +++++++--- tools/drawTools/vtoolsplinepath.h | 58 ++++++++++++------------- widgets/vgraphicssimpletextitem.cpp | 10 ++++- widgets/vgraphicssimpletextitem.h | 6 ++- widgets/vmaingraphicsscene.cpp | 9 +++- widgets/vmaingraphicsscene.h | 3 ++ widgets/vmaingraphicsview.cpp | 1 + widgets/vmaingraphicsview.h | 1 + xml/vdomdocument.cpp | 1 + 38 files changed, 386 insertions(+), 249 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 1bd08ccd2..19ae78c59 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -62,6 +62,7 @@ MainWindow::MainWindow(QWidget *parent) : view = new VMainGraphicsView(); ui->LayoutView->addWidget(view); view->setScene(currentScene); + connect(view, &VMainGraphicsView::NewFactor, sceneDraw, &VMainGraphicsScene::SetFactor); QSizePolicy policy(QSizePolicy::Expanding, QSizePolicy::Expanding); policy.setHorizontalStretch(12); view->setSizePolicy(policy); @@ -162,6 +163,7 @@ void MainWindow::ActionNewDraw(){ VToolSinglePoint *spoint = new VToolSinglePoint(doc, data, id, Tool::FromGui); sceneDraw->addItem(spoint); connect(spoint, &VToolPoint::ChoosedTool, sceneDraw, &VMainGraphicsScene::ChoosedItem); + connect(sceneDraw, &VMainGraphicsScene::NewFactor, spoint, &VToolSinglePoint::SetFactor); QHash* tools = doc->getTools(); tools->insert(id, spoint); VDrawTool::AddRecord(id, Tool::SinglePointTool, doc); diff --git a/options.h b/options.h index d2620f3dd..1d04de588 100644 --- a/options.h +++ b/options.h @@ -28,7 +28,7 @@ #define PaperSize 50000 #define toPixel(mm) ((mm / 25.4) * PrintDPI) #define toMM(pix) ((pix / PrintDPI) * 25.4) -#define widthMainLine toPixel(0.8) +#define widthMainLine toPixel(1.2) #define widthHairLine widthMainLine/3 namespace Scene{ diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index 89164341b..197d800b9 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -22,6 +22,8 @@ #include "vdrawtool.h" #include +qreal VDrawTool::factor = 1; + VDrawTool::VDrawTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent) : VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false), nameActivDraw(doc->GetNameActivDraw()){ @@ -78,6 +80,12 @@ void VDrawTool::ChangedNameDraw(const QString oldName, const QString newName){ } } +void VDrawTool::SetFactor(qreal factor){ + if(factor <= 2 && factor >= 0.5){ + this->factor = factor; + } +} + void VDrawTool::AddToCalculation(const QDomElement &domElement){ QDomElement calcElement; bool ok = doc->GetActivCalculationElement(calcElement); diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index 15415bed2..91a7a4527 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -38,11 +38,13 @@ public slots: virtual void ChangedActivDraw(const QString newName); void ChangedNameDraw(const QString oldName, const QString newName); virtual void FullUpdateFromGui(int result)=0; + virtual void SetFactor(qreal factor); signals: void RemoveTool(QGraphicsItem *tool); protected: bool ignoreContextMenuEvent; QString nameActivDraw; + static qreal factor; void AddToCalculation(const QDomElement &domElement); template void ContextMenu(QSharedPointer &dialog, Tool *tool, QGraphicsSceneContextMenuEvent *event, diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index c7e9ee7e4..8d54e14bc 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -63,6 +63,11 @@ void VToolAlongLine::FullUpdateFromGui(int result){ dialogAlongLine.clear(); } +void VToolAlongLine::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshGeometry(); +} + void VToolAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ ContextMenu(dialogAlongLine, this, event); } @@ -145,6 +150,7 @@ void VToolAlongLine::Create(const qint64 _id, const QString &pointName, const QS scene->addItem(point); connect(point, &VToolAlongLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(point, &VToolAlongLine::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolAlongLine::SetFactor); doc->AddTool(id, point); doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index aede99661..ce02b8b30 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -42,6 +42,7 @@ public: public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); + virtual void SetFactor(qreal factor); protected: virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); virtual void AddToFile(); diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index c85aba0da..a5e845d25 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -30,7 +30,7 @@ VToolArc::VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources path.addPath(arc.GetPath()); path.setFillRule( Qt::WindingFill ); this->setPath(path); - this->setPen(QPen(Qt::black, widthHairLine)); + this->setPen(QPen(Qt::black, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); @@ -126,14 +126,16 @@ void VToolArc::FullUpdateFromGui(int result){ void VToolArc::ChangedActivDraw(const QString newName){ if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine)); + this->setPen(QPen(Qt::black, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); + currentColor = Qt::black; VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine)); + this->setPen(QPen(Qt::gray, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, false); this->setAcceptHoverEvents (false); + currentColor = Qt::gray; VDrawTool::ChangedActivDraw(newName); } } @@ -141,15 +143,20 @@ void VToolArc::ChangedActivDraw(const QString newName){ void VToolArc::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ if(id == this->id){ if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine)); + this->setPen(QPen(baseColor, widthHairLine/factor)); currentColor = baseColor; } else { - this->setPen(QPen(color, widthHairLine)); + this->setPen(QPen(color, widthHairLine/factor)); currentColor = color; } } } +void VToolArc::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshGeometry(); +} + void VToolArc::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ ContextMenu(dialogArc, this, event); } @@ -177,12 +184,12 @@ void VToolArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ void VToolArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthMainLine)); + this->setPen(QPen(currentColor, widthMainLine/factor)); } void VToolArc::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthHairLine)); + this->setPen(QPen(currentColor, widthHairLine/factor)); } void VToolArc::RemoveReferens(){ @@ -191,6 +198,7 @@ void VToolArc::RemoveReferens(){ } void VToolArc::RefreshGeometry(){ + this->setPen(QPen(currentColor, widthHairLine/factor)); VArc arc = VAbstractTool::data.GetArc(id); QPainterPath path; path.addPath(arc.GetPath()); diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index f78f26bbc..bca594770 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -30,31 +30,30 @@ class VToolArc :public VDrawTool, public QGraphicsPathItem{ Q_OBJECT public: - VToolArc(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, - VContainer *data); - static void Create(const qint64 _id, const qint64 ¢er, const QString &radius, - const QString &f1, const QString &f2, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, + const QString &f2, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); - virtual void ChangedActivDraw(const QString newName); - virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + virtual void ChangedActivDraw(const QString newName); + virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void RemoveReferens(); private: QSharedPointer dialogArc; - void RefreshGeometry(); + void RefreshGeometry(); }; #endif // VTOOLARC_H diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 02e4e5cb2..7e243a9f9 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -109,6 +109,7 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 scene->addItem(point); connect(point, &VToolBisector::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(point, &VToolBisector::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolBisector::SetFactor); doc->AddTool(id, point); doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); @@ -145,6 +146,11 @@ void VToolBisector::FullUpdateFromGui(int result){ dialogBisector.clear(); } +void VToolBisector::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshGeometry(); +} + void VToolBisector::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ ContextMenu(dialogBisector, this, event); } diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 1c88f670d..3a982bbc1 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -44,6 +44,7 @@ public: public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); + virtual void SetFactor(qreal factor); protected: virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); virtual void AddToFile(); diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index c65e2ec9a..2e0d24abb 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -69,7 +69,7 @@ void VToolEndLine::Create(const qint64 _id, const QString &pointName, const QStr QString errorMsg; qreal result = cal.eval(formula, &errorMsg); if(errorMsg.isEmpty()){ - line.setLength(result*PrintDPI/25.4); + line.setLength(toPixel(result)); line.setAngle(angle); qint64 id = _id; if(typeCreation == Tool::FromGui){ @@ -89,6 +89,7 @@ void VToolEndLine::Create(const qint64 _id, const QString &pointName, const QStr scene->addItem(point); connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(point, &VToolPoint::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPoint::SetFactor); doc->AddTool(id, point); doc->IncrementReferens(basePointId); } diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 760c273b6..7f4c07bd5 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -33,6 +33,7 @@ VToolLine::VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firs this->setFlag(QGraphicsItem::ItemStacksBehindParent, true); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); + this->setPen(QPen(Qt::black, widthHairLine/factor)); if(typeCreation == Tool::FromGui){ AddToFile(); @@ -74,6 +75,7 @@ void VToolLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 scene->addItem(line); connect(line, &VToolLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(line, &VToolLine::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, line, &VToolLine::SetFactor); doc->AddTool(id, line); doc->IncrementReferens(firstPoint); doc->IncrementReferens(secondPoint); @@ -81,14 +83,7 @@ void VToolLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 } void VToolLine::FullUpdateFromFile(){ - QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ - firstPoint = domElement.attribute("firstPoint", "").toLongLong(); - secondPoint = domElement.attribute("secondPoint", "").toLongLong(); - } - VPointF first = VAbstractTool::data.GetPoint(firstPoint); - VPointF second = VAbstractTool::data.GetPoint(secondPoint); - this->setLine(QLineF(first.toQPointF(), second.toQPointF())); + RefreshGeometry(); } void VToolLine::FullUpdateFromGui(int result){ @@ -106,23 +101,30 @@ void VToolLine::FullUpdateFromGui(int result){ void VToolLine::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ if(id == this->id){ if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine)); + this->setPen(QPen(baseColor, widthHairLine/factor)); currentColor = baseColor; } else { - this->setPen(QPen(color, widthHairLine)); + this->setPen(QPen(color, widthHairLine/factor)); currentColor = color; } } } +void VToolLine::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshGeometry(); +} + void VToolLine::ChangedActivDraw(const QString newName){ if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine)); + this->setPen(QPen(Qt::black, widthHairLine/factor)); this->setAcceptHoverEvents (true); + currentColor = Qt::black; VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine)); + this->setPen(QPen(Qt::gray, widthHairLine/factor)); this->setAcceptHoverEvents (false); + currentColor = Qt::gray; VDrawTool::ChangedActivDraw(newName); } } @@ -143,12 +145,12 @@ void VToolLine::AddToFile(){ void VToolLine::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthMainLine)); + this->setPen(QPen(currentColor, widthMainLine/factor)); } void VToolLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthHairLine)); + this->setPen(QPen(currentColor, widthHairLine/factor)); } void VToolLine::RemoveReferens(){ @@ -156,3 +158,15 @@ void VToolLine::RemoveReferens(){ doc->DecrementReferens(secondPoint); } +void VToolLine::RefreshGeometry(){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + firstPoint = domElement.attribute("firstPoint", "").toLongLong(); + secondPoint = domElement.attribute("secondPoint", "").toLongLong(); + } + VPointF first = VAbstractTool::data.GetPoint(firstPoint); + VPointF second = VAbstractTool::data.GetPoint(secondPoint); + this->setLine(QLineF(first.toQPointF(), second.toQPointF())); + this->setPen(QPen(currentColor, widthHairLine/factor)); +} + diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index a7b31824e..dab4b6d47 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -29,19 +29,20 @@ class VToolLine: public VDrawTool, public QGraphicsLineItem{ Q_OBJECT public: - VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data); - static void Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, + qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data); + static void Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void ChangedActivDraw(const QString newName); virtual void FullUpdateFromGui(int result); virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + virtual void SetFactor(qreal factor); protected: virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); virtual void AddToFile(); @@ -52,6 +53,7 @@ private: qint64 firstPoint; qint64 secondPoint; QSharedPointer dialogLine; + void RefreshGeometry(); }; #endif // VTOOLLINE_H diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index 35067c399..132013d5a 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -24,7 +24,8 @@ VToolLineIntersect::VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem *parent): + const qint64 &p2Line2, Tool::Sources typeCreation, + QGraphicsItem *parent): VToolPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()){ if(typeCreation == Tool::FromGui){ @@ -57,8 +58,9 @@ void VToolLineIntersect::Create(QSharedPointer &dialog, VMa void VToolLineIntersect::Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 &p2Line1Id, const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, - const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + const qreal &mx, const qreal &my, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation){ VPointF p1Line1 = data->GetPoint(p1Line1Id); VPointF p2Line1 = data->GetPoint(p2Line1Id); VPointF p1Line2 = data->GetPoint(p1Line2Id); @@ -94,6 +96,7 @@ void VToolLineIntersect::Create(const qint64 _id, const qint64 &p1Line1Id, const scene->addItem(point); connect(point, &VToolLineIntersect::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(point, &VToolLineIntersect::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolLineIntersect::SetFactor); doc->AddTool(id, point); doc->IncrementReferens(p1Line1Id); doc->IncrementReferens(p2Line1Id); @@ -129,6 +132,11 @@ void VToolLineIntersect::FullUpdateFromGui(int result){ dialogLineIntersect.clear(); } +void VToolLineIntersect::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); +} + void VToolLineIntersect::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ ContextMenu(dialogLineIntersect, this, event); } @@ -140,8 +148,8 @@ void VToolLineIntersect::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "lineIntersect"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "p1Line1", p1Line1); AddAttribute(domElement, "p2Line1", p2Line1); diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index 1c5b36cfd..90e4d07f6 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -28,34 +28,30 @@ class VToolLineIntersect:public VToolPoint{ Q_OBJECT public: - VToolLineIntersect(VDomDocument *doc, VContainer *data, - const qint64 &id, - const qint64 &p1Line1, - const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static void Create(QSharedPointer &dialog, - VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data); - static void Create(const qint64 _id, const qint64 &p1Line1Id, - const qint64 &p2Line1Id, const qint64 &p1Line2Id, - const qint64 &p2Line2Id, const QString &pointName, - const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, + const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, + const qint64 &p2Line2, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data); + static void Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 &p2Line1Id, + const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, + const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 p1Line1; - qint64 p2Line1; - qint64 p1Line2; - qint64 p2Line2; + qint64 p1Line1; + qint64 p2Line1; + qint64 p1Line2; + qint64 p2Line2; QSharedPointer dialogLineIntersect; }; diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index b7536c1ae..af55544d4 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -30,7 +30,7 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 QPointF point1 = data->GetPoint(basePointId).toQPointF(); QPointF point2 = data->GetPoint(id).toQPointF(); mainLine = new QGraphicsLineItem(QLineF(point1 - point2, QPointF()), this); - mainLine->setPen(QPen(Qt::black, widthHairLine)); + mainLine->setPen(QPen(Qt::black, widthHairLine/factor)); mainLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); if(typeLine == "none"){ mainLine->setVisible(false); @@ -41,15 +41,18 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 void VToolLinePoint::ChangedActivDraw(const QString newName){ if(nameActivDraw == newName){ - mainLine->setPen(QPen(Qt::black, widthHairLine)); + mainLine->setPen(QPen(Qt::black, widthHairLine/factor)); + currentColor = Qt::black; VToolPoint::ChangedActivDraw(newName); } else { - mainLine->setPen(QPen(Qt::gray, widthHairLine)); + mainLine->setPen(QPen(Qt::gray, widthHairLine/factor)); + currentColor = Qt::gray; VToolPoint::ChangedActivDraw(newName); } } void VToolLinePoint::RefreshGeometry(){ + mainLine->setPen(QPen(currentColor, widthHairLine/factor)); VToolPoint::RefreshPointGeometry(VDrawTool::data.GetPoint(id)); QPointF point = VDrawTool::data.GetPoint(id).toQPointF(); QPointF basePoint = VDrawTool::data.GetPoint(basePointId).toQPointF(); @@ -64,3 +67,8 @@ void VToolLinePoint::RefreshGeometry(){ void VToolLinePoint::RemoveReferens(){ doc->DecrementReferens(basePointId); } + +void VToolLinePoint::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshGeometry(); +} diff --git a/tools/drawTools/vtoollinepoint.h b/tools/drawTools/vtoollinepoint.h index a298bc5f1..3d82b33f5 100644 --- a/tools/drawTools/vtoollinepoint.h +++ b/tools/drawTools/vtoollinepoint.h @@ -32,6 +32,7 @@ public: const qint64 &basePointId, const qreal &angle, QGraphicsItem * parent = 0); public slots: virtual void ChangedActivDraw(const QString newName); + virtual void SetFactor(qreal factor); protected: QString typeLine; QString formula; diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index b742c3fe7..0ae377eb0 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -21,8 +21,7 @@ #include "vtoolnormal.h" -VToolNormal::VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, +VToolNormal::VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent): VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), @@ -62,7 +61,8 @@ void VToolNormal::Create(QSharedPointer &dialog, VMainGraphicsScen void VToolNormal::Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString typeLine, const QString pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation){ VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); Calculator cal(data); @@ -70,7 +70,7 @@ void VToolNormal::Create(const qint64 _id, const QString &formula, const qint64 qreal result = cal.eval(formula, &errorMsg); if(errorMsg.isEmpty()){ QPointF fPoint = VToolNormal::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), - result*PrintDPI/25.4, angle); + toPixel(result), angle); qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); @@ -89,6 +89,7 @@ void VToolNormal::Create(const qint64 _id, const QString &formula, const qint64 scene->addItem(point); connect(point, &VToolNormal::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(point, &VToolNormal::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolNormal::SetFactor); doc->AddTool(id, point); doc->IncrementReferens(firstPointId); doc->IncrementReferens(secondPointId); @@ -112,7 +113,7 @@ void VToolNormal::FullUpdateFromFile(){ formula = domElement.attribute("length", ""); basePointId = domElement.attribute("firstPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong(); - angle = domElement.attribute("angle", "").toInt(); + angle = domElement.attribute("angle", "").toDouble(); } RefreshGeometry(); } @@ -133,6 +134,11 @@ void VToolNormal::FullUpdateFromGui(int result){ dialogNormal.clear(); } +void VToolNormal::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshGeometry(); +} + void VToolNormal::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ ContextMenu(dialogNormal, this, event); } @@ -144,8 +150,8 @@ void VToolNormal::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "normal"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "typeLine", typeLine); AddAttribute(domElement, "length", formula); diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 217328744..41bda6144 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -29,29 +29,30 @@ class VToolNormal : public VToolLinePoint { Q_OBJECT public: - VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, - const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data); - static void Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const QString typeLine, const QString pointName, - const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); - static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, - const qreal &length, const qreal &angle = 0); + VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, + const QString &formula, const qreal &angle, const qint64 &firstPointId, + const qint64 &secondPointId, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, + const qint64 &secondPointId, const QString typeLine, const QString pointName, + const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation); + static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const qreal &length, + const qreal &angle = 0); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 secondPointId; + qint64 secondPointId; QSharedPointer dialogNormal; }; diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index afd581fd4..faf1daf03 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -28,12 +28,11 @@ VToolPoint::VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem *parent):VDrawTool(doc, data, id), - QGraphicsEllipseItem(parent), radius(toPixel(1.5)), namePoint(0), lineName(0){ + QGraphicsEllipseItem(parent), radius(toPixel(2)), namePoint(0), lineName(0){ namePoint = new VGraphicsSimpleTextItem(this); lineName = new QGraphicsLineItem(this); connect(namePoint, &VGraphicsSimpleTextItem::NameChangePosition, this, &VToolPoint::NameChangePosition); - this->setPen(QPen(Qt::black, widthHairLine)); this->setBrush(QBrush(Qt::NoBrush)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); @@ -61,7 +60,7 @@ void VToolPoint::UpdateNamePosition(qreal mx, qreal my){ void VToolPoint::ChangedActivDraw(const QString newName){ if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine)); + this->setPen(QPen(Qt::black, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); namePoint->setFlag(QGraphicsItem::ItemIsMovable, true); @@ -69,10 +68,11 @@ void VToolPoint::ChangedActivDraw(const QString newName){ namePoint->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); namePoint->setBrush(QBrush(Qt::black)); namePoint->setAcceptHoverEvents(true); - lineName->setPen(QPen(Qt::black, widthHairLine)); + lineName->setPen(QPen(Qt::black, widthHairLine/factor)); + currentColor = Qt::black; VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine)); + this->setPen(QPen(Qt::gray, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, false); this->setAcceptHoverEvents (false); namePoint->setFlag(QGraphicsItem::ItemIsMovable, false); @@ -80,7 +80,8 @@ void VToolPoint::ChangedActivDraw(const QString newName){ namePoint->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false); namePoint->setBrush(QBrush(Qt::gray)); namePoint->setAcceptHoverEvents(false); - lineName->setPen(QPen(Qt::gray, widthHairLine)); + lineName->setPen(QPen(Qt::gray, widthHairLine/factor)); + currentColor = Qt::gray; VDrawTool::ChangedActivDraw(newName); } } @@ -88,15 +89,20 @@ void VToolPoint::ChangedActivDraw(const QString newName){ void VToolPoint::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ if(id == this->id){ if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine)); + this->setPen(QPen(baseColor, widthHairLine/factor)); currentColor = baseColor; } else { - this->setPen(QPen(color, widthHairLine)); + this->setPen(QPen(color, widthHairLine/factor)); currentColor = color; } } } +void VToolPoint::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); +} + void VToolPoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ if(event->button() == Qt::LeftButton){ emit ChoosedTool(id, Scene::Point); @@ -106,21 +112,25 @@ void VToolPoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ void VToolPoint::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthMainLine)); + this->setPen(QPen(currentColor, widthMainLine/factor)); } void VToolPoint::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthHairLine)); + this->setPen(QPen(currentColor, widthHairLine/factor)); } void VToolPoint::RefreshPointGeometry(const VPointF &point){ - QRectF rec = QRectF(0, 0, radius*2, radius*2); + this->setPen(QPen(currentColor, widthHairLine/factor)); + QRectF rec = QRectF(0, 0, radius*2/factor, radius*2/factor); rec.translate(-rec.center().x(), -rec.center().y()); this->setRect(rec); this->setPos(point.toQPointF()); disconnect(namePoint, &VGraphicsSimpleTextItem::NameChangePosition, this, &VToolPoint::NameChangePosition); + QFont font = namePoint->font(); + font.setPointSize(static_cast(namePoint->FontSize()/factor)); + namePoint->setFont(font); namePoint->setText(point.name()); namePoint->setPos(QPointF(point.mx(), point.my())); connect(namePoint, &VGraphicsSimpleTextItem::NameChangePosition, this, @@ -131,9 +141,10 @@ void VToolPoint::RefreshPointGeometry(const VPointF &point){ void VToolPoint::RefreshLine(){ QRectF nameRec = namePoint->sceneBoundingRect(); QPointF p1, p2; - LineIntersectCircle(QPointF(), radius, QLineF(QPointF(), nameRec.center()- scenePos()), p1, p2); + LineIntersectCircle(QPointF(), radius/factor, QLineF(QPointF(), nameRec.center()- scenePos()), p1, p2); QPointF pRec = LineIntersectRect(nameRec, QLineF(scenePos(), nameRec.center())); lineName->setLine(QLineF(p1, pRec - scenePos())); + lineName->setPen(QPen(currentColor, widthHairLine/factor)); if(QLineF(p1, pRec - scenePos()).length() <= toPixel(4)){ lineName->setVisible(false); } else { diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index 4b740bd74..35b8f1abd 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -36,6 +36,7 @@ public slots: virtual void ChangedActivDraw(const QString newName); virtual void FullUpdateFromGui(int result) = 0; virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + virtual void SetFactor(qreal factor); protected: qreal radius; VGraphicsSimpleTextItem *namePoint; diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index 9cc003477..d4bf3d522 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -91,7 +91,7 @@ void VToolPointOfContact::Create(const qint64 _id, const QString &radius, const QString errorMsg; qreal result = cal.eval(radius, &errorMsg); if(errorMsg.isEmpty()){ - QPointF fPoint = VToolPointOfContact::FindPoint(result*PrintDPI/25.4, centerP.toQPointF(), + QPointF fPoint = VToolPointOfContact::FindPoint(toPixel(result), centerP.toQPointF(), firstP.toQPointF(), secondP.toQPointF()); qint64 id = _id; if(typeCreation == Tool::FromGui){ @@ -115,6 +115,7 @@ void VToolPointOfContact::Create(const qint64 _id, const QString &radius, const scene->addItem(point); connect(point, &VToolPointOfContact::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(point, &VToolPointOfContact::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPointOfContact::SetFactor); doc->AddTool(id, point); doc->IncrementReferens(center); doc->IncrementReferens(firstPointId); @@ -149,6 +150,11 @@ void VToolPointOfContact::FullUpdateFromGui(int result){ dialogPointOfContact.clear(); } +void VToolPointOfContact::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); +} + void VToolPointOfContact::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ ContextMenu(dialogPointOfContact, this, event); } @@ -160,8 +166,8 @@ void VToolPointOfContact::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "pointOfContact"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "radius", radius); AddAttribute(domElement, "center", center); diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index 4ed8e0c97..049e6efbc 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -28,30 +28,32 @@ class VToolPointOfContact : public VToolPoint { public: - VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &radius, const qint64 ¢er, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static QPointF FindPoint(const qreal &radius, const QPointF ¢er, const QPointF &firstPoint, - const QPointF &secondPoint); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data); - static void Create(const qint64 _id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, - const qint64 &secondPointId, const QString &pointName, - const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &radius, const qint64 ¢er, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static QPointF FindPoint(const qreal &radius, const QPointF ¢er, const QPointF &firstPoint, + const QPointF &secondPoint); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data); + static void Create(const qint64 _id, const QString &radius, const qint64 ¢er, + const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, + const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - QString radius; - qint64 center; - qint64 firstPointId; - qint64 secondPointId; + QString radius; + qint64 center; + qint64 firstPointId; + qint64 secondPointId; QSharedPointer dialogPointOfContact; }; diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index 9e01ff4ec..4e3307a51 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -117,6 +117,7 @@ void VToolShoulderPoint::Create(const qint64 _id, const QString &formula, const scene->addItem(point); connect(point, &VToolShoulderPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(point, &VToolShoulderPoint::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolShoulderPoint::SetFactor); doc->AddTool(id, point); doc->IncrementReferens(p1Line); doc->IncrementReferens(p2Line); @@ -153,6 +154,11 @@ void VToolShoulderPoint::FullUpdateFromGui(int result){ dialogShoulderPoint.clear(); } +void VToolShoulderPoint::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshGeometry(); +} + void VToolShoulderPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ ContextMenu(dialogShoulderPoint, this, event); } @@ -164,8 +170,8 @@ void VToolShoulderPoint::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "shoulder"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "typeLine", typeLine); AddAttribute(domElement, "length", formula); diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index 91f682ecb..ccf92fe3e 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -25,32 +25,33 @@ #include "vtoollinepoint.h" #include "dialogs/dialogshoulderpoint.h" -class VToolShoulderPoint : public VToolLinePoint -{ +class VToolShoulderPoint : public VToolLinePoint{ public: - VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, - const qreal &length); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data); - static void Create(const qint64 _id, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, - const qint64 &pShoulder, const QString &typeLine, const QString &pointName, - const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &typeLine, const QString &formula, const qint64 &p1Line, + const qint64 &p2Line, const qint64 &pShoulder, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, + const qreal &length); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data); + static void Create(const qint64 _id, const QString &formula, const qint64 &p1Line, + const qint64 &p2Line, const qint64 &pShoulder, const QString &typeLine, + const QString &pointName, const qreal &mx, const qreal &my, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 p2Line; - qint64 pShoulder; + qint64 p2Line; + qint64 pShoulder; QSharedPointer dialogShoulderPoint; }; diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index f244d0104..b77d4973d 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -124,3 +124,8 @@ void VToolSinglePoint::ChangedActivDraw(const QString newName){ VToolPoint::ChangedActivDraw(newName); } } + +void VToolSinglePoint::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); +} diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index f5b2dad67..2a610bc92 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -36,6 +36,7 @@ public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); virtual void ChangedActivDraw(const QString newName); + virtual void SetFactor(qreal factor); signals: void FullUpdateTree(); protected: diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 71535e5f1..25efb8ab6 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -34,7 +34,7 @@ VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, path.addPath(spl.GetPath()); path.setFillRule( Qt::WindingFill ); this->setPath(path); - this->setPen(QPen(Qt::black, widthHairLine)); + this->setPen(QPen(Qt::black, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); @@ -108,6 +108,7 @@ void VToolSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, c scene->addItem(spl); connect(spl, &VToolSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(spl, &VToolSpline::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, spl, &VToolSpline::SetFactor); doc->AddTool(id, spl); doc->IncrementReferens(p1); doc->IncrementReferens(p4); @@ -202,12 +203,12 @@ void VToolSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ void VToolSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthMainLine)); + this->setPen(QPen(currentColor, widthMainLine/factor)); } void VToolSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthHairLine)); + this->setPen(QPen(currentColor, widthHairLine/factor)); } void VToolSpline::RemoveReferens(){ @@ -217,6 +218,7 @@ void VToolSpline::RemoveReferens(){ } void VToolSpline::RefreshGeometry(){ + this->setPen(QPen(currentColor, widthHairLine/factor)); VSpline spl = VAbstractTool::data.GetSpline(id); QPainterPath path; path.addPath(spl.GetPath()); @@ -244,15 +246,17 @@ void VToolSpline::RefreshGeometry(){ void VToolSpline::ChangedActivDraw(const QString newName){ if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine)); + this->setPen(QPen(Qt::black, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); + currentColor = Qt::black; emit setEnabledPoint(true); VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine)); + this->setPen(QPen(Qt::gray, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, false); this->setAcceptHoverEvents (false); + currentColor = Qt::gray; emit setEnabledPoint(false); VDrawTool::ChangedActivDraw(newName); } @@ -261,11 +265,16 @@ void VToolSpline::ChangedActivDraw(const QString newName){ void VToolSpline::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ if(id == this->id){ if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine)); + this->setPen(QPen(baseColor, widthHairLine/factor)); currentColor = baseColor; } else { - this->setPen(QPen(color, widthHairLine)); + this->setPen(QPen(color, widthHairLine/factor)); currentColor = color; } } } + +void VToolSpline::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshGeometry(); +} diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index b421b35a0..daddf741e 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -28,42 +28,41 @@ #include "widgets/vcontrolpointspline.h" #include "geometry/vsplinepath.h" -class VToolSpline:public VDrawTool, public QGraphicsPathItem -{ +class VToolSpline:public VDrawTool, public QGraphicsPathItem{ Q_OBJECT public: - VToolSpline (VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); + VToolSpline (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem * parent = 0 ); virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data); - static void Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, - const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, + const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); signals: - void RefreshLine ( const qint32 &indexSpline, SplinePoint::Position position, - const QPointF &controlPoint, const QPointF &splinePoint ); - void setEnabledPoint ( bool enable ); + void RefreshLine ( const qint32 &indexSpline, SplinePoint::Position position, + const QPointF &controlPoint, const QPointF &splinePoint ); + void setEnabledPoint ( bool enable ); public slots: - virtual void FullUpdateFromFile (); - virtual void FullUpdateFromGui ( int result ); - void ControlPointChangePosition ( const qint32 &indexSpline, - SplinePoint::Position position, - const QPointF pos); - virtual void ChangedActivDraw ( const QString newName ); - virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + virtual void FullUpdateFromFile (); + virtual void FullUpdateFromGui ( int result ); + void ControlPointChangePosition ( const qint32 &indexSpline, SplinePoint::Position position, + const QPointF pos); + virtual void ChangedActivDraw ( const QString newName ); + virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile (); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile (); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void RemoveReferens(); private: QSharedPointer dialogSpline; QVector controlPoints; - void RefreshGeometry (); + void RefreshGeometry (); }; #endif // VTOOLSPLINE_H diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index 399367688..ca9fb7b0d 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -32,7 +32,7 @@ VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, path.addPath(splPath.GetPath()); path.setFillRule( Qt::WindingFill ); this->setPath(path); - this->setPen(QPen(Qt::black, widthHairLine)); + this->setPen(QPen(Qt::black, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); @@ -96,6 +96,7 @@ void VToolSplinePath::Create(const qint64 _id, const VSplinePath &path, VMainGra scene->addItem(spl); connect(spl, &VToolSplinePath::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(spl, &VToolSplinePath::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, spl, &VToolSplinePath::SetFactor); doc->AddTool(id, spl); } } @@ -187,15 +188,17 @@ void VToolSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path){ void VToolSplinePath::ChangedActivDraw(const QString newName){ if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine)); + this->setPen(QPen(Qt::black, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); + currentColor = Qt::black; emit setEnabledPoint(true); VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine)); + this->setPen(QPen(Qt::gray, widthHairLine/factor)); this->setFlag(QGraphicsItem::ItemIsSelectable, false); this->setAcceptHoverEvents (false); + currentColor = Qt::gray; emit setEnabledPoint(false); VDrawTool::ChangedActivDraw(newName); } @@ -204,15 +207,20 @@ void VToolSplinePath::ChangedActivDraw(const QString newName){ void VToolSplinePath::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ if(id == this->id){ if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine)); + this->setPen(QPen(baseColor, widthHairLine/factor)); currentColor = baseColor; } else { - this->setPen(QPen(color, widthHairLine)); + this->setPen(QPen(color, widthHairLine/factor)); currentColor = color; } } } +void VToolSplinePath::SetFactor(qreal factor){ + VDrawTool::SetFactor(factor); + RefreshGeometry(); +} + void VToolSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ ContextMenu(dialogSplinePath, this, event); } @@ -252,12 +260,12 @@ void VToolSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ void VToolSplinePath::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthMainLine)); + this->setPen(QPen(currentColor, widthMainLine/factor)); } void VToolSplinePath::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ Q_UNUSED(event); - this->setPen(QPen(currentColor, widthHairLine)); + this->setPen(QPen(currentColor, widthHairLine/factor)); } void VToolSplinePath::RemoveReferens(){ @@ -268,6 +276,7 @@ void VToolSplinePath::RemoveReferens(){ } void VToolSplinePath::RefreshGeometry(){ + this->setPen(QPen(currentColor, widthHairLine/factor)); VSplinePath splPath = VAbstractTool::data.GetSplinePath(id); QPainterPath path; path.addPath(splPath.GetPath()); diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index b880bdfd2..b614f8896 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -30,42 +30,40 @@ class VToolSplinePath:public VDrawTool, public QGraphicsPathItem{ Q_OBJECT public: - VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static void Create(QSharedPointer &dialog, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); - static void Create(const qint64 _id, const VSplinePath &path, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data); + static void Create(const qint64 _id, const VSplinePath &path, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation); signals: - void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, - const QPointF &controlPoint, const QPointF &splinePoint); - void setEnabledPoint(bool enable); + void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, + const QPointF &controlPoint, const QPointF &splinePoint); + void setEnabledPoint(bool enable); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); - void ControlPointChangePosition(const qint32 &indexSpline, - SplinePoint::Position position, - const QPointF pos); - virtual void ChangedActivDraw(const QString newName); - virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + void ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, + const QPointF pos); + virtual void ChangedActivDraw(const QString newName); + virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void RemoveReferens(); private: QSharedPointer dialogSplinePath; QVector controlPoints; - void RefreshGeometry(); - void AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint); - void UpdatePathPoint(QDomNode& node, VSplinePath &path); - void CorectControlPoints(const VSpline &spl, VSplinePath &splPath, - const qint32 &indexSpline); + void RefreshGeometry(); + void AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint); + void UpdatePathPoint(QDomNode& node, VSplinePath &path); + void CorectControlPoints(const VSpline &spl, VSplinePath &splPath, const qint32 &indexSpline); }; #endif // VTOOLSPLINEPATH_H diff --git a/widgets/vgraphicssimpletextitem.cpp b/widgets/vgraphicssimpletextitem.cpp index a37aba2fc..6522aa093 100644 --- a/widgets/vgraphicssimpletextitem.cpp +++ b/widgets/vgraphicssimpletextitem.cpp @@ -22,16 +22,22 @@ #include "vgraphicssimpletextitem.h" #include #include +#include -VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent):QGraphicsSimpleTextItem(parent){ +VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent):QGraphicsSimpleTextItem(parent), + fontSize(0){ this->setFlag(QGraphicsItem::ItemIsMovable, true); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); this->setAcceptHoverEvents(true); + QFont font = this->font(); + font.setPointSize(font.pointSize()+3); + fontSize = font.pointSize(); + this->setFont(font); } VGraphicsSimpleTextItem::VGraphicsSimpleTextItem( const QString & text, QGraphicsItem * parent ) - :QGraphicsSimpleTextItem(text, parent){ + :QGraphicsSimpleTextItem(text, parent), fontSize(0){ this->setFlag(QGraphicsItem::ItemIsMovable, true); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); diff --git a/widgets/vgraphicssimpletextitem.h b/widgets/vgraphicssimpletextitem.h index e3f31d0bf..6f9dc20ef 100644 --- a/widgets/vgraphicssimpletextitem.h +++ b/widgets/vgraphicssimpletextitem.h @@ -24,18 +24,20 @@ #include -class VGraphicsSimpleTextItem : public QObject, public QGraphicsSimpleTextItem -{ +class VGraphicsSimpleTextItem : public QObject, public QGraphicsSimpleTextItem{ Q_OBJECT public: VGraphicsSimpleTextItem(QGraphicsItem * parent = 0); VGraphicsSimpleTextItem( const QString & text, QGraphicsItem * parent = 0 ); + qint32 FontSize()const {return fontSize;} signals: void NameChangePosition(const QPointF pos); protected: QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); +private: + qint32 fontSize; }; #endif // VGRAPHICSSIMPLETEXTITEM_H diff --git a/widgets/vmaingraphicsscene.cpp b/widgets/vmaingraphicsscene.cpp index 74fee4735..3f9e932b0 100644 --- a/widgets/vmaingraphicsscene.cpp +++ b/widgets/vmaingraphicsscene.cpp @@ -25,11 +25,11 @@ #include #include -VMainGraphicsScene::VMainGraphicsScene():QGraphicsScene(), horScrollBar(0), verScrollBar(0){ +VMainGraphicsScene::VMainGraphicsScene():QGraphicsScene(), horScrollBar(0), verScrollBar(0), scaleFactor(1){ } VMainGraphicsScene::VMainGraphicsScene(const QRectF & sceneRect, QObject * parent): - QGraphicsScene ( sceneRect, parent ), horScrollBar(0), verScrollBar(0){ + QGraphicsScene ( sceneRect, parent ), horScrollBar(0), verScrollBar(0), scaleFactor(1){ } void VMainGraphicsScene::mouseMoveEvent(QGraphicsSceneMouseEvent* event){ @@ -50,6 +50,11 @@ void VMainGraphicsScene::RemoveTool(QGraphicsItem *tool){ this->removeItem(tool); } +void VMainGraphicsScene::SetFactor(qreal factor){ + scaleFactor=scaleFactor*factor; + emit NewFactor(scaleFactor); +} + qint32 VMainGraphicsScene::getVerScrollBar() const{ return verScrollBar; } diff --git a/widgets/vmaingraphicsscene.h b/widgets/vmaingraphicsscene.h index 41ec68d89..5acf6d555 100644 --- a/widgets/vmaingraphicsscene.h +++ b/widgets/vmaingraphicsscene.h @@ -42,6 +42,7 @@ public: public slots: void ChoosedItem(qint64 id, Scene::Scenes type); void RemoveTool(QGraphicsItem *tool); + void SetFactor(qreal factor); protected: void mouseMoveEvent(QGraphicsSceneMouseEvent* event); void mousePressEvent(QGraphicsSceneMouseEvent *event); @@ -49,9 +50,11 @@ signals: void mouseMove(QPointF scenePos); void mousePress(QPointF scenePos); void ChoosedObject(qint64 id, Scene::Scenes type); + void NewFactor(qreal factor); private: qint32 horScrollBar; qint32 verScrollBar; + qreal scaleFactor; }; #endif // VMAINGRAPHICSSCENE_H diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index ca232aa95..a8558bec3 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -60,6 +60,7 @@ void VMainGraphicsView::scalingTime(qreal x){ verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() - factor*3.5)); } } + emit NewFactor(factor); } void VMainGraphicsView::animFinished(){ diff --git a/widgets/vmaingraphicsview.h b/widgets/vmaingraphicsview.h index 39d1687ff..df53f39cb 100644 --- a/widgets/vmaingraphicsview.h +++ b/widgets/vmaingraphicsview.h @@ -29,6 +29,7 @@ class VMainGraphicsView : public QGraphicsView{ public: explicit VMainGraphicsView(QWidget *parent = 0); signals: + void NewFactor(qreal factor); public slots: void scalingTime(qreal x); void animFinished(); diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 87942ff27..8c7118c84 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -584,6 +584,7 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen Q_ASSERT(spoint != 0); scene->addItem(spoint); connect(spoint, &VToolSinglePoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + connect(scene, &VMainGraphicsScene::NewFactor, spoint, &VToolSinglePoint::SetFactor); tools[id] = spoint; } return; From 54bf459e17c01ed15978bd44bfcc00f201e85578 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 18 Oct 2013 13:03:01 +0300 Subject: [PATCH 24/83] New tool Height. --HG-- branch : develop --- Valentina.pro | 13 +- cursor.qrc | 1 + cursor/height_cursor.png | Bin 0 -> 1284 bytes dialogs/dialogendline.h | 3 +- dialogs/dialogheight.cpp | 122 ++++++++++++ dialogs/dialogheight.h | 40 ++++ dialogs/dialogheight.ui | 211 +++++++++++++++++++++ dialogs/dialoghistory.cpp | 14 ++ dialogs/dialogs.h | 1 + dialogs/dialogtool.cpp | 2 + icon.qrc | 1 + icon/32x32/height.png | Bin 0 -> 857 bytes mainwindow.cpp | 192 ++++++++++--------- mainwindow.h | 3 + mainwindow.ui | 104 ++++++---- options.h | 3 +- tools/drawTools/drawtools.h | 1 + tools/drawTools/vdrawtool.cpp | 2 +- tools/drawTools/vdrawtool.h | 12 +- tools/drawTools/vtoolendline.cpp | 14 +- tools/drawTools/vtoolheight.cpp | 138 ++++++++++++++ tools/drawTools/vtoolheight.h | 34 ++++ tools/modelingTools/modelingtools.h | 1 + tools/modelingTools/vmodelingalongline.cpp | 4 +- tools/modelingTools/vmodelingendline.cpp | 27 ++- tools/modelingTools/vmodelingheight.cpp | 130 +++++++++++++ tools/modelingTools/vmodelingheight.h | 34 ++++ tools/modelingTools/vmodelingtool.cpp | 2 +- tools/modelingTools/vmodelingtool.h | 52 ++--- tools/vabstracttool.cpp | 13 +- tools/vabstracttool.h | 4 +- xml/vdomdocument.cpp | 25 +++ 32 files changed, 1013 insertions(+), 190 deletions(-) create mode 100644 cursor/height_cursor.png create mode 100644 dialogs/dialogheight.cpp create mode 100644 dialogs/dialogheight.h create mode 100644 dialogs/dialogheight.ui create mode 100644 icon/32x32/height.png create mode 100644 tools/drawTools/vtoolheight.cpp create mode 100644 tools/drawTools/vtoolheight.h create mode 100644 tools/modelingTools/vmodelingheight.cpp create mode 100644 tools/modelingTools/vmodelingheight.h diff --git a/Valentina.pro b/Valentina.pro index ee7b1ec2b..c05bf37e1 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -97,7 +97,10 @@ SOURCES += main.cpp\ exception/vexceptionemptyparameter.cpp \ exception/vexceptionobjecterror.cpp \ widgets/vapplication.cpp \ - exception/vexceptionuniqueid.cpp + exception/vexceptionuniqueid.cpp \ + tools/drawTools/vtoolheight.cpp \ + tools/modelingTools/vmodelingheight.cpp \ + dialogs/dialogheight.cpp HEADERS += mainwindow.h \ widgets/vmaingraphicsscene.h \ @@ -188,7 +191,10 @@ HEADERS += mainwindow.h \ exception/vexceptionemptyparameter.h \ exception/vexceptionobjecterror.h \ widgets/vapplication.h \ - exception/vexceptionuniqueid.h + exception/vexceptionuniqueid.h \ + tools/drawTools/vtoolheight.h \ + tools/modelingTools/vmodelingheight.h \ + dialogs/dialogheight.h FORMS += mainwindow.ui \ dialogs/dialogsinglepoint.ui \ @@ -206,7 +212,8 @@ FORMS += mainwindow.ui \ dialogs/dialoghistory.ui \ dialogs/dialogpointofcontact.ui \ dialogs/dialogdetail.ui \ - tablewindow.ui + tablewindow.ui \ + dialogs/dialogheight.ui RESOURCES += \ icon.qrc \ diff --git a/cursor.qrc b/cursor.qrc index ece04dd88..b38ff9e43 100644 --- a/cursor.qrc +++ b/cursor.qrc @@ -12,5 +12,6 @@ cursor/splinepath_cursor.png cursor/pointcontact_cursor.png cursor/new_detail_cursor.png + cursor/height_cursor.png diff --git a/cursor/height_cursor.png b/cursor/height_cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..05da2a5ae3d8643df9711c5b5a3cba02ee67ebdf GIT binary patch literal 1284 zcmV+f1^fDmP)Vl&|00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3ky6ARyeS!w&!e06}y` zSad^gZEa<4bO1wAML|?gQaT`KWG!lNWoICEF)lD5D0OpbZf77#N=G0{P(?=|b~Z98 zEFf`pVQgu1c_2L?IWP*aMOc#n00cxyL_t(Y$HkXjOdM4d$A5QbmQ|FsP?govv=Jq- zVQFL67$`N07(QIW$J55>6ES3Mp`{Wc5+g<*G$#618#M+K6YznG^pOxlOr;M*;u2|0 z0Yys_ENqDi?ZWOHA9iM)!mW3Vfgpte#fd2bui*Vl(qO1xgLl$MreXDsG+ zyq%(y!Y~X(gt4))Rr~qi;GoJF>`sZrVk|8!NiZ0cSS&^`7^I=0;m#;e<*_Zgt`m>P z0aSl~KLAx#Rq4*m1zrWN0bc;-wqQ>Mc`Oz~L=cf=F`Ai~0mv&aFF%;#wPxU5;B&yg zBdR%vU2v3A$ziX#-EJu;C`bj_G2lAzyM@B`vVEgC!?AHsG#Vv4JDbtb(ZZgdo+Be8 zBM(?h7lAS$47hicaH*hAWr$LW>FH@gq0sd5@-iNe=QZF%Ys(d24tUCdZ!})dLXcj$ zuItGnqm;rlO>%N_*8P6};>ya(bs(aYiW!EH6^%w8bi3VqMI=u|^!4?10DL}QbPaTX zLvTI>7b-vwL7z&+`TF|$WIqQ)(=?l6>oqksSAcs+K&dUf7SVbjYL_PpM8iGr=;M!%F{{wzG_sOUH zIycM7(;cb1nw`ZbPMiq0w6wf8IXU@dJRY9~RyQaV;9ejHcpjJn-T)%NI|`mX5A82N z*)fk9*5GVldPSqZO zkAdS!D!Q^bdFo7JQd?Ua1|&B(*KBQVy$YP_=;(OPs!(8<1N7egvY{Ro&@7Qr%*R0MYWY uGC6#>gzv{LvKC#FpDzEL4S0d8K>Qyp?4_X9M^!xl0000setupUi(this); + labelEditNamePoint = ui->labelEditNamePoint; + flagFormula = true; + bOk = ui->buttonBox->button(QDialogButtonBox::Ok); + connect(bOk, &QPushButton::clicked, this, &DialogHeight::DialogAccepted); + flagName = false; + CheckState(); + QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); + connect(bCansel, &QPushButton::clicked, this, &DialogHeight::DialogRejected); + FillComboBoxPoints(ui->comboBoxBasePoint); + FillComboBoxPoints(ui->comboBoxP1Line); + FillComboBoxPoints(ui->comboBoxP2Line); + FillComboBoxTypeLine(ui->comboBoxLineType); + connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogHeight::NamePointChanged); +} + +DialogHeight::~DialogHeight(){ + delete ui; +} + +QString DialogHeight::getPointName() const{ + return pointName; +} + +void DialogHeight::setPointName(const QString &value){ + pointName = value; + ui->lineEditNamePoint->setText(pointName); +} + +QString DialogHeight::getTypeLine() const{ + return typeLine; +} + +void DialogHeight::setTypeLine(const QString &value){ + typeLine = value; + SetupTypeLine(ui->comboBoxLineType, value); +} + +qint64 DialogHeight::getBasePointId() const{ + return basePointId; +} + +void DialogHeight::setBasePointId(const qint64 &value, const qint64 &id){ + basePointId = value; + setCurrentPointId(ui->comboBoxBasePoint, basePointId, value, id); +} + +qint64 DialogHeight::getP1LineId() const{ + return p1LineId; +} + +void DialogHeight::setP1LineId(const qint64 &value, const qint64 &id){ + p1LineId = value; + setCurrentPointId(ui->comboBoxP1Line, p1LineId, value, id); +} + +qint64 DialogHeight::getP2LineId() const{ + return p2LineId; +} + +void DialogHeight::setP2LineId(const qint64 &value, const qint64 &id){ + p2LineId = value; + setCurrentPointId(ui->comboBoxP2Line, p2LineId, value, id); +} + +void DialogHeight::ChoosedObject(qint64 id, Scene::Scenes type){ + if(idDetail == 0 && mode == Draw::Modeling){ + if(type == Scene::Detail){ + idDetail = id; + return; + } + } + if(mode == Draw::Modeling){ + if(!CheckObject(id)){ + return; + } + } + if(type == Scene::Point){ + VPointF point; + if(mode == Draw::Calculation){ + point = data->GetPoint(id); + } else { + point = data->GetModelingPoint(id); + } + switch(number){ + case(0): + ChangeCurrentText(ui->comboBoxBasePoint, point.name()); + number++; + emit ToolTip(tr("Select first point of line")); + break; + case(1): + ChangeCurrentText(ui->comboBoxP1Line, point.name()); + number++; + emit ToolTip(tr("Select second point of line")); + break; + case(2): + ChangeCurrentText(ui->comboBoxP2Line, point.name()); + number = 0; + emit ToolTip(tr("")); + if(!isInitialized){ + this->show(); + } + break; + } + } +} + +void DialogHeight::DialogAccepted(){ + pointName = ui->lineEditNamePoint->text(); + typeLine = GetTypeLine(ui->comboBoxLineType); + basePointId = getCurrentPointId(ui->comboBoxBasePoint); + p1LineId = getCurrentPointId(ui->comboBoxP1Line); + p2LineId = getCurrentPointId(ui->comboBoxP2Line); + emit DialogClosed(QDialog::Accepted); +} + diff --git a/dialogs/dialogheight.h b/dialogs/dialogheight.h new file mode 100644 index 000000000..b4e4c05b6 --- /dev/null +++ b/dialogs/dialogheight.h @@ -0,0 +1,40 @@ +#ifndef DIALOGHEIGHT_H +#define DIALOGHEIGHT_H + +#include "dialogtool.h" + +namespace Ui { +class DialogHeight; +} + +class DialogHeight : public DialogTool{ + Q_OBJECT +public: + explicit DialogHeight(const VContainer *data, Draw::Draws mode = Draw::Calculation, + QWidget *parent = 0); + ~DialogHeight(); + QString getPointName() const; + void setPointName(const QString &value); + QString getTypeLine() const; + void setTypeLine(const QString &value); + qint64 getBasePointId() const; + void setBasePointId(const qint64 &value, const qint64 &id); + qint64 getP1LineId() const; + void setP1LineId(const qint64 &value, const qint64 &id); + qint64 getP2LineId() const; + void setP2LineId(const qint64 &value, const qint64 &id); +public slots: + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); +private: + Q_DISABLE_COPY(DialogHeight) + Ui::DialogHeight *ui; + qint32 number; + QString pointName; + QString typeLine; + qint64 basePointId; + qint64 p1LineId; + qint64 p2LineId; +}; + +#endif // DIALOGHEIGHT_H diff --git a/dialogs/dialogheight.ui b/dialogs/dialogheight.ui new file mode 100644 index 000000000..bfb3dab67 --- /dev/null +++ b/dialogs/dialogheight.ui @@ -0,0 +1,211 @@ + + + DialogHeight + + + + 0 + 0 + 247 + 220 + + + + Dialog + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Name new point + + + + + + + + + + + + + + + 0 + 0 + + + + Base point + + + + + + + First point of line + + + + + + + + + + + + 0 + 0 + + + + First point of line + + + + + + + First point of line + + + + + + + + + + + + 0 + 0 + + + + Second point of line + + + + + + + First point of line + + + + + + + + + + + Type line + + + + + + + Show line from first point to our point + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + DialogHeight + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + DialogHeight + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index 8e59671a3..d1b19544a 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -250,6 +250,20 @@ QString DialogHistory::Record(const VToolRecord &tool){ data->GetPoint(secondPointId).name(), data->GetPoint(tool.getId()).name()); break; + case Tool::Height:{ + qint64 p1LineId = 0; + qint64 p2LineId = 0; + domElement = doc->elementById(QString().setNum(tool.getId())); + if(domElement.isElement()){ + basePointId = domElement.attribute("basePoint", "").toLongLong(); + p1LineId = domElement.attribute("p1Line", "").toLongLong(); + p2LineId = domElement.attribute("p2Line", "").toLongLong(); + } + record = QString(tr("Point of perpendical from point %1 to line %2_%3")).arg(data->GetPoint(basePointId).name(), + data->GetPoint(p1LineId).name(), + data->GetPoint(p2LineId).name()); + break; + } default: qWarning()<findText(value); if(index != -1){ box->setCurrentIndex(index); + } else { + qWarning()<icon/32x32/new_detail.png icon/32x32/layout.png icon/16x16/mirror.png + icon/32x32/height.png diff --git a/icon/32x32/height.png b/icon/32x32/height.png new file mode 100644 index 0000000000000000000000000000000000000000..c44de68bcd8f33dc30267dd792a281946ac2fbab GIT binary patch literal 857 zcmV-f1E&0mP)T1risCXK~R=8lVd#<`6XGc>v5fsdK{`p*Bn{^xv| zbxMJf2|R>5F;}pdRri~fqWYP@F)YVAhKZv8ygB8e-~g_o8|x|#-Q?MV4f-^xXN9gp{6tUaP6tUKg9zQ?^7H(~&ADRSX1++v6@Y&3v>g`u%B zT*Ih4a2rnIvJp#)L--XBH{j)=Wa!u@#qPhQaA*ZC3lgm5yO+@X_6P5;M5)DL*~M z)D0BfDhp3+uX18=8LV9S>gCb1^Z~qp*8`#gk{5`Hc6UptYArR^xUuxm z`6#nXm=C4%t1#nf?8k?L0Q6k2FWmVY9>k5<9;|j6@8Z6=zZ2O)nEUnyaKb(KBfQ?h zkD+8+fSJZ5vRA^Sg;=fd`&yiUqhZAEmDQHw@rZE}*Lf&kz~}fz70=F>5rZ<;&v^t_zX?N*`K6F~Nt zETmORHQt?)tOBwNU)Ahf#7y3#@~i^TYcu26TjRaWIN0d0(CNpa8;6(UD~@o-M=~VT jl6xzj#hcMN|9|-#E4;xN0aS7700000NkvXXu0mjf(#DqX literal 0 HcmV?d00001 diff --git a/mainwindow.cpp b/mainwindow.cpp index 19ae78c59..7befade91 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -44,10 +44,10 @@ MainWindow::MainWindow(QWidget *parent) : dialogAlongLine(QSharedPointer()), dialogShoulderPoint(QSharedPointer()), dialogNormal(QSharedPointer()), dialogBisector(QSharedPointer()), - dialogLineIntersect(QSharedPointer()), - dialogSpline(QSharedPointer()), + dialogLineIntersect(QSharedPointer()), dialogSpline(QSharedPointer()), dialogArc(QSharedPointer()), dialogSplinePath(QSharedPointer()), - dialogPointOfContact(QSharedPointer()), dialogDetail(QSharedPointer()), + dialogPointOfContact(QSharedPointer()), + dialogDetail(QSharedPointer()), dialogHeight(QSharedPointer()), dialogHistory(0), doc(0), data(0), comboBoxDraws(0), fileName(QString()), changeInFile(false), mode(Draw::Calculation){ ui->setupUi(this); @@ -91,6 +91,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->toolButtonSplinePath, &QToolButton::clicked, this, &MainWindow::ToolSplinePath); connect(ui->toolButtonPointOfContact, &QToolButton::clicked, this, &MainWindow::ToolPointOfContact); connect(ui->toolButtonNewDetail, &QToolButton::clicked, this, &MainWindow::ToolDetail); + connect(ui->toolButtonHeight, &QToolButton::clicked, this, &MainWindow::ToolHeight); data = new VContainer; @@ -463,6 +464,23 @@ void MainWindow::ClosedDialogDetail(int result){ ArrowTool(); } +void MainWindow::ToolHeight(bool checked){ + SetToolButton(checked, Tool::Height, ":/cursor/height_cursor.png", tr("Select base point"), + dialogHeight, &MainWindow::ClosedDialogHeight); +} + +void MainWindow::ClosedDialogHeight(int result){ + if(result == QDialog::Accepted){ + if(mode == Draw::Calculation){ + VToolHeight::Create(dialogHeight, currentScene, doc, data); + } else { + VModelingHeight *point = VModelingHeight::Create(dialogHeight, doc, data); + AddToolToDetail(point, point->getId(), Tool::Height, dialogHeight->getIdDetail()); + } + } + ArrowTool(); +} + void MainWindow::About(){ QMessageBox::about(this, tr("About Valentina"), tr("Valentina v.0.1.0")); } @@ -616,88 +634,91 @@ void MainWindow::mouseMove(QPointF scenePos){ } void MainWindow::CanselTool(){ - switch( tool ) - { - case Tool::ArrowTool: - ui->actionArrowTool->setChecked(false); - helpLabel->setText(""); - break; - case Tool::SinglePointTool: - //Nothing to do here because we can't create this tool from main window. - break; - case Tool::EndLineTool: - dialogEndLine.clear(); - ui->toolButtonEndLine->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::LineTool: - dialogLine.clear(); - ui->toolButtonLine->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearFocus(); - break; - case Tool::AlongLineTool: - dialogAlongLine.clear(); - ui->toolButtonAlongLine->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::ShoulderPointTool: - dialogShoulderPoint.clear(); - ui->toolButtonShoulderPoint->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::NormalTool: - dialogNormal.clear(); - ui->toolButtonNormal->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::BisectorTool: - dialogBisector.clear(); - ui->toolButtonBisector->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::LineIntersectTool: - dialogLineIntersect.clear(); - ui->toolButtonLineIntersect->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::SplineTool: - dialogSpline.clear(); - ui->toolButtonSpline->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::ArcTool: - dialogArc.clear(); - ui->toolButtonArc->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::SplinePathTool: - dialogSplinePath.clear(); - ui->toolButtonSplinePath->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::PointOfContact: - dialogPointOfContact.clear(); - ui->toolButtonPointOfContact->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::Detail: - dialogDetail.clear(); - ui->toolButtonNewDetail->setChecked(false); - break; - default: - qWarning()<<"Get wrong tool type. Ignore."; - break; + switch( tool ){ + case Tool::ArrowTool: + ui->actionArrowTool->setChecked(false); + helpLabel->setText(""); + break; + case Tool::SinglePointTool: + //Nothing to do here because we can't create this tool from main window. + break; + case Tool::EndLineTool: + dialogEndLine.clear(); + ui->toolButtonEndLine->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::LineTool: + dialogLine.clear(); + ui->toolButtonLine->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearFocus(); + break; + case Tool::AlongLineTool: + dialogAlongLine.clear(); + ui->toolButtonAlongLine->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::ShoulderPointTool: + dialogShoulderPoint.clear(); + ui->toolButtonShoulderPoint->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::NormalTool: + dialogNormal.clear(); + ui->toolButtonNormal->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::BisectorTool: + dialogBisector.clear(); + ui->toolButtonBisector->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::LineIntersectTool: + dialogLineIntersect.clear(); + ui->toolButtonLineIntersect->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::SplineTool: + dialogSpline.clear(); + ui->toolButtonSpline->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::ArcTool: + dialogArc.clear(); + ui->toolButtonArc->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::SplinePathTool: + dialogSplinePath.clear(); + ui->toolButtonSplinePath->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::PointOfContact: + dialogPointOfContact.clear(); + ui->toolButtonPointOfContact->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::Detail: + dialogDetail.clear(); + ui->toolButtonNewDetail->setChecked(false); + break; + case Tool::Height: + dialogHeight.clear(); + ui->toolButtonHeight->setChecked(false); + break; + default: + qWarning()<<"Get wrong tool type. Ignore."; + break; } } @@ -935,6 +956,7 @@ void MainWindow::SetEnableTool(bool enable){ ui->toolButtonSplinePath->setEnabled(enable); ui->toolButtonPointOfContact->setEnabled(enable); ui->toolButtonNewDetail->setEnabled(enable); + ui->toolButtonHeight->setEnabled(enable); } void MainWindow::MinimumScrollBar(){ diff --git a/mainwindow.h b/mainwindow.h index 3d55ab212..844052539 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -80,6 +80,7 @@ public slots: void ToolSplinePath(bool checked); void ToolPointOfContact(bool checked); void ToolDetail(bool checked); + void ToolHeight(bool checked); void ClosedDialogEndLine(int result); void ClosedDialogLine(int result); void ClosedDialogAlongLine(int result); @@ -92,6 +93,7 @@ public slots: void ClosedDialogSplinePath(int result); void ClosedDialogPointOfContact(int result); void ClosedDialogDetail(int result); + void ClosedDialogHeight(int result); void About(); void AboutQt(); void ShowToolTip(const QString &toolTip); @@ -135,6 +137,7 @@ private: QSharedPointer dialogSplinePath; QSharedPointer dialogPointOfContact; QSharedPointer dialogDetail; + QSharedPointer dialogHeight; DialogHistory *dialogHistory; VDomDocument *doc; VContainer *data; diff --git a/mainwindow.ui b/mainwindow.ui index b842a4655..0e9a0df8b 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -48,7 +48,7 @@ 0 0 150 - 104 + 150 @@ -64,20 +64,20 @@ Point - - + + false - Tool point of normal. + Tool point on the end line. ... - :/icon/32x32/normal.png:/icon/32x32/normal.png + :/icon/32x32/segment.png:/icon/32x32/segment.png @@ -116,46 +116,20 @@ - - + + false - Tool point on the end line. + Tool point of contact. ... - :/icon/32x32/segment.png:/icon/32x32/segment.png - - - - 32 - 32 - - - - true - - - - - - - false - - - Tool point along line. - - - ... - - - - :/icon/32x32/along_line.png:/icon/32x32/along_line.png + :/icon/32x32/point_of_contact.png:/icon/32x32/point_of_contact.png @@ -194,20 +168,72 @@ - - + + false - Tool point of contact. + Tool point of normal. ... - :/icon/32x32/point_of_contact.png:/icon/32x32/point_of_contact.png + :/icon/32x32/normal.png:/icon/32x32/normal.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Tool point along line. + + + ... + + + + :/icon/32x32/along_line.png:/icon/32x32/along_line.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Tool point of height. + + + ... + + + + :/icon/32x32/height.png:/icon/32x32/height.png diff --git a/options.h b/options.h index 1d04de588..28b99f2d9 100644 --- a/options.h +++ b/options.h @@ -55,7 +55,8 @@ enum Tool {ArrowTool, NodePoint, NodeArc, NodeSpline, - NodeSplinePath + NodeSplinePath, + Height }; Q_DECLARE_FLAGS(Tools, Tool) diff --git a/tools/drawTools/drawtools.h b/tools/drawTools/drawtools.h index 0d2c5b613..58fcbaf08 100644 --- a/tools/drawTools/drawtools.h +++ b/tools/drawTools/drawtools.h @@ -34,5 +34,6 @@ #include "vtoolsinglepoint.h" #include "vtoolspline.h" #include "vtoolsplinepath.h" +#include "vtoolheight.h" #endif // DRAWTOOLS_H diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index 197d800b9..0e622413b 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -25,7 +25,7 @@ qreal VDrawTool::factor = 1; VDrawTool::VDrawTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent) : - VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false), + VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false), ignoreFullUpdate(false), nameActivDraw(doc->GetNameActivDraw()){ connect(this->doc, &VDomDocument::ChangedActivDraw, this, &VDrawTool::ChangedActivDraw); connect(this->doc, &VDomDocument::ChangedNameDraw, this, &VDrawTool::ChangedNameDraw); diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index 91a7a4527..4ef092514 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -43,6 +43,7 @@ signals: void RemoveTool(QGraphicsItem *tool); protected: bool ignoreContextMenuEvent; + bool ignoreFullUpdate; QString nameActivDraw; static qreal factor; void AddToCalculation(const QDomElement &domElement); @@ -67,11 +68,12 @@ protected: if(selectedAction == actionOption){ dialog = QSharedPointer(new Dialog(getData())); - connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), &VMainGraphicsScene::ChoosedObject, - dialog.data(), &Dialog::ChoosedObject); - connect(dialog.data(), &Dialog::DialogClosed, tool, - &Tool::FullUpdateFromGui); - connect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &Dialog::UpdateList); + connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), + &VMainGraphicsScene::ChoosedObject, dialog.data(), &Dialog::ChoosedObject); + connect(dialog.data(), &Dialog::DialogClosed, tool, &Tool::FullUpdateFromGui); + if(!ignoreFullUpdate){ + connect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &Dialog::UpdateList); + } tool->setDialog(); diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index 2e0d24abb..3bfd214a0 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -37,14 +37,12 @@ VToolEndLine::VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id void VToolEndLine::setDialog(){ Q_ASSERT(!dialogEndLine.isNull()); - if(!dialogEndLine.isNull()){ - VPointF p = VAbstractTool::data.GetPoint(id); - dialogEndLine->setTypeLine(typeLine); - dialogEndLine->setFormula(formula); - dialogEndLine->setAngle(angle); - dialogEndLine->setBasePointId(basePointId, id); - dialogEndLine->setPointName(p.name()); - } + VPointF p = VAbstractTool::data.GetPoint(id); + dialogEndLine->setTypeLine(typeLine); + dialogEndLine->setFormula(formula); + dialogEndLine->setAngle(angle); + dialogEndLine->setBasePointId(basePointId, id); + dialogEndLine->setPointName(p.name()); } void VToolEndLine::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, diff --git a/tools/drawTools/vtoolheight.cpp b/tools/drawTools/vtoolheight.cpp new file mode 100644 index 000000000..3779eebfe --- /dev/null +++ b/tools/drawTools/vtoolheight.cpp @@ -0,0 +1,138 @@ +#include "vtoolheight.h" + +VToolHeight::VToolHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, + const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, + Tool::Sources typeCreation, QGraphicsItem * parent) + :VToolLinePoint(doc, data, id, typeLine, QString(), basePointId, 0, parent), + dialogHeight(QSharedPointer()), p1LineId(p1LineId), p2LineId(p2LineId){ + ignoreFullUpdate = true; + if(typeCreation == Tool::FromGui){ + AddToFile(); + } +} + +void VToolHeight::setDialog(){ + Q_ASSERT(!dialogHeight.isNull()); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogHeight->setTypeLine(typeLine); + dialogHeight->setBasePointId(basePointId, id); + dialogHeight->setP1LineId(p1LineId, id); + dialogHeight->setP2LineId(p2LineId, id); + dialogHeight->setPointName(p.name()); +} + +void VToolHeight::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data){ + disconnect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &DialogHeight::UpdateList); + QString pointName = dialog->getPointName(); + QString typeLine = dialog->getTypeLine(); + qint64 basePointId = dialog->getBasePointId(); + qint64 p1LineId = dialog->getP1LineId(); + qint64 p2LineId = dialog->getP2LineId(); + Create(0, pointName, typeLine, basePointId, p1LineId, p2LineId, 5, 10, scene, doc, data, + Document::FullParse, Tool::FromGui); +} + +void VToolHeight::Create(const qint64 _id, const QString &pointName, const QString &typeLine, + const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, + const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + VPointF basePoint = data->GetPoint(basePointId); + VPointF p1Line = data->GetPoint(p1LineId); + VPointF p2Line = data->GetPoint(p2LineId); + + QPointF pHeight = FindPoint(QLineF(p1Line.toQPointF(), p2Line.toQPointF()), basePoint.toQPointF()); + qint64 id = _id; + if(typeCreation == Tool::FromGui){ + id = data->AddPoint(VPointF(pHeight.x(), pHeight.y(), pointName, mx, my)); + data->AddLine(basePointId, id); + data->AddLine(p1LineId, id); + data->AddLine(p2LineId, id); + } else { + data->UpdatePoint(id, VPointF(pHeight.x(), pHeight.y(), pointName, mx, my)); + data->AddLine(basePointId, id); + data->AddLine(p1LineId, id); + data->AddLine(p2LineId, id); + if(parse != Document::FullParse){ + doc->UpdateToolData(id, data); + } + } + VDrawTool::AddRecord(id, Tool::Height, doc); + if(parse == Document::FullParse){ + VToolHeight *point = new VToolHeight(doc, data, id, typeLine, basePointId, p1LineId, p2LineId, + typeCreation); + scene->addItem(point); + connect(point, &VToolPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolPoint::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPoint::SetFactor); + doc->AddTool(id, point); + doc->IncrementReferens(basePointId); + doc->IncrementReferens(p1LineId); + doc->IncrementReferens(p2LineId); + } +} + +QPointF VToolHeight::FindPoint(const QLineF &line, const QPointF &point){ + qreal a = 0, b = 0, c = 0; + LineCoefficients(line, &a, &b, &c); + qreal x = point.x() + a; + qreal y = b + point.y(); + QLineF l (point, QPointF(x, y)); + QPointF p; + QLineF::IntersectType intersect = line.intersect(l, &p); + if(intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection){ + return p; + } else { + return QPointF(); + } +} + +void VToolHeight::FullUpdateFromFile(){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + typeLine = domElement.attribute("typeLine", ""); + basePointId = domElement.attribute("basePoint", "").toLongLong(); + p1LineId = domElement.attribute("p1Line", "").toLongLong(); + p2LineId = domElement.attribute("p2Line", "").toLongLong(); + } + RefreshGeometry(); + +} + +void VToolHeight::FullUpdateFromGui(int result){ + if(result == QDialog::Accepted){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("name", dialogHeight->getPointName()); + domElement.setAttribute("typeLine", dialogHeight->getTypeLine()); + domElement.setAttribute("basePoint", QString().setNum(dialogHeight->getBasePointId())); + domElement.setAttribute("p1Line", QString().setNum(dialogHeight->getP1LineId())); + domElement.setAttribute("p2Line", QString().setNum(dialogHeight->getP2LineId())); + emit FullUpdateTree(); + } + } + dialogHeight.clear(); +} + +void VToolHeight::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ + ContextMenu(dialogHeight, this, event); +} + +void VToolHeight::AddToFile(){ + VPointF point = VAbstractTool::data.GetPoint(id); + QDomElement domElement = doc->createElement("point"); + + AddAttribute(domElement, "id", id); + AddAttribute(domElement, "type", "height"); + AddAttribute(domElement, "name", point.name()); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); + + AddAttribute(domElement, "typeLine", typeLine); + AddAttribute(domElement, "basePoint", basePointId); + AddAttribute(domElement, "p1Line", p1LineId); + AddAttribute(domElement, "p2Line", p2LineId); + + AddToCalculation(domElement); + +} diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h new file mode 100644 index 000000000..c3ab6d02f --- /dev/null +++ b/tools/drawTools/vtoolheight.h @@ -0,0 +1,34 @@ +#ifndef VTOOLHEIGHT_H +#define VTOOLHEIGHT_H + +#include "vtoollinepoint.h" +#include "dialogs/dialogheight.h" +#include + +class VToolHeight: public VToolLinePoint{ + Q_OBJECT +public: + VToolHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, + const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data); + static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, + const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, + const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static QPointF FindPoint(const QLineF &line, const QPointF &point); +public slots: + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); +protected: + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); +private: + QSharedPointer dialogHeight; + qint64 p1LineId; + qint64 p2LineId; +}; + +#endif // VTOOLHEIGHT_H diff --git a/tools/modelingTools/modelingtools.h b/tools/modelingTools/modelingtools.h index 2a051f87a..a40cdf15a 100644 --- a/tools/modelingTools/modelingtools.h +++ b/tools/modelingTools/modelingtools.h @@ -34,5 +34,6 @@ #include "vmodelingsinglepoint.h" #include "vmodelingspline.h" #include "vmodelingsplinepath.h" +#include "vmodelingheight.h" #endif // MODELINGTOOLS_H diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index 76d448dad..096ad37aa 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -74,8 +74,8 @@ void VModelingAlongLine::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "alongLine"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "typeLine", typeLine); AddAttribute(domElement, "length", formula); diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index 17021859d..f13768c51 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -24,9 +24,10 @@ #include #include "widgets/vmaingraphicsscene.h" -VModelingEndLine::VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, - const QString &formula, const qreal &angle, const qint64 &basePointId, - Tool::Sources typeCreation, QGraphicsItem *parent): +VModelingEndLine::VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &typeLine, const QString &formula, const qreal &angle, + const qint64 &basePointId, Tool::Sources typeCreation, + QGraphicsItem *parent): VModelingLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), dialogEndLine(QSharedPointer()){ @@ -37,18 +38,16 @@ VModelingEndLine::VModelingEndLine(VDomDocument *doc, VContainer *data, const qi void VModelingEndLine::setDialog(){ Q_ASSERT(!dialogEndLine.isNull()); - if(!dialogEndLine.isNull()){ - VPointF p = VAbstractTool::data.GetModelingPoint(id); - dialogEndLine->setTypeLine(typeLine); - dialogEndLine->setFormula(formula); - dialogEndLine->setAngle(angle); - dialogEndLine->setBasePointId(basePointId, id); - dialogEndLine->setPointName(p.name()); - } + VPointF p = VAbstractTool::data.GetModelingPoint(id); + dialogEndLine->setTypeLine(typeLine); + dialogEndLine->setFormula(formula); + dialogEndLine->setAngle(angle); + dialogEndLine->setBasePointId(basePointId, id); + dialogEndLine->setPointName(p.name()); } VModelingEndLine *VModelingEndLine::Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data){ + VContainer *data){ QString pointName = dialog->getPointName(); QString typeLine = dialog->getTypeLine(); QString formula = dialog->getFormula(); @@ -70,7 +69,7 @@ VModelingEndLine *VModelingEndLine::Create(const qint64 _id, const QString &poin QString errorMsg; qreal result = cal.eval(formula, &errorMsg); if(errorMsg.isEmpty()){ - line.setLength(result*PrintDPI/25.4); + line.setLength(toPixel(result)); line.setAngle(angle); qint64 id = _id; if(typeCreation == Tool::FromGui){ @@ -97,7 +96,7 @@ void VModelingEndLine::FullUpdateFromFile(){ typeLine = domElement.attribute("typeLine", ""); formula = domElement.attribute("length", ""); basePointId = domElement.attribute("basePoint", "").toLongLong(); - angle = domElement.attribute("angle", "").toInt(); + angle = domElement.attribute("angle", "").toDouble(); } RefreshGeometry(); } diff --git a/tools/modelingTools/vmodelingheight.cpp b/tools/modelingTools/vmodelingheight.cpp new file mode 100644 index 000000000..d4d6ef1bc --- /dev/null +++ b/tools/modelingTools/vmodelingheight.cpp @@ -0,0 +1,130 @@ +#include "vmodelingheight.h" + +VModelingHeight::VModelingHeight(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, + const qint64 &p2LineId, Tool::Sources typeCreation, + QGraphicsItem * parent) + :VModelingLinePoint(doc, data, id, typeLine, QString(), basePointId, 0, parent), + dialogHeight(QSharedPointer()), p1LineId(p1LineId), p2LineId(p2LineId){ + ignoreFullUpdate = true; + if(typeCreation == Tool::FromGui){ + AddToFile(); + } +} + +void VModelingHeight::setDialog(){ + Q_ASSERT(!dialogHeight.isNull()); + VPointF p = VAbstractTool::data.GetModelingPoint(id); + dialogHeight->setTypeLine(typeLine); + dialogHeight->setBasePointId(basePointId, id); + dialogHeight->setP1LineId(p1LineId, id); + dialogHeight->setP2LineId(p2LineId, id); + dialogHeight->setPointName(p.name()); +} + +VModelingHeight *VModelingHeight::Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data){ + disconnect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &DialogHeight::UpdateList); + QString pointName = dialog->getPointName(); + QString typeLine = dialog->getTypeLine(); + qint64 basePointId = dialog->getBasePointId(); + qint64 p1LineId = dialog->getP1LineId(); + qint64 p2LineId = dialog->getP2LineId(); + return Create(0, pointName, typeLine, basePointId, p1LineId, p2LineId, 5, 10, doc, data, + Document::FullParse, Tool::FromGui); +} + +VModelingHeight *VModelingHeight::Create(const qint64 _id, const QString &pointName, const QString &typeLine, + const qint64 &basePointId, const qint64 &p1LineId, + const qint64 &p2LineId, const qreal &mx, const qreal &my, + VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation){ + VModelingHeight *point = 0; + VPointF basePoint = data->GetModelingPoint(basePointId); + VPointF p1Line = data->GetModelingPoint(p1LineId); + VPointF p2Line = data->GetModelingPoint(p2LineId); + + QPointF pHeight = FindPoint(QLineF(p1Line.toQPointF(), p2Line.toQPointF()), basePoint.toQPointF()); + QLineF line = QLineF(basePoint.toQPointF(), pHeight); + qint64 id = _id; + if(typeCreation == Tool::FromGui){ + id = data->AddModelingPoint(VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); + } else { + data->UpdateModelingPoint(id, VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); + if(parse != Document::FullParse){ + doc->UpdateToolData(id, data); + } + } + data->AddLine(basePointId, id, Draw::Modeling); + if(parse == Document::FullParse){ + point = new VModelingHeight(doc, data, id, typeLine, basePointId, p1LineId, p2LineId, typeCreation); + doc->AddTool(id, point); + doc->IncrementReferens(basePointId); + doc->IncrementReferens(p1LineId); + doc->IncrementReferens(p2LineId); + } + return point; +} + +void VModelingHeight::FullUpdateFromFile(){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + typeLine = domElement.attribute("typeLine", ""); + basePointId = domElement.attribute("basePoint", "").toLongLong(); + p1LineId = domElement.attribute("p1Line", "").toLongLong(); + p2LineId = domElement.attribute("p2Line", "").toLongLong(); + } + RefreshGeometry(); +} + +void VModelingHeight::FullUpdateFromGui(int result){ + if(result == QDialog::Accepted){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("name", dialogHeight->getPointName()); + domElement.setAttribute("typeLine", dialogHeight->getTypeLine()); + domElement.setAttribute("basePoint", QString().setNum(dialogHeight->getBasePointId())); + domElement.setAttribute("p1Line", QString().setNum(dialogHeight->getP1LineId())); + domElement.setAttribute("p2Line", QString().setNum(dialogHeight->getP2LineId())); + emit FullUpdateTree(); + } + } + dialogHeight.clear(); +} + +void VModelingHeight::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ + ContextMenu(dialogHeight, this, event); +} + +void VModelingHeight::AddToFile(){ + VPointF point = VAbstractTool::data.GetModelingPoint(id); + QDomElement domElement = doc->createElement("point"); + + AddAttribute(domElement, "id", id); + AddAttribute(domElement, "type", "endLine"); + AddAttribute(domElement, "name", point.name()); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); + + AddAttribute(domElement, "typeLine", typeLine); + AddAttribute(domElement, "basePoint", basePointId); + AddAttribute(domElement, "p1Line", p1LineId); + AddAttribute(domElement, "p2Line", p2LineId); + + AddToModeling(domElement); +} + +QPointF VModelingHeight::FindPoint(const QLineF &line, const QPointF &point){ + qreal a = 0, b = 0, c = 0; + LineCoefficients(line, &a, &b, &c); + qreal x = point.x() - b; + qreal y = -a + point.y(); + QLineF l (point, QPointF(x, y)); + QPointF p; + QLineF::IntersectType intersect = line.intersect(l, &p); + if(intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection){ + return p; + } else { + return QPointF(); + } +} diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h new file mode 100644 index 000000000..8d02dd8fd --- /dev/null +++ b/tools/modelingTools/vmodelingheight.h @@ -0,0 +1,34 @@ +#ifndef VMODELINGHEIGHT_H +#define VMODELINGHEIGHT_H + +#include "vmodelinglinepoint.h" +#include "dialogs/dialogheight.h" + +class VModelingHeight : public VModelingLinePoint{ + Q_OBJECT +public: + VModelingHeight(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &typeLine, const qint64 &basePointId, + const qint64 &p1LineId, const qint64 &p2LineId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); +virtual void setDialog(); + static VModelingHeight* Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data); + static VModelingHeight* Create(const qint64 _id, const QString &pointName, const QString &typeLine, + const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, + const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); + static QPointF FindPoint(const QLineF &line, const QPointF &point); +public slots: + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); +protected: + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); +private: + QSharedPointer dialogHeight; + qint64 p1LineId; + qint64 p2LineId; +}; + +#endif // VMODELINGHEIGHT_H diff --git a/tools/modelingTools/vmodelingtool.cpp b/tools/modelingTools/vmodelingtool.cpp index c651880dd..2dc6b5ad4 100644 --- a/tools/modelingTools/vmodelingtool.cpp +++ b/tools/modelingTools/vmodelingtool.cpp @@ -23,7 +23,7 @@ #include VModelingTool::VModelingTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent): -VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false){ +VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false), ignoreFullUpdate(false) { _referens = 0; } diff --git a/tools/modelingTools/vmodelingtool.h b/tools/modelingTools/vmodelingtool.h index f5bb4bbc7..69a4814e6 100644 --- a/tools/modelingTools/vmodelingtool.h +++ b/tools/modelingTools/vmodelingtool.h @@ -39,6 +39,7 @@ signals: void RemoveTool(QGraphicsItem *tool); protected: bool ignoreContextMenuEvent; + bool ignoreFullUpdate; void AddToModeling(const QDomElement &domElement); virtual void decrementReferens(); template @@ -46,39 +47,44 @@ protected: bool showRemove = true){ if(!ignoreContextMenuEvent){ QMenu menu; - QAction *actionOption = menu.addAction("Властивості"); - QAction *actionRemove; + QAction *actionOption = menu.addAction(tr("Option")); + QAction *actionRemove = 0; if(showRemove){ - actionRemove = menu.addAction("Видалити"); + actionRemove = menu.addAction(tr("Delete")); } QAction *selectedAction = menu.exec(event->screenPos()); if(selectedAction == actionOption){ - dialog = QSharedPointer(new Dialog(getData())); + dialog = QSharedPointer(new Dialog(getData())); - connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), &VMainGraphicsScene::ChoosedObject, - dialog.data(), &Dialog::ChoosedObject); - connect(dialog.data(), &Dialog::DialogClosed, tool, - &Tool::FullUpdateFromGui); - connect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &Dialog::UpdateList); + connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), + &VMainGraphicsScene::ChoosedObject, dialog.data(), &Dialog::ChoosedObject); + connect(dialog.data(), &Dialog::DialogClosed, tool, &Tool::FullUpdateFromGui); + if(!ignoreFullUpdate){ + connect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &Dialog::UpdateList); + } tool->setDialog(); dialog->show(); } - if(selectedAction == actionRemove){ - //remove form xml file - QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ - QDomElement element; - bool ok = doc->GetActivCalculationElement(element); - if(ok){ - element.removeChild(domElement); - //update xml file - emit FullUpdateTree(); - //remove form scene - emit RemoveTool(tool); - } - } + if(showRemove){ + if(selectedAction == actionRemove){ + //deincrement referens + RemoveReferens(); + //remove form xml file + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + QDomElement element; + bool ok = doc->GetActivCalculationElement(element); + if(ok){ + element.removeChild(domElement); + //update xml file + emit FullUpdateTree(); + //remove form scene + emit RemoveTool(tool); + } + } + } } } } diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index 50838f4d7..e6b656efc 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -85,10 +85,8 @@ qint32 VAbstractTool::LineIntersectCircle(QPointF center, qreal radius, QLineF l QPointF &p2){ const qreal eps = 1e-8; //коефіцієнти для рівняння відрізку - qreal a = line.p2().y() - line.p1().y(); - qreal b = line.p1().x() - line.p2().x(); - // В даному випадку не використовується. - //qreal c = - a * line.p1().x() - b * line.p1().y(); + qreal a = 0, b = 0, c = 0; + LineCoefficients(line, &a, &b, &c); // проекция центра окружности на прямую QPointF p = ClosestPoint (line, center); // сколько всего решений? @@ -138,6 +136,13 @@ const VContainer *VAbstractTool::getData()const{ return &data; } +void VAbstractTool::LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c){ + //коефіцієнти для рівняння відрізку + *a = line.p2().y() - line.p1().y(); + *b = line.p1().x() - line.p2().x(); + *c = - *a * line.p1().x() - *b * line.p1().y(); +} + qint64 VAbstractTool::getId() const{ return id; } diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index 2391e053b..0982bc64c 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -35,8 +35,8 @@ public: QPointF &p2); static QPointF ClosestPoint(QLineF line, QPointF p); static QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k); - qint64 getId() const; - + qint64 getId() const; + static void LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c); public slots: virtual void FullUpdateFromFile()=0; signals: diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 8c7118c84..52e42e7ff 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -806,6 +806,31 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen throw excep; } } + if(type == "height"){ + try{ + qint64 id = GetParametrId(domElement); + QString name = GetParametrString(domElement, "name"); + qreal mx = toPixel(GetParametrDouble(domElement, "mx")); + qreal my = toPixel(GetParametrDouble(domElement, "my")); + QString typeLine = GetParametrString(domElement, "typeLine"); + qint64 basePointId = GetParametrLongLong(domElement, "basePoint"); + qint64 p1LineId = GetParametrLongLong(domElement, "p1Line"); + qint64 p2LineId = GetParametrLongLong(domElement, "p2Line"); + if(mode == Draw::Calculation){ + VToolHeight::Create(id, name, typeLine, basePointId, p1LineId, p2LineId, mx, my, scene, + this, data, parse, Tool::FromFile); + } else { + VModelingHeight::Create(id, name, typeLine, basePointId, p1LineId, p2LineId, mx, my, this, + data, parse, Tool::FromFile); + } + return; + } + catch(const VExceptionBadId &e){ + VExceptionObjectError excep(tr("Error creating or updating height"), domElement); + excep.AddMoreInformation(e.ErrorMessage()); + throw excep; + } + } } void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &domElement, From 25190e16a95568de58ea71cb1eb50c8957d3fa42 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 18 Oct 2013 13:43:51 +0300 Subject: [PATCH 25/83] Use static method FindPoint common for tools. --HG-- branch : develop --- tools/drawTools/vtoolalongline.h | 38 ++++++------- tools/drawTools/vtoolbisector.h | 42 +++++++-------- tools/drawTools/vtoolendline.h | 27 +++++----- tools/drawTools/vtoolline.h | 42 +++++++-------- tools/drawTools/vtoolnormal.h | 3 +- tools/drawTools/vtoolpointofcontact.h | 3 +- tools/drawTools/vtoolsinglepoint.h | 27 +++++----- tools/modelingTools/vmodelingbisector.cpp | 16 +----- tools/modelingTools/vmodelingbisector.h | 42 +++++++-------- tools/modelingTools/vmodelingheight.cpp | 19 ++----- tools/modelingTools/vmodelingheight.h | 3 +- tools/modelingTools/vmodelingnormal.cpp | 14 ++--- tools/modelingTools/vmodelingnormal.h | 39 +++++++------- .../modelingTools/vmodelingpointofcontact.cpp | 27 ++-------- tools/modelingTools/vmodelingpointofcontact.h | 47 ++++++++-------- .../modelingTools/vmodelingshoulderpoint.cpp | 26 ++------- tools/modelingTools/vmodelingshoulderpoint.h | 45 ++++++++-------- tools/modelingTools/vmodelingsplinepath.h | 54 +++++++++---------- tools/modelingTools/vmodelingtool.h | 5 ++ 19 files changed, 216 insertions(+), 303 deletions(-) diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index ce02b8b30..4f5ddd04b 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -25,30 +25,30 @@ #include "vtoollinepoint.h" #include "dialogs/dialogalongline.h" -class VToolAlongLine : public VToolLinePoint -{ +class VToolAlongLine : public VToolLinePoint{ Q_OBJECT public: - VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, - const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data); - static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, - const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, - const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, + const qint64 &firstPointId, const qint64 &secondPointId, + const QString &typeLine, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, + const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, + const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); - virtual void SetFactor(qreal factor); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 secondPointId; + qint64 secondPointId; QSharedPointer dialogAlongLine; }; diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 3a982bbc1..fa0bc9061 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -27,31 +27,31 @@ class VToolBisector : public VToolLinePoint{ public: - VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, + VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &typeLine, const QString &formula, const qint64 &firstPointId, + const qint64 &secondPointId, const qint64 &thirdPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint, const qreal& length); - virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data); - static void Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, - const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data); + static void Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, + const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, + const QString &pointName, const qreal &mx, const qreal &my, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); - virtual void SetFactor(qreal factor); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 firstPointId; - qint64 thirdPointId; + qint64 firstPointId; + qint64 thirdPointId; QSharedPointer dialogBisector; }; diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index 4cd89b31b..7b9a5e39b 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -28,23 +28,22 @@ class VToolEndLine : public VToolLinePoint{ Q_OBJECT public: - VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, const qreal &angle, - const qint64 &basePointId, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); + VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, + const QString &formula, const qreal &angle, const qint64 &basePointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data); - static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, - const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, + const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, + const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); private: QSharedPointer dialogEndLine; }; diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index dab4b6d47..bc9976805 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -29,31 +29,31 @@ class VToolLine: public VDrawTool, public QGraphicsLineItem{ Q_OBJECT public: - VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data); - static void Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, + qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void ChangedActivDraw(const QString newName); - virtual void FullUpdateFromGui(int result); - virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); - virtual void SetFactor(qreal factor); + virtual void FullUpdateFromFile(); + virtual void ChangedActivDraw(const QString newName); + virtual void FullUpdateFromGui(int result); + virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void RemoveReferens(); private: - qint64 firstPoint; - qint64 secondPoint; + qint64 firstPoint; + qint64 secondPoint; QSharedPointer dialogLine; - void RefreshGeometry(); + void RefreshGeometry(); }; #endif // VTOOLLINE_H diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 41bda6144..f7336cacf 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -25,8 +25,7 @@ #include "vtoollinepoint.h" #include "dialogs/dialognormal.h" -class VToolNormal : public VToolLinePoint -{ +class VToolNormal : public VToolLinePoint{ Q_OBJECT public: VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index 049e6efbc..de7390549 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -25,8 +25,7 @@ #include "vtoolpoint.h" #include "dialogs/dialogpointofcontact.h" -class VToolPointOfContact : public VToolPoint -{ +class VToolPointOfContact : public VToolPoint{ public: VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index 2a610bc92..ee9b7bcf3 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -25,25 +25,24 @@ #include "dialogs/dialogsinglepoint.h" #include "vtoolpoint.h" -class VToolSinglePoint : public VToolPoint -{ +class VToolSinglePoint : public VToolPoint{ Q_OBJECT public: - VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); - virtual void setDialog(); + VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem * parent = 0 ); + virtual void setDialog(); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); - virtual void ChangedActivDraw(const QString newName); - virtual void SetFactor(qreal factor); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + virtual void ChangedActivDraw(const QString newName); + virtual void SetFactor(qreal factor); signals: - void FullUpdateTree(); + void FullUpdateTree(); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); - virtual void decrementReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); + virtual void decrementReferens(); private: QSharedPointer dialogSinglePoint; }; diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index 158b19ad0..b98391d06 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -21,6 +21,7 @@ #include "vmodelingbisector.h" #include +#include "../drawTools/vtoolbisector.h" VModelingBisector::VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, @@ -36,19 +37,6 @@ VModelingBisector::VModelingBisector(VDomDocument *doc, VContainer *data, const } } -QPointF VModelingBisector::FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, - const QPointF &thirdPoint, const qreal &length){ - QLineF line1(secondPoint, firstPoint); - QLineF line2(secondPoint, thirdPoint); - qreal angle = line1.angleTo(line2); - if(angle>180){ - angle = 360 - angle; - } - line1.setAngle(line1.angle()-angle/2); - line1.setLength(length); - return line1.p2(); -} - void VModelingBisector::setDialog(){ Q_ASSERT(!dialogBisector.isNull()); if(!dialogBisector.isNull()){ @@ -89,7 +77,7 @@ VModelingBisector *VModelingBisector::Create(const qint64 _id, const QString &fo QString errorMsg; qreal result = cal.eval(formula, &errorMsg); if(errorMsg.isEmpty()){ - QPointF fPoint = VModelingBisector::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), + QPointF fPoint = VToolBisector::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), thirdPoint.toQPointF(), result*PrintDPI/25.4); qint64 id = _id; if(typeCreation == Tool::FromGui){ diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index 8795d90de..3c13a03e6 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -28,31 +28,29 @@ class VModelingBisector : public VModelingLinePoint{ Q_OBJECT public: - VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, - const qint64 &firstPointId, const qint64 &secondPointId, - const qint64 &thirdPointId, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, - const QPointF &thirdPoint, const qreal& length); - virtual void setDialog(); - static VModelingBisector* Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data); - static VModelingBisector* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, - const QString &typeLine, const QString &pointName, const qreal &mx, - const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &typeLine, const QString &formula, + const qint64 &firstPointId, const qint64 &secondPointId, + const qint64 &thirdPointId, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingBisector* Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data); + static VModelingBisector* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, + const qint64 &secondPointId, const qint64 &thirdPointId, + const QString &typeLine, const QString &pointName, const qreal &mx, + const qreal &my, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 firstPointId; - qint64 thirdPointId; + qint64 firstPointId; + qint64 thirdPointId; QSharedPointer dialogBisector; }; diff --git a/tools/modelingTools/vmodelingheight.cpp b/tools/modelingTools/vmodelingheight.cpp index d4d6ef1bc..46e3d3565 100644 --- a/tools/modelingTools/vmodelingheight.cpp +++ b/tools/modelingTools/vmodelingheight.cpp @@ -1,4 +1,5 @@ #include "vmodelingheight.h" +#include "../drawTools/vtoolheight.h" VModelingHeight::VModelingHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, @@ -44,7 +45,8 @@ VModelingHeight *VModelingHeight::Create(const qint64 _id, const QString &pointN VPointF p1Line = data->GetModelingPoint(p1LineId); VPointF p2Line = data->GetModelingPoint(p2LineId); - QPointF pHeight = FindPoint(QLineF(p1Line.toQPointF(), p2Line.toQPointF()), basePoint.toQPointF()); + QPointF pHeight = VToolHeight::FindPoint(QLineF(p1Line.toQPointF(), p2Line.toQPointF()), + basePoint.toQPointF()); QLineF line = QLineF(basePoint.toQPointF(), pHeight); qint64 id = _id; if(typeCreation == Tool::FromGui){ @@ -113,18 +115,3 @@ void VModelingHeight::AddToFile(){ AddToModeling(domElement); } - -QPointF VModelingHeight::FindPoint(const QLineF &line, const QPointF &point){ - qreal a = 0, b = 0, c = 0; - LineCoefficients(line, &a, &b, &c); - qreal x = point.x() - b; - qreal y = -a + point.y(); - QLineF l (point, QPointF(x, y)); - QPointF p; - QLineF::IntersectType intersect = line.intersect(l, &p); - if(intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection){ - return p; - } else { - return QPointF(); - } -} diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index 8d02dd8fd..7d2362b5a 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -11,14 +11,13 @@ public: const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); -virtual void setDialog(); + virtual void setDialog(); static VModelingHeight* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingHeight* Create(const qint64 _id, const QString &pointName, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); - static QPointF FindPoint(const QLineF &line, const QPointF &point); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index 55edddd10..448232f50 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -20,6 +20,7 @@ ****************************************************************************/ #include "vmodelingnormal.h" +#include "../drawTools/vtoolnormal.h" VModelingNormal::VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, @@ -72,8 +73,8 @@ VModelingNormal *VModelingNormal::Create(const qint64 _id, const QString &formul QString errorMsg; qreal result = cal.eval(formula, &errorMsg); if(errorMsg.isEmpty()){ - QPointF fPoint = VModelingNormal::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), - result*PrintDPI/25.4, angle); + QPointF fPoint = VToolNormal::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), + toPixel(result), angle); qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddModelingPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); @@ -95,15 +96,6 @@ VModelingNormal *VModelingNormal::Create(const qint64 _id, const QString &formul return point; } -QPointF VModelingNormal::FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const qreal &length, - const qreal &angle){ - QLineF line(firstPoint, secondPoint); - QLineF normal = line.normalVector(); - normal.setAngle(normal.angle()+angle); - normal.setLength(length); - return normal.p2(); -} - void VModelingNormal::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index 906aa797f..7d640421e 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -28,30 +28,27 @@ class VModelingNormal : public VModelingLinePoint{ Q_OBJECT public: - VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, - const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static VModelingNormal* Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data); - static VModelingNormal* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const QString typeLine, - const QString pointName, const qreal angle, const qreal &mx, - const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); - static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, - const qreal &length, const qreal &angle = 0); + VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &typeLine, const QString &formula, + const qreal &angle, const qint64 &firstPointId, + const qint64 &secondPointId, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingNormal* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); + static VModelingNormal* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, + const qint64 &secondPointId, const QString typeLine, + const QString pointName, const qreal angle, const qreal &mx, + const qreal &my, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 secondPointId; + qint64 secondPointId; QSharedPointer dialogNormal; }; diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index 35d6e9c2e..049d90300 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -20,6 +20,7 @@ ****************************************************************************/ #include "vmodelingpointofcontact.h" +#include "../drawTools/vtoolpointofcontact.h" VModelingPointOfContact::VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, @@ -45,28 +46,6 @@ void VModelingPointOfContact::setDialog(){ } } -QPointF VModelingPointOfContact::FindPoint(const qreal &radius, const QPointF ¢er, const QPointF &firstPoint, - const QPointF &secondPoint){ - QPointF pArc; - qreal s = 0.0, s_x, s_y, step = 0.01, distans; - while( s < 1){ - s_x = secondPoint.x()-(qAbs(secondPoint.x()-firstPoint.x()))*s; - s_y = secondPoint.y()-(qAbs(secondPoint.y()-firstPoint.y()))*s; - distans = QLineF(center.x(), center.y(), s_x, s_y).length(); - if(ceil(distans*10) == ceil(radius*10)){ - pArc.rx() = s_x; - pArc.ry() = s_y; - break; - } - if(distans &dialog, VDomDocument *doc, VContainer *data){ QString radius = dialog->getRadius(); @@ -94,8 +73,8 @@ VModelingPointOfContact *VModelingPointOfContact::Create(const qint64 _id, const QString errorMsg; qreal result = cal.eval(radius, &errorMsg); if(errorMsg.isEmpty()){ - QPointF fPoint = VModelingPointOfContact::FindPoint(result*PrintDPI/25.4, centerP.toQPointF(), - firstP.toQPointF(), secondP.toQPointF()); + QPointF fPoint = VToolPointOfContact::FindPoint(toPixel(result), centerP.toQPointF(), + firstP.toQPointF(), secondP.toQPointF()); qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddModelingPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index 02302bc45..d8d4af4a4 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -28,35 +28,32 @@ class VModelingPointOfContact : public VModelingPoint{ Q_OBJECT public: - VModelingPointOfContact(VDomDocument *doc, VContainer *data, - const qint64 &id, const QString &radius, - const qint64 ¢er, - const qint64 &firstPointId, - const qint64 &secondPointId, - Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static QPointF FindPoint(const qreal &radius, const QPointF ¢er, - const QPointF &firstPoint, const QPointF &secondPoint); - static VModelingPointOfContact* Create(QSharedPointer &dialog, + VModelingPointOfContact(VDomDocument *doc, VContainer *data, + const qint64 &id, const QString &radius, + const qint64 ¢er, const qint64 &firstPointId, + const qint64 &secondPointId, + Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingPointOfContact* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); - static VModelingPointOfContact* Create(const qint64 _id, const QString &radius, const qint64 ¢er, - const qint64 &firstPointId, const qint64 &secondPointId, - const QString &pointName, const qreal &mx, const qreal &my, - VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + static VModelingPointOfContact* Create(const qint64 _id, const QString &radius, const qint64 ¢er, + const qint64 &firstPointId, const qint64 &secondPointId, + const QString &pointName, const qreal &mx, const qreal &my, + VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - QString radius; - qint64 center; - qint64 firstPointId; - qint64 secondPointId; + QString radius; + qint64 center; + qint64 firstPointId; + qint64 secondPointId; QSharedPointer dialogPointOfContact; }; diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index d96b5ccdf..16292b4df 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -21,6 +21,7 @@ #include "vmodelingshoulderpoint.h" #include +#include "../drawTools/vtoolshoulderpoint.h" VModelingShoulderPoint::VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, @@ -48,27 +49,6 @@ void VModelingShoulderPoint::setDialog(){ } } -QPointF VModelingShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, - const qreal &length){ - QLineF line = QLineF(p1Line, p2Line); - qreal dist = line.length(); - if(dist>length){ - qDebug()<<"A3П2="<=length){ - return line.p2(); - } - } -} - VModelingShoulderPoint *VModelingShoulderPoint::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data){ QString formula = dialog->getFormula(); @@ -97,8 +77,8 @@ VModelingShoulderPoint *VModelingShoulderPoint::Create(const qint64 _id, const Q QString errorMsg; qreal result = cal.eval(formula, &errorMsg); if(errorMsg.isEmpty()){ - QPointF fPoint = VModelingShoulderPoint::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), - shoulderPoint.toQPointF(), result*PrintDPI/25.4); + QPointF fPoint = VToolShoulderPoint::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), + shoulderPoint.toQPointF(), toPixel(result)); qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddModelingPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index 399c95868..e4bc9b928 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -28,33 +28,30 @@ class VModelingShoulderPoint : public VModelingLinePoint{ Q_OBJECT public: - VModelingShoulderPoint(VDomDocument *doc, VContainer *data, - const qint64 &id, const QString &typeLine, - const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, - Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, - const QPointF &pShoulder, const qreal &length); - static VModelingShoulderPoint* Create(QSharedPointer &dialog, - VDomDocument *doc, VContainer *data); - static VModelingShoulderPoint* Create(const qint64 _id, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, - const QString &typeLine, const QString &pointName, - const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, - const Tool::Sources &typeCreation); + VModelingShoulderPoint(VDomDocument *doc, VContainer *data, + const qint64 &id, const QString &typeLine, + const QString &formula, const qint64 &p1Line, + const qint64 &p2Line, const qint64 &pShoulder, + Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingShoulderPoint* Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data); + static VModelingShoulderPoint* Create(const qint64 _id, const QString &formula, const qint64 &p1Line, + const qint64 &p2Line, const qint64 &pShoulder, + const QString &typeLine, const QString &pointName, const qreal &mx, + const qreal &my, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, const Tool::Sources &typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 p2Line; - qint64 pShoulder; + qint64 p2Line; + qint64 pShoulder; QSharedPointer dialogShoulderPoint; }; diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index de3ea52c8..c92a70204 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -30,40 +30,38 @@ class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem{ Q_OBJECT public: - VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static VModelingSplinePath* Create(QSharedPointer &dialog, - VDomDocument *doc, VContainer *data); - static VModelingSplinePath* Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingSplinePath* Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data); + static VModelingSplinePath* Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation); signals: - void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, - const QPointF &controlPoint, const QPointF &splinePoint); - void setEnabledPoint(bool enable); + void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, + const QPointF &controlPoint, const QPointF &splinePoint); + void setEnabledPoint(bool enable); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); - void ControlPointChangePosition(const qint32 &indexSpline, - SplinePoint::Position position, - const QPointF pos); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + void ControlPointChangePosition(const qint32 &indexSpline, + SplinePoint::Position position, const QPointF pos); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void RemoveReferens(); private: QSharedPointer dialogSplinePath; QVector controlPoints; - void RefreshGeometry(); - void AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint); - void UpdatePathPoint(QDomNode& node, VSplinePath &path); - void CorectControlPoints(const VSpline &spl, VSplinePath &splPath, - const qint32 &indexSpline); + void RefreshGeometry(); + void AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint); + void UpdatePathPoint(QDomNode& node, VSplinePath &path); + void CorectControlPoints(const VSpline &spl, VSplinePath &splPath, + const qint32 &indexSpline); }; #endif // VMODELINGSPLINEPATH_H diff --git a/tools/modelingTools/vmodelingtool.h b/tools/modelingTools/vmodelingtool.h index 69a4814e6..d19819378 100644 --- a/tools/modelingTools/vmodelingtool.h +++ b/tools/modelingTools/vmodelingtool.h @@ -51,6 +51,11 @@ protected: QAction *actionRemove = 0; if(showRemove){ actionRemove = menu.addAction(tr("Delete")); + if(_referens > 1){ + actionRemove->setEnabled(false); + } else { + actionRemove->setEnabled(true); + } } QAction *selectedAction = menu.exec(event->screenPos()); if(selectedAction == actionOption){ From 0263b60e3cff79b9e44a0cd0b11ad7949f533c5a Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 18 Oct 2013 21:20:54 +0300 Subject: [PATCH 26/83] New tool triangle. --HG-- branch : develop --- Valentina.pro | 13 +- cursor.qrc | 1 + cursor/triangle_cursor.png | Bin 0 -> 1480 bytes dialogs/dialogheight.cpp | 1 - dialogs/dialogheight.ui | 3 + dialogs/dialoghistory.cpp | 15 ++ dialogs/dialogtriangle.cpp | 125 ++++++++++++++ dialogs/dialogtriangle.h | 42 +++++ dialogs/dialogtriangle.ui | 196 ++++++++++++++++++++++ icon.qrc | 1 + icon/32x32/triangle.png | Bin 0 -> 3907 bytes mainwindow.cpp | 29 ++++ mainwindow.h | 6 +- mainwindow.ui | 34 +++- options.h | 3 +- tools/drawTools/drawtools.h | 1 + tools/drawTools/vtoolalongline.cpp | 4 +- tools/drawTools/vtoolshoulderpoint.cpp | 28 ++-- tools/drawTools/vtooltriangle.cpp | 150 +++++++++++++++++ tools/drawTools/vtooltriangle.h | 39 +++++ tools/modelingTools/modelingtools.h | 1 + tools/modelingTools/vmodelingtriangle.cpp | 127 ++++++++++++++ tools/modelingTools/vmodelingtriangle.h | 39 +++++ tools/vtooldetail.cpp | 16 ++ xml/vdomdocument.cpp | 26 +++ 25 files changed, 873 insertions(+), 27 deletions(-) create mode 100644 cursor/triangle_cursor.png create mode 100644 dialogs/dialogtriangle.cpp create mode 100644 dialogs/dialogtriangle.h create mode 100644 dialogs/dialogtriangle.ui create mode 100644 icon/32x32/triangle.png create mode 100644 tools/drawTools/vtooltriangle.cpp create mode 100644 tools/drawTools/vtooltriangle.h create mode 100644 tools/modelingTools/vmodelingtriangle.cpp create mode 100644 tools/modelingTools/vmodelingtriangle.h diff --git a/Valentina.pro b/Valentina.pro index c05bf37e1..74ac8fbca 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -100,7 +100,10 @@ SOURCES += main.cpp\ exception/vexceptionuniqueid.cpp \ tools/drawTools/vtoolheight.cpp \ tools/modelingTools/vmodelingheight.cpp \ - dialogs/dialogheight.cpp + dialogs/dialogheight.cpp \ + tools/drawTools/vtooltriangle.cpp \ + tools/modelingTools/vmodelingtriangle.cpp \ + dialogs/dialogtriangle.cpp HEADERS += mainwindow.h \ widgets/vmaingraphicsscene.h \ @@ -194,7 +197,10 @@ HEADERS += mainwindow.h \ exception/vexceptionuniqueid.h \ tools/drawTools/vtoolheight.h \ tools/modelingTools/vmodelingheight.h \ - dialogs/dialogheight.h + dialogs/dialogheight.h \ + tools/drawTools/vtooltriangle.h \ + tools/modelingTools/vmodelingtriangle.h \ + dialogs/dialogtriangle.h FORMS += mainwindow.ui \ dialogs/dialogsinglepoint.ui \ @@ -213,7 +219,8 @@ FORMS += mainwindow.ui \ dialogs/dialogpointofcontact.ui \ dialogs/dialogdetail.ui \ tablewindow.ui \ - dialogs/dialogheight.ui + dialogs/dialogheight.ui \ + dialogs/dialogtriangle.ui RESOURCES += \ icon.qrc \ diff --git a/cursor.qrc b/cursor.qrc index b38ff9e43..a0827a0a2 100644 --- a/cursor.qrc +++ b/cursor.qrc @@ -13,5 +13,6 @@ cursor/pointcontact_cursor.png cursor/new_detail_cursor.png cursor/height_cursor.png + cursor/triangle_cursor.png diff --git a/cursor/triangle_cursor.png b/cursor/triangle_cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..2fc657ce879efdd8520dad8db447d914bf2fa432 GIT binary patch literal 1480 zcmV;(1vmPMP)Vl&|00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3k&A89I~x@jd_m06}y` zSad^gZEa<4bO1wAML|?gQaT`KWG!lNWoICEF)lD5D0OpbZf77#N=G0{P(?=|b~Z98 zEFf`pVQgu1c_2L?IWP*aMOc#n00jt1L_t(Y$HkUyXq9Cc$A993kp^*4|KFZ34mIVtI z_$MvqiFl`)QVPd$5D}W1nuZeRr%s(xlO}trX|3t*?v|>mD$!a~RaM1`6)XN5@N|q5 zX4^KN=K-kW$BzTBc=6%~2E6_?Ry0bL2y3moT~tb;wMIk`kz_Nvdi5$mVBx}rkKZr2 zcB!&Fj!wzoIcFk2P)dyo$L`&`$;`~`?(FOYn6Uhv$Enl<9G(_{3_sCP**?}%!!hZ(>bD)qNAgOP$<;V z+uKWSZtfOfPg=%Dd49N?Z}X>8;P-=gAZARdO*8}|f-wdWp}oDG8#it+G&B@V+-YuZ zPTs%zB~Q46e3j+!NI?-;Dh@7j@VjMux{x@IlXN0co@dUSdB3u<^3VGE`s?%O&j+C6 z2!(o(@3I_b6$K$W0>;BL28}+^!q5u z3&2PO28MY#ZwmDpK7!-GZQD*}bt1!aa&n}+yj+FD;ZYq=Yn|+TB7*C>0A6Wn>G0(* z$k$;$_l77boC~gjfiO#FuI5Z{1Fp}G$?l|MYFQS>7?e^hTC_-=Jb7}$<#hi11$AjJ zdowIvnOy<{{dg{HnYo(pA(m*y#Ns|G=EfK-%St+sNURelPTX^({<$->10A|R%gzUw_}{H){FBx?DkFpJ&km50mj`_VT<#fW&6`K(_7)fQ(0!*L5f4Ej#3UCx zrNcRn^DeNat*z~~ix)30O(QFS8(%sB+`f+&hWj{DG>wd$9Ow^osV~gDo#$S?skMjp zT%wT(BO@c+ywy!l&uzqD5=o~f5YM#j@5%v6db()N%_g^C8UTZRL%axdX_H|&Dk_QB z1+YO!45bA*{N&j9qMF+e1m5%>vqbYlwx8KEg5c^{({MfT3|>+#HTogP#>$ANctmr{ zx!=Lkyn{S(IS`o2>?u<~yD|5ag3Q=!_P8ORvJn$^)a8$RfsbQtSr~joHMo%|I^w1W iNqZFEXpa`xBlI_6Mqud%g5MVa0000setupUi(this); labelEditNamePoint = ui->labelEditNamePoint; - flagFormula = true; bOk = ui->buttonBox->button(QDialogButtonBox::Ok); connect(bOk, &QPushButton::clicked, this, &DialogHeight::DialogAccepted); flagName = false; diff --git a/dialogs/dialogheight.ui b/dialogs/dialogheight.ui index bfb3dab67..9c4900050 100644 --- a/dialogs/dialogheight.ui +++ b/dialogs/dialogheight.ui @@ -13,6 +13,9 @@ Dialog + + + diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index d1b19544a..10df37d63 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -264,6 +264,21 @@ QString DialogHistory::Record(const VToolRecord &tool){ data->GetPoint(p2LineId).name()); break; } + case Tool::Triangle:{ + qint64 axisP1Id = 0; + qint64 axisP2Id = 0; + domElement = doc->elementById(QString().setNum(tool.getId())); + if(domElement.isElement()){ + axisP1Id = domElement.attribute("axisP1", "").toLongLong(); + axisP2Id = domElement.attribute("axisP2", "").toLongLong(); + firstPointId = domElement.attribute("firstPoint", "").toLongLong(); + secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + } + record = QString(tr("Triangle: axis %1_%2, points %3 and %4")).arg( + data->GetPoint(axisP1Id).name(),data->GetPoint(axisP2Id).name(), + data->GetPoint(firstPointId).name(), data->GetPoint(secondPointId).name()); + break; + } default: qWarning()<setupUi(this); + labelEditNamePoint = ui->labelEditNamePoint; + bOk = ui->buttonBox->button(QDialogButtonBox::Ok); + connect(bOk, &QPushButton::clicked, this, &DialogTriangle::DialogAccepted); + flagName = false; + CheckState(); + QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); + connect(bCansel, &QPushButton::clicked, this, &DialogTriangle::DialogRejected); + FillComboBoxPoints(ui->comboBoxAxisP1); + FillComboBoxPoints(ui->comboBoxAxisP2); + FillComboBoxPoints(ui->comboBoxFirstPoint); + FillComboBoxPoints(ui->comboBoxSecondPoint); + connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogTriangle::NamePointChanged); +} + +DialogTriangle::~DialogTriangle(){ + delete ui; +} + +void DialogTriangle::ChoosedObject(qint64 id, Scene::Scenes type){ + if(idDetail == 0 && mode == Draw::Modeling){ + if(type == Scene::Detail){ + idDetail = id; + return; + } + } + if(mode == Draw::Modeling){ + if(!CheckObject(id)){ + return; + } + } + if(type == Scene::Point){ + VPointF point; + if(mode == Draw::Calculation){ + point = data->GetPoint(id); + } else { + point = data->GetModelingPoint(id); + } + switch(number){ + case(0): + ChangeCurrentText(ui->comboBoxAxisP1, point.name()); + number++; + emit ToolTip(tr("Select second point of axis")); + break; + case(1): + ChangeCurrentText(ui->comboBoxAxisP2, point.name()); + number++; + emit ToolTip(tr("Select first point")); + break; + case(2): + ChangeCurrentText(ui->comboBoxFirstPoint, point.name()); + number++; + emit ToolTip(tr("Select second point")); + break; + case(3): + ChangeCurrentText(ui->comboBoxSecondPoint, point.name()); + number = 0; + emit ToolTip(tr("")); + if(!isInitialized){ + this->show(); + } + break; + } + } +} + +void DialogTriangle::DialogAccepted(){ + pointName = ui->lineEditNamePoint->text(); + firstPointId = getCurrentPointId(ui->comboBoxFirstPoint); + secondPointId = getCurrentPointId(ui->comboBoxSecondPoint); + axisP1Id = getCurrentPointId(ui->comboBoxAxisP1); + axisP2Id = getCurrentPointId(ui->comboBoxAxisP2); + emit DialogClosed(QDialog::Accepted); +} +QString DialogTriangle::getPointName() const{ + return pointName; +} + +void DialogTriangle::setPointName(const QString &value){ + pointName = value; + ui->lineEditNamePoint->setText(pointName); +} + +qint64 DialogTriangle::getSecondPointId() const{ + return secondPointId; +} + +void DialogTriangle::setSecondPointId(const qint64 &value, const qint64 &id){ + secondPointId = value; + setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); +} + +qint64 DialogTriangle::getFirstPointId() const{ + return firstPointId; +} + +void DialogTriangle::setFirstPointId(const qint64 &value, const qint64 &id){ + firstPointId = value; + setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); +} + +qint64 DialogTriangle::getAxisP2Id() const{ + return axisP2Id; +} + +void DialogTriangle::setAxisP2Id(const qint64 &value, const qint64 &id){ + axisP2Id = value; + setCurrentPointId(ui->comboBoxAxisP2, axisP2Id, value, id); +} + +qint64 DialogTriangle::getAxisP1Id() const{ + return axisP1Id; +} + +void DialogTriangle::setAxisP1Id(const qint64 &value, const qint64 &id){ + axisP1Id = value; + setCurrentPointId(ui->comboBoxAxisP1, axisP1Id, value, id); +} + diff --git a/dialogs/dialogtriangle.h b/dialogs/dialogtriangle.h new file mode 100644 index 000000000..74c9bcf3c --- /dev/null +++ b/dialogs/dialogtriangle.h @@ -0,0 +1,42 @@ +#ifndef DIALOGTRIANGLE_H +#define DIALOGTRIANGLE_H + +#include "dialogtool.h" + +namespace Ui { +class DialogTriangle; +} + +class DialogTriangle : public DialogTool +{ + Q_OBJECT + +public: + DialogTriangle(const VContainer *data, Draw::Draws mode = Draw::Calculation, + QWidget *parent = 0); + ~DialogTriangle(); + qint64 getAxisP1Id() const; + void setAxisP1Id(const qint64 &value, const qint64 &id); + qint64 getAxisP2Id() const; + void setAxisP2Id(const qint64 &value, const qint64 &id); + qint64 getFirstPointId() const; + void setFirstPointId(const qint64 &value, const qint64 &id); + qint64 getSecondPointId() const; + void setSecondPointId(const qint64 &value, const qint64 &id); + QString getPointName() const; + void setPointName(const QString &value); +public slots: + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); +private: + Q_DISABLE_COPY(DialogTriangle) + Ui::DialogTriangle *ui; + qint32 number; + QString pointName; + qint64 axisP1Id; + qint64 axisP2Id; + qint64 firstPointId; + qint64 secondPointId; +}; + +#endif // DIALOGTRIANGLE_H diff --git a/dialogs/dialogtriangle.ui b/dialogs/dialogtriangle.ui new file mode 100644 index 000000000..7e788b2f0 --- /dev/null +++ b/dialogs/dialogtriangle.ui @@ -0,0 +1,196 @@ + + + DialogTriangle + + + + 0 + 0 + 267 + 220 + + + + Dialog + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Name new point + + + + + + + + + + + + + + First point of axis + + + + + + + First point of line + + + + + + + + + + + Second point of axis + + + + + + + First point of line + + + + + + + + + + + First point + + + + + + + First point of line + + + + + + + + + + + Second point + + + + + + + First point of line + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + DialogTriangle + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + DialogTriangle + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/icon.qrc b/icon.qrc index e5bf6d0ed..520ff398d 100644 --- a/icon.qrc +++ b/icon.qrc @@ -35,5 +35,6 @@ icon/32x32/layout.png icon/16x16/mirror.png icon/32x32/height.png + icon/32x32/triangle.png diff --git a/icon/32x32/triangle.png b/icon/32x32/triangle.png new file mode 100644 index 0000000000000000000000000000000000000000..c409b3b41367a854e73a52140cd08a6780d7fefc GIT binary patch literal 3907 zcmV-J54`Y+P)StO&>uS)ve< z0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH15C~g000{K(ZT*W zKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9 zG%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5!4#~(4xGUqyucR% zVFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9;1XPc>u?taU>Kgl z7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZqynizYLQ(?Bl0bB z6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>XmZEFX8nhlgfVQHi z(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1#CT#lv5;6stS0Uu z9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>w zk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>Lsh-pbs)#zDT1jo7 zc2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8eYv>2*=jns=cMJ`N z4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^d=-((5|uiYR+WC0 z=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~?uTdNHFy_3W~^@< zVyraYW!!5#VPa`A+oZ&##pJ#z&6I1JX1dX|({#+t$SmBf*sRIyjyctwYo1}g*}U8Q zjfJH}oW)9uHjBrW+LnCF1(r>g_pF#!K2~{F^;XxcN!DEJEbDF7S8PxlSDOr*I-AS3 zsI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{%p4LO);n}Nd~$Sk z%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X;pL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_kmoO6c3xRt`@J4d zvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~e%5}Oeh2)X`#bu} z{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg6+#RN4Ot&@lW)Km z@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnWh~P(Th`1kV8JQRP zeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmhY-8-3xPZ8-xPf?w z_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C%bs^USv6UZd^m-e z5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3hINdvaL;7fjPeygd zGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eTPi8AClMUo~=55Lw zlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1`^^VQ7&C1OKHDNXF zTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk9!NTH<(q(S+MDf~ zceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8zO#GQ^T~S@VXG71P zKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S_si{9Jg#)~P3t?+ z@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZWdXIRo{Jz@#>IeD{ z>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl9~%uCz4Bzvli{bb zrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f&AH2?aJ@Kaet zy{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*!15EuYV=^4!c00ehQL_t(o z!@ZYVOk7nIhQB>GU}h)-Ln&1#mjbP{*r<()z8K#cjryb^Awe5U;Gq`FgS9cyMop^~ zEN!%@RlHP7n`kt#Ufz5$O`{JY$X^lnDE-oZ+3)x>W=KP__x%hBB}L z>NKsxr)XJK0BB&gLSYf80RY||`k1Fz4S)m$5cI=_D$qh;wsLm(GagwL00NK_+y#)4 z0qaXZ^@9}rH2Ni5<>*Q?Amc-i4;3=)Ff$3$5qhV7qiFQ(3IjkI6B5XBLQ#pKiJ2QP z+6CdbpYk__meYalhyRnSye;{t~hVm`9GBMcQ)U>*K^1ye9fLHt=$A=?GHZir2h zf4P@|(t5c3>2d?m=NQoS`Fe0@e~t^fnX0R+Q*&~c7xUyw0Xf#QvjzZNoWphem7*9khScCG{i zdOQs}V&|jC@kuHI5rV1$!UTEwphiKT;kkhmyuSQZkjTG)@&<4@iA?&a420064%1O6 z-wY_AMtJ2?Cr!(ff`s}LBGe3rQUkMYP<$}`=T9nNf-{$9<7U*eDvkxST@s<<-H7`J42UIrm zKp@PJsu;1(Y$IL?@o>*!zTUPMdfL+I1KRvvkdAHL1N|K^=;1DZ7_Y7&5wNk+sF0|S zr+V9Xe_LxhDPV5*5;A^oOAo}BJy2ADIvJuO7$st}fD(h^QUgTbI?a9U?7wvi;$k!l z$h30k?$-3{x#mT<|0M#k7<+ZyU@#IgG+{G?-^-hQ?L3^bbXXCFT%Vk`ir6hk*BrPl# zAVH)|#A9TVqb@;Fz&j2x35v$LEGHAQOZ6S*{2Dv87W2Y8TZn#{hEM8TI11Os!I4YH zz58hq0Nn@SzL%lrE#AnmP;WMof78dr+?|m$0jADL6L=@U<;LUnQs;1T@m~yoYy=Mx RSnB`)002ovPDHLkV1hvcS0Vra literal 0 HcmV?d00001 diff --git a/mainwindow.cpp b/mainwindow.cpp index 7befade91..37e1be32c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -48,6 +48,7 @@ MainWindow::MainWindow(QWidget *parent) : dialogArc(QSharedPointer()), dialogSplinePath(QSharedPointer()), dialogPointOfContact(QSharedPointer()), dialogDetail(QSharedPointer()), dialogHeight(QSharedPointer()), + dialogTriangle(QSharedPointer()), dialogHistory(0), doc(0), data(0), comboBoxDraws(0), fileName(QString()), changeInFile(false), mode(Draw::Calculation){ ui->setupUi(this); @@ -92,6 +93,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->toolButtonPointOfContact, &QToolButton::clicked, this, &MainWindow::ToolPointOfContact); connect(ui->toolButtonNewDetail, &QToolButton::clicked, this, &MainWindow::ToolDetail); connect(ui->toolButtonHeight, &QToolButton::clicked, this, &MainWindow::ToolHeight); + connect(ui->toolButtonTriangle, &QToolButton::clicked, this, &MainWindow::ToolTriangle); data = new VContainer; @@ -481,6 +483,23 @@ void MainWindow::ClosedDialogHeight(int result){ ArrowTool(); } +void MainWindow::ToolTriangle(bool checked){ + SetToolButton(checked, Tool::Triangle, ":/cursor/triangle_cursor.png", tr("Select first point of axis"), + dialogTriangle, &MainWindow::ClosedDialogTriangle); +} + +void MainWindow::ClosedDialogTriangle(int result){ + if(result == QDialog::Accepted){ + if(mode == Draw::Calculation){ + VToolTriangle::Create(dialogTriangle, currentScene, doc, data); + } else { + VModelingTriangle *point = VModelingTriangle::Create(dialogTriangle, doc, data); + AddToolToDetail(point, point->getId(), Tool::Triangle, dialogTriangle->getIdDetail()); + } + } + ArrowTool(); +} + void MainWindow::About(){ QMessageBox::about(this, tr("About Valentina"), tr("Valentina v.0.1.0")); } @@ -640,6 +659,7 @@ void MainWindow::CanselTool(){ helpLabel->setText(""); break; case Tool::SinglePointTool: + Q_UNREACHABLE(); //Nothing to do here because we can't create this tool from main window. break; case Tool::EndLineTool: @@ -715,6 +735,14 @@ void MainWindow::CanselTool(){ case Tool::Height: dialogHeight.clear(); ui->toolButtonHeight->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::Triangle: + dialogTriangle.clear(); + ui->toolButtonTriangle->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); break; default: qWarning()<<"Get wrong tool type. Ignore."; @@ -957,6 +985,7 @@ void MainWindow::SetEnableTool(bool enable){ ui->toolButtonPointOfContact->setEnabled(enable); ui->toolButtonNewDetail->setEnabled(enable); ui->toolButtonHeight->setEnabled(enable); + ui->toolButtonTriangle->setEnabled(enable); } void MainWindow::MinimumScrollBar(){ diff --git a/mainwindow.h b/mainwindow.h index 844052539..2b65763b8 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -41,8 +41,7 @@ namespace Ui { class MainWindow; } -class MainWindow : public QMainWindow -{ +class MainWindow : public QMainWindow{ Q_OBJECT public: explicit MainWindow(QWidget *parent = 0); @@ -81,6 +80,7 @@ public slots: void ToolPointOfContact(bool checked); void ToolDetail(bool checked); void ToolHeight(bool checked); + void ToolTriangle(bool checked); void ClosedDialogEndLine(int result); void ClosedDialogLine(int result); void ClosedDialogAlongLine(int result); @@ -94,6 +94,7 @@ public slots: void ClosedDialogPointOfContact(int result); void ClosedDialogDetail(int result); void ClosedDialogHeight(int result); + void ClosedDialogTriangle(int result); void About(); void AboutQt(); void ShowToolTip(const QString &toolTip); @@ -138,6 +139,7 @@ private: QSharedPointer dialogPointOfContact; QSharedPointer dialogDetail; QSharedPointer dialogHeight; + QSharedPointer dialogTriangle; DialogHistory *dialogHistory; VDomDocument *doc; VContainer *data; diff --git a/mainwindow.ui b/mainwindow.ui index 0e9a0df8b..920dd684a 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -246,6 +246,32 @@ + + + + false + + + Tool triangle. + + + ... + + + + :/icon/32x32/triangle.png:/icon/32x32/triangle.png + + + + 32 + 32 + + + + true + + + @@ -253,7 +279,7 @@ 0 0 - 150 + 100 58 @@ -329,7 +355,7 @@ 0 0 - 150 + 100 58 @@ -405,7 +431,7 @@ 0 0 - 150 + 98 58 @@ -455,7 +481,7 @@ 0 0 - 150 + 98 58 diff --git a/options.h b/options.h index 28b99f2d9..71aaa9dfd 100644 --- a/options.h +++ b/options.h @@ -56,7 +56,8 @@ enum Tool {ArrowTool, NodeArc, NodeSpline, NodeSplinePath, - Height + Height, + Triangle }; Q_DECLARE_FLAGS(Tools, Tool) diff --git a/tools/drawTools/drawtools.h b/tools/drawTools/drawtools.h index 58fcbaf08..8051d3641 100644 --- a/tools/drawTools/drawtools.h +++ b/tools/drawTools/drawtools.h @@ -35,5 +35,6 @@ #include "vtoolspline.h" #include "vtoolsplinepath.h" #include "vtoolheight.h" +#include "vtooltriangle.h" #endif // DRAWTOOLS_H diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index 8d54e14bc..905a5ea98 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -79,8 +79,8 @@ void VToolAlongLine::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "alongLine"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "typeLine", typeLine); AddAttribute(domElement, "length", formula); diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index 4e3307a51..f1ee18525 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -51,22 +51,22 @@ void VToolShoulderPoint::setDialog(){ QPointF VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, const qreal &length){ QLineF line = QLineF(p1Line, p2Line); - qreal dist = line.length(); - if(dist>length){ - qDebug()<<"A3П2="<length){ + qDebug()<<"A3П2="<=length){ return line.p2(); } - qreal step = 0.01; - while(1){ - line.setLength(line.length()+step); - QLineF line2 = QLineF(pShoulder, line.p2()); - if(line2.length()>=length){ - return line.p2(); - } - } + } } void VToolShoulderPoint::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp new file mode 100644 index 000000000..5b02c23c3 --- /dev/null +++ b/tools/drawTools/vtooltriangle.cpp @@ -0,0 +1,150 @@ +#include "vtooltriangle.h" + +VToolTriangle::VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, + const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) + :VToolPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), firstPointId(firstPointId), + secondPointId(secondPointId), dialogTriangle(QSharedPointer()) { + if(typeCreation == Tool::FromGui){ + AddToFile(); + } +} + +void VToolTriangle::setDialog(){ + Q_ASSERT(!dialogTriangle.isNull()); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogTriangle->setAxisP1Id(axisP1Id, id); + dialogTriangle->setAxisP2Id(axisP2Id, id); + dialogTriangle->setFirstPointId(firstPointId, id); + dialogTriangle->setSecondPointId(secondPointId, id); + dialogTriangle->setPointName(p.name()); +} + +void VToolTriangle::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data){ + qint64 axisP1Id = dialog->getAxisP1Id(); + qint64 axisP2Id = dialog->getAxisP2Id(); + qint64 firstPointId = dialog->getFirstPointId(); + qint64 secondPointId = dialog->getSecondPointId(); + QString pointName = dialog->getPointName(); + Create(0, pointName, axisP1Id, axisP2Id, firstPointId, secondPointId, 5, 10, scene, doc, data, + Document::FullParse, Tool::FromGui); + +} + +void VToolTriangle::Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, + const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, + const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + VPointF axisP1 = data->GetPoint(axisP1Id); + VPointF axisP2 = data->GetPoint(axisP2Id); + VPointF firstPoint = data->GetPoint(firstPointId); + VPointF secondPoint = data->GetPoint(secondPointId); + + QPointF point = FindPoint(axisP1.toQPointF(), axisP2.toQPointF(), firstPoint.toQPointF(), + secondPoint.toQPointF()); + qint64 id = _id; + if(typeCreation == Tool::FromGui){ + id = data->AddPoint(VPointF(point.x(), point.y(), pointName, mx, my)); + } else { + data->UpdatePoint(id, VPointF(point.x(), point.y(), pointName, mx, my)); + if(parse != Document::FullParse){ + doc->UpdateToolData(id, data); + } + } + VDrawTool::AddRecord(id, Tool::Triangle, doc); + if(parse == Document::FullParse){ + VToolTriangle *point = new VToolTriangle(doc, data, id, axisP1Id, axisP2Id, firstPointId, + secondPointId, typeCreation); + scene->addItem(point); + connect(point, &VToolTriangle::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolTriangle::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolTriangle::SetFactor); + doc->AddTool(id, point); + doc->IncrementReferens(axisP1Id); + doc->IncrementReferens(axisP2Id); + doc->IncrementReferens(firstPointId); + doc->IncrementReferens(secondPointId); + } +} + +QPointF VToolTriangle::FindPoint(const QPointF axisP1, const QPointF axisP2, const QPointF firstPoint, + const QPointF secondPoint){ + qreal c = QLineF(firstPoint, secondPoint).length(); + qreal a = QLineF(axisP2, firstPoint).length(); + qreal b = QLineF(axisP2, secondPoint).length(); + if(c*c == a*a + b*b){ + return axisP2; + } + + QLineF line = QLineF(axisP1, axisP2); + qreal step = 0.01; + while(1){ + line.setLength(line.length()+step); + a = QLineF(line.p2(), firstPoint).length(); + b = QLineF(line.p2(), secondPoint).length(); + if(static_cast(c*c) == static_cast(a*a + b*b)){ + return line.p2(); + } + if(c*c < a*a + b*b){ + return axisP2; + qWarning()<elementById(QString().setNum(id)); + if(domElement.isElement()){ + axisP1Id = domElement.attribute("axisP1", "").toLongLong(); + axisP2Id = domElement.attribute("axisP2", "").toLongLong(); + firstPointId = domElement.attribute("firstPoint", "").toLongLong(); + secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + } + VToolPoint::RefreshPointGeometry(VDrawTool::data.GetPoint(id)); +} + +void VToolTriangle::FullUpdateFromGui(int result){ + if(result == QDialog::Accepted){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("name", dialogTriangle->getPointName()); + domElement.setAttribute("axisP1", QString().setNum(dialogTriangle->getAxisP1Id())); + domElement.setAttribute("axisP2", QString().setNum(dialogTriangle->getAxisP2Id())); + domElement.setAttribute("firstPoint", QString().setNum(dialogTriangle->getFirstPointId())); + domElement.setAttribute("secondPoint", QString().setNum(dialogTriangle->getSecondPointId())); + emit FullUpdateTree(); + } + + } + dialogTriangle.clear(); +} + +void VToolTriangle::RemoveReferens(){ + doc->DecrementReferens(axisP1Id); + doc->DecrementReferens(axisP2Id); + doc->DecrementReferens(firstPointId); + doc->DecrementReferens(secondPointId); +} + +void VToolTriangle::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ + ContextMenu(dialogTriangle, this, event); +} + +void VToolTriangle::AddToFile(){ + VPointF point = VAbstractTool::data.GetPoint(id); + QDomElement domElement = doc->createElement("point"); + + AddAttribute(domElement, "id", id); + AddAttribute(domElement, "type", "triangle"); + AddAttribute(domElement, "name", point.name()); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); + + AddAttribute(domElement, "axisP1", axisP1Id); + AddAttribute(domElement, "axisP2", axisP2Id); + AddAttribute(domElement, "firstPoint", firstPointId); + AddAttribute(domElement, "secondPoint", secondPointId); + + AddToCalculation(domElement); +} diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h new file mode 100644 index 000000000..173af52cb --- /dev/null +++ b/tools/drawTools/vtooltriangle.h @@ -0,0 +1,39 @@ +#ifndef VTOOLTRIANGLE_H +#define VTOOLTRIANGLE_H + +#include "vtoolpoint.h" +#include "dialogs/dialogtriangle.h" + +class VToolTriangle : public VToolPoint{ + Q_OBJECT +public: + VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, + const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 _id, const QString &pointName, + const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, + const qint64 &secondPointId, const qreal &mx, const qreal &my, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); + static QPointF FindPoint(const QPointF axisP1, const QPointF axisP2, const QPointF firstPoint, + const QPointF secondPoint); +public slots: + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); +protected: + virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); +private: + Q_DISABLE_COPY(VToolTriangle) + qint64 axisP1Id; + qint64 axisP2Id; + qint64 firstPointId; + qint64 secondPointId; + QSharedPointer dialogTriangle; +}; + +#endif // VTOOLTRIANGLE_H diff --git a/tools/modelingTools/modelingtools.h b/tools/modelingTools/modelingtools.h index a40cdf15a..bd61fee59 100644 --- a/tools/modelingTools/modelingtools.h +++ b/tools/modelingTools/modelingtools.h @@ -35,5 +35,6 @@ #include "vmodelingspline.h" #include "vmodelingsplinepath.h" #include "vmodelingheight.h" +#include "vmodelingtriangle.h" #endif // MODELINGTOOLS_H diff --git a/tools/modelingTools/vmodelingtriangle.cpp b/tools/modelingTools/vmodelingtriangle.cpp new file mode 100644 index 000000000..e2f722a07 --- /dev/null +++ b/tools/modelingTools/vmodelingtriangle.cpp @@ -0,0 +1,127 @@ +#include "vmodelingtriangle.h" +#include "../drawTools/vtooltriangle.h" + +VModelingTriangle::VModelingTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, + const qint64 &axisP1Id, const qint64 &axisP2Id, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem *parent) + :VModelingPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), + firstPointId(firstPointId), secondPointId(secondPointId), + dialogTriangle(QSharedPointer()) { + if(typeCreation == Tool::FromGui){ + AddToFile(); + } +} + +void VModelingTriangle::setDialog(){ + Q_ASSERT(!dialogTriangle.isNull()); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogTriangle->setAxisP1Id(axisP1Id, id); + dialogTriangle->setAxisP2Id(axisP2Id, id); + dialogTriangle->setFirstPointId(firstPointId, id); + dialogTriangle->setSecondPointId(secondPointId, id); + dialogTriangle->setPointName(p.name()); +} + +VModelingTriangle *VModelingTriangle::Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data){ + qint64 axisP1Id = dialog->getAxisP1Id(); + qint64 axisP2Id = dialog->getAxisP2Id(); + qint64 firstPointId = dialog->getFirstPointId(); + qint64 secondPointId = dialog->getSecondPointId(); + QString pointName = dialog->getPointName(); + return Create(0, pointName, axisP1Id, axisP2Id, firstPointId, secondPointId, 5, 10, doc, data, + Document::FullParse, Tool::FromGui); + +} + +VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &pointName, + const qint64 &axisP1Id, const qint64 &axisP2Id, + const qint64 &firstPointId, const qint64 &secondPointId, + const qreal &mx, const qreal &my, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation){ + VModelingTriangle *tool = 0; + VPointF axisP1 = data->GetPoint(axisP1Id); + VPointF axisP2 = data->GetPoint(axisP2Id); + VPointF firstPoint = data->GetPoint(firstPointId); + VPointF secondPoint = data->GetPoint(secondPointId); + + QPointF point = VToolTriangle::FindPoint(axisP1.toQPointF(), axisP2.toQPointF(), firstPoint.toQPointF(), + secondPoint.toQPointF()); + qint64 id = _id; + if(typeCreation == Tool::FromGui){ + id = data->AddPoint(VPointF(point.x(), point.y(), pointName, mx, my)); + } else { + data->UpdatePoint(id, VPointF(point.x(), point.y(), pointName, mx, my)); + if(parse != Document::FullParse){ + doc->UpdateToolData(id, data); + } + } + if(parse == Document::FullParse){ + tool = new VModelingTriangle(doc, data, id, axisP1Id, axisP2Id, firstPointId, + secondPointId, typeCreation); + doc->AddTool(id, tool); + doc->IncrementReferens(axisP1Id); + doc->IncrementReferens(axisP2Id); + doc->IncrementReferens(firstPointId); + doc->IncrementReferens(secondPointId); + } + return tool; +} + +void VModelingTriangle::FullUpdateFromFile(){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + axisP1Id = domElement.attribute("axisP1", "").toLongLong(); + axisP2Id = domElement.attribute("axisP2", "").toLongLong(); + firstPointId = domElement.attribute("firstPoint", "").toLongLong(); + secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + } + VModelingPoint::RefreshPointGeometry(VModelingTool::data.GetPoint(id)); +} + +void VModelingTriangle::FullUpdateFromGui(int result){ + if(result == QDialog::Accepted){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("name", dialogTriangle->getPointName()); + domElement.setAttribute("axisP1", QString().setNum(dialogTriangle->getAxisP1Id())); + domElement.setAttribute("axisP2", QString().setNum(dialogTriangle->getAxisP2Id())); + domElement.setAttribute("firstPoint", QString().setNum(dialogTriangle->getFirstPointId())); + domElement.setAttribute("secondPoint", QString().setNum(dialogTriangle->getSecondPointId())); + emit FullUpdateTree(); + } + + } + dialogTriangle.clear(); +} + +void VModelingTriangle::RemoveReferens(){ + doc->DecrementReferens(axisP1Id); + doc->DecrementReferens(axisP2Id); + doc->DecrementReferens(firstPointId); + doc->DecrementReferens(secondPointId); +} + +void VModelingTriangle::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ + ContextMenu(dialogTriangle, this, event); +} + +void VModelingTriangle::AddToFile(){ + VPointF point = VAbstractTool::data.GetPoint(id); + QDomElement domElement = doc->createElement("point"); + + AddAttribute(domElement, "id", id); + AddAttribute(domElement, "type", "triangle"); + AddAttribute(domElement, "name", point.name()); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); + + AddAttribute(domElement, "axisP1", axisP1Id); + AddAttribute(domElement, "axisP2", axisP2Id); + AddAttribute(domElement, "firstPoint", firstPointId); + AddAttribute(domElement, "secondPoint", secondPointId); + + AddToModeling(domElement); +} diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h new file mode 100644 index 000000000..a43b73867 --- /dev/null +++ b/tools/modelingTools/vmodelingtriangle.h @@ -0,0 +1,39 @@ +#ifndef VMODELINGTRIANGLE_H +#define VMODELINGTRIANGLE_H + +#include "vmodelingpoint.h" +#include "../drawTools/vtooltriangle.h" +#include "dialogs/dialogtriangle.h" + +class VModelingTriangle : public VModelingPoint{ + Q_OBJECT +public: + VModelingTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, + const qint64 &axisP1Id, const qint64 &axisP2Id, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingTriangle* Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data); + static VModelingTriangle* Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, + const qint64 &axisP2Id, const qint64 &firstPointId, + const qint64 &secondPointId, const qreal &mx, const qreal &my, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation); +public slots: + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); +protected: + virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); +private: + Q_DISABLE_COPY(VModelingTriangle) + qint64 axisP1Id; + qint64 axisP2Id; + qint64 firstPointId; + qint64 secondPointId; + QSharedPointer dialogTriangle; +}; + +#endif // VMODELINGTRIANGLE_H diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 8f113e39b..93c1c8f3d 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -150,6 +150,22 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, tool->setParentItem(this); break; } + case(Tool::Height):{ + VModelingHeight *tool = qobject_cast(tools->value(detail[i].getId())); + Q_ASSERT(tool != 0); + connect(tool, &VModelingHeight::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + connect(tool, &VModelingHeight::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + tool->setParentItem(this); + break; + } + case(Tool::Triangle):{ + VModelingTriangle *tool = qobject_cast(tools->value(detail[i].getId())); + Q_ASSERT(tool != 0); + connect(tool, &VModelingTriangle::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + connect(tool, &VModelingTriangle::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + tool->setParentItem(this); + break; + } default: qWarning()<<"Get wrong tool type. Ignore."; break; diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 52e42e7ff..e4d31e700 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -831,6 +831,32 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen throw excep; } } + if(type == "triangle"){ + try{ + qint64 id = GetParametrId(domElement); + QString name = GetParametrString(domElement, "name"); + qreal mx = toPixel(GetParametrDouble(domElement, "mx")); + qreal my = toPixel(GetParametrDouble(domElement, "my")); + qint64 axisP1Id = GetParametrLongLong(domElement, "axisP1"); + qint64 axisP2Id = GetParametrLongLong(domElement, "axisP2"); + qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); + qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); + + if(mode == Draw::Calculation){ + VToolTriangle::Create(id, name, axisP1Id, axisP2Id, firstPointId, secondPointId, mx, my, + scene, this, data, parse, Tool::FromFile); + } else { + VModelingTriangle::Create(id, name, axisP1Id, axisP2Id, firstPointId, secondPointId, mx, my, + this, data, parse, Tool::FromFile); + } + return; + } + catch(const VExceptionBadId &e){ + VExceptionObjectError excep(tr("Error creating or updating triangle"), domElement); + excep.AddMoreInformation(e.ErrorMessage()); + throw excep; + } + } } void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &domElement, From c6ae85b5acaa8a024d00edc7c24372a974b5ebf1 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 21 Oct 2013 10:45:49 +0300 Subject: [PATCH 27/83] Update id of line. Find point of tool triangle. Ignore full update for dialog of tool single point. --HG-- branch : develop --- container/vcontainer.cpp | 15 +++++++-------- tools/drawTools/vtoolline.cpp | 1 + tools/drawTools/vtoolsinglepoint.cpp | 1 + tools/drawTools/vtooltriangle.cpp | 14 +++++++++++--- tools/modelingTools/vmodelingline.cpp | 1 + 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index f5ef78bc7..eaf543107 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -796,18 +796,17 @@ void VContainer::CreateManTableIGroup (){ AddStandartTableCell("Vzy", VStandartTableCell(1328, 0, 49)); AddStandartTableCell("Vlop", VStandartTableCell(1320, 0, 49)); AddStandartTableCell("Vps", VStandartTableCell(811, -1, 36)); - AddStandartTableCell("Osh", VStandartTableCell(404,8, 2)); - AddStandartTableCell("OgI", VStandartTableCell(1034, 36, 4)); - AddStandartTableCell("OgII", VStandartTableCell(1044, 38, 2)); - AddStandartTableCell("OgIII", VStandartTableCell(1000, 40, 0)); - AddStandartTableCell("Ot", VStandartTableCell(780, 40, 0)); - AddStandartTableCell("Ob", VStandartTableCell(984, 30, 10)); - AddStandartTableCell("ObI", VStandartTableCell(964, 24, 12)); + AddStandartTableCell("Ssh", VStandartTableCell(202,4, 1)); + AddStandartTableCell("SgI", VStandartTableCell(517, 18, 2)); + AddStandartTableCell("SgII", VStandartTableCell(522, 19, 1)); + AddStandartTableCell("SgIII", VStandartTableCell(500, 20, 0)); + AddStandartTableCell("St", VStandartTableCell(390, 20, 0)); + AddStandartTableCell("Sb", VStandartTableCell(492, 15, 5)); + AddStandartTableCell("SbI", VStandartTableCell(482, 12, 6)); AddStandartTableCell("Obed", VStandartTableCell(566, 18, 6)); AddStandartTableCell("Ok", VStandartTableCell(386, 8, 8)); AddStandartTableCell("Oi", VStandartTableCell(380, 8, 6)); AddStandartTableCell("Osch", VStandartTableCell(234, 4, 4)); - AddStandartTableCell("Os", VStandartTableCell(350, 2, 8)); AddStandartTableCell("Dsb", VStandartTableCell(1120, 0, 44)); AddStandartTableCell("Dsp", VStandartTableCell(1110, 0, 43)); AddStandartTableCell("Dn", VStandartTableCell(826, -3, 37)); diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 7f4c07bd5..e3fb9e9ac 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -63,6 +63,7 @@ void VToolLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 id = data->getNextId(); data->AddLine(firstPoint, secondPoint); } else { + data->UpdateId(id); data->AddLine(firstPoint, secondPoint); if(parse != Document::FullParse){ doc->UpdateToolData(id, data); diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index b77d4973d..d8c4d8327 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -29,6 +29,7 @@ VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem * parent ):VToolPoint(doc, data, id, parent), dialogSinglePoint(QSharedPointer()){ + ignoreFullUpdate = true; this->setFlag(QGraphicsItem::ItemIsMovable, true); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); if(typeCreation == Tool::FromGui){ diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index 5b02c23c3..d19f498b7 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -74,7 +74,11 @@ QPointF VToolTriangle::FindPoint(const QPointF axisP1, const QPointF axisP2, con qreal a = QLineF(axisP2, firstPoint).length(); qreal b = QLineF(axisP2, secondPoint).length(); if(c*c == a*a + b*b){ - return axisP2; + QLineF l1(axisP2, firstPoint); + QLineF l2(axisP2, secondPoint); + if(l1.angleTo(l2) == 90 || l2.angleTo(l1) == 90){ + return axisP2; + } } QLineF line = QLineF(axisP1, axisP2); @@ -84,10 +88,14 @@ QPointF VToolTriangle::FindPoint(const QPointF axisP1, const QPointF axisP2, con a = QLineF(line.p2(), firstPoint).length(); b = QLineF(line.p2(), secondPoint).length(); if(static_cast(c*c) == static_cast(a*a + b*b)){ - return line.p2(); + QLineF l1(axisP2, firstPoint); + QLineF l2(axisP2, secondPoint); + if(l1.angleTo(l2) == 90 || l2.angleTo(l1) == 90){ + return line.p2(); + } } if(c*c < a*a + b*b){ - return axisP2; + return line.p2(); qWarning()<getNextId(); } else { if(parse != Document::FullParse){ + data->UpdateId(id); doc->UpdateToolData(id, data); } } From 70901ddb1b932479d77d38564c238a9ca85f887c Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 21 Oct 2013 12:15:50 +0300 Subject: [PATCH 28/83] Wrong scaling in verticalScrollBar. --HG-- branch : develop --- widgets/vmaingraphicsview.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index a8558bec3..7c3e78be1 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -53,14 +53,18 @@ void VMainGraphicsView::scalingTime(qreal x){ qreal factor = 1.0 + qreal(_numScheduledScalings) / 300.0; if (QApplication::keyboardModifiers() == Qt::ControlModifier){// If you press CTRL this code will execute scale(factor, factor); + emit NewFactor(factor); } else { if(_numScheduledScalings < 0){ verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() + factor*3.5)); + emit NewFactor(factor); } else { - verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() - factor*3.5)); + if(verticalScrollBar()->value() > 0){ + verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() - factor*3.5)); + emit NewFactor(factor); + } } - } - emit NewFactor(factor); + } } void VMainGraphicsView::animFinished(){ From 27b239fc84e9660ce17279aed7481e91f70b211f Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 21 Oct 2013 12:36:24 +0300 Subject: [PATCH 29/83] Align for field description of increment. --HG-- branch : develop --- dialogs/dialogincrements.cpp | 6 ++++-- dialogs/dialogincrements.ui | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index b12414859..0bceb8d27 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -148,7 +148,7 @@ void DialogIncrements::FillIncrementTable(){ ui->tableWidgetIncrement->setItem(currentRow, 4, item); item = new QTableWidgetItem(cell.getDescription()); - item->setTextAlignment(Qt::AlignHCenter); + item->setTextAlignment(Qt::AlignLeft); ui->tableWidgetIncrement->setItem(currentRow, 5, item); } if(ui->tableWidgetIncrement->rowCount()>0){ @@ -156,7 +156,6 @@ void DialogIncrements::FillIncrementTable(){ } ui->tableWidgetIncrement->resizeColumnsToContents(); ui->tableWidgetIncrement->resizeRowsToContents(); - ui->tableWidgetIncrement->verticalHeader()->setDefaultSectionSize(20); ui->tableWidgetIncrement->setCurrentCell( row, column ); } @@ -466,6 +465,8 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ VIncrementTableRow incr = data->GetIncrementTableRow(itemName->text()); incr.setDescription(item->text()); data->UpdateIncrementTableRow(itemName->text(), incr); + ui->tableWidgetIncrement->resizeColumnsToContents(); + ui->tableWidgetIncrement->resizeRowsToContents(); ui->tableWidgetIncrement->setCurrentCell( row, 0 ); emit haveLiteChange(); } @@ -491,6 +492,7 @@ void DialogIncrements::InitialIncrementTable(){ ui->tableWidgetIncrement->setHorizontalHeaderItem(3, new QTableWidgetItem(tr("In size"))); ui->tableWidgetIncrement->setHorizontalHeaderItem(4, new QTableWidgetItem(tr("In growth"))); ui->tableWidgetIncrement->setHorizontalHeaderItem(5, new QTableWidgetItem(tr("Description"))); + ui->tableWidgetIncrement->verticalHeader()->setDefaultSectionSize(20); } void DialogIncrements::InitialLinesTable(){ diff --git a/dialogs/dialogincrements.ui b/dialogs/dialogincrements.ui index 1917246a3..74203d5cc 100644 --- a/dialogs/dialogincrements.ui +++ b/dialogs/dialogincrements.ui @@ -27,7 +27,7 @@ QTabWidget::North - 0 + 1 @@ -149,9 +149,15 @@ false + + false + 45 + + false + Denotation From 933c7d8a75007c65b87ee3e62b127f85e0214f07 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 21 Oct 2013 13:18:12 +0300 Subject: [PATCH 30/83] Before saving file run test "unique id". --HG-- branch : develop --- mainwindow.cpp | 17 ++++++++++++++++- xml/vdomdocument.h | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 37e1be32c..f32f20d3c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -996,6 +996,21 @@ void MainWindow::MinimumScrollBar(){ } bool MainWindow::SafeSaveing(const QString &fileName) const{ + try{ + doc->TestUniqueId(); + } + catch(const VExceptionUniqueId &e){ + QMessageBox msgBox; + msgBox.setWindowTitle(tr("Error!")); + msgBox.setText(tr("Error don't unique id.")); + msgBox.setInformativeText(e.ErrorMessage()); + msgBox.setStandardButtons(QMessageBox::Ok); + msgBox.setDefaultButton(QMessageBox::Ok); + msgBox.setDetailedText(e.DetailedInformation()); + msgBox.setIcon(QMessageBox::Critical); + msgBox.exec(); + return false; + } if(fileName.isEmpty()){ qWarning()<actionSave->setEnabled(false); diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index 76449e24b..51fcd2f03 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -66,6 +66,7 @@ public: void UpdateToolData(const qint64 &id, VContainer *data); void IncrementReferens(qint64 id) const; void DecrementReferens(qint64 id) const; + void TestUniqueId() const; signals: void ChangedActivDraw(const QString newName); void ChangedNameDraw(const QString oldName, const QString newName); @@ -111,8 +112,7 @@ private: qint64 GetParametrId(const QDomElement& domElement) const; qint64 GetParametrLongLong(const QDomElement& domElement, const QString &name) const; QString GetParametrString(const QDomElement& domElement, const QString &name) const; - qreal GetParametrDouble(const QDomElement& domElement, const QString &name) const; - void TestUniqueId() const; + qreal GetParametrDouble(const QDomElement& domElement, const QString &name) const; void CollectId(QDomElement node, QVector &vector)const; }; From c66439ba7a45a8616d9b2156d8e9d42825b8dab6 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 21 Oct 2013 17:09:05 +0300 Subject: [PATCH 31/83] Tool point of intersection. --HG-- branch : develop --- Valentina.pro | 13 +- cursor.qrc | 1 + cursor/pointofintersect_cursor.png | Bin 0 -> 1403 bytes dialogs/dialogpointofintersection.cpp | 98 ++++++++++ dialogs/dialogpointofintersection.h | 34 ++++ dialogs/dialogpointofintersection.ui | 169 ++++++++++++++++++ icon.qrc | 1 + icon/32x32/point_of_intersection.png | Bin 0 -> 652 bytes mainwindow.cpp | 31 +++- mainwindow.h | 33 ++-- mainwindow.ui | 31 +++- options.h | 3 +- tools/drawTools/drawtools.h | 1 + tools/drawTools/vtoolline.cpp | 1 + tools/drawTools/vtoollineintersect.cpp | 1 + tools/drawTools/vtoolpointofintersection.cpp | 106 +++++++++++ tools/drawTools/vtoolpointofintersection.h | 33 ++++ tools/drawTools/vtoolspline.cpp | 1 + tools/drawTools/vtoolsplinepath.cpp | 1 + tools/drawTools/vtooltriangle.cpp | 2 +- tools/modelingTools/modelingtools.h | 1 + tools/modelingTools/vmodelingline.cpp | 1 + .../modelingTools/vmodelinglineintersect.cpp | 1 + .../vmodelingpointofintersection.cpp | 105 +++++++++++ .../vmodelingpointofintersection.h | 35 ++++ tools/modelingTools/vmodelingspline.cpp | 2 +- tools/modelingTools/vmodelingsplinepath.cpp | 1 + tools/modelingTools/vmodelingtriangle.cpp | 1 - xml/vdomdocument.cpp | 24 +++ 29 files changed, 704 insertions(+), 27 deletions(-) create mode 100644 cursor/pointofintersect_cursor.png create mode 100644 dialogs/dialogpointofintersection.cpp create mode 100644 dialogs/dialogpointofintersection.h create mode 100644 dialogs/dialogpointofintersection.ui create mode 100644 icon/32x32/point_of_intersection.png create mode 100644 tools/drawTools/vtoolpointofintersection.cpp create mode 100644 tools/drawTools/vtoolpointofintersection.h create mode 100644 tools/modelingTools/vmodelingpointofintersection.cpp create mode 100644 tools/modelingTools/vmodelingpointofintersection.h diff --git a/Valentina.pro b/Valentina.pro index 74ac8fbca..f9b662a95 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -103,7 +103,10 @@ SOURCES += main.cpp\ dialogs/dialogheight.cpp \ tools/drawTools/vtooltriangle.cpp \ tools/modelingTools/vmodelingtriangle.cpp \ - dialogs/dialogtriangle.cpp + dialogs/dialogtriangle.cpp \ + dialogs/dialogpointofintersection.cpp \ + tools/drawTools/vtoolpointofintersection.cpp \ + tools/modelingTools/vmodelingpointofintersection.cpp HEADERS += mainwindow.h \ widgets/vmaingraphicsscene.h \ @@ -200,7 +203,10 @@ HEADERS += mainwindow.h \ dialogs/dialogheight.h \ tools/drawTools/vtooltriangle.h \ tools/modelingTools/vmodelingtriangle.h \ - dialogs/dialogtriangle.h + dialogs/dialogtriangle.h \ + dialogs/dialogpointofintersection.h \ + tools/drawTools/vtoolpointofintersection.h \ + tools/modelingTools/vmodelingpointofintersection.h FORMS += mainwindow.ui \ dialogs/dialogsinglepoint.ui \ @@ -220,7 +226,8 @@ FORMS += mainwindow.ui \ dialogs/dialogdetail.ui \ tablewindow.ui \ dialogs/dialogheight.ui \ - dialogs/dialogtriangle.ui + dialogs/dialogtriangle.ui \ + dialogs/dialogpointofintersection.ui RESOURCES += \ icon.qrc \ diff --git a/cursor.qrc b/cursor.qrc index a0827a0a2..785c3ddd8 100644 --- a/cursor.qrc +++ b/cursor.qrc @@ -14,5 +14,6 @@ cursor/new_detail_cursor.png cursor/height_cursor.png cursor/triangle_cursor.png + cursor/pointofintersect_cursor.png diff --git a/cursor/pointofintersect_cursor.png b/cursor/pointofintersect_cursor.png new file mode 100644 index 0000000000000000000000000000000000000000..c01923887156d8f8f4e996f48696e5ce8d64bb21 GIT binary patch literal 1403 zcmV->1%&#EP)Vl&|00006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3k>8EDoLDvlRdU06}y` zSad^gZEa<4bO1wAML|?gQaT`KWG!lNWoICEF)lD5D0OpbZf77#N=G0{P(?=|b~Z98 zEFf`pVQgu1c_2L?IWP*aMOc#n00g^9L_t(Y$HkU^Xq0sv$6w#)dG6NTZo1v5%^^C- zB+XN=1|?d9Va??>ow?W_LgCC zwbf=!z3H@_-raN0r$5|t-EMbl1J6G2h41ryzR&mleZN1y9{4|P_wL;jp6l!D)g!$? zOH0du&*ziM%1RNDMUND`qN3s=APW~Rl*IMk-rkJj8UTi205CE#A`J}<;&3=vx^!tn zNlD3pj5DvQs=5e>uIr+d5C_gkbw4k}Ud0T61YuO`VZnL+C zQcB9o%A~!$JvU=MPc+N201y#0O{1WofDIcq+|HQnNDnj-V+Xoal73F0)Z#@?%lim%$YNfrvY{VJ;2Mr1t4d_ z+v@7-l+2S^Cn}+7nrNCPix)4JqM{;cYioNi4fs1rXYQJo&(p<$h+tV3BEsd%ml+-& zCKL)q>^(g_J&B+6BpvbNw0sVTrfHMd8-_8#|4Jz-EiDb!)YSZb`0(Mu6nEYVoCUT| zO0{%8xBZ@+il%8!+7k!_ynwf`urSpzhk)mSeQCjUU5^(Tr4*KBk&}}nB_$AJ3}l-~SY zOdKCrmZ|Hym7A9*1`rRHyu3Wwv}x0|{rmTS7>!2Hnx;8&{rdHYVHnEob`yz2Fims5 z+wJamxm*N;!3iZ`JoUI4yvd2LIssJJ=~<-U(?MNcC_??QOLMlJ{IcWYTf=`n_-gg) z)fWL-vSf)lReb?Yj04;O<|w7mG%aNzQc59Nvm9Zk=hv{)BMHL{J3Y@fH0_B0I=>Ih zx^(H%oxZ-lWq!Z^rxf6C0oCL49N;4n`CLRs0pIwgdVp6%!~(vXAGy2siX(f0Ok|+9 z#iBbye~-Ry0CaVAb=pzy_xsZ^pPy8Y1@Hi4`= zY;;}6FpQMGoyw{!D_FDUMf}e^g*bCI9yA`ieZ`TzZ^)CEUs_r^5Adr0=wM1j6kyE^ zxSW%n->`GXc2!VVV4OP_aOg^R_?9hq&7Pf`+q|vi=h}_0@eiK^7{)V2t-1gJ002ov JPDHLkV1iS`nZ^JB literal 0 HcmV?d00001 diff --git a/dialogs/dialogpointofintersection.cpp b/dialogs/dialogpointofintersection.cpp new file mode 100644 index 000000000..04f239337 --- /dev/null +++ b/dialogs/dialogpointofintersection.cpp @@ -0,0 +1,98 @@ +#include "dialogpointofintersection.h" +#include "ui_dialogpointofintersection.h" + +DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, Draw::Draws mode, QWidget *parent) : + DialogTool(data, mode, parent), ui(new Ui::DialogPointOfIntersection), number(0), pointName(QString()), + firstPointId(0), secondPointId(0){ + ui->setupUi(this); + labelEditNamePoint = ui->labelEditNamePoint; + bOk = ui->buttonBox->button(QDialogButtonBox::Ok); + connect(bOk, &QPushButton::clicked, this, &DialogPointOfIntersection::DialogAccepted); + flagName = false; + CheckState(); + QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); + connect(bCansel, &QPushButton::clicked, this, &DialogPointOfIntersection::DialogRejected); + FillComboBoxPoints(ui->comboBoxFirstPoint); + FillComboBoxPoints(ui->comboBoxSecondPoint); + connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointOfIntersection::NamePointChanged); +} + +DialogPointOfIntersection::~DialogPointOfIntersection(){ + delete ui; +} + +qint64 DialogPointOfIntersection::getSecondPointId() const{ + return secondPointId; +} + +void DialogPointOfIntersection::setSecondPointId(const qint64 &value, const qint64 &id){ + secondPointId = value; + setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); +} + +void DialogPointOfIntersection::ChoosedObject(qint64 id, Scene::Scenes type){ + if(idDetail == 0 && mode == Draw::Modeling){ + if(type == Scene::Detail){ + idDetail = id; + return; + } + } + if(mode == Draw::Modeling){ + if(!CheckObject(id)){ + return; + } + } + if(type == Scene::Point){ + VPointF point; + if(mode == Draw::Calculation){ + point = data->GetPoint(id); + } else { + point = data->GetModelingPoint(id); + } + if(number == 0){ + qint32 index = ui->comboBoxFirstPoint->findText(point.name()); + if ( index != -1 ) { // -1 for not found + ui->comboBoxFirstPoint->setCurrentIndex(index); + number++; + emit ToolTip(tr("Select point horizontally")); + return; + } + } + if(number == 1){ + qint32 index = ui->comboBoxSecondPoint->findText(point.name()); + if ( index != -1 ) { // -1 for not found + ui->comboBoxSecondPoint->setCurrentIndex(index); + number = 0; + emit ToolTip(""); + } + if(!isInitialized){ + this->show(); + } + } + } +} + +void DialogPointOfIntersection::DialogAccepted(){ + pointName = ui->lineEditNamePoint->text(); + firstPointId = getCurrentPointId(ui->comboBoxFirstPoint); + secondPointId = getCurrentPointId(ui->comboBoxSecondPoint); + emit DialogClosed(QDialog::Accepted); +} + +qint64 DialogPointOfIntersection::getFirstPointId() const{ + return firstPointId; +} + +void DialogPointOfIntersection::setFirstPointId(const qint64 &value, const qint64 &id){ + firstPointId = value; + setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); +} + +QString DialogPointOfIntersection::getPointName() const{ + return pointName; +} + +void DialogPointOfIntersection::setPointName(const QString &value){ + pointName = value; + ui->lineEditNamePoint->setText(pointName); +} diff --git a/dialogs/dialogpointofintersection.h b/dialogs/dialogpointofintersection.h new file mode 100644 index 000000000..7ffb57604 --- /dev/null +++ b/dialogs/dialogpointofintersection.h @@ -0,0 +1,34 @@ +#ifndef DIALOGPOINTOFINTERSECTION_H +#define DIALOGPOINTOFINTERSECTION_H + +#include "dialogtool.h" + +namespace Ui { +class DialogPointOfIntersection; +} + +class DialogPointOfIntersection : public DialogTool{ + Q_OBJECT +public: + DialogPointOfIntersection(const VContainer *data, Draw::Draws mode = Draw::Calculation, + QWidget *parent = 0); + ~DialogPointOfIntersection(); + QString getPointName() const; + void setPointName(const QString &value); + qint64 getFirstPointId() const; + void setFirstPointId(const qint64 &value, const qint64 &id); + qint64 getSecondPointId() const; + void setSecondPointId(const qint64 &value, const qint64 &id); +public slots: + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); +private: + Q_DISABLE_COPY(DialogPointOfIntersection) + Ui::DialogPointOfIntersection *ui; + qint32 number; + QString pointName; + qint64 firstPointId; + qint64 secondPointId; +}; + +#endif // DIALOGPOINTOFINTERSECTION_H diff --git a/dialogs/dialogpointofintersection.ui b/dialogs/dialogpointofintersection.ui new file mode 100644 index 000000000..303aa8cc0 --- /dev/null +++ b/dialogs/dialogpointofintersection.ui @@ -0,0 +1,169 @@ + + + DialogPointOfIntersection + + + + 0 + 0 + 293 + 180 + + + + Dialog + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Name new point + + + + + + + + + + + + + + + 0 + 0 + + + + Point vertically + + + + + + + First point of angle + + + + + + + + + + + + 0 + 0 + + + + Point horizontally + + + + + + + Second point of angle + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + DialogPointOfIntersection + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + DialogPointOfIntersection + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/icon.qrc b/icon.qrc index 520ff398d..66b939f04 100644 --- a/icon.qrc +++ b/icon.qrc @@ -36,5 +36,6 @@ icon/16x16/mirror.png icon/32x32/height.png icon/32x32/triangle.png + icon/32x32/point_of_intersection.png diff --git a/icon/32x32/point_of_intersection.png b/icon/32x32/point_of_intersection.png new file mode 100644 index 0000000000000000000000000000000000000000..7ab757dde6bdb361a22cc30c9a65d9b91dde14c5 GIT binary patch literal 652 zcmV;70(1R|P)8CN@tp;{gBw0vSm} zK~z}7?UuW16j2n$fAczKcTU_WSZGWk#Ks^(P*AYhK)_1SMpT4=LJ(Z6{4?xRN;(B0 zf{h3kDhs|4EmEl1C15lWBe>q#Y{urUj_XW(?cQy2;4(9J&fN3ebHDS=flYH`6ToAj z0(dS1d%#)X6_5hYfMYHJ9JYb8V+9y*JNP{Ya4u)A0-SIKAaDKDB@d3|9Kk!_s7oGP z2HpUlftSE^Kgw_vm;`qBO9yrU*Bx-K&_;j-Ao>%Q_QKXI0e`W;5r7o<0zB#j;wl5{ zKp6=8#epGU*#v~f2oje5W(-~wqMjfaH!e15d!=3>eK4?0I)T) zbI%5A0Zj|$y)CnK+wXk>=6$>cV9!R{Q1Pg@!JNuDf+xVPe{G)<(b{h~a3>uYirfAn za0O`C;4gr&E|lZ_g5WDgbfTz_-_|W1FrtAGok>I&mn3ekiheYrPmO4`=ZctJJRRH_ mPx|5f#UQFVQNm688~X+@g3_69>p|xL0000()), dialogDetail(QSharedPointer()), dialogHeight(QSharedPointer()), dialogTriangle(QSharedPointer()), + dialogPointOfIntersection(QSharedPointer()), dialogHistory(0), doc(0), data(0), comboBoxDraws(0), fileName(QString()), changeInFile(false), mode(Draw::Calculation){ ui->setupUi(this); @@ -94,6 +95,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->toolButtonNewDetail, &QToolButton::clicked, this, &MainWindow::ToolDetail); connect(ui->toolButtonHeight, &QToolButton::clicked, this, &MainWindow::ToolHeight); connect(ui->toolButtonTriangle, &QToolButton::clicked, this, &MainWindow::ToolTriangle); + connect(ui->toolButtonPointOfIntersection, &QToolButton::clicked, this, &MainWindow::ToolPointOfIntersection); data = new VContainer; @@ -485,7 +487,7 @@ void MainWindow::ClosedDialogHeight(int result){ void MainWindow::ToolTriangle(bool checked){ SetToolButton(checked, Tool::Triangle, ":/cursor/triangle_cursor.png", tr("Select first point of axis"), - dialogTriangle, &MainWindow::ClosedDialogTriangle); + dialogTriangle, &MainWindow::ClosedDialogTriangle); } void MainWindow::ClosedDialogTriangle(int result){ @@ -500,6 +502,26 @@ void MainWindow::ClosedDialogTriangle(int result){ ArrowTool(); } +void MainWindow::ToolPointOfIntersection(bool checked){ + SetToolButton(checked, Tool::PointOfIntersection, ":/cursor/pointofintersect_cursor.png", + tr("Select point vertically"), + dialogPointOfIntersection, &MainWindow::ClosedDialogPointOfIntersection); +} + +void MainWindow::ClosedDialogPointOfIntersection(int result){ + if(result == QDialog::Accepted){ + if(mode == Draw::Calculation){ + VToolPointOfIntersection::Create(dialogPointOfIntersection, currentScene, doc, data); + } else { + VModelingPointOfIntersection *point = VModelingPointOfIntersection::Create(dialogPointOfIntersection, + doc, data); + AddToolToDetail(point, point->getId(), Tool::PointOfIntersection, + dialogPointOfIntersection->getIdDetail()); + } + } + ArrowTool(); +} + void MainWindow::About(){ QMessageBox::about(this, tr("About Valentina"), tr("Valentina v.0.1.0")); } @@ -744,6 +766,12 @@ void MainWindow::CanselTool(){ currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; + case Tool::PointOfIntersection: + dialogPointOfIntersection.clear(); + ui->toolButtonPointOfIntersection->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; default: qWarning()<<"Get wrong tool type. Ignore."; break; @@ -986,6 +1014,7 @@ void MainWindow::SetEnableTool(bool enable){ ui->toolButtonNewDetail->setEnabled(enable); ui->toolButtonHeight->setEnabled(enable); ui->toolButtonTriangle->setEnabled(enable); + ui->toolButtonPointOfIntersection->setEnabled(enable); } void MainWindow::MinimumScrollBar(){ diff --git a/mainwindow.h b/mainwindow.h index 2b65763b8..fca2537a4 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -81,6 +81,7 @@ public slots: void ToolDetail(bool checked); void ToolHeight(bool checked); void ToolTriangle(bool checked); + void ToolPointOfIntersection(bool checked); void ClosedDialogEndLine(int result); void ClosedDialogLine(int result); void ClosedDialogAlongLine(int result); @@ -95,6 +96,7 @@ public slots: void ClosedDialogDetail(int result); void ClosedDialogHeight(int result); void ClosedDialogTriangle(int result); + void ClosedDialogPointOfIntersection(int result); void About(); void AboutQt(); void ShowToolTip(const QString &toolTip); @@ -126,27 +128,28 @@ private: VMainGraphicsView *view; bool isInitialized; DialogIncrements *dialogTable; - QSharedPointer dialogEndLine; - QSharedPointer dialogLine; - QSharedPointer dialogAlongLine; - QSharedPointer dialogShoulderPoint; - QSharedPointer dialogNormal; - QSharedPointer dialogBisector; - QSharedPointer dialogLineIntersect; - QSharedPointer dialogSpline; - QSharedPointer dialogArc; - QSharedPointer dialogSplinePath; - QSharedPointer dialogPointOfContact; - QSharedPointer dialogDetail; - QSharedPointer dialogHeight; - QSharedPointer dialogTriangle; + QSharedPointer dialogEndLine; + QSharedPointer dialogLine; + QSharedPointer dialogAlongLine; + QSharedPointer dialogShoulderPoint; + QSharedPointer dialogNormal; + QSharedPointer dialogBisector; + QSharedPointer dialogLineIntersect; + QSharedPointer dialogSpline; + QSharedPointer dialogArc; + QSharedPointer dialogSplinePath; + QSharedPointer dialogPointOfContact; + QSharedPointer dialogDetail; + QSharedPointer dialogHeight; + QSharedPointer dialogTriangle; + QSharedPointer dialogPointOfIntersection; DialogHistory *dialogHistory; VDomDocument *doc; VContainer *data; QComboBox *comboBoxDraws; QString fileName; bool changeInFile; - Draw::Draws mode; + Draw::Draws mode; void ToolBarOption(); void ToolBarDraws(); void CanselTool(); diff --git a/mainwindow.ui b/mainwindow.ui index 920dd684a..2ea6899fd 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -272,6 +272,29 @@ + + + + false + + + ... + + + + :/icon/32x32/point_of_intersection.png:/icon/32x32/point_of_intersection.png + + + + 32 + 32 + + + + true + + + @@ -279,7 +302,7 @@ 0 0 - 100 + 150 58 @@ -355,7 +378,7 @@ 0 0 - 100 + 150 58 @@ -431,7 +454,7 @@ 0 0 - 98 + 150 58 @@ -481,7 +504,7 @@ 0 0 - 98 + 150 58 diff --git a/options.h b/options.h index 71aaa9dfd..5e1a70fab 100644 --- a/options.h +++ b/options.h @@ -57,7 +57,8 @@ enum Tool {ArrowTool, NodeSpline, NodeSplinePath, Height, - Triangle + Triangle, + PointOfIntersection }; Q_DECLARE_FLAGS(Tools, Tool) diff --git a/tools/drawTools/drawtools.h b/tools/drawTools/drawtools.h index 8051d3641..0b07ebc2b 100644 --- a/tools/drawTools/drawtools.h +++ b/tools/drawTools/drawtools.h @@ -36,5 +36,6 @@ #include "vtoolsplinepath.h" #include "vtoolheight.h" #include "vtooltriangle.h" +#include "vtoolpointofintersection.h" #endif // DRAWTOOLS_H diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index e3fb9e9ac..ced59ed03 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -26,6 +26,7 @@ VToolLine::VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firs Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint), dialogLine(QSharedPointer()){ + ignoreFullUpdate = true; //Лінія VPointF first = data->GetPoint(firstPoint); VPointF second = data->GetPoint(secondPoint); diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index 132013d5a..797ce2c26 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -28,6 +28,7 @@ VToolLineIntersect::VToolLineIntersect(VDomDocument *doc, VContainer *data, cons QGraphicsItem *parent): VToolPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()){ + ignoreFullUpdate = true; if(typeCreation == Tool::FromGui){ AddToFile(); } diff --git a/tools/drawTools/vtoolpointofintersection.cpp b/tools/drawTools/vtoolpointofintersection.cpp new file mode 100644 index 000000000..10ef3c214 --- /dev/null +++ b/tools/drawTools/vtoolpointofintersection.cpp @@ -0,0 +1,106 @@ +#include "vtoolpointofintersection.h" + +VToolPointOfIntersection::VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem *parent) + :VToolPoint(doc, data, id, parent), firstPointId(firstPointId), secondPointId(secondPointId), + dialogPointOfIntersection(QSharedPointer()) { + ignoreFullUpdate = true; + if(typeCreation == Tool::FromGui){ + AddToFile(); + } +} + +void VToolPointOfIntersection::setDialog(){ + Q_ASSERT(!dialogPointOfIntersection.isNull()); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogPointOfIntersection->setFirstPointId(firstPointId, id); + dialogPointOfIntersection->setSecondPointId(secondPointId, id); + dialogPointOfIntersection->setPointName(p.name()); +} + +void VToolPointOfIntersection::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data){ + qint64 firstPointId = dialog->getFirstPointId(); + qint64 secondPointId = dialog->getSecondPointId(); + QString pointName = dialog->getPointName(); + Create(0, pointName, firstPointId, secondPointId, 5, 10, scene, doc, data, Document::FullParse, Tool::FromGui); +} + +void VToolPointOfIntersection::Create(const qint64 _id, const QString &pointName, const qint64 &firstPointId, + const qint64 &secondPointId, const qreal &mx, const qreal &my, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation){ + VPointF firstPoint = data->GetPoint(firstPointId); + VPointF secondPoint = data->GetPoint(secondPointId); + + QPointF point(firstPoint.x(), secondPoint.y()); + qint64 id = _id; + if(typeCreation == Tool::FromGui){ + id = data->AddPoint(VPointF(point.x(), point.y(), pointName, mx, my)); + } else { + data->UpdatePoint(id, VPointF(point.x(), point.y(), pointName, mx, my)); + if(parse != Document::FullParse){ + doc->UpdateToolData(id, data); + } + } + VDrawTool::AddRecord(id, Tool::Triangle, doc); + if(parse == Document::FullParse){ + VToolPointOfIntersection *point = new VToolPointOfIntersection(doc, data, id, firstPointId, + secondPointId, typeCreation); + scene->addItem(point); + connect(point, &VToolPointOfIntersection::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + connect(point, &VToolPointOfIntersection::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + connect(scene, &VMainGraphicsScene::NewFactor, point, &VToolPointOfIntersection::SetFactor); + doc->AddTool(id, point); + doc->IncrementReferens(firstPointId); + doc->IncrementReferens(secondPointId); + } +} + +void VToolPointOfIntersection::FullUpdateFromFile(){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + firstPointId = domElement.attribute("firstPoint", "").toLongLong(); + secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + } + VToolPoint::RefreshPointGeometry(VDrawTool::data.GetPoint(id)); +} + +void VToolPointOfIntersection::FullUpdateFromGui(int result){ + if(result == QDialog::Accepted){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("name", dialogPointOfIntersection->getPointName()); + domElement.setAttribute("firstPoint", QString().setNum(dialogPointOfIntersection->getFirstPointId())); + domElement.setAttribute("secondPoint", QString().setNum(dialogPointOfIntersection->getSecondPointId())); + emit FullUpdateTree(); + } + } + dialogPointOfIntersection.clear(); +} + +void VToolPointOfIntersection::RemoveReferens(){ + doc->DecrementReferens(firstPointId); + doc->DecrementReferens(secondPointId); +} + +void VToolPointOfIntersection::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ + ContextMenu(dialogPointOfIntersection, this, event); +} + +void VToolPointOfIntersection::AddToFile(){ + VPointF point = VAbstractTool::data.GetPoint(id); + QDomElement domElement = doc->createElement("point"); + + AddAttribute(domElement, "id", id); + AddAttribute(domElement, "type", "pointOfIntersection"); + AddAttribute(domElement, "name", point.name()); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); + + AddAttribute(domElement, "firstPoint", firstPointId); + AddAttribute(domElement, "secondPoint", secondPointId); + + AddToCalculation(domElement); +} diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h new file mode 100644 index 000000000..206ad322f --- /dev/null +++ b/tools/drawTools/vtoolpointofintersection.h @@ -0,0 +1,33 @@ +#ifndef VTOOLPOINTOFINTERSECTION_H +#define VTOOLPOINTOFINTERSECTION_H + +#include "vtoolpoint.h" +#include "dialogs/dialogpointofintersection.h" + +class VToolPointOfIntersection : public VToolPoint{ + Q_OBJECT +public: + VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &firstPointId, + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data); + static void Create(const qint64 _id, const QString &pointName, const qint64 &firstPointId, + const qint64 &secondPointId, const qreal &mx, const qreal &my, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); +public slots: + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); +protected: + virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); +private: + Q_DISABLE_COPY(VToolPointOfIntersection) + qint64 firstPointId; + qint64 secondPointId; + QSharedPointer dialogPointOfIntersection; +}; + +#endif // VTOOLPOINTOFINTERSECTION_H diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 25efb8ab6..00d3478fb 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -28,6 +28,7 @@ VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogSpline(QSharedPointer()), controlPoints(QVector()){ + ignoreFullUpdate = true; VSpline spl = data->GetSpline(id); QPainterPath path; diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index ca9fb7b0d..f13333e62 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -27,6 +27,7 @@ VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), controlPoints(QVector()){ + ignoreFullUpdate = true; VSplinePath splPath = data->GetSplinePath(id); QPainterPath path; path.addPath(splPath.GetPath()); diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index d19f498b7..79fd2c3d2 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -5,6 +5,7 @@ VToolTriangle::VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 & const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), firstPointId(firstPointId), secondPointId(secondPointId), dialogTriangle(QSharedPointer()) { + ignoreFullUpdate = true; if(typeCreation == Tool::FromGui){ AddToFile(); } @@ -29,7 +30,6 @@ void VToolTriangle::Create(QSharedPointer &dialog, VMainGraphics QString pointName = dialog->getPointName(); Create(0, pointName, axisP1Id, axisP2Id, firstPointId, secondPointId, 5, 10, scene, doc, data, Document::FullParse, Tool::FromGui); - } void VToolTriangle::Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, diff --git a/tools/modelingTools/modelingtools.h b/tools/modelingTools/modelingtools.h index bd61fee59..2fbf1dfad 100644 --- a/tools/modelingTools/modelingtools.h +++ b/tools/modelingTools/modelingtools.h @@ -36,5 +36,6 @@ #include "vmodelingsplinepath.h" #include "vmodelingheight.h" #include "vmodelingtriangle.h" +#include "vmodelingpointofintersection.h" #endif // MODELINGTOOLS_H diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index b9c03f4ca..ea09c70a7 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -26,6 +26,7 @@ VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qin qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem *parent): VModelingTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint), dialogLine(QSharedPointer()){ + ignoreFullUpdate = true; //Лінія VPointF first = data->GetModelingPoint(firstPoint); VPointF second = data->GetModelingPoint(secondPoint); diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp index 51a45e7d0..0ae7c31a3 100644 --- a/tools/modelingTools/vmodelinglineintersect.cpp +++ b/tools/modelingTools/vmodelinglineintersect.cpp @@ -26,6 +26,7 @@ VModelingLineIntersect::VModelingLineIntersect(VDomDocument *doc, VContainer *da const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem *parent): VModelingPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()){ + ignoreFullUpdate = true; if(typeCreation == Tool::FromGui){ AddToFile(); } diff --git a/tools/modelingTools/vmodelingpointofintersection.cpp b/tools/modelingTools/vmodelingpointofintersection.cpp new file mode 100644 index 000000000..70d4db79d --- /dev/null +++ b/tools/modelingTools/vmodelingpointofintersection.cpp @@ -0,0 +1,105 @@ +#include "vmodelingpointofintersection.h" + +VModelingPointOfIntersection::VModelingPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem *parent) + :VModelingPoint(doc, data, id, parent), firstPointId(firstPointId), secondPointId(secondPointId), + dialogPointOfIntersection(QSharedPointer()) { + ignoreFullUpdate = true; + if(typeCreation == Tool::FromGui){ + AddToFile(); + } +} + +void VModelingPointOfIntersection::setDialog(){ + Q_ASSERT(!dialogPointOfIntersection.isNull()); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogPointOfIntersection->setFirstPointId(firstPointId, id); + dialogPointOfIntersection->setSecondPointId(secondPointId, id); + dialogPointOfIntersection->setPointName(p.name()); +} + +VModelingPointOfIntersection *VModelingPointOfIntersection::Create(QSharedPointer &dialog, + VDomDocument *doc, VContainer *data){ + qint64 firstPointId = dialog->getFirstPointId(); + qint64 secondPointId = dialog->getSecondPointId(); + QString pointName = dialog->getPointName(); + return Create(0, pointName, firstPointId, secondPointId, 5, 10, doc, data, Document::FullParse, Tool::FromGui); +} + +VModelingPointOfIntersection *VModelingPointOfIntersection::Create(const qint64 _id, const QString &pointName, + const qint64 &firstPointId, + const qint64 &secondPointId, const qreal &mx, + const qreal &my, VDomDocument *doc, + VContainer *data, + const Document::Documents &parse, + Tool::Sources typeCreation){ + VModelingPointOfIntersection *tool = 0; + VPointF firstPoint = data->GetPoint(firstPointId); + VPointF secondPoint = data->GetPoint(secondPointId); + + QPointF point(firstPoint.x(), secondPoint.y()); + qint64 id = _id; + if(typeCreation == Tool::FromGui){ + id = data->AddPoint(VPointF(point.x(), point.y(), pointName, mx, my)); + } else { + data->UpdatePoint(id, VPointF(point.x(), point.y(), pointName, mx, my)); + if(parse != Document::FullParse){ + doc->UpdateToolData(id, data); + } + } + if(parse == Document::FullParse){ + tool = new VModelingPointOfIntersection(doc, data, id, firstPointId, secondPointId, typeCreation); + doc->AddTool(id, tool); + doc->IncrementReferens(firstPointId); + doc->IncrementReferens(secondPointId); + } + return tool; +} + +void VModelingPointOfIntersection::FullUpdateFromFile(){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + firstPointId = domElement.attribute("firstPoint", "").toLongLong(); + secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + } + VModelingPoint::RefreshPointGeometry(VModelingTool::data.GetPoint(id)); +} + +void VModelingPointOfIntersection::FullUpdateFromGui(int result){ + if(result == QDialog::Accepted){ + QDomElement domElement = doc->elementById(QString().setNum(id)); + if(domElement.isElement()){ + domElement.setAttribute("name", dialogPointOfIntersection->getPointName()); + domElement.setAttribute("firstPoint", QString().setNum(dialogPointOfIntersection->getFirstPointId())); + domElement.setAttribute("secondPoint", QString().setNum(dialogPointOfIntersection->getSecondPointId())); + emit FullUpdateTree(); + } + } + dialogPointOfIntersection.clear(); +} + +void VModelingPointOfIntersection::RemoveReferens(){ + doc->DecrementReferens(firstPointId); + doc->DecrementReferens(secondPointId); +} + +void VModelingPointOfIntersection::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ + ContextMenu(dialogPointOfIntersection, this, event); +} + +void VModelingPointOfIntersection::AddToFile(){ + VPointF point = VAbstractTool::data.GetPoint(id); + QDomElement domElement = doc->createElement("point"); + + AddAttribute(domElement, "id", id); + AddAttribute(domElement, "type", "pointOfIntersection"); + AddAttribute(domElement, "name", point.name()); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); + + AddAttribute(domElement, "firstPoint", firstPointId); + AddAttribute(domElement, "secondPoint", secondPointId); + + AddToModeling(domElement); +} diff --git a/tools/modelingTools/vmodelingpointofintersection.h b/tools/modelingTools/vmodelingpointofintersection.h new file mode 100644 index 000000000..1c4c94397 --- /dev/null +++ b/tools/modelingTools/vmodelingpointofintersection.h @@ -0,0 +1,35 @@ +#ifndef VMODELINGPOINTOFINTERSECTION_H +#define VMODELINGPOINTOFINTERSECTION_H + +#include "vmodelingpoint.h" +#include "dialogs/dialogpointofintersection.h" + +class VModelingPointOfIntersection : public VModelingPoint{ + Q_OBJECT +public: + VModelingPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingPointOfIntersection* Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data); + static VModelingPointOfIntersection* Create(const qint64 _id, const QString &pointName, + const qint64 &firstPointId, const qint64 &secondPointId, + const qreal &mx, const qreal &my, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation); +public slots: + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); +protected: + virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); +private: + Q_DISABLE_COPY(VModelingPointOfIntersection) + qint64 firstPointId; + qint64 secondPointId; + QSharedPointer dialogPointOfIntersection; +}; + +#endif // VMODELINGPOINTOFINTERSECTION_H diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index 17467591b..ccc1a8bb6 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -29,7 +29,7 @@ VModelingSpline::VModelingSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSpline(QSharedPointer()), controlPoints(QVector()){ - + ignoreFullUpdate = true; VSpline spl = data->GetModelingSpline(id); QPainterPath path; path.addPath(spl.GetPath()); diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 6756e0d4c..75d4f6c98 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -27,6 +27,7 @@ VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qi QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), controlPoints(QVector()){ + ignoreFullUpdate = true; VSplinePath splPath = data->GetModelingSplinePath(id); QPainterPath path; path.addPath(splPath.GetPath()); diff --git a/tools/modelingTools/vmodelingtriangle.cpp b/tools/modelingTools/vmodelingtriangle.cpp index e2f722a07..feeb7c1c5 100644 --- a/tools/modelingTools/vmodelingtriangle.cpp +++ b/tools/modelingTools/vmodelingtriangle.cpp @@ -32,7 +32,6 @@ VModelingTriangle *VModelingTriangle::Create(QSharedPointer &dia QString pointName = dialog->getPointName(); return Create(0, pointName, axisP1Id, axisP2Id, firstPointId, secondPointId, 5, 10, doc, data, Document::FullParse, Tool::FromGui); - } VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &pointName, diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index e4d31e700..7d3cfc2fd 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -857,6 +857,30 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen throw excep; } } + if(type == "pointOfIntersection"){ + try{ + qint64 id = GetParametrId(domElement); + QString name = GetParametrString(domElement, "name"); + qreal mx = toPixel(GetParametrDouble(domElement, "mx")); + qreal my = toPixel(GetParametrDouble(domElement, "my")); + qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); + qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); + + if(mode == Draw::Calculation){ + VToolPointOfIntersection::Create(id, name, firstPointId, secondPointId, mx, my, scene, this, data, + parse, Tool::FromFile); + } else { + VModelingPointOfIntersection::Create(id, name, firstPointId, secondPointId, mx, my, this, data, + parse, Tool::FromFile); + } + return; + } + catch(const VExceptionBadId &e){ + VExceptionObjectError excep(tr("Error creating or updating point of intersection"), domElement); + excep.AddMoreInformation(e.ErrorMessage()); + throw excep; + } + } } void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &domElement, From b5afc2192d6e3abb83a3a5854f24b41deea679b2 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 22 Oct 2013 15:11:29 +0300 Subject: [PATCH 32/83] Wrong fill rule for detail. --HG-- branch : develop --- container/vcontainer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index eaf543107..a4d8b8c0f 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -232,6 +232,7 @@ QPainterPath VContainer::ContourPath(qint64 idDetail) const{ } path.lineTo(points[0]); path.addPath(ekv); + path.setFillRule(Qt::WindingFill); return path; } From 4a89486f8d43ab3718b58f10059ef9a2e6df8949 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 22 Oct 2013 16:09:49 +0300 Subject: [PATCH 33/83] Add point of intersection to detail. --HG-- branch : develop --- tools/vtooldetail.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 93c1c8f3d..56126fcef 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -166,6 +166,14 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, tool->setParentItem(this); break; } + case(Tool::PointOfIntersection):{ + VModelingPointOfIntersection *tool = qobject_cast(tools->value(detail[i].getId())); + Q_ASSERT(tool != 0); + connect(tool, &VModelingPointOfIntersection::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + connect(tool, &VModelingPointOfIntersection::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + tool->setParentItem(this); + break; + } default: qWarning()<<"Get wrong tool type. Ignore."; break; From 76ca37642c82e62e86ada234358d54baa56880a6 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 22 Oct 2013 16:39:51 +0300 Subject: [PATCH 34/83] Wrong path in spline. --HG-- branch : develop --- geometry/vspline.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 4e6ac988c..674980add 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -601,9 +601,13 @@ qreal VSpline::CalcSqDistance (qreal x1, qreal y1, qreal x2, qreal y2){ QPainterPath VSpline::GetPath() const{ QPainterPath splinePath; QVector points = GetPoints (); - splinePath.moveTo(points[0]); - for (qint32 i = 1; i < points.count(); ++i){ - splinePath.lineTo(points[i]); + if(points.count() >= 2){ + for (qint32 i = 0; i < points.count()-1; ++i){ + splinePath.moveTo(points[i]); + splinePath.lineTo(points[i+1]); + } + } else { + qWarning()<<"points.count() < 2"< Date: Wed, 23 Oct 2013 12:12:39 +0300 Subject: [PATCH 35/83] Delete file lekalo.xml. --HG-- branch : develop --- mainwindow.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 40a25f252..e1d04f1f0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1099,14 +1099,6 @@ MainWindow::~MainWindow(){ CanselTool(); delete ui; - QFile file("lekalo.xml"); - if(file.open(QIODevice::WriteOnly | QIODevice::Truncate)){ - const int Indent = 4; - QTextStream out(&file); - doc->save(out, Indent); - file.close(); - } - delete data; if(!doc->isNull()){ delete doc; From aac3dca7644a2cccdf3f2f098f74d5d6a7364ed2 Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 23 Oct 2013 13:40:51 +0300 Subject: [PATCH 36/83] New message box about program. --HG-- branch : develop --- Valentina.pro | 3 ++- mainwindow.cpp | 7 ++++++- version.h | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 version.h diff --git a/Valentina.pro b/Valentina.pro index f9b662a95..b523128a3 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -206,7 +206,8 @@ HEADERS += mainwindow.h \ dialogs/dialogtriangle.h \ dialogs/dialogpointofintersection.h \ tools/drawTools/vtoolpointofintersection.h \ - tools/modelingTools/vmodelingpointofintersection.h + tools/modelingTools/vmodelingpointofintersection.h \ + version.h FORMS += mainwindow.ui \ dialogs/dialogsinglepoint.ui \ diff --git a/mainwindow.cpp b/mainwindow.cpp index e1d04f1f0..72b05ef32 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -36,6 +36,7 @@ #include "exception/vexceptionemptyparameter.h" #include "exception/vexceptionwrongparameterid.h" #include "exception/vexceptionuniqueid.h" +#include "version.h" MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow), tool(Tool::ArrowTool), currentScene(0), sceneDraw(0), @@ -523,7 +524,11 @@ void MainWindow::ClosedDialogPointOfIntersection(int result){ } void MainWindow::About(){ - QMessageBox::about(this, tr("About Valentina"), tr("Valentina v.0.1.0")); + QString fullName = QString("Valentina %1").arg(APP_VERSION); + QString qtBase(tr("Based on Qt %2 (32 bit)").arg(QT_VERSION_STR)); + QString buildOn(tr("Built on %3 at %4").arg(__DATE__).arg(__TIME__)); + QString about = QString(tr("

%1

%2

%3

%4")).arg(fullName).arg(qtBase).arg(buildOn).arg(WARRANTY); + QMessageBox::about(this, tr("About Valentina"), about); } void MainWindow::AboutQt(){ diff --git a/version.h b/version.h new file mode 100644 index 000000000..4c5d92805 --- /dev/null +++ b/version.h @@ -0,0 +1,14 @@ +#ifndef VERSION_H +#define VERSION_H + +#include + +extern const int MAJOR_VERSION = 0; +extern const int MINOR_VERSION = 1; +extern const int DEBUG_VERSION = 0; + +extern const QString APP_VERSION(QStringLiteral("%1.%2.%3").arg(MAJOR_VERSION) + .arg(MINOR_VERSION) + .arg(DEBUG_VERSION)); +extern const QString WARRANTY(QT_TR_NOOP("The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.")); +#endif // VERSION_H From 473c90c72ce75a4994c3d0711fa7175b8a38c7de Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 25 Oct 2013 14:10:45 +0300 Subject: [PATCH 37/83] Supplement for seams. --HG-- branch : develop --- container/vcontainer.cpp | 54 ++++++++++- container/vcontainer.h | 1 + dialogs/dialogdetail.cpp | 77 +++++++++++++-- dialogs/dialogdetail.h | 23 +++-- dialogs/dialogdetail.ui | 198 ++++++++++++++++++++++++++++++++++----- geometry/vdetail.cpp | 55 ++++++++++- geometry/vdetail.h | 39 +++++--- geometry/vnodedetail.cpp | 37 +++++++- geometry/vnodedetail.h | 30 +++--- tools/vtooldetail.cpp | 71 +++++++++----- xml/vdomdocument.cpp | 13 ++- 11 files changed, 500 insertions(+), 98 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index a4d8b8c0f..d53da37d5 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -177,11 +177,18 @@ void VContainer::UpdateId(qint64 newId){ QPainterPath VContainer::ContourPath(qint64 idDetail) const{ VDetail detail = GetDetail(idDetail); QVector points; + QVector pointsEkv; for(qint32 i = 0; i< detail.CountNode(); ++i){ switch(detail[i].getTypeTool()){ case(Tool::NodePoint):{ VPointF point = GetModelingPoint(detail[i].getId()); points.append(point.toQPointF()); + if(detail.getSupplement() == true){ + QPointF pEkv = point.toQPointF(); + pEkv.setX(pEkv.x()+detail[i].getMx()); + pEkv.setY(pEkv.y()+detail[i].getMy()); + pointsEkv.append(pEkv); + } } break; case(Tool::NodeArc):{ @@ -190,8 +197,15 @@ QPainterPath VContainer::ContourPath(qint64 idDetail) const{ qreal lenReverse = GetLengthContour(points, GetReversePoint(arc.GetPoints())); if(len1 <= lenReverse){ points << arc.GetPoints(); + if(detail.getSupplement() == true){ + pointsEkv << biasPoints(arc.GetPoints(), detail[i].getMx(), detail[i].getMy()); + } } else { points << GetReversePoint(arc.GetPoints()); + if(detail.getSupplement() == true){ + pointsEkv << biasPoints(GetReversePoint(arc.GetPoints()), detail[i].getMx(), + detail[i].getMy()); + } } } break; @@ -201,8 +215,15 @@ QPainterPath VContainer::ContourPath(qint64 idDetail) const{ qreal lenReverse = GetLengthContour(points, GetReversePoint(spline.GetPoints())); if(len1 <= lenReverse){ points << spline.GetPoints(); + if(detail.getSupplement() == true){ + pointsEkv << biasPoints(spline.GetPoints(), detail[i].getMx(), detail[i].getMy()); + } } else { points << GetReversePoint(spline.GetPoints()); + if(detail.getSupplement() == true){ + pointsEkv << biasPoints(GetReversePoint(spline.GetPoints()), detail[i].getMx(), + detail[i].getMy()); + } } } break; @@ -212,8 +233,15 @@ QPainterPath VContainer::ContourPath(qint64 idDetail) const{ qreal lenReverse = GetLengthContour(points, GetReversePoint(splinePath.GetPathPoints())); if(len1 <= lenReverse){ points << splinePath.GetPathPoints(); + if(detail.getSupplement() == true){ + pointsEkv << biasPoints(splinePath.GetPathPoints(), detail[i].getMx(), detail[i].getMy()); + } } else { points << GetReversePoint(splinePath.GetPathPoints()); + if(detail.getSupplement() == true){ + pointsEkv << biasPoints(GetReversePoint(splinePath.GetPathPoints()), detail[i].getMx(), + detail[i].getMy()); + } } } break; @@ -224,18 +252,38 @@ QPainterPath VContainer::ContourPath(qint64 idDetail) const{ break; } } - QPainterPath ekv = Equidistant(points, Detail::CloseEquidistant, toPixel(10)); + QPainterPath path; path.moveTo(points[0]); for (qint32 i = 1; i < points.count(); ++i){ path.lineTo(points[i]); } path.lineTo(points[0]); - path.addPath(ekv); - path.setFillRule(Qt::WindingFill); + + if(detail.getSupplement() == true){ + QPainterPath ekv; + if(detail.getClosed() == true){ + ekv = Equidistant(pointsEkv, Detail::CloseEquidistant, toPixel(detail.getWidth())); + } else { + ekv = Equidistant(pointsEkv, Detail::OpenEquidistant, toPixel(detail.getWidth())); + } + path.addPath(ekv); + path.setFillRule(Qt::WindingFill); + } return path; } +QVector VContainer::biasPoints(const QVector &points, const qreal &mx, const qreal &my) const{ + QVector p; + for(qint32 i = 0; i < points.size(); ++i){ + QPointF point = points.at(i); + point.setX(point.x() + mx); + point.setY(point.x() + my); + p.append(point); + } + return p; +} + QPainterPath VContainer::Equidistant(QVector points, const Detail::Equidistant &eqv, const qreal &width) const{ QPainterPath ekv; diff --git a/container/vcontainer.h b/container/vcontainer.h index 235a4243a..4dee1c149 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -140,6 +140,7 @@ public: const QHash *DataDetails() const; static void UpdateId(qint64 newId); QPainterPath ContourPath(qint64 idDetail) const; + QVector biasPoints(const QVector &points, const qreal &mx, const qreal &my) const; QPainterPath Equidistant(QVector points, const Detail::Equidistant &eqv, const qreal &width)const; static QLineF ParallelLine(const QLineF &line, qreal width ); diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index 32492ffb3..64fe68fd7 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -23,13 +23,24 @@ #include DialogDetail::DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(), details(VDetail()){ + DialogTool(data, mode, parent), ui(), details(VDetail()), supplement(true), closed(true){ ui.setupUi(this); + labelEditNamePoint = ui.labelEditNameDetail; bOk = ui.buttonBox->button(QDialogButtonBox::Ok); connect(bOk, &QPushButton::clicked, this, &DialogDetail::DialogAccepted); - + flagName = false; + CheckState(); QPushButton *bCansel = ui.buttonBox->button(QDialogButtonBox::Cancel); connect(bCansel, &QPushButton::clicked, this, &DialogDetail::DialogRejected); + + connect(ui.listWidget, &QListWidget::currentRowChanged, this, &DialogDetail::ObjectChanged); + connect(ui.doubleSpinBoxBiasX, static_cast(&QDoubleSpinBox::valueChanged), + this, &DialogDetail::BiasXChanged); + connect(ui.doubleSpinBoxBiasY, static_cast(&QDoubleSpinBox::valueChanged), + this, &DialogDetail::BiasYChanged); + connect(ui.checkBoxSeams, &QCheckBox::clicked, this, &DialogDetail::ClickedSeams); + connect(ui.checkBoxClosed, &QCheckBox::clicked, this, &DialogDetail::ClickedClosed); + connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged); } void DialogDetail::ChoosedObject(qint64 id, Scene::Scenes type){ @@ -72,12 +83,16 @@ void DialogDetail::DialogAccepted(){ QListWidgetItem *item = ui.listWidget->item(i); details.append( qvariant_cast(item->data(Qt::UserRole))); } + details.setWidth(ui.doubleSpinBoxSeams->value()); details.setName(ui.lineEditNameDetail->text()); + details.setSupplement(supplement); + details.setClosed(closed); emit ToolTip(""); emit DialogClosed(QDialog::Accepted); } -void DialogDetail::NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode){ +void DialogDetail::NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, qreal mx, + qreal my){ QString name; switch(typeTool){ case(Tool::NodePoint):{ @@ -127,9 +142,19 @@ void DialogDetail::NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, No QListWidgetItem *item = new QListWidgetItem(name); item->setFont(QFont("Times", 12, QFont::Bold)); - VNodeDetail node(id, typeTool, mode, typeNode); + VNodeDetail node(id, typeTool, mode, typeNode, mx, my); item->setData(Qt::UserRole, QVariant::fromValue(node)); ui.listWidget->addItem(item); + disconnect(ui.doubleSpinBoxBiasX, static_cast(&QDoubleSpinBox::valueChanged), + this, &DialogDetail::BiasXChanged); + disconnect(ui.doubleSpinBoxBiasY, static_cast(&QDoubleSpinBox::valueChanged), + this, &DialogDetail::BiasYChanged); + ui.doubleSpinBoxBiasX->setValue(toMM(node.getMx())); + ui.doubleSpinBoxBiasY->setValue(toMM(node.getMy())); + connect(ui.doubleSpinBoxBiasX, static_cast(&QDoubleSpinBox::valueChanged), + this, &DialogDetail::BiasXChanged); + connect(ui.doubleSpinBoxBiasY, static_cast(&QDoubleSpinBox::valueChanged), + this, &DialogDetail::BiasYChanged); } VDetail DialogDetail::getDetails() const{ @@ -140,9 +165,49 @@ void DialogDetail::setDetails(const VDetail &value){ details = value; ui.listWidget->clear(); for(qint32 i = 0; i < details.CountNode(); ++i){ - NewItem(details[i].getId(), details[i].getTypeTool(),details[i].getMode(), details[i].getTypeNode()); + NewItem(details[i].getId(), details[i].getTypeTool(), details[i].getMode(), details[i].getTypeNode(), details[i].getMx(), + details[i].getMy()); } - details.setName(ui.lineEditNameDetail->text()); + ui.lineEditNameDetail->setText(details.getName()); + ui.checkBoxSeams->setChecked(details.getSupplement()); + ui.checkBoxClosed->setChecked(details.getClosed()); + ui.doubleSpinBoxSeams->setValue(details.getWidth()); + ui.listWidget->setCurrentRow(0); ui.listWidget->setFocus(Qt::OtherFocusReason); } +void DialogDetail::BiasXChanged(qreal d){ + qint32 row = ui.listWidget->currentRow(); + QListWidgetItem *item = ui.listWidget->item( row ); + VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); + node.setMx(toPixel(d)); + item->setData(Qt::UserRole, QVariant::fromValue(node)); +} + +void DialogDetail::BiasYChanged(qreal d){ + qint32 row = ui.listWidget->currentRow(); + QListWidgetItem *item = ui.listWidget->item( row ); + VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); + node.setMy(toPixel(d)); + item->setData(Qt::UserRole, QVariant::fromValue(node)); +} + +void DialogDetail::ClickedSeams(bool checked){ + supplement = checked; + ui.checkBoxClosed->setEnabled(checked); + ui.doubleSpinBoxSeams->setEnabled(checked); +} + +void DialogDetail::ClickedClosed(bool checked){ + closed = checked; +} + +void DialogDetail::ObjectChanged(int row){ + if(ui.listWidget->count() == 0){ + return; + } + QListWidgetItem *item = ui.listWidget->item( row ); + VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); + ui.doubleSpinBoxBiasX->setValue(toMM(node.getMx())); + ui.doubleSpinBoxBiasY->setValue(toMM(node.getMy())); +} diff --git a/dialogs/dialogdetail.h b/dialogs/dialogdetail.h index 79cc1b55e..efddaf2dc 100644 --- a/dialogs/dialogdetail.h +++ b/dialogs/dialogdetail.h @@ -29,17 +29,24 @@ class DialogDetail : public DialogTool{ Q_OBJECT public: - explicit DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent = 0); - VDetail getDetails() const; - void setDetails(const VDetail &value); - + DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent = 0); + VDetail getDetails() const; + void setDetails(const VDetail &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); + void BiasXChanged(qreal d); + void BiasYChanged(qreal d); + void ClickedSeams(bool checked); + void ClickedClosed(bool checked); + void ObjectChanged(int row); private: Ui::DialogDetail ui; - VDetail details; - void NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode); + VDetail details; + bool supplement; + bool closed; + void NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, qreal mx = 0, + qreal my = 0); }; #endif // DIALOGDETAIL_H diff --git a/dialogs/dialogdetail.ui b/dialogs/dialogdetail.ui index 7f1370ed1..08aba5839 100644 --- a/dialogs/dialogdetail.ui +++ b/dialogs/dialogdetail.ui @@ -6,8 +6,8 @@ 0 0 - 340 - 298 + 544 + 327 @@ -20,47 +20,196 @@ - + - + - + - + + + 6 + + + QLayout::SetDefaultConstraint + + + 0 + + + 0 + - + + + Bias X + + + + + + + -10000.000000000000000 + + + 10000.000000000000000 + + + + + + + + + 0 0 - - - - Name detail + Bias Y - + + + -10000.000000000000000 + + + 10000.000000000000000 + + - - - - - Closed - - - true - - - - + + + Option + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + + + + Name of detail + + + + + + + + 0 + 0 + + + + + + + + + + Supplement for seams + + + true + + + + + + + + + + 0 + 0 + + + + + + + Width + + + + + + + -10000.000000000000000 + + + 10.000000000000000 + + + + + + + + + Closed + + + true + + + + + @@ -83,7 +232,6 @@ lineEditNameDetail - checkBoxClosed listWidget buttonBox diff --git a/geometry/vdetail.cpp b/geometry/vdetail.cpp index 509fa073d..7e7fdf0c2 100644 --- a/geometry/vdetail.cpp +++ b/geometry/vdetail.cpp @@ -21,14 +21,30 @@ #include "vdetail.h" -VDetail::VDetail():nodes(QVector()),name(QString()), mx(0), my(0){ +VDetail::VDetail():nodes(QVector()),name(QString()), mx(0), my(0), supplement(true), closed(true), + width(10){ } VDetail::VDetail(const QString &name, const QVector &nodes):nodes(QVector()), - name(name), mx(0), my(0){ + name(name), mx(0), my(0), supplement(true), closed(true), width(10){ this->nodes = nodes; } +VDetail::VDetail(const VDetail &detail):nodes(detail.getNodes()), name(detail.getName()), mx(detail.getMx()), + my(detail.getMy()), supplement(detail.getSupplement()), closed(detail.getClosed()), width(detail.getWidth()){ +} + +VDetail &VDetail::operator =(const VDetail &detail){ + nodes = detail.getNodes(); + name = detail.getName(); + mx = detail.getMx(); + my = detail.getMy(); + supplement = detail.getSupplement(); + closed = detail.getClosed(); + width = detail.getWidth(); + return *this; +} + void VDetail::append(const VNodeDetail &node){ nodes.append(node); } @@ -38,6 +54,9 @@ void VDetail::Clear(){ name.clear(); mx = 0; my = 0; + supplement = true; + closed = true; + width = 10; } qint32 VDetail::CountNode() const{ @@ -81,3 +100,35 @@ QString VDetail::getName() const{ void VDetail::setName(const QString &value){ name = value; } + +qreal VDetail::getWidth() const{ + return width; +} + +void VDetail::setWidth(const qreal &value){ + width = value; +} + +bool VDetail::getClosed() const{ + return closed; +} + +void VDetail::setClosed(bool value){ + closed = value; +} + +bool VDetail::getSupplement() const{ + return supplement; +} + +void VDetail::setSupplement(bool value){ + supplement = value; +} + +QVector VDetail::getNodes() const{ + return nodes; +} + +void VDetail::setNodes(const QVector &value){ + nodes = value; +} diff --git a/geometry/vdetail.h b/geometry/vdetail.h index 45cf841fb..5372e219a 100644 --- a/geometry/vdetail.h +++ b/geometry/vdetail.h @@ -39,24 +39,37 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Detail::Equidistants) class VDetail{ public: - VDetail(); - VDetail(const QString &name, const QVector &nodes); - void append(const VNodeDetail &node); - void Clear(); - qint32 CountNode() const; - bool Containes(const qint64 &id)const; + VDetail(); + VDetail(const QString &name, const QVector &nodes); + VDetail(const VDetail &detail); + VDetail &operator=(const VDetail &detail); + void append(const VNodeDetail &node); + void Clear(); + qint32 CountNode() const; + bool Containes(const qint64 &id)const; VNodeDetail & operator[](int indx); QString getName() const; - void setName(const QString &value); - qreal getMx() const; - void setMx(const qreal &value); - qreal getMy() const; - void setMy(const qreal &value); + void setName(const QString &value); + qreal getMx() const; + void setMx(const qreal &value); + qreal getMy() const; + void setMy(const qreal &value); + bool getSupplement() const; + void setSupplement(bool value); + bool getClosed() const; + void setClosed(bool value); + qreal getWidth() const; + void setWidth(const qreal &value); + QVector getNodes() const; + void setNodes(const QVector &value); private: QVector nodes; QString name; - qreal mx; - qreal my; + qreal mx; + qreal my; + bool supplement; + bool closed; + qreal width; }; #endif // VDETAIL_H diff --git a/geometry/vnodedetail.cpp b/geometry/vnodedetail.cpp index e1392e22e..b25c28d92 100644 --- a/geometry/vnodedetail.cpp +++ b/geometry/vnodedetail.cpp @@ -21,16 +21,27 @@ #include "vnodedetail.h" -VNodeDetail::VNodeDetail():id(0), typeTool(Tool::NodePoint), mode(Draw::Calculation), - typeNode(NodeDetail::Contour){ +VNodeDetail::VNodeDetail():id(0), typeTool(Tool::NodePoint), mode(Draw::Modeling), + typeNode(NodeDetail::Contour), mx(0), my(0){ } -VNodeDetail::VNodeDetail(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode):id(id), - typeTool(typeTool), mode(mode), typeNode(typeNode){ +VNodeDetail::VNodeDetail(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, + qreal mx, qreal my):id(id), typeTool(typeTool), mode(mode), typeNode(typeNode), + mx(mx), my(my){ } VNodeDetail::VNodeDetail(const VNodeDetail &node):id(node.getId()), typeTool(node.getTypeTool()), - mode(node.getMode()), typeNode(node.getTypeNode()){ + mode(node.getMode()), typeNode(node.getTypeNode()), mx(node.getMx()), my(node.getMy()){ +} + +VNodeDetail &VNodeDetail::operator =(const VNodeDetail &node){ + id = node.getId(); + typeTool = node.getTypeTool(); + mode = node.getMode(); + typeNode = node.getTypeNode(); + mx = node.getMx(); + my = node.getMy(); + return *this; } Tool::Tools VNodeDetail::getTypeTool() const{ @@ -64,3 +75,19 @@ NodeDetail::NodeDetails VNodeDetail::getTypeNode() const{ void VNodeDetail::setTypeNode(const NodeDetail::NodeDetails &value){ typeNode = value; } + +qreal VNodeDetail::getMy() const{ + return my; +} + +void VNodeDetail::setMy(const qreal &value){ + my = value; +} + +qreal VNodeDetail::getMx() const{ + return mx; +} + +void VNodeDetail::setMx(const qreal &value){ + mx = value; +} diff --git a/geometry/vnodedetail.h b/geometry/vnodedetail.h index 71763a677..04359f9da 100644 --- a/geometry/vnodedetail.h +++ b/geometry/vnodedetail.h @@ -31,26 +31,32 @@ namespace NodeDetail { } Q_DECLARE_OPERATORS_FOR_FLAGS(NodeDetail::NodeDetails) -class VNodeDetail -{ +class VNodeDetail{ public: - VNodeDetail(); - VNodeDetail(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode); - VNodeDetail(const VNodeDetail &node); - qint64 getId() const; - void setId(const qint64 &value); + VNodeDetail(); + VNodeDetail(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, + qreal mx = 0, qreal my = 0); + VNodeDetail(const VNodeDetail &node); + VNodeDetail &operator=(const VNodeDetail &node); + qint64 getId() const; + void setId(const qint64 &value); Tool::Tools getTypeTool() const; - void setTypeTool(const Tool::Tools &value); + void setTypeTool(const Tool::Tools &value); Draw::Draws getMode() const; - void setMode(const Draw::Draws &value); + void setMode(const Draw::Draws &value); NodeDetail::NodeDetails getTypeNode() const; - void setTypeNode(const NodeDetail::NodeDetails &value); - + void setTypeNode(const NodeDetail::NodeDetails &value); + qreal getMx() const; + void setMx(const qreal &value); + qreal getMy() const; + void setMy(const qreal &value); private: - qint64 id; + qint64 id; Tool::Tools typeTool; Draw::Draws mode; NodeDetail::NodeDetails typeNode; + qreal mx; + qreal my; }; Q_DECLARE_METATYPE(VNodeDetail) diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 56126fcef..559180c76 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -192,10 +192,8 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, void VToolDetail::setDialog(){ Q_ASSERT(!dialogDetail.isNull()); - if(!dialogDetail.isNull()){ - VDetail detail = VAbstractTool::data.GetDetail(id); - dialogDetail->setDetails(detail); - } + VDetail detail = VAbstractTool::data.GetDetail(id); + dialogDetail->setDetails(detail); } void VToolDetail::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, @@ -257,7 +255,7 @@ void VToolDetail::Create(QSharedPointer &dialog, VMainGraphicsScen qWarning()<<"May be wrong tool type!!! Ignoring."<elementById(QString().setNum(id)); + if(domElement.isElement()){ + VDetail det = dialogDetail->getDetails(); + domElement.setAttribute("name", det.getName()); + domElement.setAttribute("supplement", QString().setNum(det.getSupplement())); + domElement.setAttribute("closed", QString().setNum(det.getClosed())); + domElement.setAttribute("width", QString().setNum(det.getWidth())); + if ( domElement.hasChildNodes() ){ + while ( domElement.childNodes().length() >= 1 ){ + domElement.removeChild( domElement.firstChild() ); + } + } + for(qint32 i = 0; i < det.CountNode(); ++i){ + AddNode(domElement, det[i]); + } + emit FullUpdateTree(); + } + } + dialogDetail.clear(); } void VToolDetail::AddToFile(){ @@ -299,8 +316,11 @@ void VToolDetail::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "name", detail.getName()); - AddAttribute(domElement, "mx", detail.getMx()); - AddAttribute(domElement, "my", detail.getMy()); + AddAttribute(domElement, "mx", toMM(detail.getMx())); + AddAttribute(domElement, "my", toMM(detail.getMy())); + AddAttribute(domElement, "supplement", detail.getSupplement()); + AddAttribute(domElement, "closed", detail.getClosed()); + AddAttribute(domElement, "width", detail.getWidth()); for(qint32 i = 0; i < detail.CountNode(); ++i){ AddNode(domElement, detail[i]); @@ -338,7 +358,7 @@ void VToolDetail::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ QMenu menu; - //QAction *actionOption = menu.addAction(tr("Options")); + QAction *actionOption = menu.addAction(tr("Options")); QAction *actionRemove = menu.addAction(tr("Delete")); if(_referens > 1){ actionRemove->setEnabled(false); @@ -346,21 +366,15 @@ void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ actionRemove->setEnabled(true); } QAction *selectedAction = menu.exec(event->screenPos()); -// if(selectedAction == actionOption){ -// dialog = QSharedPointer(new Dialog(getData())); - -// connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), &VMainGraphicsScene::ChoosedObject, -// dialog.data(), &Dialog::ChoosedObject); -// connect(dialog.data(), &Dialog::DialogClosed, tool, -// &Tool::FullUpdateFromGui); -// connect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &Dialog::UpdateList); - -// tool->setDialog(); - -// dialog->show(); -// } + if(selectedAction == actionOption){ + dialogDetail = QSharedPointer(new DialogDetail(getData(), Draw::Modeling)); + connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, + dialogDetail.data(), &DialogDetail::ChoosedObject); + connect(dialogDetail.data(), &DialogDetail::DialogClosed, this, &VToolDetail::FullUpdateFromGui); + setDialog(); + dialogDetail->show(); + } if(selectedAction == actionRemove){ - //remove form xml file QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ @@ -393,6 +407,8 @@ void VToolDetail::AddNode(QDomElement &domElement, VNodeDetail &node){ QDomElement nod = doc->createElement("node"); AddAttribute(nod, "idObject", node.getId()); + AddAttribute(nod, "mx", toMM(node.getMx())); + AddAttribute(nod, "my", toMM(node.getMy())); if(node.getTypeNode() == NodeDetail::Contour){ AddAttribute(nod, "nodeType", "Contour"); } else { @@ -444,6 +460,15 @@ void VToolDetail::AddNode(QDomElement &domElement, VNodeDetail &node){ case(Tool::SplineTool): AddAttribute(nod, "type", "SplineTool"); break; + case(Tool::Height): + AddAttribute(nod, "type", "Height"); + break; + case(Tool::Triangle): + AddAttribute(nod, "type", "Triangle"); + break; + case(Tool::PointOfIntersection): + AddAttribute(nod, "type", "PointOfIntersection"); + break; default: qWarning()<<"May be wrong tool type!!! Ignoring."< Date: Fri, 25 Oct 2013 14:16:07 +0300 Subject: [PATCH 38/83] New method RemoveAllChild. --HG-- branch : develop --- tools/vabstracttool.cpp | 8 ++++++++ tools/vabstracttool.h | 1 + tools/vtooldetail.cpp | 6 +----- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index e6b656efc..61709d7b5 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -136,6 +136,14 @@ const VContainer *VAbstractTool::getData()const{ return &data; } +void VAbstractTool::RemoveAllChild(QDomElement &domElement){ + if ( domElement.hasChildNodes() ){ + while ( domElement.childNodes().length() >= 1 ){ + domElement.removeChild( domElement.firstChild() ); + } + } +} + void VAbstractTool::LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c){ //коефіцієнти для рівняння відрізку *a = line.p2().y() - line.p1().y(); diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index 0982bc64c..fc7d1e809 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -55,6 +55,7 @@ protected: void AddAttribute(QDomElement &domElement, const QString &name, const QString &value); const VContainer *getData() const; virtual void RemoveReferens(){} + void RemoveAllChild(QDomElement &domElement); private: Q_DISABLE_COPY(VAbstractTool) }; diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 559180c76..81a9a3fbd 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -296,11 +296,7 @@ void VToolDetail::FullUpdateFromGui(int result){ domElement.setAttribute("supplement", QString().setNum(det.getSupplement())); domElement.setAttribute("closed", QString().setNum(det.getClosed())); domElement.setAttribute("width", QString().setNum(det.getWidth())); - if ( domElement.hasChildNodes() ){ - while ( domElement.childNodes().length() >= 1 ){ - domElement.removeChild( domElement.firstChild() ); - } - } + RemoveAllChild(domElement); for(qint32 i = 0; i < det.CountNode(); ++i){ AddNode(domElement, det[i]); } From b42bc9560a163ef826c20efdc532341498d1efbc Mon Sep 17 00:00:00 2001 From: dismine Date: Sat, 26 Oct 2013 20:55:06 +0300 Subject: [PATCH 39/83] Refactoring. --HG-- branch : develop --- container/vincrementtablerow.h | 40 ++++++------- container/vstandarttablecell.h | 19 +++---- dialogs/dialogalongline.cpp | 20 ------- dialogs/dialogalongline.h | 16 +++--- dialogs/dialogarc.cpp | 21 +------ dialogs/dialogarc.h | 27 ++++----- dialogs/dialogbisector.cpp | 24 -------- dialogs/dialogbisector.h | 19 +++---- dialogs/dialogdetail.cpp | 5 -- dialogs/dialogdetail.h | 3 +- dialogs/dialogendline.cpp | 27 +-------- dialogs/dialogendline.h | 12 ++-- dialogs/dialogheight.cpp | 20 ------- dialogs/dialogheight.h | 10 ++-- dialogs/dialoghistory.cpp | 1 - dialogs/dialoghistory.h | 34 ++++++----- dialogs/dialogincrements.cpp | 8 +-- dialogs/dialogline.cpp | 10 ---- dialogs/dialogline.h | 7 +-- dialogs/dialoglineintersect.cpp | 23 +------- dialogs/dialoglineintersect.h | 13 ++--- dialogs/dialognormal.cpp | 28 +-------- dialogs/dialognormal.h | 17 +++--- dialogs/dialogpointofcontact.cpp | 21 ------- dialogs/dialogpointofcontact.h | 49 +++++++--------- dialogs/dialogpointofintersection.cpp | 12 ---- dialogs/dialogpointofintersection.h | 30 +++++----- dialogs/dialogshoulderpoint.cpp | 27 +-------- dialogs/dialogshoulderpoint.h | 52 ++++++++--------- dialogs/dialogsinglepoint.cpp | 12 ---- dialogs/dialogsinglepoint.h | 21 ++++--- dialogs/dialogspline.cpp | 28 --------- dialogs/dialogspline.h | 57 +++++++++---------- dialogs/dialogsplinepath.cpp | 7 +-- dialogs/dialogsplinepath.h | 39 +++++++------ dialogs/dialogtool.cpp | 18 +----- dialogs/dialogtool.h | 18 ++---- dialogs/dialogtriangle.cpp | 19 ------- dialogs/dialogtriangle.h | 46 +++++++-------- tools/drawTools/vtoolbisector.cpp | 1 + tools/drawTools/vtoolendline.cpp | 1 + tools/drawTools/vtoolnormal.cpp | 1 + tools/drawTools/vtoolpointofcontact.cpp | 1 + tools/drawTools/vtoolshoulderpoint.cpp | 1 + tools/modelingTools/vmodelingbisector.cpp | 2 +- tools/modelingTools/vmodelingendline.cpp | 4 +- tools/modelingTools/vmodelingnormal.cpp | 1 + .../modelingTools/vmodelingpointofcontact.cpp | 1 + .../modelingTools/vmodelingshoulderpoint.cpp | 1 + 49 files changed, 260 insertions(+), 614 deletions(-) diff --git a/container/vincrementtablerow.h b/container/vincrementtablerow.h index 3896340fb..7846f0441 100644 --- a/container/vincrementtablerow.h +++ b/container/vincrementtablerow.h @@ -24,32 +24,26 @@ #include -class VIncrementTableRow -{ +class VIncrementTableRow{ public: - VIncrementTableRow(); - VIncrementTableRow(qint64 id, qreal base, qreal ksize, qreal kgrowth, - QString description = QString()); - qint64 getId() const; - void setId(const qint64 &value); - - qreal getBase() const; - void setBase(const qreal &value); - - qreal getKsize() const; - void setKsize(const qreal &value); - - qreal getKgrowth() const; - void setKgrowth(const qreal &value); - + VIncrementTableRow(); + VIncrementTableRow(qint64 id, qreal base, qreal ksize, qreal kgrowth, + QString description = QString()); + qint64 getId() const; + void setId(const qint64 &value); + qreal getBase() const; + void setBase(const qreal &value); + qreal getKsize() const; + void setKsize(const qreal &value); + qreal getKgrowth() const; + void setKgrowth(const qreal &value); QString getDescription() const; - void setDescription(const QString &value); - + void setDescription(const QString &value); private: - qint64 id; - qreal base; - qreal ksize; - qreal kgrowth; + qint64 id; + qreal base; + qreal ksize; + qreal kgrowth; QString description; }; diff --git a/container/vstandarttablecell.h b/container/vstandarttablecell.h index c165fbca4..536a63f8e 100644 --- a/container/vstandarttablecell.h +++ b/container/vstandarttablecell.h @@ -24,19 +24,18 @@ #include -class VStandartTableCell -{ +class VStandartTableCell{ public: - VStandartTableCell(); - VStandartTableCell(qint32 base, qreal ksize, qreal kgrowth, QString description = QString()); - qint32 GetBase() const; - qreal GetKsize() const; - qreal GetKgrowth() const; + VStandartTableCell(); + VStandartTableCell(qint32 base, qreal ksize, qreal kgrowth, QString description = QString()); + qint32 GetBase() const; + qreal GetKsize() const; + qreal GetKgrowth() const; QString GetDescription() const; private: - qint32 base; - qreal ksize; - qreal kgrowth; + qint32 base; + qreal ksize; + qreal kgrowth; QString description; }; diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index aa66b467a..c0724f951 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -121,44 +121,24 @@ void DialogAlongLine::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -qint64 DialogAlongLine::getSecondPointId() const{ - return secondPointId; -} - void DialogAlongLine::setSecondPointId(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -qint64 DialogAlongLine::getFirstPointId() const{ - return firstPointId; -} - void DialogAlongLine::setFirstPointId(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -QString DialogAlongLine::getFormula() const{ - return formula; -} - void DialogAlongLine::setFormula(const QString &value){ formula = value; ui->lineEditFormula->setText(formula); } -QString DialogAlongLine::getTypeLine() const{ - return typeLine; -} - void DialogAlongLine::setTypeLine(const QString &value){ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -QString DialogAlongLine::getPointName() const{ - return pointName; -} - void DialogAlongLine::setPointName(const QString &value){ pointName = value; ui->lineEditNamePoint->setText(pointName); diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index 200d4168a..5020e17de 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -23,28 +23,26 @@ #define DIALOGALONGLINE_H #include "dialogtool.h" -#include "container/calculator.h" namespace Ui { class DialogAlongLine; } -class DialogAlongLine : public DialogTool -{ +class DialogAlongLine : public DialogTool{ Q_OBJECT public: - explicit DialogAlongLine(const VContainer *data, Draw::Draws mode = Draw::Calculation, + DialogAlongLine(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogAlongLine(); - QString getPointName() const; + inline QString getPointName() const {return pointName;} void setPointName(const QString &value); - QString getTypeLine() const; + inline QString getTypeLine() const {return typeLine;} void setTypeLine(const QString &value); - QString getFormula() const; + inline QString getFormula() const {return formula;} void setFormula(const QString &value); - qint64 getFirstPointId() const; + inline qint64 getFirstPointId() const {return firstPointId;} void setFirstPointId(const qint64 &value, const qint64 &id); - qint64 getSecondPointId() const; + inline qint64 getSecondPointId() const {return secondPointId;} void setSecondPointId(const qint64 &value, const qint64 &id); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); diff --git a/dialogs/dialogarc.cpp b/dialogs/dialogarc.cpp index bfefe9037..adb2ac91b 100644 --- a/dialogs/dialogarc.cpp +++ b/dialogs/dialogarc.cpp @@ -21,7 +21,6 @@ #include "dialogarc.h" #include "ui_dialogarc.h" -#include "../container/calculator.h" DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent) : DialogTool(data, mode, parent), ui(new Ui::DialogArc), flagRadius(false), flagF1(false), flagF2(false), @@ -78,8 +77,8 @@ DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent) connect(ui->lineEditF2, &QLineEdit::textChanged, this, &DialogArc::F2Changed); } -qint64 DialogArc::GetCenter() const{ - return center; +DialogArc::~DialogArc(){ + delete ui; } void DialogArc::SetCenter(const qint64 &value){ @@ -87,37 +86,21 @@ void DialogArc::SetCenter(const qint64 &value){ ChangeCurrentData(ui->comboBoxBasePoint, center); } -QString DialogArc::GetF2() const{ - return f2; -} - void DialogArc::SetF2(const QString &value){ f2 = value; ui->lineEditF2->setText(f2); } -QString DialogArc::GetF1() const{ - return f1; -} - void DialogArc::SetF1(const QString &value){ f1 = value; ui->lineEditF1->setText(f1); } -QString DialogArc::GetRadius() const{ - return radius; -} - void DialogArc::SetRadius(const QString &value){ radius = value; ui->lineEditRadius->setText(radius); } -DialogArc::~DialogArc(){ -delete ui; -} - void DialogArc::ChoosedObject(qint64 id, Scene::Scenes type){ if(idDetail == 0 && mode == Draw::Modeling){ if(type == Scene::Detail){ diff --git a/dialogs/dialogarc.h b/dialogs/dialogarc.h index cb4291a5c..53467f108 100644 --- a/dialogs/dialogarc.h +++ b/dialogs/dialogarc.h @@ -28,24 +28,19 @@ namespace Ui { class DialogArc; } -class DialogArc : public DialogTool -{ +class DialogArc : public DialogTool{ Q_OBJECT public: - explicit DialogArc(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); - ~DialogArc(); - qint64 GetCenter() const; - void SetCenter(const qint64 &value); - - QString GetRadius() const; - void SetRadius(const QString &value); - - QString GetF1() const; - void SetF1(const QString &value); - - QString GetF2() const; - void SetF2(const QString &value); - + DialogArc(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); + ~DialogArc(); + inline qint64 GetCenter() const {return center;} + void SetCenter(const qint64 &value); + inline QString GetRadius() const {return radius;} + void SetRadius(const QString &value); + inline QString GetF1() const {return f1;} + void SetF1(const QString &value); + inline QString GetF2() const {return f2;} + void SetF2(const QString &value); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); virtual void DialogAccepted(); diff --git a/dialogs/dialogbisector.cpp b/dialogs/dialogbisector.cpp index 0296b71a3..5b22c2f4a 100644 --- a/dialogs/dialogbisector.cpp +++ b/dialogs/dialogbisector.cpp @@ -121,53 +121,29 @@ void DialogBisector::ChoosedObject(qint64 id, Scene::Scenes type){ } } -QString DialogBisector::getPointName() const{ - return pointName; -} - void DialogBisector::setPointName(const QString &value){ pointName = value; ui->lineEditNamePoint->setText(pointName); } -QString DialogBisector::getTypeLine() const{ - return typeLine; -} - void DialogBisector::setTypeLine(const QString &value){ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -QString DialogBisector::getFormula() const{ - return formula; -} - void DialogBisector::setFormula(const QString &value){ formula = value; ui->lineEditFormula->setText(formula); } -qint64 DialogBisector::getFirstPointId() const{ - return firstPointId; -} - void DialogBisector::setFirstPointId(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -qint64 DialogBisector::getSecondPointId() const{ - return secondPointId; -} - void DialogBisector::setSecondPointId(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -qint64 DialogBisector::getThirdPointId() const{ - return thirdPointId; -} - void DialogBisector::setThirdPointId(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxThirdPoint, thirdPointId, value, id); } diff --git a/dialogs/dialogbisector.h b/dialogs/dialogbisector.h index aa7f529f2..e237cfbb8 100644 --- a/dialogs/dialogbisector.h +++ b/dialogs/dialogbisector.h @@ -23,32 +23,29 @@ #define DIALOGBISECTOR_H #include "dialogtool.h" -#include -#include "container/calculator.h" namespace Ui { class DialogBisector; } -class DialogBisector : public DialogTool -{ +class DialogBisector : public DialogTool{ Q_OBJECT public: explicit DialogBisector(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); - ~DialogBisector(); - QString getPointName() const; + ~DialogBisector(); + QString getPointName() const {return pointName;} void setPointName(const QString &value); - QString getTypeLine() const; + inline QString getTypeLine() const {return typeLine;} void setTypeLine(const QString &value); - QString getFormula() const; + inline QString getFormula() const {return formula;} void setFormula(const QString &value); - qint64 getFirstPointId() const; + inline qint64 getFirstPointId() const {return firstPointId;} void setFirstPointId(const qint64 &value, const qint64 &id); - qint64 getSecondPointId() const; + inline qint64 getSecondPointId() const {return secondPointId;} void setSecondPointId(const qint64 &value, const qint64 &id); - qint64 getThirdPointId() const; + inline qint64 getThirdPointId() const {return thirdPointId;} void setThirdPointId(const qint64 &value, const qint64 &id); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index 64fe68fd7..caaa1bf78 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "dialogdetail.h" -#include DialogDetail::DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent) : DialogTool(data, mode, parent), ui(), details(VDetail()), supplement(true), closed(true){ @@ -157,10 +156,6 @@ void DialogDetail::NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, No this, &DialogDetail::BiasYChanged); } -VDetail DialogDetail::getDetails() const{ - return details; -} - void DialogDetail::setDetails(const VDetail &value){ details = value; ui.listWidget->clear(); diff --git a/dialogs/dialogdetail.h b/dialogs/dialogdetail.h index efddaf2dc..00ceb22b9 100644 --- a/dialogs/dialogdetail.h +++ b/dialogs/dialogdetail.h @@ -24,13 +24,12 @@ #include "ui_dialogdetail.h" #include "dialogtool.h" -#include "geometry/vdetail.h" class DialogDetail : public DialogTool{ Q_OBJECT public: DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent = 0); - VDetail getDetails() const; + inline VDetail getDetails() const {return details;} void setDetails(const VDetail &value); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); diff --git a/dialogs/dialogendline.cpp b/dialogs/dialogendline.cpp index 1251ce77a..d415e84c5 100644 --- a/dialogs/dialogendline.cpp +++ b/dialogs/dialogendline.cpp @@ -21,10 +21,6 @@ #include "dialogendline.h" #include "ui_dialogendline.h" -#include -#include -#include "container/vpointf.h" -#include "container/calculator.h" DialogEndLine::DialogEndLine(const VContainer *data, Draw::Draws mode, QWidget *parent) : DialogTool(data, mode, parent), ui(new Ui::DialogEndLine), pointName(QString()), typeLine(QString()), @@ -110,46 +106,26 @@ void DialogEndLine::ChoosedObject(qint64 id, Scene::Scenes type){ } } -QString DialogEndLine::getPointName() const{ - return pointName; -} - void DialogEndLine::setPointName(const QString &value){ pointName = value; ui->lineEditNamePoint->setText(pointName); } -QString DialogEndLine::getTypeLine() const{ - return typeLine; -} - void DialogEndLine::setTypeLine(const QString &value){ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -QString DialogEndLine::getFormula() const{ - return formula; -} - void DialogEndLine::setFormula(const QString &value){ formula = value; ui->lineEditFormula->setText(formula); } -qreal DialogEndLine::getAngle() const{ - return angle; -} - void DialogEndLine::setAngle(const qreal &value){ angle = value; ui->doubleSpinBoxAngle->setValue(angle); } -qint64 DialogEndLine::getBasePointId() const{ - return basePointId; -} - void DialogEndLine::setBasePointId(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxBasePoint, basePointId, value, id); } @@ -163,7 +139,6 @@ void DialogEndLine::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -DialogEndLine::~DialogEndLine() -{ +DialogEndLine::~DialogEndLine(){ delete ui; } diff --git a/dialogs/dialogendline.h b/dialogs/dialogendline.h index b07701169..a793ca85a 100644 --- a/dialogs/dialogendline.h +++ b/dialogs/dialogendline.h @@ -23,8 +23,6 @@ #define DIALOGENDLINE_H #include "dialogtool.h" -#include -#include "container/calculator.h" namespace Ui { class DialogEndLine; @@ -36,15 +34,15 @@ public: explicit DialogEndLine(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogEndLine(); - QString getPointName() const; + inline QString getPointName() const {return pointName;} void setPointName(const QString &value); - QString getTypeLine() const; + inline QString getTypeLine() const {return typeLine;} void setTypeLine(const QString &value); - QString getFormula() const; + inline QString getFormula() const {return formula;} void setFormula(const QString &value); - qreal getAngle() const; + inline qreal getAngle() const {return angle;} void setAngle(const qreal &value); - qint64 getBasePointId() const; + inline qint64 getBasePointId() const {return basePointId;} void setBasePointId(const qint64 &value, const qint64 &id); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); diff --git a/dialogs/dialogheight.cpp b/dialogs/dialogheight.cpp index fa71daa7c..7024d94c1 100644 --- a/dialogs/dialogheight.cpp +++ b/dialogs/dialogheight.cpp @@ -23,46 +23,26 @@ DialogHeight::~DialogHeight(){ delete ui; } -QString DialogHeight::getPointName() const{ - return pointName; -} - void DialogHeight::setPointName(const QString &value){ pointName = value; ui->lineEditNamePoint->setText(pointName); } -QString DialogHeight::getTypeLine() const{ - return typeLine; -} - void DialogHeight::setTypeLine(const QString &value){ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -qint64 DialogHeight::getBasePointId() const{ - return basePointId; -} - void DialogHeight::setBasePointId(const qint64 &value, const qint64 &id){ basePointId = value; setCurrentPointId(ui->comboBoxBasePoint, basePointId, value, id); } -qint64 DialogHeight::getP1LineId() const{ - return p1LineId; -} - void DialogHeight::setP1LineId(const qint64 &value, const qint64 &id){ p1LineId = value; setCurrentPointId(ui->comboBoxP1Line, p1LineId, value, id); } -qint64 DialogHeight::getP2LineId() const{ - return p2LineId; -} - void DialogHeight::setP2LineId(const qint64 &value, const qint64 &id){ p2LineId = value; setCurrentPointId(ui->comboBoxP2Line, p2LineId, value, id); diff --git a/dialogs/dialogheight.h b/dialogs/dialogheight.h index b4e4c05b6..d2eaa2022 100644 --- a/dialogs/dialogheight.h +++ b/dialogs/dialogheight.h @@ -13,15 +13,15 @@ public: explicit DialogHeight(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogHeight(); - QString getPointName() const; + inline QString getPointName() const {return pointName;} void setPointName(const QString &value); - QString getTypeLine() const; + inline QString getTypeLine() const {return typeLine;} void setTypeLine(const QString &value); - qint64 getBasePointId() const; + inline qint64 getBasePointId() const {return basePointId;} void setBasePointId(const qint64 &value, const qint64 &id); - qint64 getP1LineId() const; + inline qint64 getP1LineId() const {return p1LineId;} void setP1LineId(const qint64 &value, const qint64 &id); - qint64 getP2LineId() const; + inline qint64 getP2LineId() const{return p2LineId;} void setP2LineId(const qint64 &value, const qint64 &id); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index 10df37d63..e8f78704d 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -304,7 +304,6 @@ void DialogHistory::ShowPoint(){ } } - void DialogHistory::closeEvent(QCloseEvent *event){ QTableWidgetItem *item = ui->tableWidget->item(cursorToolRecordRow, 0); qint64 id = qvariant_cast(item->data(Qt::UserRole)); diff --git a/dialogs/dialoghistory.h b/dialogs/dialoghistory.h index a515a94a2..65dc1c1ce 100644 --- a/dialogs/dialoghistory.h +++ b/dialogs/dialoghistory.h @@ -29,32 +29,30 @@ namespace Ui { class DialogHistory; } -class DialogHistory : public DialogTool -{ +class DialogHistory : public DialogTool{ Q_OBJECT - public: - explicit DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent = 0); - virtual ~DialogHistory(); + DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent = 0); + virtual ~DialogHistory(); public slots: - virtual void DialogAccepted(); - void cellClicked(int row, int column); - void ChangedCursor(qint64 id); - void UpdateHistory(); + virtual void DialogAccepted(); + void cellClicked(int row, int column); + void ChangedCursor(qint64 id); + void UpdateHistory(); signals: - void ShowHistoryTool(qint64 id, Qt::GlobalColor color, bool enable); + void ShowHistoryTool(qint64 id, Qt::GlobalColor color, bool enable); protected: - virtual void closeEvent ( QCloseEvent * event ); + virtual void closeEvent ( QCloseEvent * event ); private: Q_DISABLE_COPY(DialogHistory) Ui::DialogHistory *ui; - VDomDocument *doc; - qint32 cursorRow; - qint32 cursorToolRecordRow; - void FillTable(); - QString Record(const VToolRecord &tool); - void InitialTable(); - void ShowPoint(); + VDomDocument *doc; + qint32 cursorRow; + qint32 cursorToolRecordRow; + void FillTable(); + QString Record(const VToolRecord &tool); + void InitialTable(); + void ShowPoint(); }; #endif // DIALOGHISTORY_H diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 0bceb8d27..b103273d4 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -21,12 +21,8 @@ #include "dialogincrements.h" #include "ui_dialogincrements.h" -#include -#include -#include "widgets/doubledelegate.h" -#include "container/vincrementtablerow.h" -#include -#include "exception/vexception.h" +#include +#include DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent) : DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogIncrements), data(data), doc(doc), diff --git a/dialogs/dialogline.cpp b/dialogs/dialogline.cpp index 784d6448a..ed6db782e 100644 --- a/dialogs/dialogline.cpp +++ b/dialogs/dialogline.cpp @@ -21,8 +21,6 @@ #include "dialogline.h" #include "ui_dialogline.h" -#include -#include DialogLine::DialogLine(const VContainer *data, Draw::Draws mode, QWidget *parent) : DialogTool(data, mode, parent), ui(new Ui::DialogLine), number(0), firstPoint(0), secondPoint(0){ @@ -40,10 +38,6 @@ DialogLine::~DialogLine(){ delete ui; } -qint64 DialogLine::getSecondPoint() const{ - return secondPoint; -} - void DialogLine::setSecondPoint(const qint64 &value){ secondPoint = value; VPointF point = data->GetPoint(value); @@ -53,10 +47,6 @@ void DialogLine::setSecondPoint(const qint64 &value){ } } -qint64 DialogLine::getFirstPoint() const{ - return firstPoint; -} - void DialogLine::setFirstPoint(const qint64 &value){ firstPoint = value; VPointF point = data->GetPoint(value); diff --git a/dialogs/dialogline.h b/dialogs/dialogline.h index dca627eaa..8a19cec33 100644 --- a/dialogs/dialogline.h +++ b/dialogs/dialogline.h @@ -28,16 +28,15 @@ namespace Ui { class DialogLine; } -class DialogLine : public DialogTool -{ +class DialogLine : public DialogTool{ Q_OBJECT public: explicit DialogLine(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogLine(); - qint64 getFirstPoint() const; + inline qint64 getFirstPoint() const {return firstPoint;} void setFirstPoint(const qint64 &value); - qint64 getSecondPoint() const; + inline qint64 getSecondPoint() const {return secondPoint;} void setSecondPoint(const qint64 &value); public slots: void ChoosedObject(qint64 id, Scene::Scenes type); diff --git a/dialogs/dialoglineintersect.cpp b/dialogs/dialoglineintersect.cpp index 260f4cc7d..9e8d2b8ff 100644 --- a/dialogs/dialoglineintersect.cpp +++ b/dialogs/dialoglineintersect.cpp @@ -41,8 +41,7 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, Draw::Draws mod connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogLineIntersect::NamePointChanged); } -DialogLineIntersect::~DialogLineIntersect() -{ +DialogLineIntersect::~DialogLineIntersect(){ delete ui; } @@ -179,46 +178,26 @@ bool DialogLineIntersect::CheckIntersecion(){ } } -qint64 DialogLineIntersect::getP2Line2() const{ - return p2Line2; -} - void DialogLineIntersect::setP2Line2(const qint64 &value){ p2Line2 = value; ChangeCurrentData(ui->comboBoxP2Line2, value); } -qint64 DialogLineIntersect::getP1Line2() const{ - return p1Line2; -} - void DialogLineIntersect::setP1Line2(const qint64 &value){ p1Line2 = value; ChangeCurrentData(ui->comboBoxP1Line2, value); } -qint64 DialogLineIntersect::getP2Line1() const{ - return p2Line1; -} - void DialogLineIntersect::setP2Line1(const qint64 &value){ p2Line1 = value; ChangeCurrentData(ui->comboBoxP2Line1, value); } -qint64 DialogLineIntersect::getP1Line1() const{ - return p1Line1; -} - void DialogLineIntersect::setP1Line1(const qint64 &value){ p1Line1 = value; ChangeCurrentData(ui->comboBoxP1Line1, value); } -QString DialogLineIntersect::getPointName() const{ - return pointName; -} - void DialogLineIntersect::setPointName(const QString &value){ pointName = value; ui->lineEditNamePoint->setText(pointName); diff --git a/dialogs/dialoglineintersect.h b/dialogs/dialoglineintersect.h index 4f2f586b8..5d1ce01c5 100644 --- a/dialogs/dialoglineintersect.h +++ b/dialogs/dialoglineintersect.h @@ -28,22 +28,21 @@ namespace Ui { class DialogLineIntersect; } -class DialogLineIntersect : public DialogTool -{ +class DialogLineIntersect : public DialogTool{ Q_OBJECT public: explicit DialogLineIntersect(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogLineIntersect(); - qint64 getP1Line1() const; + inline qint64 getP1Line1() const {return p1Line1;} void setP1Line1(const qint64 &value); - qint64 getP2Line1() const; + inline qint64 getP2Line1() const {return p2Line1;} void setP2Line1(const qint64 &value); - qint64 getP1Line2() const; + inline qint64 getP1Line2() const {return p1Line2;} void setP1Line2(const qint64 &value); - qint64 getP2Line2() const; + inline qint64 getP2Line2() const {return p2Line2;} void setP2Line2(const qint64 &value); - QString getPointName() const; + inline QString getPointName() const {return pointName;} void setPointName(const QString &value); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); diff --git a/dialogs/dialognormal.cpp b/dialogs/dialognormal.cpp index ef60bcb91..c52340ba9 100644 --- a/dialogs/dialognormal.cpp +++ b/dialogs/dialognormal.cpp @@ -21,7 +21,6 @@ #include "dialognormal.h" #include "ui_dialognormal.h" -#include DialogNormal::DialogNormal(const VContainer *data, Draw::Draws mode, QWidget *parent) : DialogTool(data, mode, parent), ui(new Ui::DialogNormal), number(0), pointName(QString()), @@ -83,8 +82,7 @@ DialogNormal::DialogNormal(const VContainer *data, Draw::Draws mode, QWidget *pa connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogNormal::FormulaChanged); } -DialogNormal::~DialogNormal() -{ +DialogNormal::~DialogNormal(){ delete ui; } @@ -140,53 +138,29 @@ void DialogNormal::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -qint64 DialogNormal::getSecondPointId() const{ - return secondPointId; -} - void DialogNormal::setSecondPointId(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -qint64 DialogNormal::getFirstPointId() const{ - return firstPointId; -} - void DialogNormal::setFirstPointId(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -qreal DialogNormal::getAngle() const{ - return angle; -} - void DialogNormal::setAngle(const qreal &value){ angle = value; ui->doubleSpinBoxAngle->setValue(angle); } -QString DialogNormal::getFormula() const{ - return formula; -} - void DialogNormal::setFormula(const QString &value){ formula = value; ui->lineEditFormula->setText(formula); } -QString DialogNormal::getTypeLine() const{ - return typeLine; -} - void DialogNormal::setTypeLine(const QString &value){ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -QString DialogNormal::getPointName() const{ - return pointName; -} - void DialogNormal::setPointName(const QString &value){ pointName = value; ui->lineEditNamePoint->setText(pointName); diff --git a/dialogs/dialognormal.h b/dialogs/dialognormal.h index 5586ae825..f96b5b39e 100644 --- a/dialogs/dialognormal.h +++ b/dialogs/dialognormal.h @@ -23,31 +23,28 @@ #define DIALOGNORMAL_H #include "dialogtool.h" -#include -#include "container/calculator.h" namespace Ui { class DialogNormal; } -class DialogNormal : public DialogTool -{ +class DialogNormal : public DialogTool{ Q_OBJECT public: explicit DialogNormal(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogNormal(); - QString getPointName() const; + inline QString getPointName() const{return pointName;} void setPointName(const QString &value); - QString getTypeLine() const; + inline QString getTypeLine() const {return typeLine;} void setTypeLine(const QString &value); - QString getFormula() const; + inline QString getFormula() const {return formula;} void setFormula(const QString &value); - qreal getAngle() const; + inline qreal getAngle() const {return angle;} void setAngle(const qreal &value); - qint64 getFirstPointId() const; + inline qint64 getFirstPointId() const {return firstPointId;} void setFirstPointId(const qint64 &value, const qint64 &id); - qint64 getSecondPointId() const; + inline qint64 getSecondPointId() const {return secondPointId;} void setSecondPointId(const qint64 &value, const qint64 &id); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); diff --git a/dialogs/dialogpointofcontact.cpp b/dialogs/dialogpointofcontact.cpp index 21a03227f..d3ba3c5c4 100644 --- a/dialogs/dialogpointofcontact.cpp +++ b/dialogs/dialogpointofcontact.cpp @@ -115,7 +115,6 @@ void DialogPointOfContact::ChoosedObject(qint64 id, Scene::Scenes type){ } } - void DialogPointOfContact::DialogAccepted(){ pointName = ui.lineEditNamePoint->text(); radius = ui.lineEditFormula->text(); @@ -125,44 +124,24 @@ void DialogPointOfContact::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -qint64 DialogPointOfContact::getSecondPoint() const{ - return secondPoint; -} - void DialogPointOfContact::setSecondPoint(const qint64 &value, const qint64 &id){ setCurrentPointId(ui.comboBoxSecondPoint, secondPoint, value, id); } -qint64 DialogPointOfContact::getFirstPoint() const{ - return firstPoint; -} - void DialogPointOfContact::setFirstPoint(const qint64 &value, const qint64 &id){ setCurrentPointId(ui.comboBoxFirstPoint, firstPoint, value, id); } -qint64 DialogPointOfContact::getCenter() const{ - return center; -} - void DialogPointOfContact::setCenter(const qint64 &value, const qint64 &id){ setCurrentPointId(ui.comboBoxCenter, center, value, id); center = value; } -QString DialogPointOfContact::getRadius() const{ - return radius; -} - void DialogPointOfContact::setRadius(const QString &value){ radius = value; ui.lineEditFormula->setText(radius); } -QString DialogPointOfContact::getPointName() const{ - return pointName; -} - void DialogPointOfContact::setPointName(const QString &value){ pointName = value; ui.lineEditNamePoint->setText(pointName); diff --git a/dialogs/dialogpointofcontact.h b/dialogs/dialogpointofcontact.h index 7d85ddcb3..68ee50e80 100644 --- a/dialogs/dialogpointofcontact.h +++ b/dialogs/dialogpointofcontact.h @@ -24,42 +24,35 @@ #include "ui_dialogpointofcontact.h" #include "dialogtool.h" -#include "container/calculator.h" -class DialogPointOfContact : public DialogTool -{ +class DialogPointOfContact : public DialogTool{ Q_OBJECT public: - explicit DialogPointOfContact(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); - QString getPointName() const; - void setPointName(const QString &value); - - QString getRadius() const; - void setRadius(const QString &value); - - qint64 getCenter() const; - void setCenter(const qint64 &value, const qint64 &id); - - qint64 getFirstPoint() const; - void setFirstPoint(const qint64 &value, const qint64 &id); - - qint64 getSecondPoint() const; - void setSecondPoint(const qint64 &value, const qint64 &id); - + DialogPointOfContact(const VContainer *data, Draw::Draws mode = Draw::Calculation, + QWidget *parent = 0); + inline QString getPointName() const {return pointName;} + void setPointName(const QString &value); + inline QString getRadius() const {return radius;} + void setRadius(const QString &value); + inline qint64 getCenter() const {return center;} + void setCenter(const qint64 &value, const qint64 &id); + inline qint64 getFirstPoint() const {return firstPoint;} + void setFirstPoint(const qint64 &value, const qint64 &id); + inline qint64 getSecondPoint() const {return secondPoint;} + void setSecondPoint(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogPointOfContact) Ui::DialogPointOfContact ui; - qint32 number; - QString pointName; - QString radius; - qint64 center; - qint64 firstPoint; - qint64 secondPoint; + qint32 number; + QString pointName; + QString radius; + qint64 center; + qint64 firstPoint; + qint64 secondPoint; }; #endif // DIALOGPOINTOFCONTACT_H diff --git a/dialogs/dialogpointofintersection.cpp b/dialogs/dialogpointofintersection.cpp index 04f239337..1172284fe 100644 --- a/dialogs/dialogpointofintersection.cpp +++ b/dialogs/dialogpointofintersection.cpp @@ -21,10 +21,6 @@ DialogPointOfIntersection::~DialogPointOfIntersection(){ delete ui; } -qint64 DialogPointOfIntersection::getSecondPointId() const{ - return secondPointId; -} - void DialogPointOfIntersection::setSecondPointId(const qint64 &value, const qint64 &id){ secondPointId = value; setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); @@ -79,19 +75,11 @@ void DialogPointOfIntersection::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -qint64 DialogPointOfIntersection::getFirstPointId() const{ - return firstPointId; -} - void DialogPointOfIntersection::setFirstPointId(const qint64 &value, const qint64 &id){ firstPointId = value; setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -QString DialogPointOfIntersection::getPointName() const{ - return pointName; -} - void DialogPointOfIntersection::setPointName(const QString &value){ pointName = value; ui->lineEditNamePoint->setText(pointName); diff --git a/dialogs/dialogpointofintersection.h b/dialogs/dialogpointofintersection.h index 7ffb57604..432105400 100644 --- a/dialogs/dialogpointofintersection.h +++ b/dialogs/dialogpointofintersection.h @@ -10,25 +10,25 @@ class DialogPointOfIntersection; class DialogPointOfIntersection : public DialogTool{ Q_OBJECT public: - DialogPointOfIntersection(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); - ~DialogPointOfIntersection(); - QString getPointName() const; - void setPointName(const QString &value); - qint64 getFirstPointId() const; - void setFirstPointId(const qint64 &value, const qint64 &id); - qint64 getSecondPointId() const; - void setSecondPointId(const qint64 &value, const qint64 &id); + DialogPointOfIntersection(const VContainer *data, Draw::Draws mode = Draw::Calculation, + QWidget *parent = 0); + ~DialogPointOfIntersection(); + inline QString getPointName() const {return pointName;} + void setPointName(const QString &value); + inline qint64 getFirstPointId() const {return firstPointId;} + void setFirstPointId(const qint64 &value, const qint64 &id); + inline qint64 getSecondPointId() const {return secondPointId;} + void setSecondPointId(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogPointOfIntersection) Ui::DialogPointOfIntersection *ui; - qint32 number; - QString pointName; - qint64 firstPointId; - qint64 secondPointId; + qint32 number; + QString pointName; + qint64 firstPointId; + qint64 secondPointId; }; #endif // DIALOGPOINTOFINTERSECTION_H diff --git a/dialogs/dialogshoulderpoint.cpp b/dialogs/dialogshoulderpoint.cpp index f1a5fff82..0429522ae 100644 --- a/dialogs/dialogshoulderpoint.cpp +++ b/dialogs/dialogshoulderpoint.cpp @@ -67,8 +67,7 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, Draw::Draws mod connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogShoulderPoint::FormulaChanged); } -DialogShoulderPoint::~DialogShoulderPoint() -{ +DialogShoulderPoint::~DialogShoulderPoint(){ delete ui; } @@ -133,52 +132,28 @@ void DialogShoulderPoint::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -qint64 DialogShoulderPoint::getPShoulder() const{ - return pShoulder; -} - void DialogShoulderPoint::setPShoulder(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxPShoulder, pShoulder, value, id); } -qint64 DialogShoulderPoint::getP2Line() const{ - return p2Line; -} - void DialogShoulderPoint::setP2Line(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxP2Line, p2Line, value, id); } -qint64 DialogShoulderPoint::getP1Line() const{ - return p1Line; -} - void DialogShoulderPoint::setP1Line(const qint64 &value, const qint64 &id){ setCurrentPointId(ui->comboBoxP1Line, p1Line, value, id); } -QString DialogShoulderPoint::getFormula() const{ - return formula; -} - void DialogShoulderPoint::setFormula(const QString &value){ formula = value; ui->lineEditFormula->setText(formula); } -QString DialogShoulderPoint::getTypeLine() const{ - return typeLine; -} - void DialogShoulderPoint::setTypeLine(const QString &value){ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -QString DialogShoulderPoint::getPointName() const{ - return pointName; -} - void DialogShoulderPoint::setPointName(const QString &value){ pointName = value; ui->lineEditNamePoint->setText(pointName); diff --git a/dialogs/dialogshoulderpoint.h b/dialogs/dialogshoulderpoint.h index 49df44255..ed2cfb1cf 100644 --- a/dialogs/dialogshoulderpoint.h +++ b/dialogs/dialogshoulderpoint.h @@ -23,44 +23,42 @@ #define DIALOGSHOULDERPOINT_H #include "dialogtool.h" -#include "container/calculator.h" namespace Ui { class DialogShoulderPoint; } -class DialogShoulderPoint : public DialogTool -{ +class DialogShoulderPoint : public DialogTool{ Q_OBJECT public: - explicit DialogShoulderPoint(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); - ~DialogShoulderPoint(); - QString getPointName() const; - void setPointName(const QString &value); - QString getTypeLine() const; - void setTypeLine(const QString &value); - QString getFormula() const; - void setFormula(const QString &value); - qint64 getP1Line() const; - void setP1Line(const qint64 &value, const qint64 &id); - qint64 getP2Line() const; - void setP2Line(const qint64 &value, const qint64 &id); - qint64 getPShoulder() const; - void setPShoulder(const qint64 &value, const qint64 &id); + DialogShoulderPoint(const VContainer *data, Draw::Draws mode = Draw::Calculation, + QWidget *parent = 0); + ~DialogShoulderPoint(); + inline QString getPointName() const {return pointName;} + void setPointName(const QString &value); + inline QString getTypeLine() const {return typeLine;} + void setTypeLine(const QString &value); + inline QString getFormula() const {return formula;} + void setFormula(const QString &value); + inline qint64 getP1Line() const {return p1Line;} + void setP1Line(const qint64 &value, const qint64 &id); + inline qint64 getP2Line() const {return p2Line;} + void setP2Line(const qint64 &value, const qint64 &id); + inline qint64 getPShoulder() const {return pShoulder;} + void setPShoulder(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogShoulderPoint) Ui::DialogShoulderPoint *ui; - qint32 number; - QString pointName; - QString typeLine; - QString formula; - qint64 p1Line; - qint64 p2Line; - qint64 pShoulder; + qint32 number; + QString pointName; + QString typeLine; + QString formula; + qint64 p1Line; + qint64 p2Line; + qint64 pShoulder; }; #endif // DIALOGSHOULDERPOINT_H diff --git a/dialogs/dialogsinglepoint.cpp b/dialogs/dialogsinglepoint.cpp index 276dd9542..47ee98d79 100644 --- a/dialogs/dialogsinglepoint.cpp +++ b/dialogs/dialogsinglepoint.cpp @@ -21,10 +21,6 @@ #include "dialogsinglepoint.h" #include "ui_dialogsinglepoint.h" -#include -#include -#include -#include "options.h" DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent) : DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogSinglePoint), name(QString()), @@ -69,14 +65,6 @@ void DialogSinglePoint::setData(const QString name, const QPointF point){ ui->doubleSpinBoxY->setValue(point.y()/PrintDPI*25.4); } -QString DialogSinglePoint::getName()const{ - return name; -} - -QPointF DialogSinglePoint::getPoint()const{ - return point; -} - DialogSinglePoint::~DialogSinglePoint(){ delete ui; } diff --git a/dialogs/dialogsinglepoint.h b/dialogs/dialogsinglepoint.h index 02c064386..d60f8e2cd 100644 --- a/dialogs/dialogsinglepoint.h +++ b/dialogs/dialogsinglepoint.h @@ -28,23 +28,22 @@ namespace Ui { class DialogSinglePoint; } -class DialogSinglePoint : public DialogTool -{ +class DialogSinglePoint : public DialogTool{ Q_OBJECT public: - explicit DialogSinglePoint(const VContainer *data, QWidget *parent = 0); - void setData(const QString name, const QPointF point); - QString getName()const; - QPointF getPoint()const; - ~DialogSinglePoint(); + DialogSinglePoint(const VContainer *data, QWidget *parent = 0); + void setData(const QString name, const QPointF point); + inline QString getName()const {return name;} + inline QPointF getPoint()const {return point;} + ~DialogSinglePoint(); public slots: - void mousePress(QPointF scenePos); - virtual void DialogAccepted(); + void mousePress(QPointF scenePos); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogSinglePoint) Ui::DialogSinglePoint *ui; - QString name; - QPointF point; + QString name; + QPointF point; }; #endif // DIALOGSINGLEPOINT_H diff --git a/dialogs/dialogspline.cpp b/dialogs/dialogspline.cpp index c17c3d385..40bbe35db 100644 --- a/dialogs/dialogspline.cpp +++ b/dialogs/dialogspline.cpp @@ -109,64 +109,36 @@ void DialogSpline::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -qreal DialogSpline::getKCurve() const{ - return kCurve; -} - void DialogSpline::setKCurve(const qreal &value){ kCurve = value; ui->doubleSpinBoxKcurve->setValue(value); } -qreal DialogSpline::getKAsm2() const{ - return kAsm2; -} - void DialogSpline::setKAsm2(const qreal &value){ kAsm2 = value; ui->doubleSpinBoxKasm2->setValue(value); } -qreal DialogSpline::getKAsm1() const{ - return kAsm1; -} - void DialogSpline::setKAsm1(const qreal &value){ kAsm1 = value; ui->doubleSpinBoxKasm1->setValue(value); } -qreal DialogSpline::getAngle2() const{ - return angle2; -} - void DialogSpline::setAngle2(const qreal &value){ angle2 = value; ui->spinBoxAngle2->setValue(static_cast(value)); } -qreal DialogSpline::getAngle1() const{ - return angle1; -} - void DialogSpline::setAngle1(const qreal &value){ angle1 = value; ui->spinBoxAngle1->setValue(static_cast(value)); } -qint64 DialogSpline::getP4() const{ - return p4; -} - void DialogSpline::setP4(const qint64 &value){ p4 = value; ChangeCurrentData(ui->comboBoxP4, value); } -qint64 DialogSpline::getP1() const{ - return p1; -} - void DialogSpline::setP1(const qint64 &value){ p1 = value; ChangeCurrentData(ui->comboBoxP1, value); diff --git a/dialogs/dialogspline.h b/dialogs/dialogspline.h index 180f3a455..3aaf78a42 100644 --- a/dialogs/dialogspline.h +++ b/dialogs/dialogspline.h @@ -28,41 +28,40 @@ namespace Ui { class DialogSpline; } -class DialogSpline : public DialogTool -{ +class DialogSpline : public DialogTool{ Q_OBJECT public: - explicit DialogSpline(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); - ~DialogSpline(); - qint64 getP1() const; - void setP1(const qint64 &value); - qint64 getP4() const; - void setP4(const qint64 &value); - qreal getAngle1() const; - void setAngle1(const qreal &value); - qreal getAngle2() const; - void setAngle2(const qreal &value); - qreal getKAsm1() const; - void setKAsm1(const qreal &value); - qreal getKAsm2() const; - void setKAsm2(const qreal &value); - qreal getKCurve() const; - void setKCurve(const qreal &value); + explicit DialogSpline(const VContainer *data, Draw::Draws mode = Draw::Calculation, + QWidget *parent = 0); + ~DialogSpline(); + inline qint64 getP1() const {return p1;} + void setP1(const qint64 &value); + inline qint64 getP4() const {return p4;} + void setP4(const qint64 &value); + inline qreal getAngle1() const {return angle1;} + void setAngle1(const qreal &value); + inline qreal getAngle2() const {return angle2;} + void setAngle2(const qreal &value); + inline qreal getKAsm1() const {return kAsm1;} + void setKAsm1(const qreal &value); + inline qreal getKAsm2() const {return kAsm2;} + void setKAsm2(const qreal &value); + inline qreal getKCurve() const {return kCurve;} + void setKCurve(const qreal &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogSpline) Ui::DialogSpline *ui; - qint32 number; - qint64 p1; // перша точка - qint64 p4; // четверта точка - qreal angle1; // кут нахилу дотичної в першій точці - qreal angle2; // кут нахилу дотичної в другій точці - qreal kAsm1; - qreal kAsm2; - qreal kCurve; + qint32 number; + qint64 p1; // перша точка + qint64 p4; // четверта точка + qreal angle1; // кут нахилу дотичної в першій точці + qreal angle2; // кут нахилу дотичної в другій точці + qreal kAsm1; + qreal kAsm2; + qreal kCurve; }; #endif // DIALOGSPLINE_H diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index 0f085895d..848c0e7a9 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -48,15 +48,10 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWi this, &DialogSplinePath::KAsm2Changed); } -DialogSplinePath::~DialogSplinePath() -{ +DialogSplinePath::~DialogSplinePath(){ delete ui; } -VSplinePath DialogSplinePath::GetPath() const{ - return path; -} - void DialogSplinePath::SetPath(const VSplinePath &value){ this->path = value; ui->listWidget->clear(); diff --git a/dialogs/dialogsplinepath.h b/dialogs/dialogsplinepath.h index 41cfeb0c2..01ab75334 100644 --- a/dialogs/dialogsplinepath.h +++ b/dialogs/dialogsplinepath.h @@ -29,32 +29,31 @@ namespace Ui { class DialogSplinePath; } -class DialogSplinePath : public DialogTool -{ +class DialogSplinePath : public DialogTool{ Q_OBJECT public: - explicit DialogSplinePath(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); - ~DialogSplinePath(); - VSplinePath GetPath() const; - void SetPath(const VSplinePath &value); + DialogSplinePath(const VContainer *data, Draw::Draws mode = Draw::Calculation, + QWidget *parent = 0); + ~DialogSplinePath(); + inline VSplinePath GetPath() const {return path;} + void SetPath(const VSplinePath &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); - void PointChenged(int row); - void currentPointChanged( int index ); - void Angle1Changed( int index ); - void Angle2Changed( int index ); - void KAsm1Changed(qreal d); - void KAsm2Changed(qreal d); + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); + void PointChenged(int row); + void currentPointChanged( int index ); + void Angle1Changed( int index ); + void Angle2Changed( int index ); + void KAsm1Changed(qreal d); + void KAsm2Changed(qreal d); private: Q_DISABLE_COPY(DialogSplinePath) Ui::DialogSplinePath *ui; - VSplinePath path; - void NewItem(qint64 id, qreal kAsm1, qreal angle, qreal kAsm2); - void DataPoint(qint64 id, qreal kAsm1, qreal angle1, qreal kAsm2, qreal angle2); - void EnableFields(); - void SetAngle(qint32 angle); + VSplinePath path; + void NewItem(qint64 id, qreal kAsm1, qreal angle, qreal kAsm2); + void DataPoint(qint64 id, qreal kAsm1, qreal angle1, qreal kAsm2, qreal angle2); + void EnableFields(); + void SetAngle(qint32 angle); }; #endif // DIALOGSPLINEPATH_H diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index 571cc7d5b..de54c2465 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -20,11 +20,7 @@ ****************************************************************************/ #include "dialogtool.h" -#include -#include -#include "container/calculator.h" -#include "geometry/vdetail.h" -#include +#include DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent):QDialog(parent), data(data), isInitialized(false), flagName(true), flagFormula(true), timerFormula(0), bOk(0), spinBoxAngle(0), @@ -36,9 +32,6 @@ DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent connect(timerFormula, &QTimer::timeout, this, &DialogTool::EvalFormula); } -DialogTool::~DialogTool(){ -} - void DialogTool::closeEvent(QCloseEvent *event){ DialogClosed(QDialog::Rejected); event->accept(); @@ -214,7 +207,6 @@ void DialogTool::CheckState(){ bOk->setEnabled(flagFormula && flagName); } - void DialogTool::ChoosedObject(qint64 id, Scene::Scenes type){ Q_UNUSED(id); Q_UNUSED(type); @@ -456,11 +448,3 @@ void DialogTool::ShowVariable(const QHash *var){ connect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); listWidget->setCurrentRow (0); } - -qint64 DialogTool::getIdDetail() const{ - return idDetail; -} - -void DialogTool::setIdDetail(const qint64 &value){ - idDetail = value; -} diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index dbe0b4730..9c418bd3b 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -23,24 +23,16 @@ #define DIALOGTOOL_H #include -#include -#include -#include -#include -#include -#include -#include -#include -#include "container/vcontainer.h" +#include class DialogTool : public QDialog{ Q_OBJECT public: DialogTool(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); - virtual ~DialogTool(); - qint64 getIdDetail() const; - void setIdDetail(const qint64 &value); + virtual ~DialogTool() {} + inline qint64 getIdDetail() const {return idDetail;} + inline void setIdDetail(const qint64 &value) {idDetail = value;} signals: void DialogClosed(int result); void ToolTip(const QString &toolTip); @@ -91,7 +83,7 @@ protected: QRadioButton *radioButtonLengthArc; QRadioButton *radioButtonLengthCurve; qint64 idDetail; - Draw::Draws mode; + Draw::Draws mode; bool CheckObject(const qint64 &id); virtual void closeEvent ( QCloseEvent * event ); virtual void showEvent( QShowEvent *event ); diff --git a/dialogs/dialogtriangle.cpp b/dialogs/dialogtriangle.cpp index fbb3dc3df..c86e3c008 100644 --- a/dialogs/dialogtriangle.cpp +++ b/dialogs/dialogtriangle.cpp @@ -78,46 +78,27 @@ void DialogTriangle::DialogAccepted(){ axisP2Id = getCurrentPointId(ui->comboBoxAxisP2); emit DialogClosed(QDialog::Accepted); } -QString DialogTriangle::getPointName() const{ - return pointName; -} void DialogTriangle::setPointName(const QString &value){ pointName = value; ui->lineEditNamePoint->setText(pointName); } -qint64 DialogTriangle::getSecondPointId() const{ - return secondPointId; -} - void DialogTriangle::setSecondPointId(const qint64 &value, const qint64 &id){ secondPointId = value; setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -qint64 DialogTriangle::getFirstPointId() const{ - return firstPointId; -} - void DialogTriangle::setFirstPointId(const qint64 &value, const qint64 &id){ firstPointId = value; setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -qint64 DialogTriangle::getAxisP2Id() const{ - return axisP2Id; -} - void DialogTriangle::setAxisP2Id(const qint64 &value, const qint64 &id){ axisP2Id = value; setCurrentPointId(ui->comboBoxAxisP2, axisP2Id, value, id); } -qint64 DialogTriangle::getAxisP1Id() const{ - return axisP1Id; -} - void DialogTriangle::setAxisP1Id(const qint64 &value, const qint64 &id){ axisP1Id = value; setCurrentPointId(ui->comboBoxAxisP1, axisP1Id, value, id); diff --git a/dialogs/dialogtriangle.h b/dialogs/dialogtriangle.h index 74c9bcf3c..2ec3df1a2 100644 --- a/dialogs/dialogtriangle.h +++ b/dialogs/dialogtriangle.h @@ -7,36 +7,34 @@ namespace Ui { class DialogTriangle; } -class DialogTriangle : public DialogTool -{ +class DialogTriangle : public DialogTool{ Q_OBJECT - public: - DialogTriangle(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); - ~DialogTriangle(); - qint64 getAxisP1Id() const; - void setAxisP1Id(const qint64 &value, const qint64 &id); - qint64 getAxisP2Id() const; - void setAxisP2Id(const qint64 &value, const qint64 &id); - qint64 getFirstPointId() const; - void setFirstPointId(const qint64 &value, const qint64 &id); - qint64 getSecondPointId() const; - void setSecondPointId(const qint64 &value, const qint64 &id); - QString getPointName() const; - void setPointName(const QString &value); + DialogTriangle(const VContainer *data, Draw::Draws mode = Draw::Calculation, + QWidget *parent = 0); + ~DialogTriangle(); + inline qint64 getAxisP1Id() const {return axisP1Id;} + void setAxisP1Id(const qint64 &value, const qint64 &id); + inline qint64 getAxisP2Id() const {return axisP2Id;} + void setAxisP2Id(const qint64 &value, const qint64 &id); + inline qint64 getFirstPointId() const {return firstPointId;} + void setFirstPointId(const qint64 &value, const qint64 &id); + inline qint64 getSecondPointId() const {return secondPointId;} + void setSecondPointId(const qint64 &value, const qint64 &id); + inline QString getPointName() const {return pointName;} + void setPointName(const QString &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); + virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogTriangle) Ui::DialogTriangle *ui; - qint32 number; - QString pointName; - qint64 axisP1Id; - qint64 axisP2Id; - qint64 firstPointId; - qint64 secondPointId; + qint32 number; + QString pointName; + qint64 axisP1Id; + qint64 axisP2Id; + qint64 firstPointId; + qint64 secondPointId; }; #endif // DIALOGTRIANGLE_H diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 7e243a9f9..d88229457 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -20,6 +20,7 @@ ****************************************************************************/ #include "vtoolbisector.h" +#include VToolBisector::VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index 3bfd214a0..fd0802008 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -23,6 +23,7 @@ #include #include #include "widgets/vmaingraphicsscene.h" +#include VToolEndLine::VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 0ae377eb0..2ff7c233d 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -20,6 +20,7 @@ ****************************************************************************/ #include "vtoolnormal.h" +#include VToolNormal::VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index d4bf3d522..0f212993f 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -20,6 +20,7 @@ ****************************************************************************/ #include "vtoolpointofcontact.h" +#include VToolPointOfContact::VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index f1ee18525..bcb96974f 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -21,6 +21,7 @@ #include "vtoolshoulderpoint.h" #include +#include VToolShoulderPoint::VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index b98391d06..f42616157 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -20,8 +20,8 @@ ****************************************************************************/ #include "vmodelingbisector.h" -#include #include "../drawTools/vtoolbisector.h" +#include VModelingBisector::VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index f13768c51..a45cc8ba2 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -20,9 +20,7 @@ ****************************************************************************/ #include "vmodelingendline.h" -#include -#include -#include "widgets/vmaingraphicsscene.h" +#include VModelingEndLine::VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index 448232f50..c0e76e68c 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -21,6 +21,7 @@ #include "vmodelingnormal.h" #include "../drawTools/vtoolnormal.h" +#include VModelingNormal::VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index 049d90300..c0024457f 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -21,6 +21,7 @@ #include "vmodelingpointofcontact.h" #include "../drawTools/vtoolpointofcontact.h" +#include VModelingPointOfContact::VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index 16292b4df..c2c934bf0 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -22,6 +22,7 @@ #include "vmodelingshoulderpoint.h" #include #include "../drawTools/vtoolshoulderpoint.h" +#include VModelingShoulderPoint::VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, From 2a88e74086c254baf66ac45fff9d4c57895c2aaa Mon Sep 17 00:00:00 2001 From: dismine Date: Sat, 26 Oct 2013 22:30:20 +0300 Subject: [PATCH 40/83] Refactoring. --HG-- branch : develop --- exception/vexception.cpp | 3 --- exception/vexception.h | 22 ++++++++---------- exception/vexceptionbadid.cpp | 11 --------- exception/vexceptionbadid.h | 20 ++++++++-------- exception/vexceptionconversionerror.cpp | 4 ---- exception/vexceptionconversionerror.h | 13 +++++------ exception/vexceptionemptyparameter.cpp | 5 ---- exception/vexceptionemptyparameter.h | 28 +++++++++++------------ exception/vexceptionobjecterror.cpp | 4 ---- exception/vexceptionobjecterror.h | 29 ++++++++++++------------ exception/vexceptionuniqueid.cpp | 1 - exception/vexceptionuniqueid.h | 21 ++++++++--------- exception/vexceptionwrongparameterid.cpp | 4 ---- exception/vexceptionwrongparameterid.h | 23 +++++++++---------- 14 files changed, 75 insertions(+), 113 deletions(-) diff --git a/exception/vexception.cpp b/exception/vexception.cpp index a22df35a3..ade9cb27d 100644 --- a/exception/vexception.cpp +++ b/exception/vexception.cpp @@ -25,9 +25,6 @@ VException::VException(const QString &what):QException(), what(what){ Q_ASSERT_X(!what.isEmpty(), Q_FUNC_INFO, "Error message is empty"); } -VException::VException(const VException &e):what(e.What()){ -} - QString VException::ErrorMessage() const{ QString error = QString("Exception: %1").arg(what); return error; diff --git a/exception/vexception.h b/exception/vexception.h index fc53c3d77..ad21054fb 100644 --- a/exception/vexception.h +++ b/exception/vexception.h @@ -24,21 +24,19 @@ #define VEXCEPTION_H #include -#include -class VException : public QException -{ +class VException : public QException{ public: - VException(const QString &what); - VException(const VException &e); - virtual ~VException() noexcept(true){} - void raise() const { throw *this; } - VException *clone() const { return new VException(*this); } - virtual QString ErrorMessage() const; - virtual QString DetailedInformation() const { return QString(); } - QString What() const {return what;} + VException(const QString &what); + VException(const VException &e):what(e.What()){} + virtual ~VException() noexcept(true){} + inline void raise() const { throw *this; } + inline VException *clone() const { return new VException(*this); } + virtual QString ErrorMessage() const; + virtual QString DetailedInformation() const { return QString(); } + inline QString What() const {return what;} protected: - QString what; + QString what; }; #endif // VEXCEPTION_H diff --git a/exception/vexceptionbadid.cpp b/exception/vexceptionbadid.cpp index 82f686f48..6e6d13691 100644 --- a/exception/vexceptionbadid.cpp +++ b/exception/vexceptionbadid.cpp @@ -21,17 +21,6 @@ #include "vexceptionbadid.h" -VExceptionBadId::VExceptionBadId(const QString &what, const qint64 &id):VException(what), id(id), - key(QString()){ -} - -VExceptionBadId::VExceptionBadId(const QString &what, const QString &key):VException(what), id(0), key(key) -{ -} - -VExceptionBadId::VExceptionBadId(const VExceptionBadId &e):VException(e), id(e.BadId()), key(e.BadKey()){ -} - QString VExceptionBadId::ErrorMessage() const{ QString error; if(key.isEmpty()){ diff --git a/exception/vexceptionbadid.h b/exception/vexceptionbadid.h index caa9fcd54..47a772c6b 100644 --- a/exception/vexceptionbadid.h +++ b/exception/vexceptionbadid.h @@ -24,19 +24,19 @@ #include "vexception.h" -class VExceptionBadId : public VException -{ +class VExceptionBadId : public VException{ public: - VExceptionBadId(const QString &what, const qint64 &id); - VExceptionBadId(const QString &what, const QString &key); - VExceptionBadId(const VExceptionBadId &e); - virtual ~VExceptionBadId() noexcept(true){} + VExceptionBadId(const QString &what, const qint64 &id):VException(what), id(id), + key(QString()){} + VExceptionBadId(const QString &what, const QString &key):VException(what), id(0), key(key){} + VExceptionBadId(const VExceptionBadId &e):VException(e), id(e.BadId()), key(e.BadKey()){} + virtual ~VExceptionBadId() noexcept(true){} virtual QString ErrorMessage() const; - qint64 BadId() const {return id; } - QString BadKey() const {return key; } + inline qint64 BadId() const {return id; } + inline QString BadKey() const {return key; } protected: - qint64 id; - QString key; + qint64 id; + QString key; }; #endif // VEXCEPTIONBADID_H diff --git a/exception/vexceptionconversionerror.cpp b/exception/vexceptionconversionerror.cpp index 7bfbf1366..6fca5172b 100644 --- a/exception/vexceptionconversionerror.cpp +++ b/exception/vexceptionconversionerror.cpp @@ -26,10 +26,6 @@ VExceptionConversionError::VExceptionConversionError(const QString &what, const Q_ASSERT_X(!str.isEmpty(), Q_FUNC_INFO, "Error converting string is empty"); } -VExceptionConversionError::VExceptionConversionError(const VExceptionConversionError &e): - VException(e), str(e.String()){ -} - QString VExceptionConversionError::ErrorMessage() const{ QString error = QString("ExceptionConversionError: %1 %2").arg(what, str); return error; diff --git a/exception/vexceptionconversionerror.h b/exception/vexceptionconversionerror.h index f0650a50d..3b011ed07 100644 --- a/exception/vexceptionconversionerror.h +++ b/exception/vexceptionconversionerror.h @@ -24,16 +24,15 @@ #include "vexception.h" -class VExceptionConversionError : public VException -{ +class VExceptionConversionError : public VException{ public: - VExceptionConversionError(const QString &what, const QString &str); - VExceptionConversionError(const VExceptionConversionError &e); - virtual ~VExceptionConversionError() noexcept(true) {} + VExceptionConversionError(const QString &what, const QString &str); + VExceptionConversionError(const VExceptionConversionError &e):VException(e), str(e.String()){} + virtual ~VExceptionConversionError() noexcept(true) {} virtual QString ErrorMessage() const; - QString String() const {return str;} + inline QString String() const {return str;} protected: - QString str; + QString str; }; #endif // VEXCEPTIONCONVERSIONERROR_H diff --git a/exception/vexceptionemptyparameter.cpp b/exception/vexceptionemptyparameter.cpp index fb7ee565f..b070a682f 100644 --- a/exception/vexceptionemptyparameter.cpp +++ b/exception/vexceptionemptyparameter.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vexceptionemptyparameter.h" -#include VExceptionEmptyParameter::VExceptionEmptyParameter(const QString &what, const QString &name, const QDomElement &domElement): VException(what), @@ -33,10 +32,6 @@ VExceptionEmptyParameter::VExceptionEmptyParameter(const QString &what, const QS lineNumber = domElement.lineNumber(); } -VExceptionEmptyParameter::VExceptionEmptyParameter(const VExceptionEmptyParameter &e):VException(e), - name(e.Name()), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){ -} - QString VExceptionEmptyParameter::ErrorMessage() const{ QString error = QString("ExceptionEmptyParameter: %1 %2").arg(what, name); return error; diff --git a/exception/vexceptionemptyparameter.h b/exception/vexceptionemptyparameter.h index 5e2ad973f..694ab0913 100644 --- a/exception/vexceptionemptyparameter.h +++ b/exception/vexceptionemptyparameter.h @@ -23,25 +23,25 @@ #define VEXCEPTIONEMPTYPARAMETER_H #include "vexception.h" -#include -class VExceptionEmptyParameter : public VException -{ +class VExceptionEmptyParameter : public VException{ public: - VExceptionEmptyParameter(const QString &what, const QString &name, const QDomElement &domElement); - VExceptionEmptyParameter(const VExceptionEmptyParameter &e); - virtual ~VExceptionEmptyParameter() noexcept(true) {} + VExceptionEmptyParameter(const QString &what, const QString &name, + const QDomElement &domElement); + VExceptionEmptyParameter(const VExceptionEmptyParameter &e):VException(e), name(e.Name()), + tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} + virtual ~VExceptionEmptyParameter() noexcept(true) {} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; - QString Name() const {return name;} - QString TagText() const {return tagText;} - QString TagName() const {return tagName;} - qint32 LineNumber() const {return lineNumber;} + inline QString Name() const {return name;} + inline QString TagText() const {return tagText;} + inline QString TagName() const {return tagName;} + inline qint32 LineNumber() const {return lineNumber;} protected: - QString name; - QString tagText; - QString tagName; - qint32 lineNumber; + QString name; + QString tagText; + QString tagName; + qint32 lineNumber; }; #endif // VEXCEPTIONEMPTYPARAMETER_H diff --git a/exception/vexceptionobjecterror.cpp b/exception/vexceptionobjecterror.cpp index d1a424eff..e3f4d833c 100644 --- a/exception/vexceptionobjecterror.cpp +++ b/exception/vexceptionobjecterror.cpp @@ -31,10 +31,6 @@ VExceptionObjectError::VExceptionObjectError(const QString &what, const QDomElem lineNumber = domElement.lineNumber(); } -VExceptionObjectError::VExceptionObjectError(const VExceptionObjectError &e):VException(e), - tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()), moreInfo(e.MoreInformation()){ -} - QString VExceptionObjectError::ErrorMessage() const{ QString error = QString("ExceptionObjectError: %1").arg(what); return error; diff --git a/exception/vexceptionobjecterror.h b/exception/vexceptionobjecterror.h index f0e36bb99..ab38f164e 100644 --- a/exception/vexceptionobjecterror.h +++ b/exception/vexceptionobjecterror.h @@ -23,26 +23,25 @@ #define VEXCEPTIONOBJECTERROR_H #include "vexception.h" -#include -class VExceptionObjectError : public VException -{ +class VExceptionObjectError : public VException{ public: - VExceptionObjectError(const QString &what, const QDomElement &domElement); - VExceptionObjectError(const VExceptionObjectError &e); - virtual ~VExceptionObjectError() noexcept(true) {} + VExceptionObjectError(const QString &what, const QDomElement &domElement); + VExceptionObjectError(const VExceptionObjectError &e):VException(e), tagText(e.TagText()), + tagName(e.TagName()), lineNumber(e.LineNumber()), moreInfo(e.MoreInformation()){} + virtual ~VExceptionObjectError() noexcept(true) {} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; - QString TagText() const {return tagText;} - QString TagName() const {return tagName;} - qint32 LineNumber() const {return lineNumber;} - void AddMoreInformation(const QString &info); - QString MoreInformation() const {return moreInfo;} + inline QString TagText() const {return tagText;} + inline QString TagName() const {return tagName;} + inline qint32 LineNumber() const {return lineNumber;} + void AddMoreInformation(const QString &info); + inline QString MoreInformation() const {return moreInfo;} protected: - QString tagText; - QString tagName; - qint32 lineNumber; - QString moreInfo; + QString tagText; + QString tagName; + qint32 lineNumber; + QString moreInfo; }; #endif // VEXCEPTIONOBJECTERROR_H diff --git a/exception/vexceptionuniqueid.cpp b/exception/vexceptionuniqueid.cpp index 51ddf4c82..c33fb592d 100644 --- a/exception/vexceptionuniqueid.cpp +++ b/exception/vexceptionuniqueid.cpp @@ -1,5 +1,4 @@ #include "vexceptionuniqueid.h" -#include VExceptionUniqueId::VExceptionUniqueId(const QString &what, const QDomElement &domElement) :VException(what), tagText(QString()), tagName(QString()), lineNumber(-1){ diff --git a/exception/vexceptionuniqueid.h b/exception/vexceptionuniqueid.h index 1bf1760d4..d2e9cb5bd 100644 --- a/exception/vexceptionuniqueid.h +++ b/exception/vexceptionuniqueid.h @@ -2,23 +2,22 @@ #define VEXCEPTIONUNIQUEID_H #include "vexception.h" -#include class VExceptionUniqueId : public VException{ public: - VExceptionUniqueId(const QString &what, const QDomElement &domElement); - VExceptionUniqueId(const VExceptionUniqueId &e):VException(e), tagText(e.TagText()), - tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionUniqueId() noexcept(true){} + VExceptionUniqueId(const QString &what, const QDomElement &domElement); + VExceptionUniqueId(const VExceptionUniqueId &e):VException(e), tagText(e.TagText()), + tagName(e.TagName()), lineNumber(e.LineNumber()){} + virtual ~VExceptionUniqueId() noexcept(true){} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; - QString TagText() const {return tagText;} - QString TagName() const {return tagName;} - qint32 LineNumber() const {return lineNumber;} + inline QString TagText() const {return tagText;} + inline QString TagName() const {return tagName;} + inline qint32 LineNumber() const {return lineNumber;} protected: - QString tagText; - QString tagName; - qint32 lineNumber; + QString tagText; + QString tagName; + qint32 lineNumber; }; #endif // VEXCEPTIONUNIQUEID_H diff --git a/exception/vexceptionwrongparameterid.cpp b/exception/vexceptionwrongparameterid.cpp index 0da7ea21b..59dd94450 100644 --- a/exception/vexceptionwrongparameterid.cpp +++ b/exception/vexceptionwrongparameterid.cpp @@ -31,10 +31,6 @@ VExceptionWrongParameterId::VExceptionWrongParameterId(const QString &what, cons lineNumber = domElement.lineNumber(); } -VExceptionWrongParameterId::VExceptionWrongParameterId(const VExceptionWrongParameterId &e):VException(e), - tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){ -} - QString VExceptionWrongParameterId::ErrorMessage() const{ QString error = QString("ExceptionWrongParameterId: %1").arg(what); return error; diff --git a/exception/vexceptionwrongparameterid.h b/exception/vexceptionwrongparameterid.h index 1b8e611f6..1c4a9933c 100644 --- a/exception/vexceptionwrongparameterid.h +++ b/exception/vexceptionwrongparameterid.h @@ -23,23 +23,22 @@ #define VEXCEPTIONWRONGPARAMETERID_H #include "vexception.h" -#include -class VExceptionWrongParameterId : public VException -{ +class VExceptionWrongParameterId : public VException{ public: - VExceptionWrongParameterId(const QString &what, const QDomElement &domElement); - VExceptionWrongParameterId(const VExceptionWrongParameterId &e); - virtual ~VExceptionWrongParameterId() noexcept(true){} + VExceptionWrongParameterId(const QString &what, const QDomElement &domElement); + VExceptionWrongParameterId(const VExceptionWrongParameterId &e):VException(e),tagText(e.TagText()), + tagName(e.TagName()), lineNumber(e.LineNumber()){} + virtual ~VExceptionWrongParameterId() noexcept(true){} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; - QString TagText() const {return tagText;} - QString TagName() const {return tagName;} - qint32 LineNumber() const {return lineNumber;} + inline QString TagText() const {return tagText;} + inline QString TagName() const {return tagName;} + inline qint32 LineNumber() const {return lineNumber;} protected: - QString tagText; - QString tagName; - qint32 lineNumber; + QString tagText; + QString tagName; + qint32 lineNumber; }; #endif // VEXCEPTIONWRONGPARAMETERID_H From f0a9bdf4d2471885dc20c03be0fc6ebb2c2255c2 Mon Sep 17 00:00:00 2001 From: dismine Date: Sat, 26 Oct 2013 23:42:54 +0300 Subject: [PATCH 41/83] Refactoring. --HG-- branch : develop --- geometry/varc.cpp | 51 +--------------- geometry/varc.h | 42 +++++++------ geometry/vdetail.cpp | 63 -------------------- geometry/vdetail.h | 61 +++++++++---------- geometry/vnodedetail.cpp | 48 --------------- geometry/vnodedetail.h | 44 +++++++------- geometry/vspline.cpp | 61 +------------------ geometry/vspline.h | 121 ++++++++++++++++++-------------------- geometry/vsplinepath.cpp | 46 +-------------- geometry/vsplinepath.h | 59 ++++++++++--------- geometry/vsplinepoint.cpp | 33 ----------- geometry/vsplinepoint.h | 34 +++++------ 12 files changed, 180 insertions(+), 483 deletions(-) diff --git a/geometry/varc.cpp b/geometry/varc.cpp index 607cef99e..99721616a 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -20,8 +20,7 @@ ****************************************************************************/ #include "varc.h" -#include -#include "exception/vexception.h" +#include VArc::VArc () : f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), formulaRadius(QString()), center(0), points(QHash()), mode(Draw::Calculation), idObject(0){ @@ -53,38 +52,6 @@ VArc &VArc::operator =(const VArc &arc){ return *this; } -qreal VArc::GetF1() const{ - return f1; -} - -QString VArc::GetFormulaF1() const{ - return formulaF1; -} - -qreal VArc::GetF2() const{ - return f2; -} - -QString VArc::GetFormulaF2() const{ - return formulaF2; -} - -qreal VArc::GetLength () const{ - return M_PI * radius/180 * (f2-f1); -} - -qreal VArc::GetRadius() const{ - return radius; -} - -QString VArc::GetFormulaRadius() const{ - return formulaRadius; -} - -qint64 VArc::GetCenter() const{ - return center; -} - QPointF VArc::GetCenterPoint() const{ if(points.contains(center)){ return points.value(center).toQPointF(); @@ -197,19 +164,3 @@ QVector VArc::SplOfArc(qint32 number) const{ } return QVector(); } - -Draw::Draws VArc::getMode() const{ - return mode; -} - -void VArc::setMode(const Draw::Draws &value){ - mode = value; -} - -qint64 VArc::getIdObject() const{ - return idObject; -} - -void VArc::setIdObject(const qint64 &value){ - idObject = value; -} diff --git a/geometry/varc.h b/geometry/varc.h index 7b8a99fc5..ac436da4b 100644 --- a/geometry/varc.h +++ b/geometry/varc.h @@ -23,7 +23,6 @@ #define VARC_H #include "vspline.h" -#include /** * @brief VArc клас, що реалізує дугу. Дуга розраховується за годиниковою стрілкою. @@ -51,56 +50,55 @@ public: * @brief GetF1 повертає початковий кут дуги. * @return повертає кут в градусах. */ - QString GetFormulaF1 () const; - qreal GetF1 () const; + inline QString GetFormulaF1 () const {return formulaF1;} + inline qreal GetF1 () const {return f1;} /** * @brief GetF2 повертає кінцевий кут дуги. * @return повертає кут в градусах. */ - QString GetFormulaF2 () const;\ - qreal GetF2 () const; + inline QString GetFormulaF2 () const {return formulaF2;} + inline qreal GetF2 () const {return f2;} /** * @brief GetLength повертає довжину дуги. * @return повертає довжину дуги. */ - qreal GetLength () const; + inline qreal GetLength () const {return M_PI * radius/180 * (f2-f1);} /** * @brief GetRadius повертає радіус дуги. * @return повертає радіус дуги. */ - QString GetFormulaRadius () const; - qreal GetRadius () const; + inline QString GetFormulaRadius () const {return formulaRadius;} + inline qreal GetRadius () const {return radius;} /** * @brief GetCenter повертає точку центра дуги. * @return повертає точку центра дуги. */ - qint64 GetCenter () const; - QPointF GetCenterPoint() const; + inline qint64 GetCenter () const {return center;} + QPointF GetCenterPoint() const; /** * @brief GetP1 повертає першу точку з якої починається дуга. * @return точку початку дуги. */ - QPointF GetP1 () const; + QPointF GetP1 () const; /** * @brief GetP2 повертає другу точку в якій закінчується дуга. * @return точку кінця дуги. */ - QPointF GetP2 () const; + QPointF GetP2 () const; const QHash GetDataPoints() const; /** * @brief GetPath будує шлях по даній дузі. * @return повертає шлях. */ - QPainterPath GetPath() const; - qreal AngleArc()const; - qint32 NumberSplOfArc () const; - QVector GetPoints () const; - QVector SplOfArc( qint32 number ) const; - Draw::Draws getMode() const; - void setMode(const Draw::Draws &value); - qint64 getIdObject() const; - void setIdObject(const qint64 &value); - + QPainterPath GetPath() const; + qreal AngleArc() const; + qint32 NumberSplOfArc () const; + QVector GetPoints () const; + QVector SplOfArc( qint32 number ) const; + inline Draw::Draws getMode() const {return mode;} + inline void setMode(const Draw::Draws &value) {mode = value;} + inline qint64 getIdObject() const {return idObject;} + inline void setIdObject(const qint64 &value) {idObject = value;} private: /** * @brief f1 початковий кут в градусах diff --git a/geometry/vdetail.cpp b/geometry/vdetail.cpp index 7e7fdf0c2..9003d35e5 100644 --- a/geometry/vdetail.cpp +++ b/geometry/vdetail.cpp @@ -45,10 +45,6 @@ VDetail &VDetail::operator =(const VDetail &detail){ return *this; } -void VDetail::append(const VNodeDetail &node){ - nodes.append(node); -} - void VDetail::Clear(){ nodes.clear(); name.clear(); @@ -59,10 +55,6 @@ void VDetail::Clear(){ width = 10; } -qint32 VDetail::CountNode() const{ - return nodes.size(); -} - bool VDetail::Containes(const qint64 &id) const{ for(qint32 i = 0; i < nodes.size(); ++i){ VNodeDetail node = nodes[i]; @@ -77,58 +69,3 @@ VNodeDetail &VDetail::operator [](int indx){ return nodes[indx]; } -qreal VDetail::getMy() const{ - return my; -} - -void VDetail::setMy(const qreal &value){ - my = value; -} - -qreal VDetail::getMx() const{ - return mx; -} - -void VDetail::setMx(const qreal &value){ - mx = value; -} - -QString VDetail::getName() const{ - return name; -} - -void VDetail::setName(const QString &value){ - name = value; -} - -qreal VDetail::getWidth() const{ - return width; -} - -void VDetail::setWidth(const qreal &value){ - width = value; -} - -bool VDetail::getClosed() const{ - return closed; -} - -void VDetail::setClosed(bool value){ - closed = value; -} - -bool VDetail::getSupplement() const{ - return supplement; -} - -void VDetail::setSupplement(bool value){ - supplement = value; -} - -QVector VDetail::getNodes() const{ - return nodes; -} - -void VDetail::setNodes(const QVector &value){ - nodes = value; -} diff --git a/geometry/vdetail.h b/geometry/vdetail.h index 5372e219a..cb31ceee8 100644 --- a/geometry/vdetail.h +++ b/geometry/vdetail.h @@ -23,9 +23,6 @@ #define VDETAIL_H #include "vnodedetail.h" -#include -#include -#include namespace Detail { enum Contour { OpenContour, CloseContour }; @@ -39,37 +36,37 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Detail::Equidistants) class VDetail{ public: - VDetail(); - VDetail(const QString &name, const QVector &nodes); - VDetail(const VDetail &detail); - VDetail &operator=(const VDetail &detail); - void append(const VNodeDetail &node); - void Clear(); - qint32 CountNode() const; - bool Containes(const qint64 &id)const; - VNodeDetail & operator[](int indx); - QString getName() const; - void setName(const QString &value); - qreal getMx() const; - void setMx(const qreal &value); - qreal getMy() const; - void setMy(const qreal &value); - bool getSupplement() const; - void setSupplement(bool value); - bool getClosed() const; - void setClosed(bool value); - qreal getWidth() const; - void setWidth(const qreal &value); - QVector getNodes() const; - void setNodes(const QVector &value); + VDetail(); + VDetail(const QString &name, const QVector &nodes); + VDetail(const VDetail &detail); + VDetail &operator=(const VDetail &detail); + inline void append(const VNodeDetail &node) {nodes.append(node);} + void Clear(); + inline qint32 CountNode() const {return nodes.size();} + bool Containes(const qint64 &id)const; + VNodeDetail & operator[](int indx); + inline QString getName() const {return name;} + inline void setName(const QString &value) {name = value;} + inline qreal getMx() const {return mx;} + inline void setMx(const qreal &value) {mx = value;} + inline qreal getMy() const {return my;} + inline void setMy(const qreal &value) {my = value;} + inline bool getSupplement() const {return supplement;} + inline void setSupplement(bool value) {supplement = value;} + inline bool getClosed() const {return closed;} + inline void setClosed(bool value) {closed = value;} + inline qreal getWidth() const {return width;} + inline void setWidth(const qreal &value) {width = value;} + inline QVector getNodes() const {return nodes;} + inline void setNodes(const QVector &value) {nodes = value;} private: QVector nodes; - QString name; - qreal mx; - qreal my; - bool supplement; - bool closed; - qreal width; + QString name; + qreal mx; + qreal my; + bool supplement; + bool closed; + qreal width; }; #endif // VDETAIL_H diff --git a/geometry/vnodedetail.cpp b/geometry/vnodedetail.cpp index b25c28d92..50a5b5424 100644 --- a/geometry/vnodedetail.cpp +++ b/geometry/vnodedetail.cpp @@ -43,51 +43,3 @@ VNodeDetail &VNodeDetail::operator =(const VNodeDetail &node){ my = node.getMy(); return *this; } - -Tool::Tools VNodeDetail::getTypeTool() const{ - return typeTool; -} - -void VNodeDetail::setTypeTool(const Tool::Tools &value){ - typeTool = value; -} - -qint64 VNodeDetail::getId() const{ - return id; -} - -void VNodeDetail::setId(const qint64 &value){ - id = value; -} - -Draw::Draws VNodeDetail::getMode() const{ - return mode; -} - -void VNodeDetail::setMode(const Draw::Draws &value){ - mode = value; -} - -NodeDetail::NodeDetails VNodeDetail::getTypeNode() const{ - return typeNode; -} - -void VNodeDetail::setTypeNode(const NodeDetail::NodeDetails &value){ - typeNode = value; -} - -qreal VNodeDetail::getMy() const{ - return my; -} - -void VNodeDetail::setMy(const qreal &value){ - my = value; -} - -qreal VNodeDetail::getMx() const{ - return mx; -} - -void VNodeDetail::setMx(const qreal &value){ - mx = value; -} diff --git a/geometry/vnodedetail.h b/geometry/vnodedetail.h index 04359f9da..d28068ba2 100644 --- a/geometry/vnodedetail.h +++ b/geometry/vnodedetail.h @@ -33,30 +33,30 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(NodeDetail::NodeDetails) class VNodeDetail{ public: - VNodeDetail(); - VNodeDetail(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, - qreal mx = 0, qreal my = 0); - VNodeDetail(const VNodeDetail &node); - VNodeDetail &operator=(const VNodeDetail &node); - qint64 getId() const; - void setId(const qint64 &value); - Tool::Tools getTypeTool() const; - void setTypeTool(const Tool::Tools &value); - Draw::Draws getMode() const; - void setMode(const Draw::Draws &value); - NodeDetail::NodeDetails getTypeNode() const; - void setTypeNode(const NodeDetail::NodeDetails &value); - qreal getMx() const; - void setMx(const qreal &value); - qreal getMy() const; - void setMy(const qreal &value); + VNodeDetail(); + VNodeDetail(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, + qreal mx = 0, qreal my = 0); + VNodeDetail(const VNodeDetail &node); + VNodeDetail &operator=(const VNodeDetail &node); + inline qint64 getId() const {return id;} + inline void setId(const qint64 &value) {id = value;} + inline Tool::Tools getTypeTool() const {return typeTool;} + inline void setTypeTool(const Tool::Tools &value) {typeTool = value;} + inline Draw::Draws getMode() const {return mode;} + inline void setMode(const Draw::Draws &value) {mode = value;} + inline NodeDetail::NodeDetails getTypeNode() const {return typeNode;} + inline void setTypeNode(const NodeDetail::NodeDetails &value) {typeNode = value;} + inline qreal getMx() const {return mx;} + inline void setMx(const qreal &value) {mx = value;} + inline qreal getMy() const {return my;} + inline void setMy(const qreal &value) {my = value;} private: - qint64 id; - Tool::Tools typeTool; - Draw::Draws mode; + qint64 id; + Tool::Tools typeTool; + Draw::Draws mode; NodeDetail::NodeDetails typeNode; - qreal mx; - qreal my; + qreal mx; + qreal my; }; Q_DECLARE_METATYPE(VNodeDetail) diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 674980add..f15abbde9 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vspline.h" -#include VSpline::VSpline():p1(0), p2(QPointF()), p3(QPointF()), p4(0), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1), points(QHash()), mode(Draw::Calculation), idObject(0){ @@ -33,8 +32,8 @@ VSpline::VSpline ( const VSpline & spline ):p1(spline.GetP1 ()), p2(spline.GetP2 } VSpline::VSpline (const QHash *points, qint64 p1, qint64 p4, qreal angle1, qreal angle2, - qreal kAsm1, qreal kAsm2 , qreal kCurve, Draw::Draws mode, qint64 idObject):p1(p1), p2(QPointF()), p3(QPointF()), - p4(p4), angle1(angle1), angle2(angle2), kAsm1(kAsm1), kAsm2(kAsm2), kCurve(kCurve), points(*points), + qreal kAsm1, qreal kAsm2 , qreal kCurve, Draw::Draws mode, qint64 idObject):p1(p1), p2(QPointF()), + p3(QPointF()), p4(p4), angle1(angle1), angle2(angle2), kAsm1(kAsm1), kAsm2(kAsm2), kCurve(kCurve), points(*points), mode(mode), idObject(idObject){ ModifiSpl ( p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve ); } @@ -124,10 +123,6 @@ void VSpline::ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCu // p4 = QPointF(p4.x()+mx, p4.y()+my); //} -qint64 VSpline::GetP1 () const{ - return p1; -} - VPointF VSpline::GetPointP1() const{ if(points.contains(p1)){ return points.value(p1); @@ -138,18 +133,6 @@ VPointF VSpline::GetPointP1() const{ return VPointF(); } -QPointF VSpline::GetP2 () const{ - return p2; -} - -QPointF VSpline::GetP3 () const{ - return p3; -} - -qint64 VSpline::GetP4() const{ - return p4; -} - VPointF VSpline::GetPointP4() const{ if(points.contains(p4)){ return points.value(p4); @@ -160,14 +143,6 @@ VPointF VSpline::GetPointP4() const{ return VPointF(); } -qreal VSpline::GetAngle1() const{ - return angle1; -} - -qreal VSpline::GetAngle2 () const{ - return angle2; -} - qreal VSpline::GetLength () const{ return LengthBezier ( GetPointP1().toQPointF(), this->p2, this->p3, GetPointP4().toQPointF()); } @@ -178,22 +153,6 @@ QString VSpline::GetName() const{ return QString("Spl_%1_%2").arg(first.name(), second.name()); } -qreal VSpline::GetKasm1() const{ - return kAsm1; -} - -qreal VSpline::GetKasm2() const{ - return kAsm2; -} - -qreal VSpline::GetKcurve() const{ - return kCurve; -} - -const QHash VSpline::GetDataPoints() const{ - return points; -} - QLineF::IntersectType VSpline::CrossingSplLine ( const QLineF &line, QPointF *intersectionPoint ) const{ QVector px; QVector py; @@ -737,14 +696,6 @@ qint32 VSpline::Cubic(qreal *x, qreal a, qreal b, qreal c){ // this->ModifiSpl(P1, P2, P3, P4); //} -Draw::Draws VSpline::getMode() const{ - return mode; -} - -void VSpline::setMode(const Draw::Draws &value){ - mode = value; -} - QVector VSpline::SplinePoints(QPointF p1, QPointF p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve){ QLineF p1pX(p1.x(), p1.y(), p1.x() + 100, p1.y()); @@ -761,14 +712,6 @@ QVector VSpline::SplinePoints(QPointF p1, QPointF p4, qreal angle1, qre return GetPoints(p1, p2, p3, p4); } -qint64 VSpline::getIdObject() const{ - return idObject; -} - -void VSpline::setIdObject(const qint64 &value){ - idObject = value; -} - VSpline &VSpline::operator =(const VSpline &spline){ this->p1 = spline.GetP1 (); this->p2 = spline.GetP2 (); diff --git a/geometry/vspline.h b/geometry/vspline.h index d87260421..b91d0b88a 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -22,24 +22,21 @@ #ifndef VSPLINE_H #define VSPLINE_H -#define M_2PI 6.28318530717958647692528676655900576 +#include -#include -#include -#include -#include "container/vpointf.h" +#define M_2PI 6.28318530717958647692528676655900576 /** * @brief VSpline клас, що реалізує сплайн. */ class VSpline{ public: - VSpline(); + VSpline(); /** * @brief VSpline конструктор. * @param spline сплайн з якого копіюємо. */ - VSpline (const VSpline &spline ); + VSpline (const VSpline &spline ); /** * @brief VSpline конструктор. * @param p1 початкова точка сплайна. @@ -50,9 +47,9 @@ public: * @param kAsm1 коефіцієнт довжини першої напрямної. * @param kAsm2 коефіцієнт довжини другої напрямної. */ - VSpline (const QHash *points, qint64 p1, qint64 p4, qreal angle1, - qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve, - Draw::Draws mode = Draw::Calculation, qint64 idObject = 0); + VSpline (const QHash *points, qint64 p1, qint64 p4, qreal angle1, qreal angle2, + qreal kAsm1, qreal kAsm2, qreal kCurve, Draw::Draws mode = Draw::Calculation, + qint64 idObject = 0); /** * @brief VSpline конструктор. * @param p1 початкова точка сплайну. @@ -60,9 +57,8 @@ public: * @param p3 друга контролююча точка сплайну. * @param p4 кінцева точка сплайну. */ - VSpline (const QHash *points, qint64 p1, QPointF p2, QPointF p3, - qint64 p4, qreal kCurve, Draw::Draws mode = Draw::Calculation, - qint64 idObject = 0); + VSpline (const QHash *points, qint64 p1, QPointF p2, QPointF p3, qint64 p4, + qreal kCurve, Draw::Draws mode = Draw::Calculation, qint64 idObject = 0); /** * @brief ModifiSpl модифікує сплайн. * @param p1 початкова точка сплайну. @@ -73,7 +69,7 @@ public: * @param kAsm1 коефіцієнт довжини першої напрямної. * @param kAsm2 коефіцієнт довжини другої напрямної. */ - void ModifiSpl ( qint64 p1, qint64 p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, + void ModifiSpl ( qint64 p1, qint64 p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve); /** * @brief ModifiSpl модифікує сплайн. @@ -82,61 +78,61 @@ public: * @param p3 друга контролююча точка сплайну. * @param p4 кінцева точка сплайну. */ - void ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve); + void ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve); /** * @brief RotationSpl поворот сплайна навколо точки на кут в градусах проти годиникової стрілки. * @param pRotate точка навколо якої повертаємо. * @param angle кут в градусах. */ -// void RotationSpl ( QPointF pRotate, qreal angle ); +// void RotationSpl ( QPointF pRotate, qreal angle ); /** * @brief BiasSpl зміщує сплайн. * @param mx зміщення по х координаті. * @param my зміщення по у координаті. */ -// void BiasSpl ( qreal mx, qreal my ); +// void BiasSpl ( qreal mx, qreal my ); /** * @brief GetP1 повертає першу точку сплайну. * @return перша точка сплайну. */ - qint64 GetP1 () const; - VPointF GetPointP1() const; + qint64 GetP1 () const {return p1;} + VPointF GetPointP1() const; /** * @brief GetP2 повертує першу контрольну точку сплайну. * @return перша контрольна точка сплайну. */ - QPointF GetP2 () const; + inline QPointF GetP2 () const {return p2;} /** * @brief GetP3 повертає другу контрольну точку сплайну. * @return друга контрольна точка сплайну. */ - QPointF GetP3 () const; + inline QPointF GetP3 () const {return p3;} /** * @brief GetP4 повертає останню точку сплайну. * @return остання точка сплайну. */ - qint64 GetP4 () const; - VPointF GetPointP4 () const; + inline qint64 GetP4 () const {return p4;} + VPointF GetPointP4 () const; /** * @brief GetAngle1 повертає кут першої напрямної. * @return кут в градусах. */ - qreal GetAngle1 () const; + inline qreal GetAngle1 () const {return angle1;} /** * @brief GetAngle2 повертає кут другої напрямної. * @return кут в градусах. */ - qreal GetAngle2() const; + inline qreal GetAngle2() const {return angle2;} /** * @brief GetLength повертає довжину сплайну. * @return довжина сплайну. */ - qreal GetLength () const; - QString GetName () const; - qreal GetKasm1() const; - qreal GetKasm2() const; - qreal GetKcurve() const; - const QHash GetDataPoints() const; + qreal GetLength () const; + QString GetName () const; + inline qreal GetKasm1() const {return kAsm1;} + inline qreal GetKasm2() const {return kAsm2;} + inline qreal GetKcurve() const {return kCurve;} + inline const QHash GetDataPoints() const {return points;} /** * @brief CrossingSplLine перевіряє перетин сплайну з лінією. * @param line лінія з якою перевіряється перетин. @@ -150,20 +146,20 @@ public: * @param curFir перший сплайн. * @param curSec другий сплайн. */ -// void CutSpline ( qreal length, VSpline* curFir, VSpline* curSec ) const; +// void CutSpline ( qreal length, VSpline* curFir, VSpline* curSec ) const; /** * @brief CutSpline розрізає сплайн. * @param point точка що ділить сплайн. * @param curFir перший сплайн. * @param curSec другий сплайн. */ -// void CutSpline (QPointF point, VSpline* curFir, VSpline* curSec ) const; +// void CutSpline (QPointF point, VSpline* curFir, VSpline* curSec ) const; /** * @brief PutAlongSpl розміщає точку на сплайні. * @param moveP точка яка розміщується на сплайні. * @param move довжина від початку сплайну. */ -// void PutAlongSpl ( QPointF &moveP, qreal move ) const; +// void PutAlongSpl ( QPointF &moveP, qreal move ) const; /** * @brief GetPoints повертає точки з яких складається сплайн. * @return список точок. @@ -173,19 +169,19 @@ public: * @brief GetPath повертає шлях сплайну. * @return шлях. */ - QPainterPath GetPath() const; + QPainterPath GetPath() const; /** * @brief Mirror вертикальне дзеркалення сплайну відносно точки. * @param Pmirror точка відносно якої відбувається вертикальне дзеркалення сплайну. */ -// void Mirror(const QPointF Pmirror); - Draw::Draws getMode() const; - void setMode(const Draw::Draws &value); - static QVector SplinePoints(QPointF p1, QPointF p4, qreal angle1, - qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve); - qint64 getIdObject() const; - void setIdObject(const qint64 &value); - VSpline &operator=(const VSpline &spl); +// void Mirror(const QPointF Pmirror); + inline Draw::Draws getMode() const {return mode;} + inline void setMode(const Draw::Draws &value) {mode = value;} + static QVector SplinePoints(QPointF p1, QPointF p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, + qreal kCurve); + inline qint64 getIdObject() const {return idObject;} + inline void setIdObject(const qint64 &value) {idObject = value;} + VSpline &operator=(const VSpline &spl); protected: /** * @brief GetPoints повертає точки з яких складається сплайн. @@ -200,33 +196,33 @@ private: /** * @brief p1 початкова точка сплайну */ - qint64 p1; // перша точка + qint64 p1; // перша точка /** * @brief p2 перша контрольна точка сплайну. */ - QPointF p2; // друга точка + QPointF p2; // друга точка /** * @brief p3 друга контрольна точка сплайну. */ - QPointF p3; // третя точка + QPointF p3; // третя точка /** * @brief p4 кінцеві точка сплайну. */ - qint64 p4; // четверта точка + qint64 p4; // четверта точка /** * @brief angle1 кут в градусах першої напрямної. */ - qreal angle1; // кут нахилу дотичної в першій точці + qreal angle1; // кут нахилу дотичної в першій точці /** * @brief angle2 кут в градусах другої напрямної. */ - qreal angle2; // кут нахилу дотичної в другій точці - qreal kAsm1; - qreal kAsm2; - qreal kCurve; + qreal angle2; // кут нахилу дотичної в другій точці + qreal kAsm1; + qreal kAsm2; + qreal kCurve; QHash points; - Draw::Draws mode; - qint64 idObject; + Draw::Draws mode; + qint64 idObject; /** * @brief LengthBezier повертає дожину сплайну за його чотирьма точками. * @param p1 початкова точка сплайну. @@ -235,7 +231,7 @@ private: * @param p4 кінцева точка сплайну. * @return дожина сплайну. */ - qreal LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const; + qreal LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const; /** * @brief PointBezier_r знаходить точки сплайну по його чотирьом точках. * @param x1 х координата першої точки сплайну. @@ -250,9 +246,8 @@ private: * @param px список х координат точок сплайну. * @param py список у коодринат сплайну. */ - static void PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, - qreal x3, qreal y3, qreal x4, qreal y4, - qint16 level, QVector &px, QVector &py); + static void PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4, + qint16 level, QVector &px, QVector &py); /** * @brief CalcSqDistance розраховує довжину між точками. * @param x1 х координата першої точки. @@ -261,7 +256,7 @@ private: * @param y2 у координата другої точки. * @return довжину. */ - static qreal CalcSqDistance ( qreal x1, qreal y1, qreal x2, qreal y2); + static qreal CalcSqDistance ( qreal x1, qreal y1, qreal x2, qreal y2); /** * @brief Cubic знаходить розв'язок кубічного рівняння. * @param x коефіцієнт. @@ -270,7 +265,7 @@ private: * @param c коефіцієнт. * @return повертає корені рівняння. */ - static qint32 Cubic(qreal *x, qreal a, qreal b, qreal c); + static qint32 Cubic(qreal *x, qreal a, qreal b, qreal c); /** * @brief calc_t знаходить параметр t якому відповідає точка на сплайні. * @param curve_coord1 координата Х або У кривої. @@ -280,14 +275,14 @@ private: * @param point_coord координата Х або У точки на кривій. * @return */ -// static qreal calc_t (qreal curve_coord1, qreal curve_coord2, qreal curve_coord3, -// qreal curve_coord4, qreal point_coord)const; +// static qreal calc_t (qreal curve_coord1, qreal curve_coord2, qreal curve_coord3, qreal curve_coord4, +// qreal point_coord)const; /** * @brief param_t знаходить підходяще значення параметра t якому відповідає точка на сплайні * @param pBt точка для якої шукається значення параметра t. * @return підходяще значення t. */ -// qreal param_t (QPointF pBt)const; +// qreal param_t (QPointF pBt)const; }; #endif // VSPLINE_H diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index bd0a5a8fe..e58269751 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vsplinepath.h" -#include "exception/vexception.h" +#include VSplinePath::VSplinePath(): path(QVector()), kCurve(1), mode(Draw::Calculation), points(QHash()), idObject(0){ @@ -35,14 +35,6 @@ VSplinePath::VSplinePath(const VSplinePath &splPath): path(*splPath.GetPoint()), idObject(splPath.getIdObject()){ } -Draw::Draws VSplinePath::getMode() const{ - return mode; -} - -void VSplinePath::setMode(const Draw::Draws &value){ - mode = value; -} - void VSplinePath::append(VSplinePoint point){ path.append(point); } @@ -55,10 +47,6 @@ qint32 VSplinePath::Count() const{ } } -qint32 VSplinePath::CountPoint() const{ - return path.size(); -} - VSpline VSplinePath::GetSpline(qint32 index) const{ if(Count()<1){ throw VException(tr("Not enough points to create the spline.")); @@ -94,10 +82,6 @@ QVector VSplinePath::GetPathPoints() const{ return pathPoints; } -QVector VSplinePath::GetSplinePath() const{ - return path; -} - qreal VSplinePath::GetLength() const{ qreal length = 0; for(qint32 i = 1; i <= Count(); ++i){ @@ -108,10 +92,6 @@ qreal VSplinePath::GetLength() const{ return length; } -QHash VSplinePath::GetDataPoints() const{ - return points; -} - void VSplinePath::UpdatePoint(qint32 indexSpline, SplinePoint::Position pos, VSplinePoint point){ if(indexSpline < 1 || indexSpline > Count()){ throw VException(tr("This spline is not exist.")); @@ -134,22 +114,6 @@ VSplinePoint VSplinePath::GetSplinePoint(qint32 indexSpline, SplinePoint::Positi } } -void VSplinePath::Clear(){ - path.clear(); -} - -qreal VSplinePath::getKCurve() const{ - return kCurve; -} - -void VSplinePath::setKCurve(const qreal &value){ - kCurve = value; -} - -const QVector *VSplinePath::GetPoint() const{ - return &path; -} - VSplinePath &VSplinePath::operator =(const VSplinePath &path){ this->path = path.GetSplinePath(); this->kCurve = path.getKCurve(); @@ -162,11 +126,3 @@ VSplinePath &VSplinePath::operator =(const VSplinePath &path){ VSplinePoint & VSplinePath::operator[](int indx){ return path[indx]; } - -qint64 VSplinePath::getIdObject() const{ - return idObject; -} - -void VSplinePath::setIdObject(const qint64 &value){ - idObject = value; -} diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index a00be2c9b..7a8ba8daa 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -23,8 +23,9 @@ #define VSPLINEPATH_H #include "vsplinepoint.h" +#include #include "vspline.h" -#include +#include namespace SplinePoint{ enum Position { FirstPoint, LastPoint }; @@ -41,52 +42,52 @@ public: /** * @brief VSplinePath конструктор по замовчуванню. */ - VSplinePath(); + VSplinePath(); /** * @brief VSplinePath конструктор по замовчуванню. */ - VSplinePath(const QHash *points, qreal kCurve = 1, - Draw::Draws mode = Draw::Calculation, qint64 idObject = 0); - VSplinePath(const VSplinePath& splPath); + VSplinePath(const QHash *points, qreal kCurve = 1, + Draw::Draws mode = Draw::Calculation, qint64 idObject = 0); + VSplinePath(const VSplinePath& splPath); /** * @brief append додає точку сплайну до шляху. * @param point точка. */ - void append(VSplinePoint point); - qint32 Count() const; - qint32 CountPoint() const; - VSpline GetSpline(qint32 index) const; - QPainterPath GetPath() const; - QVector GetPathPoints() const; - QVector GetSplinePath() const; - qreal GetLength() const; - QHash GetDataPoints() const; - void UpdatePoint(qint32 indexSpline, SplinePoint::Position pos, VSplinePoint point); - VSplinePoint GetSplinePoint(qint32 indexSpline, SplinePoint::Position pos) const; + void append(VSplinePoint point); + qint32 Count() const; + inline qint32 CountPoint() const {return path.size();} + VSpline GetSpline(qint32 index) const; + QPainterPath GetPath() const; + QVector GetPathPoints() const; + inline QVector GetSplinePath() const {return path;} + qreal GetLength() const; + inline QHash GetDataPoints() const {return points;} + void UpdatePoint(qint32 indexSpline, SplinePoint::Position pos, VSplinePoint point); + VSplinePoint GetSplinePoint(qint32 indexSpline, SplinePoint::Position pos) const; /** * @brief Clear очищає шлях сплайнів. */ - void Clear(); - qreal getKCurve() const; - void setKCurve(const qreal &value); - const QVector *GetPoint() const; - VSplinePath& operator=(const VSplinePath &path); - VSplinePoint & operator[](int indx); - Draw::Draws getMode() const; - void setMode(const Draw::Draws &value); + inline void Clear() {path.clear();} + inline qreal getKCurve() const {return kCurve;} + inline void setKCurve(const qreal &value) {kCurve = value;} + inline const QVector *GetPoint() const {return &path;} + VSplinePath &operator=(const VSplinePath &path); + VSplinePoint &operator[](int indx); + inline Draw::Draws getMode() const {return mode;} + inline void setMode(const Draw::Draws &value) {mode = value;} - qint64 getIdObject() const; - void setIdObject(const qint64 &value); + inline qint64 getIdObject() const {return idObject;} + inline void setIdObject(const qint64 &value) {idObject = value;} protected: /** * @brief path вектор з точок сплайна. */ QVector path; - qreal kCurve; - Draw::Draws mode; + qreal kCurve; + Draw::Draws mode; QHash points; - qint64 idObject; + qint64 idObject; }; #endif // VSPLINEPATH_H diff --git a/geometry/vsplinepoint.cpp b/geometry/vsplinepoint.cpp index 6409eb5d5..ab071e509 100644 --- a/geometry/vsplinepoint.cpp +++ b/geometry/vsplinepoint.cpp @@ -32,41 +32,8 @@ VSplinePoint::VSplinePoint(const VSplinePoint &point):pSpline(point.P()), angle( kAsm1(point.KAsm1()), kAsm2(point.KAsm2()){ } -VSplinePoint::~VSplinePoint(){ -} -qint64 VSplinePoint::P() const{ - return pSpline; -} -void VSplinePoint::SetP(const qint64 &value){ - pSpline = value; -} -qreal VSplinePoint::Angle1() const{ - return angle+180; -} -void VSplinePoint::SetAngle(const qreal &value){ - angle = value; -} -qreal VSplinePoint::Angle2() const{ - return angle; -} - -qreal VSplinePoint::KAsm1() const{ - return kAsm1; -} - -void VSplinePoint::SetKAsm1(const qreal &value){ - kAsm1 = value; -} - -qreal VSplinePoint::KAsm2() const{ - return kAsm2; -} - -void VSplinePoint::SetKAsm2(const qreal &value){ - kAsm2 = value; -} diff --git a/geometry/vsplinepoint.h b/geometry/vsplinepoint.h index 219e9fa96..ae9ffaeb5 100644 --- a/geometry/vsplinepoint.h +++ b/geometry/vsplinepoint.h @@ -32,62 +32,62 @@ public: /** * @brief VSplinePoint конструктор по замповчуванню. */ - VSplinePoint(); + VSplinePoint(); /** * @brief VSplinePoint конструктор. * @param pSpline точка сплайну. * @param angle кут дотичної сплайна. * @param factor коефіцієнт довжини дотичної. */ - VSplinePoint(qint64 pSpline, qreal kAsm1, qreal angle, qreal kAsm2); - VSplinePoint(const VSplinePoint &point); - ~VSplinePoint(); + VSplinePoint(qint64 pSpline, qreal kAsm1, qreal angle, qreal kAsm2); + VSplinePoint(const VSplinePoint &point); + ~VSplinePoint() {} /** * @brief P повертає точку. * @return точка. */ - qint64 P() const; - void SetP(const qint64 &value); + inline qint64 P() const {return pSpline;} + inline void SetP(const qint64 &value) {pSpline = value;} /** * @brief Angle1 повертає кут дотичної сплайна. * @return кут в градусах. */ - qreal Angle1() const; - void SetAngle(const qreal &value); + inline qreal Angle1() const {return angle+180;} + inline void SetAngle(const qreal &value) {angle = value;} /** * @brief Angle2 повертає кут дотичної сплайна. * @return кут в градусах. */ - qreal Angle2() const; + inline qreal Angle2() const {return angle;} /** * @brief KAsm1 повертає коефіцієнт довжини дотичної. * @return коефіцієнт. */ - qreal KAsm1() const; - void SetKAsm1(const qreal &value); + inline qreal KAsm1() const {return kAsm1;} + inline void SetKAsm1(const qreal &value) {kAsm1 = value;} /** * @brief KAsm2 повертає коефіцієнт довжини дотичної. * @return коефіцієнт. */ - qreal KAsm2() const; - void SetKAsm2(const qreal &value); + inline qreal KAsm2() const {return kAsm2;} + inline void SetKAsm2(const qreal &value) {kAsm2 = value;} protected: /** * @brief pSpline точка сплайну. */ - qint64 pSpline; + qint64 pSpline; /** * @brief angle кут дотичної сплайну. */ - qreal angle; + qreal angle; /** * @brief kAsm1 коефіцієнт довжини дотичної сплайну. */ - qreal kAsm1; + qreal kAsm1; /** * @brief kAsm2 коефіцієнт довжини дотичної сплайну. */ - qreal kAsm2; + qreal kAsm2; }; Q_DECLARE_METATYPE(VSplinePoint) From f2860076eefb74a090b68e095d16d03007e790c8 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 27 Oct 2013 09:47:01 +0200 Subject: [PATCH 42/83] Refactoring. --HG-- branch : develop --- xml/vdomdocument.cpp | 47 ++++----------- xml/vdomdocument.h | 139 +++++++++++++++++++++---------------------- xml/vtoolrecord.cpp | 24 -------- xml/vtoolrecord.h | 31 ++++------ 4 files changed, 94 insertions(+), 147 deletions(-) diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 12d55c277..1e2d048dc 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -20,21 +20,19 @@ ****************************************************************************/ #include "vdomdocument.h" -#include -#include "tools/drawTools/drawtools.h" -#include "tools/nodeDetails/nodedetails.h" -#include "tools/modelingTools/modelingtools.h" -#include "tools/vtooldetail.h" -#include "options.h" -#include "container/calculator.h" -#include "geometry/vsplinepoint.h" -#include "exception/vexceptionwrongparameterid.h" -#include "exception/vexceptionconversionerror.h" -#include "exception/vexceptionemptyparameter.h" -#include "exception/vexceptionbadid.h" -#include "exception/vexceptionobjecterror.h" -#include "exception/vexceptionuniqueid.h" -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include VDomDocument::VDomDocument(VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode) : QDomDocument(), map(QHash()), nameActivDraw(QString()), data(data), @@ -56,9 +54,6 @@ VDomDocument::VDomDocument(const QDomDocumentType& doctype, VContainer *data, QC comboBoxDraws(comboBoxDraws), mode(mode){ } -VDomDocument::~VDomDocument(){ -} - QDomElement VDomDocument::elementById(const QString& id){ if (map.contains(id)) { QDomElement e = map[id]; @@ -190,10 +185,6 @@ void VDomDocument::SetActivDraw(const QString& name){ this->nameActivDraw = name; } -QString VDomDocument::GetNameActivDraw() const{ - return nameActivDraw; -} - bool VDomDocument::GetActivDrawElement(QDomElement &element){ if(!nameActivDraw.isEmpty()){ QDomNodeList elements = this->documentElement().elementsByTagName( "draw" ); @@ -307,14 +298,6 @@ void VDomDocument::Parse(Document::Documents parse, VMainGraphicsScene *sceneDra } } -QHash *VDomDocument::getTools(){ - return &tools; -} - -QVector *VDomDocument::getHistory(){ - return &history; -} - void VDomDocument::ParseIncrementsElement(const QDomNode &node){ QDomNode domNode = node.firstChild(); while(!domNode.isNull()){ @@ -1134,10 +1117,6 @@ void VDomDocument::ShowHistoryTool(qint64 id, Qt::GlobalColor color, bool enable emit ShowTool(id, color, enable); } -qint64 VDomDocument::getCursor() const{ - return cursor; -} - void VDomDocument::setCursor(const qint64 &value){ cursor = value; emit ChangedCursor(cursor); diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index 51fcd2f03..4f3ce2564 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -23,10 +23,9 @@ #define VDOMDOCUMENT_H #include -#include -#include -#include "widgets/vmaingraphicsscene.h" -#include "tools/vdatatool.h" +#include +#include +#include #include "vtoolrecord.h" namespace Document { @@ -40,80 +39,80 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Document::Documents) class VDomDocument : public QObject, public QDomDocument{ Q_OBJECT public: - VDomDocument(VContainer *data,QComboBox *comboBoxDraws, Draw::Draws *mode); - VDomDocument(const QString& name, VContainer *data, QComboBox *comboBoxDraws, - Draw::Draws *mode); - VDomDocument(const QDomDocumentType& doctype, VContainer *data, QComboBox *comboBoxDraws, - Draw::Draws *mode); - ~VDomDocument(); - QDomElement elementById(const QString& id); - void CreateEmptyFile(); - void ChangeActivDraw(const QString& name, Document::Documents parse = Document::FullParse); - QString GetNameActivDraw() const; - bool GetActivDrawElement(QDomElement &element); - bool GetActivCalculationElement(QDomElement &element); - bool GetActivModelingElement(QDomElement &element); - bool GetActivDetailsElement(QDomElement &element); - bool appendDraw(const QString& name); - bool SetNameDraw(const QString& name); - void Parse(Document::Documents parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail); - QHash* getTools(); - QVector *getHistory(); - qint64 getCursor() const; - void setCursor(const qint64 &value); - void setCurrentData(); - void AddTool(const qint64 &id, VDataTool *tool); - void UpdateToolData(const qint64 &id, VContainer *data); - void IncrementReferens(qint64 id) const; - void DecrementReferens(qint64 id) const; - void TestUniqueId() const; + VDomDocument(VContainer *data,QComboBox *comboBoxDraws, Draw::Draws *mode); + VDomDocument(const QString& name, VContainer *data, QComboBox *comboBoxDraws, + Draw::Draws *mode); + VDomDocument(const QDomDocumentType& doctype, VContainer *data, QComboBox *comboBoxDraws, + Draw::Draws *mode); + ~VDomDocument(){} + QDomElement elementById(const QString& id); + void CreateEmptyFile(); + void ChangeActivDraw(const QString& name, Document::Documents parse = Document::FullParse); + inline QString GetNameActivDraw() const {return nameActivDraw;} + bool GetActivDrawElement(QDomElement &element); + bool GetActivCalculationElement(QDomElement &element); + bool GetActivModelingElement(QDomElement &element); + bool GetActivDetailsElement(QDomElement &element); + bool appendDraw(const QString& name); + bool SetNameDraw(const QString& name); + void Parse(Document::Documents parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail); + inline QHash* getTools() {return &tools;} + inline QVector *getHistory() {return &history;} + inline qint64 getCursor() const {return cursor;} + void setCursor(const qint64 &value); + void setCurrentData(); + void AddTool(const qint64 &id, VDataTool *tool); + void UpdateToolData(const qint64 &id, VContainer *data); + void IncrementReferens(qint64 id) const; + void DecrementReferens(qint64 id) const; + void TestUniqueId() const; signals: - void ChangedActivDraw(const QString newName); - void ChangedNameDraw(const QString oldName, const QString newName); - void FullUpdateFromFile(); - void haveChange(); - void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); - void ChangedCursor(qint64 id); + void ChangedActivDraw(const QString newName); + void ChangedNameDraw(const QString oldName, const QString newName); + void FullUpdateFromFile(); + void haveChange(); + void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); + void ChangedCursor(qint64 id); public slots: - void FullUpdateTree(); - void haveLiteChange(); - void ShowHistoryTool(qint64 id, Qt::GlobalColor color, bool enable); + void FullUpdateTree(); + void haveLiteChange(); + void ShowHistoryTool(qint64 id, Qt::GlobalColor color, bool enable); private: Q_DISABLE_COPY(VDomDocument) QHash map; - QString nameActivDraw; - VContainer *data; + QString nameActivDraw; + VContainer *data; QHash tools; QVector history; - qint64 cursor; - QComboBox *comboBoxDraws; - Draw::Draws *mode; - bool find(QDomElement node, const QString& id); - bool CheckNameDraw(const QString& name) const; - void SetActivDraw(const QString& name); - bool GetActivNodeElement(const QString& name, QDomElement& element); - void ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, - const QDomNode& node, const Document::Documents &parse); - void ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, - const QDomNode& node, const Document::Documents &parse, Draw::Draws mode); - void ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, - const Document::Documents &parse); - void ParseDetails(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, - const Document::Documents &parse); - void ParsePointElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, const QString &type, Draw::Draws mode); - void ParseLineElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, Draw::Draws mode); - void ParseSplineElement(VMainGraphicsScene *scene, const QDomElement& domElement, + qint64 cursor; + QComboBox *comboBoxDraws; + Draw::Draws *mode; + bool find(QDomElement node, const QString& id); + bool CheckNameDraw(const QString& name) const; + void SetActivDraw(const QString& name); + bool GetActivNodeElement(const QString& name, QDomElement& element); + void ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, + const QDomNode& node, const Document::Documents &parse); + void ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, + const QDomNode& node, const Document::Documents &parse, Draw::Draws mode); + void ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, + const Document::Documents &parse); + void ParseDetails(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, + const Document::Documents &parse); + void ParsePointElement(VMainGraphicsScene *scene, const QDomElement& domElement, + const Document::Documents &parse, const QString &type, Draw::Draws mode); + void ParseLineElement(VMainGraphicsScene *scene, const QDomElement& domElement, + const Document::Documents &parse, Draw::Draws mode); + void ParseSplineElement(VMainGraphicsScene *scene, const QDomElement& domElement, + const Document::Documents &parse, const QString& type, Draw::Draws mode); + void ParseArcElement(VMainGraphicsScene *scene, const QDomElement& domElement, const Document::Documents &parse, const QString& type, Draw::Draws mode); - void ParseArcElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, const QString& type, Draw::Draws mode); - void ParseIncrementsElement(const QDomNode& node); - qint64 GetParametrId(const QDomElement& domElement) const; - qint64 GetParametrLongLong(const QDomElement& domElement, const QString &name) const; - QString GetParametrString(const QDomElement& domElement, const QString &name) const; - qreal GetParametrDouble(const QDomElement& domElement, const QString &name) const; - void CollectId(QDomElement node, QVector &vector)const; + void ParseIncrementsElement(const QDomNode& node); + qint64 GetParametrId(const QDomElement& domElement) const; + qint64 GetParametrLongLong(const QDomElement& domElement, const QString &name) const; + QString GetParametrString(const QDomElement& domElement, const QString &name) const; + qreal GetParametrDouble(const QDomElement& domElement, const QString &name) const; + void CollectId(QDomElement node, QVector &vector)const; }; #pragma GCC diagnostic pop diff --git a/xml/vtoolrecord.cpp b/xml/vtoolrecord.cpp index 5fe3279b4..64bd06127 100644 --- a/xml/vtoolrecord.cpp +++ b/xml/vtoolrecord.cpp @@ -27,27 +27,3 @@ VToolRecord::VToolRecord():id(0), typeTool(Tool::ArrowTool), nameDraw(QString()) VToolRecord::VToolRecord(const qint64 &id, const Tool::Tools &typeTool, const QString &nameDraw):id(id), typeTool(typeTool), nameDraw(nameDraw){ } - -QString VToolRecord::getNameDraw() const{ - return nameDraw; -} - -void VToolRecord::setNameDraw(const QString &value){ - nameDraw = value; -} - -Tool::Tools VToolRecord::getTypeTool() const{ - return typeTool; -} - -void VToolRecord::setTypeTool(const Tool::Tools &value){ - typeTool = value; -} - -qint64 VToolRecord::getId() const{ - return id; -} - -void VToolRecord::setId(const qint64 &value){ - id = value; -} diff --git a/xml/vtoolrecord.h b/xml/vtoolrecord.h index 6292aab9f..add61c98a 100644 --- a/xml/vtoolrecord.h +++ b/xml/vtoolrecord.h @@ -22,27 +22,20 @@ #ifndef VTOOLRECORD_H #define VTOOLRECORD_H -#include -#include "options.h" - -class VToolRecord -{ +class VToolRecord{ public: - VToolRecord(); - VToolRecord(const qint64 &id, const Tool::Tools &typeTool, const QString &nameDraw); - qint64 getId() const; - void setId(const qint64 &value); - - Tool::Tools getTypeTool() const; - void setTypeTool(const Tool::Tools &value); - - QString getNameDraw() const; - void setNameDraw(const QString &value); - + VToolRecord(); + VToolRecord(const qint64 &id, const Tool::Tools &typeTool, const QString &nameDraw); + inline qint64 getId() const {return id;} + inline void setId(const qint64 &value) {id = value;} + inline Tool::Tools getTypeTool() const {return typeTool;} + inline void setTypeTool(const Tool::Tools &value) {typeTool = value;} + inline QString getNameDraw() const {return nameDraw;} + inline void setNameDraw(const QString &value) {nameDraw = value;} private: - qint64 id; - Tool::Tools typeTool; - QString nameDraw; + qint64 id; + Tool::Tools typeTool; + QString nameDraw; }; #endif // VTOOLRECORD_H From 3b908ae3285bbc7ec20ca4d1f8d8534f2d3ff507 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 27 Oct 2013 10:10:39 +0200 Subject: [PATCH 43/83] Refactoring. --HG-- branch : develop --- widgets/doubledelegate.cpp | 63 +++++++++++++---------------- widgets/doubledelegate.h | 21 +++------- widgets/vapplication.cpp | 6 --- widgets/vapplication.h | 7 ++-- widgets/vcontrolpointspline.cpp | 4 -- widgets/vcontrolpointspline.h | 39 +++++++++--------- widgets/vgraphicssimpletextitem.cpp | 3 -- widgets/vitem.cpp | 14 ------- widgets/vitem.h | 20 ++++----- widgets/vmaingraphicsscene.cpp | 24 ----------- widgets/vmaingraphicsscene.h | 44 +++++++++----------- widgets/vmaingraphicsview.cpp | 4 -- widgets/vtablegraphicsview.cpp | 17 -------- widgets/vtablegraphicsview.h | 30 +++++++------- 14 files changed, 98 insertions(+), 198 deletions(-) diff --git a/widgets/doubledelegate.cpp b/widgets/doubledelegate.cpp index c1f5ba564..612f38b5a 100644 --- a/widgets/doubledelegate.cpp +++ b/widgets/doubledelegate.cpp @@ -45,40 +45,35 @@ using a spin box widget. */ -#include #include "doubledelegate.h" - DoubleSpinBoxDelegate::DoubleSpinBoxDelegate(QObject *parent) - : QItemDelegate(parent) - { - } - - QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, - const QModelIndex &/* index */) const{ - QDoubleSpinBox *editor = new QDoubleSpinBox(parent); - editor->setMinimum(-10000.0); - editor->setMaximum(10000.0); - - return editor; - } - - void DoubleSpinBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const{ - qreal value = index.model()->data(index, Qt::EditRole).toDouble(); - - QDoubleSpinBox *spinBox = static_cast(editor); - spinBox->setValue(value); - } - - void DoubleSpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const{ - QDoubleSpinBox *spinBox = static_cast(editor); - spinBox->interpretText(); - qreal value = spinBox->value(); - - model->setData(index, value, Qt::EditRole); - } - - void DoubleSpinBoxDelegate::updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, const QModelIndex &/* index */) const{ - editor->setGeometry(option.rect); +QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, + const QModelIndex &index ) const{ + Q_UNUSED(option); + Q_UNUSED(index); + QDoubleSpinBox *editor = new QDoubleSpinBox(parent); + editor->setMinimum(-10000.0); + editor->setMaximum(10000.0); + return editor; +} + +void DoubleSpinBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const{ + qreal value = index.model()->data(index, Qt::EditRole).toDouble(); + + QDoubleSpinBox *spinBox = static_cast(editor); + spinBox->setValue(value); +} + +void DoubleSpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const{ + QDoubleSpinBox *spinBox = static_cast(editor); + spinBox->interpretText(); + qreal value = spinBox->value(); + + model->setData(index, value, Qt::EditRole); +} + +void DoubleSpinBoxDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, + const QModelIndex &index) const{ + Q_UNUSED(index) + editor->setGeometry(option.rect); } diff --git a/widgets/doubledelegate.h b/widgets/doubledelegate.h index a86b54f63..a4c7a536e 100644 --- a/widgets/doubledelegate.h +++ b/widgets/doubledelegate.h @@ -42,26 +42,15 @@ #define DOUBLEDELEGATE_H #include -#include -#include -#include -#include class DoubleSpinBoxDelegate : public QItemDelegate{ Q_OBJECT - public: - DoubleSpinBoxDelegate(QObject *parent = 0); - - QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const; - - void setEditorData(QWidget *editor, const QModelIndex &index) const; - void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const; - - void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + DoubleSpinBoxDelegate(QObject *parent = 0): QItemDelegate(parent){} + QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const; + void setEditorData(QWidget *editor, const QModelIndex &index) const; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const; + void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const; }; #endif diff --git a/widgets/vapplication.cpp b/widgets/vapplication.cpp index c522e8636..e78345d00 100644 --- a/widgets/vapplication.cpp +++ b/widgets/vapplication.cpp @@ -20,18 +20,12 @@ ****************************************************************************/ #include "vapplication.h" -#include -#include #include "exception/vexceptionobjecterror.h" #include "exception/vexceptionbadid.h" #include "exception/vexceptionconversionerror.h" #include "exception/vexceptionemptyparameter.h" #include "exception/vexceptionwrongparameterid.h" -VApplication::VApplication(int & argc, char ** argv) : - QApplication(argc, argv){ -} - // reimplemented from QApplication so we can throw exceptions in slots bool VApplication::notify(QObject *receiver, QEvent *event){ try { diff --git a/widgets/vapplication.h b/widgets/vapplication.h index 80d3f516c..3192cb658 100644 --- a/widgets/vapplication.h +++ b/widgets/vapplication.h @@ -3,12 +3,11 @@ #include -class VApplication : public QApplication -{ +class VApplication : public QApplication{ Q_OBJECT public: - VApplication(int &argc, char ** argv); - virtual ~VApplication() { } + VApplication(int &argc, char ** argv): QApplication(argc, argv){} + virtual ~VApplication() {} virtual bool notify(QObject * receiver, QEvent * event); }; diff --git a/widgets/vcontrolpointspline.cpp b/widgets/vcontrolpointspline.cpp index fceaac561..8daf75079 100644 --- a/widgets/vcontrolpointspline.cpp +++ b/widgets/vcontrolpointspline.cpp @@ -20,10 +20,6 @@ ****************************************************************************/ #include "vcontrolpointspline.h" -#include -#include -#include -#include VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position, const QPointF &controlPoint, const QPointF &splinePoint, diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h index 231f8220a..977d246e0 100644 --- a/widgets/vcontrolpointspline.h +++ b/widgets/vcontrolpointspline.h @@ -23,38 +23,35 @@ #define VCONTROLPOINTSPLINE_H #include -#include #include #include "geometry/vsplinepath.h" -class VControlPointSpline : public QObject, public QGraphicsEllipseItem -{ +class VControlPointSpline : public QObject, public QGraphicsEllipseItem{ Q_OBJECT public: - VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF &controlPoint, const QPointF &splinePoint, - QGraphicsItem * parent = 0); + VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position, + const QPointF &controlPoint, const QPointF &splinePoint, + QGraphicsItem * parent = 0); signals: - void ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos); + void ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, + const QPointF pos); public slots: - void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, - const QPointF &controlPoint, const QPointF &splinePoint); - void setEnabledPoint(bool enable); + void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, const QPointF &controlPoint, + const QPointF &splinePoint); + void setEnabledPoint(bool enable); protected: - qreal radius; - QGraphicsLineItem *controlLine; - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); + qreal radius; + QGraphicsLineItem *controlLine; + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); private: Q_DISABLE_COPY(VControlPointSpline) - qint32 indexSpline; + qint32 indexSpline; SplinePoint::Position position; - qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, - QPointF &p2) const; - QPointF ClosestPoint(QLineF line, QPointF p) const; - QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k) const; + qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, QPointF &p2) const; + QPointF ClosestPoint(QLineF line, QPointF p) const; + QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k) const; }; diff --git a/widgets/vgraphicssimpletextitem.cpp b/widgets/vgraphicssimpletextitem.cpp index 6522aa093..d0b9bb3f7 100644 --- a/widgets/vgraphicssimpletextitem.cpp +++ b/widgets/vgraphicssimpletextitem.cpp @@ -20,9 +20,6 @@ ****************************************************************************/ #include "vgraphicssimpletextitem.h" -#include -#include -#include VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent):QGraphicsSimpleTextItem(parent), fontSize(0){ diff --git a/widgets/vitem.cpp b/widgets/vitem.cpp index 917bd26ae..4f4b58f4a 100644 --- a/widgets/vitem.cpp +++ b/widgets/vitem.cpp @@ -20,16 +20,6 @@ ****************************************************************************/ #include "vitem.h" -#include -#include -#include "options.h" - -VItem::VItem():numInOutList(0){ -} - -VItem::VItem ( int numInList, QGraphicsItem * parent ):QGraphicsPathItem ( parent ), - numInOutList(numInList){ -} VItem::VItem (const QPainterPath & path, int numInList, QGraphicsItem * parent ): QGraphicsPathItem ( path, parent ), numInOutList(numInList){ @@ -77,7 +67,3 @@ QVariant VItem::itemChange( GraphicsItemChange change, const QVariant &value ){ void VItem::LengthChanged(){ checkItemChange(); } - -void VItem::SetIndexInList( qint32 index ){ - numInOutList = index; -} diff --git a/widgets/vitem.h b/widgets/vitem.h index 1b8e9e12b..7317bb315 100644 --- a/widgets/vitem.h +++ b/widgets/vitem.h @@ -35,14 +35,14 @@ public: * @brief VItem конструктор за замовчуванням *Конструктор генерує пусту деталь з номером в списку, що дорівнює 0. */ - VItem (); + VItem ():numInOutList(0){} /** * @brief VItem конструктор * @param numInList номер в списку деталей, що передається у вікно де *укладаються деталі. * @param parent батьківський об'єкт на сцені для даного. За замовчуванням немає. */ - VItem (int numInList, QGraphicsItem * parent = 0); + VItem (int numInList, QGraphicsItem * parent = 0):QGraphicsPathItem (parent), numInOutList(numInList){} /** * @brief VItem конструктор * @param path зображення що буде показуватися на сцені - об’єкт класу QPainterPath. @@ -50,22 +50,22 @@ public: *укладаються деталі. * @param parent батьківський об'єкт на сцені для даного. За замовчуванням немає. */ - VItem ( const QPainterPath & path, int numInList, QGraphicsItem * parent = 0 ); + VItem ( const QPainterPath & path, int numInList, QGraphicsItem * parent = 0 ); /** * @brief Rotate повертає об'єкт на кут в градусах * @param angle кут в градусах на який повертається деталь. */ - void Rotate ( qreal angle ); + void Rotate ( qreal angle ); public slots: /** * @brief LengthChanged слот який обробляє сигнал зміни довжини листа. */ - void LengthChanged(); + void LengthChanged(); /** * @brief SetIndexInList встановлює номер деталі в списку деталей. * @param index номер в списку. */ - void SetIndexInList( qint32 index ); + inline void SetIndexInList( qint32 index ) {numInOutList = index;} protected: /** * @brief itemChange модифікація стандартного методу itemChange. Виконується перехоплення зміни @@ -74,12 +74,12 @@ protected: * @param value * @return */ - QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); + QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); /** * @brief checkItemChange перевіряє вихід деталі за рамки листа і факт колізії. Посилає відповідні *сигнали. */ - void checkItemChange (); + void checkItemChange (); private: /** * @brief numInOutList для зберігання інформації про колізії від кожної деталі необхідно знати її @@ -92,13 +92,13 @@ signals: * @param numInOutList номер деталі яка вийшла за межі листа або тепер знаходиться в межах листа. * @param flag був вихід чи ні. */ - void itemOut ( int numInOutList, bool flag ); + void itemOut ( int numInOutList, bool flag ); /** * @brief itemColliding сигнал колізії деталі з іншими. Посилається як для додавання деталі до *списку тих що перетинаються, так і для виключення його з такого. * @param list список усіх деталей які приймають участь в колізії включаючи самого себе. * @param number 1 - перетин є, 0 - перетину немає. */ - void itemColliding ( QList list, int number ); + void itemColliding ( QList list, int number ); }; #endif // VITEM_H diff --git a/widgets/vmaingraphicsscene.cpp b/widgets/vmaingraphicsscene.cpp index 3f9e932b0..d81f3c53e 100644 --- a/widgets/vmaingraphicsscene.cpp +++ b/widgets/vmaingraphicsscene.cpp @@ -20,10 +20,6 @@ ****************************************************************************/ #include "vmaingraphicsscene.h" -#include -#include -#include -#include VMainGraphicsScene::VMainGraphicsScene():QGraphicsScene(), horScrollBar(0), verScrollBar(0), scaleFactor(1){ } @@ -46,27 +42,7 @@ void VMainGraphicsScene::ChoosedItem(qint64 id, Scene::Scenes type){ emit ChoosedObject(id, type); } -void VMainGraphicsScene::RemoveTool(QGraphicsItem *tool){ - this->removeItem(tool); -} - void VMainGraphicsScene::SetFactor(qreal factor){ scaleFactor=scaleFactor*factor; emit NewFactor(scaleFactor); } - -qint32 VMainGraphicsScene::getVerScrollBar() const{ - return verScrollBar; -} - -void VMainGraphicsScene::setVerScrollBar(const qint32 &value){ - verScrollBar = value; -} - -qint32 VMainGraphicsScene::getHorScrollBar() const{ - return horScrollBar; -} - -void VMainGraphicsScene::setHorScrollBar(const qint32 &value){ - horScrollBar = value; -} diff --git a/widgets/vmaingraphicsscene.h b/widgets/vmaingraphicsscene.h index 5acf6d555..ecf28a06d 100644 --- a/widgets/vmaingraphicsscene.h +++ b/widgets/vmaingraphicsscene.h @@ -23,38 +23,32 @@ #define VMAINGRAPHICSSCENE_H #include -#include -#include -#include "options.h" -class VMainGraphicsScene : public QGraphicsScene -{ +class VMainGraphicsScene : public QGraphicsScene{ Q_OBJECT public: - VMainGraphicsScene(); - VMainGraphicsScene(const QRectF & sceneRect, QObject * parent = 0); - qint32 getHorScrollBar() const; - void setHorScrollBar(const qint32 &value); - - qint32 getVerScrollBar() const; - void setVerScrollBar(const qint32 &value); - + VMainGraphicsScene(); + VMainGraphicsScene(const QRectF & sceneRect, QObject * parent = 0); + inline qint32 getHorScrollBar() const {return horScrollBar;} + inline void setHorScrollBar(const qint32 &value) {horScrollBar = value;} + inline qint32 getVerScrollBar() const {return verScrollBar;} + inline void setVerScrollBar(const qint32 &value) {verScrollBar = value;} public slots: - void ChoosedItem(qint64 id, Scene::Scenes type); - void RemoveTool(QGraphicsItem *tool); - void SetFactor(qreal factor); + void ChoosedItem(qint64 id, Scene::Scenes type); + inline void RemoveTool(QGraphicsItem *tool) {this->removeItem(tool);} + void SetFactor(qreal factor); protected: - void mouseMoveEvent(QGraphicsSceneMouseEvent* event); - void mousePressEvent(QGraphicsSceneMouseEvent *event); + void mouseMoveEvent(QGraphicsSceneMouseEvent* event); + void mousePressEvent(QGraphicsSceneMouseEvent *event); signals: - void mouseMove(QPointF scenePos); - void mousePress(QPointF scenePos); - void ChoosedObject(qint64 id, Scene::Scenes type); - void NewFactor(qreal factor); + void mouseMove(QPointF scenePos); + void mousePress(QPointF scenePos); + void ChoosedObject(qint64 id, Scene::Scenes type); + void NewFactor(qreal factor); private: - qint32 horScrollBar; - qint32 verScrollBar; - qreal scaleFactor; + qint32 horScrollBar; + qint32 verScrollBar; + qreal scaleFactor; }; #endif // VMAINGRAPHICSSCENE_H diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index 7c3e78be1..6de8dc1b6 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -20,10 +20,6 @@ ****************************************************************************/ #include "vmaingraphicsview.h" -#include -#include -#include -#include VMainGraphicsView::VMainGraphicsView(QWidget *parent) : QGraphicsView(parent), _numScheduledScalings(0){ diff --git a/widgets/vtablegraphicsview.cpp b/widgets/vtablegraphicsview.cpp index ce5cd7548..0fa974bda 100644 --- a/widgets/vtablegraphicsview.cpp +++ b/widgets/vtablegraphicsview.cpp @@ -20,11 +20,6 @@ ****************************************************************************/ #include "vtablegraphicsview.h" -#include -#include -#include -#include -#include VTableGraphicsView::VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent) : QGraphicsView(pScene, parent){ @@ -43,10 +38,6 @@ void VTableGraphicsView::selectionChanged(){ } } -void VTableGraphicsView::rotateItems(){ - rotateIt(); -} - void VTableGraphicsView::MirrorItem(){ QList list = scene()->selectedItems(); if(list.size()>0){ @@ -82,14 +73,6 @@ void VTableGraphicsView::MirrorItem(){ } } -void VTableGraphicsView::ZoomIn(){ - scale(1.1,1.1); -} - -void VTableGraphicsView::ZoomOut(){ - scale(1/1.1,1/1.1); -} - void VTableGraphicsView::wheelEvent(QWheelEvent *event){ if (QGuiApplication::keyboardModifiers() == Qt::ControlModifier){ // Если нажата клавиша CTRL этот код выполнится diff --git a/widgets/vtablegraphicsview.h b/widgets/vtablegraphicsview.h index ef86ebeff..d1f2363a2 100644 --- a/widgets/vtablegraphicsview.h +++ b/widgets/vtablegraphicsview.h @@ -24,70 +24,68 @@ #include -class VTableGraphicsView : public QGraphicsView -{ +class VTableGraphicsView : public QGraphicsView{ Q_OBJECT public: enum typeMove_e { Left, Right, Up, Down }; - explicit VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent = 0); - + VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent = 0); signals: /** * @brief itemChect Сигнал, що посилається коли змінюється стан вибору деталі. * @param flag Зберігає стан вибору деталі: false - знайдено, true - не знайдено. */ - void itemChect( bool flag ); + void itemChect( bool flag ); public slots: /** * @brief selectionChanged Слот виконується при зміні стану вибору деталей. */ - void selectionChanged(); + void selectionChanged(); /** * @brief rotateItems слот, який виконується при натисненні кнопки повороту деталі. */ - void rotateItems(); + inline void rotateItems() {rotateIt();} /** * @brief MirrorItem дзеркалить об'єкт відносно вертикальної вісі семетрії об'єкта. */ - void MirrorItem(); + void MirrorItem(); /** * @brief ZoomIn збільшує масштаб листа. */ - void ZoomIn(); + inline void ZoomIn() {scale(1.1,1.1);} /** * @brief ZoomOut зменшує масштаб листа. */ - void ZoomOut(); + inline void ZoomOut() {scale(1/1.1,1/1.1);} protected: /** * @brief wheelEvent обробник повороту колеса мишки. * @param event передається подія. */ - void wheelEvent ( QWheelEvent * event ); + void wheelEvent ( QWheelEvent * event ); /** * @brief mousePressEvent обробник натиснення кнопки миші. * @param mousePress передається подія. */ - void mousePressEvent(QMouseEvent *mousePress); + void mousePressEvent(QMouseEvent *mousePress); /** * @brief mouseReleaseEvent обробник відпускання кнопки миші. * @param event передається подія */ - void mouseReleaseEvent ( QMouseEvent * event ); + void mouseReleaseEvent ( QMouseEvent * event ); /** * @brief keyPressEvent обробник натиснення клавіші. * @param event передається подія. */ - void keyPressEvent ( QKeyEvent * event ); + void keyPressEvent ( QKeyEvent * event ); /** * @brief rotateIt виконує поворот вибраних деталей на 180 градусів. */ - void rotateIt(); + void rotateIt(); /** * @brief MoveItem переміщує виділені об'єкти сцени. * @param move напрямок переміщення. */ - void MoveItem( VTableGraphicsView::typeMove_e move ); + void MoveItem( VTableGraphicsView::typeMove_e move ); }; From 61be0a0a9357b7cae95fbe6bc36161d5abfced8c Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 27 Oct 2013 12:22:44 +0200 Subject: [PATCH 44/83] Refactoring. --HG-- branch : develop --- container/calculator.cpp | 1 - container/calculator.h | 44 +++--- container/vcontainer.cpp | 264 ++++++------------------------- container/vcontainer.h | 232 ++++++++++++++------------- container/vincrementtablerow.cpp | 38 ----- container/vincrementtablerow.h | 38 +++-- container/vpointf.h | 4 - container/vstandarttablecell.cpp | 16 -- container/vstandarttablecell.h | 22 ++- geometry/varc.h | 30 ++-- 10 files changed, 228 insertions(+), 461 deletions(-) diff --git a/container/calculator.cpp b/container/calculator.cpp index d161724bb..fb9642d57 100644 --- a/container/calculator.cpp +++ b/container/calculator.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "calculator.h" -#include #define DELIMITER 1 #define VARIABLE 2 diff --git a/container/calculator.h b/container/calculator.h index ad16c7f65..d8b3f518b 100644 --- a/container/calculator.h +++ b/container/calculator.h @@ -22,50 +22,48 @@ #ifndef CALCULATOR_H #define CALCULATOR_H -#include #include "vcontainer.h" /** * @brief The Calculator клас калькулятора формул лекал. Виконує розрахунок формул з підставлянням * значеннь зміних. */ -class Calculator -{ +class Calculator{ public: /** * @brief Calculator конструктор класу. Використовується при розрахунку лекала. * @param data покажчик на контейнер змінних */ - explicit Calculator(const VContainer *data); + explicit Calculator(const VContainer *data); /** * @brief eval виконує розрахунок формули. * @param prog рядко в якому зберігається формула. * @return значення формули. */ - qreal eval(QString prog, QString *errorMsg); + qreal eval(QString prog, QString *errorMsg); private: Q_DISABLE_COPY(Calculator) - QString *errorMsg; + QString *errorMsg; /** * @brief token теперішня лексема. */ - QString token; + QString token; /** * @brief tok внутрішне представлення лексеми. */ - qint32 tok; + qint32 tok; /** * @brief token_type тип лексеми. */ - qint32 token_type; + qint32 token_type; /** * @brief prog рядок в якому зберігається формула. */ - QString prog; /* Содержит анализируемое выражение */ + QString prog; /* Содержит анализируемое выражение */ /** * @brief index номер символу в рядку формули. */ - qint32 index; /* Индекс символа в строке*/ + qint32 index; /* Индекс символа в строке*/ /** * @brief data контейнер усіх змінних. */ @@ -73,16 +71,16 @@ private: /** * @brief debugFormula рядок розшифрованої формули. */ - QString debugFormula; + QString debugFormula; /** * @brief get_exp виконує розрахунок формули. * @return значення формули. */ - qreal get_exp(); + qreal get_exp(); /** * @brief get_token повертає наступну лексему. */ - void get_token();/* Получить лексему */ + void get_token();/* Получить лексему */ /** * @brief StrChr перевіряє чи символ належить рядку. * @param string рядок @@ -93,37 +91,37 @@ private: /** * @brief putback повертає зчитану лексему назад у потік. */ - void putback(); + void putback(); /** * @brief level2 метод додавання і віднімання двух термів. * @param result результат операції. */ - void level2(qreal *result); + void level2(qreal *result); /** * @brief level3 метод множення, ділення, знаходження процентів. * @param result результат операції. */ - void level3(qreal *result); + void level3(qreal *result); /** * @brief level4 метод знаходження степені двох чисел. * @param result результат операції. */ - void level4(qreal *result); + void level4(qreal *result); /** * @brief level5 метод знаходження унарного плюса чи мінуса. * @param result результат операції. */ - void level5(qreal *result); + void level5(qreal *result); /** * @brief level6 метод обробки виразу в круглих лапках. * @param result результат операції. */ - void level6(qreal *result); + void level6(qreal *result); /** * @brief primitive метод визначення значення зміної по її імені. * @param result результат операції. */ - void primitive(qreal *result); + void primitive(qreal *result); /** * @brief arith виконання специфікованої арифметики. Результат записується в перший елемент. * @param o знак операції. @@ -142,8 +140,8 @@ private: * @param s ім'я змінної. * @return значення зміної. */ - qreal find_var(QString s); - void serror(qint32 error); + qreal find_var(QString s); + void serror(qint32 error); /** * @brief look_up пошук відповідного внутрішнього формату для теперішньої лексеми в таблиці лексем. текущей лексемы в таблице лексем * @param s ім'я лексеми. diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index d53da37d5..a951bb167 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -20,8 +20,6 @@ ****************************************************************************/ #include "vcontainer.h" -#include -#include "options.h" #include qint64 VContainer::_id = 0; @@ -85,14 +83,6 @@ val VContainer::GetObject(const QHash &obj, key id){ } } -VPointF VContainer::GetPoint(qint64 id) const{ - return GetObject(points, id); -} - -VPointF VContainer::GetModelingPoint(qint64 id) const{ - return GetObject(modelingPoints, id); -} - VStandartTableCell VContainer::GetStandartTableCell(const QString &name) const{ Q_ASSERT(!name.isEmpty()); return GetObject(standartTable, name); @@ -123,44 +113,16 @@ qreal VContainer::GetLineAngle(const QString &name) const{ return GetObject(lineAngles, name); } -VSpline VContainer::GetSpline(qint64 id) const{ - return GetObject(splines, id); +qint64 VContainer::AddPoint(const VPointF &point){ + return AddObject(points, point); } -VSpline VContainer::GetModelingSpline(qint64 id) const{ - return GetObject(modelingSplines, id); +qint64 VContainer::AddModelingPoint(const VPointF &point){ +return AddObject(modelingPoints, point); } -VArc VContainer::GetArc(qint64 id) const{ - return GetObject(arcs, id); -} - -VArc VContainer::GetModelingArc(qint64 id) const{ - return GetObject(modelingArcs, id); -} - -VSplinePath VContainer::GetSplinePath(qint64 id) const{ - return GetObject(splinePaths, id); -} - -VSplinePath VContainer::GetModelingSplinePath(qint64 id) const{ - return GetObject(modelingSplinePaths, id); -} - -VDetail VContainer::GetDetail(qint64 id) const{ - return GetObject(details, id); -} - -void VContainer::AddStandartTableCell(const QString& name, const VStandartTableCell& cell){ - standartTable[name] = cell; -} - -void VContainer::AddIncrementTableRow(const QString& name, const VIncrementTableRow& cell){ - incrementTable[name] = cell; -} - -qint64 VContainer::getId(){ - return _id; +qint64 VContainer::AddDetail(const VDetail &detail){ + return AddObject(details, detail); } qint64 VContainer::getNextId(){ @@ -444,10 +406,6 @@ void VContainer::PrepareDetails(QVector &list) const{ } } -void VContainer::RemoveIncrementTableRow(const QString& name){ - incrementTable.remove(name); -} - template void VContainer::UpdateObject(QHash &obj, const qint64 &id, const val& point){ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); @@ -455,50 +413,6 @@ void VContainer::UpdateObject(QHash &obj, const qint64 &id, const v UpdateId(id); } -void VContainer::UpdatePoint(qint64 id, const VPointF& point){ - UpdateObject(points, id, point); -} - -void VContainer::UpdateModelingPoint(qint64 id, const VPointF &point){ - UpdateObject(modelingPoints, id, point); -} - -void VContainer::UpdateDetail(qint64 id, const VDetail &detail){ - UpdateObject(details, id, detail); -} - -void VContainer::UpdateSpline(qint64 id, const VSpline &spl){ - UpdateObject(splines, id, spl); -} - -void VContainer::UpdateModelingSpline(qint64 id, const VSpline &spl){ - UpdateObject(modelingSplines, id, spl); -} - -void VContainer::UpdateSplinePath(qint64 id, const VSplinePath &splPath){ - UpdateObject(splinePaths, id, splPath); -} - -void VContainer::UpdateModelingSplinePath(qint64 id, const VSplinePath &splPath){ - UpdateObject(modelingSplinePaths, id, splPath); -} - -void VContainer::UpdateArc(qint64 id, const VArc &arc){ - UpdateObject(arcs, id, arc); -} - -void VContainer::UpdateModelingArc(qint64 id, const VArc &arc){ - UpdateObject(modelingArcs, id, arc); -} - -void VContainer::UpdateStandartTableCell(const QString& name, const VStandartTableCell& cell){ - standartTable[name] = cell; -} - -void VContainer::UpdateIncrementTableRow(const QString& name, const VIncrementTableRow& cell){ - incrementTable[name] = cell; -} - void VContainer::AddLengthSpline(const QString &name, const qreal &value){ Q_ASSERT(!name.isEmpty()); lengthSplines[name] = value; @@ -557,46 +471,6 @@ void VContainer::ClearObject(){ splinePaths.clear(); } -void VContainer::ClearIncrementTable(){ - incrementTable.clear(); -} - -void VContainer::ClearLengthLines(){ - lengthLines.clear(); -} - -void VContainer::ClearLengthSplines(){ - lengthSplines.clear(); -} - -void VContainer::ClearLengthArcs(){ - lengthArcs.clear(); -} - -void VContainer::ClearLineAngles(){ - lineAngles.clear(); -} - -void VContainer::SetSize(qint32 size){ - base["Сг"] = size; -} - -void VContainer::SetGrowth(qint32 growth){ - base["Р"] = growth; -} - -qint32 VContainer::size() const{ - return base.value("Сг"); -} - -qint32 VContainer::growth() const{ - return base.value("Р"); -} - -bool VContainer::IncrementTableContains(const QString& name){ - return incrementTable.contains(name); -} - qreal VContainer::FindVar(const QString &name, bool *ok)const{ if(base.contains(name)){ *ok = true; @@ -631,70 +505,6 @@ qreal VContainer::FindVar(const QString &name, bool *ok)const{ return 0; } -const QHash *VContainer::DataPoints() const{ - return &points; -} - -const QHash *VContainer::DataModelingPoints() const{ - return &modelingPoints; -} - -const QHash *VContainer::DataSplines() const{ - return &splines; -} - -const QHash *VContainer::DataModelingSplines() const{ - return &modelingSplines; -} - -const QHash *VContainer::DataArcs() const{ - return &arcs; -} - -const QHash *VContainer::DataModelingArcs() const{ - return &modelingArcs; -} - -const QHash *VContainer::DataBase() const{ - return &base; -} - -const QHash *VContainer::DataStandartTable() const{ - return &standartTable; -} - -const QHash *VContainer::DataIncrementTable() const{ - return &incrementTable; -} - -const QHash *VContainer::DataLengthLines() const{ - return &lengthLines; -} - -const QHash *VContainer::DataLengthSplines() const{ - return &lengthSplines; -} - -const QHash *VContainer::DataLengthArcs() const{ - return &lengthArcs; -} - -const QHash *VContainer::DataLineAngles() const{ - return &lineAngles; -} - -const QHash *VContainer::DataSplinePaths() const{ - return &splinePaths; -} - -const QHash *VContainer::DataModelingSplinePaths() const{ - return &modelingSplinePaths; -} - -const QHash *VContainer::DataDetails() const{ - return &details; -} - void VContainer::AddLine(const qint64 &firstPointId, const qint64 &secondPointId, Draw::Draws mode){ QString nameLine = GetNameLine(firstPointId, secondPointId, mode); VPointF first; @@ -711,25 +521,6 @@ void VContainer::AddLine(const qint64 &firstPointId, const qint64 &secondPointId AddLineAngle(nameLine, QLineF(first.toQPointF(), second.toQPointF()).angle()); } -template -qint64 VContainer::AddObject(QHash &obj, const val& value){ - qint64 id = getNextId(); - obj[id] = value; - return id; -} - -qint64 VContainer::AddPoint(const VPointF& point){ - return AddObject(points, point); -} - -qint64 VContainer::AddModelingPoint(const VPointF &point){ - return AddObject(modelingPoints, point); -} - -qint64 VContainer::AddDetail(const VDetail &detail){ - return AddObject(details, detail); -} - qint64 VContainer::AddSpline(const VSpline &spl){ return AddObject(splines, spl); } @@ -754,6 +545,13 @@ qint64 VContainer::AddModelingArc(const VArc &arc){ return AddObject(modelingArcs, arc); } +template +qint64 VContainer::AddObject(QHash &obj, const val& value){ + qint64 id = getNextId(); + obj[id] = value; + return id; +} + QString VContainer::GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint, Draw::Draws mode) const{ VPointF first; VPointF second; @@ -827,6 +625,42 @@ QString VContainer::GetNameArc(const qint64 ¢er, const qint64 &id, Draw::Dra return QString ("Arc_%1_%2").arg(centerPoint.name()).arg(id); } +void VContainer::UpdatePoint(qint64 id, const VPointF &point){ + UpdateObject(points, id, point); +} + +void VContainer::UpdateModelingPoint(qint64 id, const VPointF &point){ + UpdateObject(modelingPoints, id, point); +} + +void VContainer::UpdateDetail(qint64 id, const VDetail &detail){ + UpdateObject(details, id, detail); +} + +void VContainer::UpdateSpline(qint64 id, const VSpline &spl){ + UpdateObject(splines, id, spl); +} + +void VContainer::UpdateModelingSpline(qint64 id, const VSpline &spl){ + UpdateObject(modelingSplines, id, spl); +} + +void VContainer::UpdateSplinePath(qint64 id, const VSplinePath &splPath){ + UpdateObject(splinePaths, id, splPath); +} + +void VContainer::UpdateModelingSplinePath(qint64 id, const VSplinePath &splPath){ + UpdateObject(modelingSplinePaths, id, splPath); +} + +void VContainer::UpdateArc(qint64 id, const VArc &arc){ + UpdateObject(arcs, id, arc); +} + +void VContainer::UpdateModelingArc(qint64 id, const VArc &arc){ + UpdateObject(modelingArcs, id, arc); +} + void VContainer::AddLengthLine(const QString &name, const qreal &value){ Q_ASSERT(!name.isEmpty()); lengthLines[name] = value; diff --git a/container/vcontainer.h b/container/vcontainer.h index 4dee1c149..dbd9c82b6 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -22,157 +22,155 @@ #ifndef VCONTAINER_H #define VCONTAINER_H -#include #include "vstandarttablecell.h" #include "vincrementtablerow.h" #include "geometry/varc.h" #include "geometry/vsplinepath.h" #include "geometry/vdetail.h" #include "widgets/vitem.h" -#include /** * @brief The VContainer class */ -class VContainer -{ +class VContainer{ Q_DECLARE_TR_FUNCTIONS(VContainer) public: /** * @brief VContainer */ - VContainer(); - VContainer &operator=(const VContainer &data); - VContainer(const VContainer &data); - void setData(const VContainer &data); + VContainer(); + VContainer &operator=(const VContainer &data); + VContainer(const VContainer &data); + void setData(const VContainer &data); /** * @brief GetPoint * @param id * @return */ - VPointF GetPoint(qint64 id) const; - VPointF GetModelingPoint(qint64 id) const; - VStandartTableCell GetStandartTableCell(const QString& name) const; - VIncrementTableRow GetIncrementTableRow(const QString& name) const; - qreal GetLine(const QString &name) const; - qreal GetLengthArc(const QString &name) const; - qreal GetLengthSpline(const QString &name) const; - qreal GetLineAngle(const QString &name) const; - VSpline GetSpline(qint64 id) const; - VSpline GetModelingSpline(qint64 id) const; - VArc GetArc(qint64 id) const; - VArc GetModelingArc(qint64 id) const; - VSplinePath GetSplinePath(qint64 id) const; - VSplinePath GetModelingSplinePath(qint64 id) const; - VDetail GetDetail(qint64 id) const; - static qint64 getId(); - qint64 AddPoint(const VPointF& point); - qint64 AddModelingPoint(const VPointF& point); - qint64 AddDetail(const VDetail& detail); - void AddStandartTableCell(const QString& name, const VStandartTableCell& cell); - void AddIncrementTableRow(const QString& name, const VIncrementTableRow &cell); - void AddLengthLine(const QString &name, const qreal &value); - void AddLengthSpline(const QString &name, const qreal &value); - void AddLengthArc(const qint64 ¢er, const qint64 &id); - void AddLengthArc(const QString &name, const qreal &value); - void AddLineAngle(const QString &name, const qreal &value); - void AddLine(const qint64 &firstPointId, const qint64 &secondPointId, - Draw::Draws mode = Draw::Calculation); - qint64 AddSpline(const VSpline& spl); - qint64 AddModelingSpline(const VSpline& spl); - qint64 AddSplinePath(const VSplinePath& splPath); - qint64 AddModelingSplinePath(const VSplinePath& splPath); - qint64 AddArc(const VArc& arc); - qint64 AddModelingArc(const VArc& arc); - QString GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint, - Draw::Draws mode = Draw::Calculation) const; - QString GetNameLineAngle(const qint64 &firstPoint, const qint64 &secondPoint, - Draw::Draws mode = Draw::Calculation) const; - QString GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint, - Draw::Draws mode = Draw::Calculation) const; - QString GetNameSplinePath(const VSplinePath &path, - Draw::Draws mode = Draw::Calculation) const; - QString GetNameArc(const qint64 ¢er, const qint64 &id, + inline VPointF GetPoint(qint64 id) const {return GetObject(points, id);} + inline VPointF GetModelingPoint(qint64 id) const {return GetObject(modelingPoints, id);} + VStandartTableCell GetStandartTableCell(const QString& name) const; + VIncrementTableRow GetIncrementTableRow(const QString& name) const; + qreal GetLine(const QString &name) const; + qreal GetLengthArc(const QString &name) const; + qreal GetLengthSpline(const QString &name) const; + qreal GetLineAngle(const QString &name) const; + inline VSpline GetSpline(qint64 id) const {return GetObject(splines, id);} + inline VSpline GetModelingSpline(qint64 id) const {return GetObject(modelingSplines, id);} + inline VArc GetArc(qint64 id) const {return GetObject(arcs, id);} + inline VArc GetModelingArc(qint64 id) const {return GetObject(modelingArcs, id);} + inline VSplinePath GetSplinePath(qint64 id) const {return GetObject(splinePaths, id);} + inline VSplinePath GetModelingSplinePath(qint64 id) const {return GetObject(modelingSplinePaths, id);} + inline VDetail GetDetail(qint64 id) const {return GetObject(details, id);} + static qint64 getId() {return _id;} + qint64 AddPoint(const VPointF& point); + qint64 AddModelingPoint(const VPointF& point); + qint64 AddDetail(const VDetail& detail); + inline void AddStandartTableCell(const QString& name, const VStandartTableCell& cell) + {standartTable[name] = cell;} + inline void AddIncrementTableRow(const QString& name, const VIncrementTableRow &cell) + {incrementTable[name] = cell;} + void AddLengthLine(const QString &name, const qreal &value); + void AddLengthSpline(const QString &name, const qreal &value); + void AddLengthArc(const qint64 ¢er, const qint64 &id); + void AddLengthArc(const QString &name, const qreal &value); + void AddLineAngle(const QString &name, const qreal &value); + void AddLine(const qint64 &firstPointId, const qint64 &secondPointId, + Draw::Draws mode = Draw::Calculation); + qint64 AddSpline(const VSpline& spl); + qint64 AddModelingSpline(const VSpline& spl); + qint64 AddSplinePath(const VSplinePath& splPath); + qint64 AddModelingSplinePath(const VSplinePath& splPath); + qint64 AddArc(const VArc& arc); + qint64 AddModelingArc(const VArc& arc); + QString GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint, Draw::Draws mode = Draw::Calculation) const; - void UpdatePoint(qint64 id, const VPointF& point); - void UpdateModelingPoint(qint64 id, const VPointF& point); - void UpdateDetail(qint64 id, const VDetail& detail); - void UpdateSpline(qint64 id, const VSpline& spl); - void UpdateModelingSpline(qint64 id, const VSpline& spl); - void UpdateSplinePath(qint64 id, const VSplinePath& splPath); - void UpdateModelingSplinePath(qint64 id, const VSplinePath& splPath); - void UpdateArc(qint64 id, const VArc& arc); - void UpdateModelingArc(qint64 id, const VArc& arc); - void UpdateStandartTableCell(const QString& name, const VStandartTableCell& cell); - void UpdateIncrementTableRow(const QString& name, const VIncrementTableRow& cell); - qreal GetValueStandartTableCell(const QString& name) const; - qreal GetValueIncrementTableRow(const QString& name) const; - void Clear(); - void ClearObject(); - void ClearIncrementTable(); - void ClearLengthLines(); - void ClearLengthSplines(); - void ClearLengthArcs(); - void ClearLineAngles(); - void SetSize(qint32 size); - void SetGrowth(qint32 growth); - qint32 size() const; - qint32 growth() const; - qreal FindVar(const QString& name, bool *ok)const; - bool IncrementTableContains(const QString& name); - static qint64 getNextId(); - void RemoveIncrementTableRow(const QString& name); - const QHash *DataPoints() const; - const QHash *DataModelingPoints() const; - const QHash *DataSplines() const; - const QHash *DataModelingSplines() const; - const QHash *DataArcs() const; - const QHash *DataModelingArcs() const; - const QHash *DataBase() const; - const QHash *DataStandartTable() const; - const QHash *DataIncrementTable() const; - const QHash *DataLengthLines() const; - const QHash *DataLengthSplines() const; - const QHash *DataLengthArcs() const; - const QHash *DataLineAngles() const; - const QHash *DataSplinePaths() const; - const QHash *DataModelingSplinePaths() const; - const QHash *DataDetails() const; - static void UpdateId(qint64 newId); - QPainterPath ContourPath(qint64 idDetail) const; - QVector biasPoints(const QVector &points, const qreal &mx, const qreal &my) const; - QPainterPath Equidistant(QVector points, const Detail::Equidistant &eqv, - const qreal &width)const; - static QLineF ParallelLine(const QLineF &line, qreal width ); - static QPointF SingleParallelPoint(const QLineF &line, const qreal &angle, const qreal &width); - QVector EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width)const; - QVector CheckLoops(const QVector &points) const; - void PrepareDetails(QVector & list)const; + QString GetNameLineAngle(const qint64 &firstPoint, const qint64 &secondPoint, + Draw::Draws mode = Draw::Calculation) const; + QString GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint, + Draw::Draws mode = Draw::Calculation) const; + QString GetNameSplinePath(const VSplinePath &path, + Draw::Draws mode = Draw::Calculation) const; + QString GetNameArc(const qint64 ¢er, const qint64 &id, Draw::Draws mode = Draw::Calculation) const; + void UpdatePoint(qint64 id, const VPointF& point); + void UpdateModelingPoint(qint64 id, const VPointF& point); + void UpdateDetail(qint64 id, const VDetail& detail); + void UpdateSpline(qint64 id, const VSpline& spl); + void UpdateModelingSpline(qint64 id, const VSpline& spl); + void UpdateSplinePath(qint64 id, const VSplinePath& splPath); + void UpdateModelingSplinePath(qint64 id, const VSplinePath& splPath); + void UpdateArc(qint64 id, const VArc& arc); + void UpdateModelingArc(qint64 id, const VArc& arc); + inline void UpdateStandartTableCell(const QString& name, const VStandartTableCell& cell) + {standartTable[name] = cell;} + inline void UpdateIncrementTableRow(const QString& name, const VIncrementTableRow& cell) + {incrementTable[name] = cell;} + qreal GetValueStandartTableCell(const QString& name) const; + qreal GetValueIncrementTableRow(const QString& name) const; + void Clear(); + void ClearObject(); + inline void ClearIncrementTable() {incrementTable.clear();} + inline void ClearLengthLines() {lengthLines.clear();} + inline void ClearLengthSplines() {lengthSplines.clear();} + inline void ClearLengthArcs() {lengthArcs.clear();} + inline void ClearLineAngles() {lineAngles.clear();} + inline void SetSize(qint32 size) {base["Сг"] = size;} + inline void SetGrowth(qint32 growth) {base["Р"] = growth;} + inline qint32 size() const {return base.value("Сг");} + inline qint32 growth() const {return base.value("Р");} + qreal FindVar(const QString& name, bool *ok)const; + inline bool IncrementTableContains(const QString& name) {return incrementTable.contains(name);} + static qint64 getNextId(); + inline void RemoveIncrementTableRow(const QString& name) {incrementTable.remove(name);} + inline const QHash *DataPoints() const {return &points;} + inline const QHash *DataModelingPoints() const {return &modelingPoints;} + inline const QHash *DataSplines() const {return &splines;} + inline const QHash *DataModelingSplines() const {return &modelingSplines;} + inline const QHash *DataArcs() const {return &arcs;} + inline const QHash *DataModelingArcs() const {return &modelingArcs;} + inline const QHash *DataBase() const {return &base;} + inline const QHash *DataStandartTable() const {return &standartTable;} + inline const QHash *DataIncrementTable() const {return &incrementTable;} + inline const QHash *DataLengthLines() const {return &lengthLines;} + inline const QHash *DataLengthSplines() const {return &lengthSplines;} + inline const QHash *DataLengthArcs() const {return &lengthArcs;} + inline const QHash *DataLineAngles() const {return &lineAngles;} + inline const QHash *DataSplinePaths() const {return &splinePaths;} + inline const QHash *DataModelingSplinePaths() const {return &modelingSplinePaths;} + inline const QHash *DataDetails() const {return &details;} + static void UpdateId(qint64 newId); + QPainterPath ContourPath(qint64 idDetail) const; + QVector biasPoints(const QVector &points, const qreal &mx, const qreal &my) const; + QPainterPath Equidistant(QVector points, const Detail::Equidistant &eqv, const qreal &width)const; + static QLineF ParallelLine(const QLineF &line, qreal width ); + static QPointF SingleParallelPoint(const QLineF &line, const qreal &angle, const qreal &width); + QVector EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width)const; + QVector CheckLoops(const QVector &points) const; + void PrepareDetails(QVector & list) const; private: - static qint64 _id; + static qint64 _id; QHash base; QHash points; QHash modelingPoints; QHash standartTable; QHash incrementTable; - QHash lengthLines; - QHash lineAngles; + QHash lengthLines; + QHash lineAngles; QHash splines; QHash modelingSplines; - QHash lengthSplines; - QHash arcs; - QHash modelingArcs; - QHash lengthArcs; + QHash lengthSplines; + QHash arcs; + QHash modelingArcs; + QHash lengthArcs; QHash splinePaths; QHash modelingSplinePaths; QHash details; + void CreateManTableIGroup (); + QVector GetReversePoint(const QVector &points)const; + qreal GetLengthContour(const QVector &contour, const QVector &newPoints)const; template static val GetObject(const QHash &obj, key id); - template static void UpdateObject(QHash &obj, const qint64 &id, - const val& point); + template static void UpdateObject(QHash &obj, const qint64 &id, const val& point); template static qint64 AddObject(QHash &obj, const val& value); - void CreateManTableIGroup (); - QVector GetReversePoint(const QVector &points)const; - qreal GetLengthContour(const QVector &contour, const QVector &newPoints)const; }; #endif // VCONTAINER_H diff --git a/container/vincrementtablerow.cpp b/container/vincrementtablerow.cpp index 5240da150..f6ba763cc 100644 --- a/container/vincrementtablerow.cpp +++ b/container/vincrementtablerow.cpp @@ -29,42 +29,4 @@ VIncrementTableRow::VIncrementTableRow(qint64 id, qreal base, qreal ksize, qreal kgrowth(kgrowth), description(description){ } -QString VIncrementTableRow::getDescription() const{ - return description; -} -void VIncrementTableRow::setDescription(const QString &value){ - description = value; -} - -qreal VIncrementTableRow::getKgrowth() const{ - return kgrowth; -} - -void VIncrementTableRow::setKgrowth(const qreal &value){ - kgrowth = value; -} - -qreal VIncrementTableRow::getKsize() const{ - return ksize; -} - -void VIncrementTableRow::setKsize(const qreal &value){ - ksize = value; -} - -qreal VIncrementTableRow::getBase() const{ - return base; -} - -void VIncrementTableRow::setBase(const qreal &value){ - base = value; -} - -qint64 VIncrementTableRow::getId() const{ - return id; -} - -void VIncrementTableRow::setId(const qint64 &value){ - id = value; -} diff --git a/container/vincrementtablerow.h b/container/vincrementtablerow.h index 7846f0441..592fe6140 100644 --- a/container/vincrementtablerow.h +++ b/container/vincrementtablerow.h @@ -22,29 +22,27 @@ #ifndef VINCREMENTTABLEROW_H #define VINCREMENTTABLEROW_H -#include - class VIncrementTableRow{ public: - VIncrementTableRow(); - VIncrementTableRow(qint64 id, qreal base, qreal ksize, qreal kgrowth, - QString description = QString()); - qint64 getId() const; - void setId(const qint64 &value); - qreal getBase() const; - void setBase(const qreal &value); - qreal getKsize() const; - void setKsize(const qreal &value); - qreal getKgrowth() const; - void setKgrowth(const qreal &value); - QString getDescription() const; - void setDescription(const QString &value); + VIncrementTableRow(); + VIncrementTableRow(qint64 id, qreal base, qreal ksize, qreal kgrowth, + QString description = QString()); + inline qint64 getId() const {return id;} + inline void setId(const qint64 &value) {id = value;} + inline qreal getBase() const {return base;} + inline void setBase(const qreal &value) {base = value;} + inline qreal getKsize() const {return ksize;} + inline void setKsize(const qreal &value) {ksize = value;} + inline qreal getKgrowth() const {return kgrowth;} + inline void setKgrowth(const qreal &value) {kgrowth = value;} + inline QString getDescription() const {return description;} + inline void setDescription(const QString &value) {description = value;} private: - qint64 id; - qreal base; - qreal ksize; - qreal kgrowth; - QString description; + qint64 id; + qreal base; + qreal ksize; + qreal kgrowth; + QString description; }; #endif // VINCREMENTTABLEROW_H diff --git a/container/vpointf.h b/container/vpointf.h index cfe7c8f1a..5282ed5fe 100644 --- a/container/vpointf.h +++ b/container/vpointf.h @@ -22,10 +22,6 @@ #ifndef VPOINTF_H #define VPOINTF_H -#include -#include -#include "options.h" - class VPointF{ public: inline VPointF () diff --git a/container/vstandarttablecell.cpp b/container/vstandarttablecell.cpp index 201aa4481..59ead8631 100644 --- a/container/vstandarttablecell.cpp +++ b/container/vstandarttablecell.cpp @@ -27,19 +27,3 @@ VStandartTableCell::VStandartTableCell():base(0), ksize(0), kgrowth(0), descript VStandartTableCell::VStandartTableCell(qint32 base, qreal ksize, qreal kgrowth, QString description):base(base), ksize(ksize), kgrowth(kgrowth), description(description){ } - -qint32 VStandartTableCell::GetBase() const{ - return base; -} - -qreal VStandartTableCell::GetKsize() const{ - return ksize; -} - -qreal VStandartTableCell::GetKgrowth() const{ - return kgrowth; -} - -QString VStandartTableCell::GetDescription() const{ - return description; -} diff --git a/container/vstandarttablecell.h b/container/vstandarttablecell.h index 536a63f8e..f94186b52 100644 --- a/container/vstandarttablecell.h +++ b/container/vstandarttablecell.h @@ -22,21 +22,19 @@ #ifndef VSTANDARTTABLECELL_H #define VSTANDARTTABLECELL_H -#include - class VStandartTableCell{ public: - VStandartTableCell(); - VStandartTableCell(qint32 base, qreal ksize, qreal kgrowth, QString description = QString()); - qint32 GetBase() const; - qreal GetKsize() const; - qreal GetKgrowth() const; - QString GetDescription() const; + VStandartTableCell(); + VStandartTableCell(qint32 base, qreal ksize, qreal kgrowth, QString description = QString()); + inline qint32 GetBase() const {return base;} + inline qreal GetKsize() const {return ksize;} + inline qreal GetKgrowth() const {return kgrowth;} + inline QString GetDescription() const {return description;} private: - qint32 base; - qreal ksize; - qreal kgrowth; - QString description; + qint32 base; + qreal ksize; + qreal kgrowth; + QString description; }; #endif // VSTANDARTTABLECELL_H diff --git a/geometry/varc.h b/geometry/varc.h index ac436da4b..964b68a52 100644 --- a/geometry/varc.h +++ b/geometry/varc.h @@ -33,7 +33,7 @@ public: /** * @brief VArc конструктор по замовчуванню. */ - VArc (); + VArc (); /** * @brief VArc конструктор. * @param center точка центру. @@ -41,11 +41,11 @@ public: * @param f1 початковий кут в градусах. * @param f2 кінцевий кут в градусах. */ - VArc (const QHash *points, qint64 center, qreal radius, QString formulaRadius, - qreal f1, QString formulaF1, qreal f2 , QString formulaF2, - Draw::Draws mode = Draw::Calculation, qint64 idObject = 0); - VArc(const VArc &arc); - VArc& operator= (const VArc &arc); + VArc (const QHash *points, qint64 center, qreal radius, QString formulaRadius, + qreal f1, QString formulaF1, qreal f2 , QString formulaF2, + Draw::Draws mode = Draw::Calculation, qint64 idObject = 0); + VArc(const VArc &arc); + VArc& operator= (const VArc &arc); /** * @brief GetF1 повертає початковий кут дуги. * @return повертає кут в градусах. @@ -103,25 +103,25 @@ private: /** * @brief f1 початковий кут в градусах */ - qreal f1; // початковий кут нахилу дуги (градуси) - QString formulaF1; + qreal f1; // початковий кут нахилу дуги (градуси) + QString formulaF1; /** * @brief f2 кінцевий кут в градусах */ - qreal f2; // кінцевий кут нахилу дуги (градуси) - QString formulaF2; + qreal f2; // кінцевий кут нахилу дуги (градуси) + QString formulaF2; /** * @brief radius радіус дуги. */ - qreal radius; - QString formulaRadius; + qreal radius; + QString formulaRadius; /** * @brief center центральна точка дуги. */ - qint64 center; + qint64 center; QHash points; - Draw::Draws mode; - qint64 idObject; + Draw::Draws mode; + qint64 idObject; }; #endif // VARC_H From 50cd9a7f201af0bca53eb08edeb4d76d3256ab37 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 27 Oct 2013 13:56:05 +0200 Subject: [PATCH 45/83] Refactoring. --HG-- branch : develop --- mainwindow.cpp | 9 ---- mainwindow.h | 7 +-- tablewindow.cpp | 4 -- tablewindow.h | 1 - tools/drawTools/vdrawtool.cpp | 11 ---- tools/drawTools/vdrawtool.h | 7 ++- tools/drawTools/vtoolalongline.cpp | 2 - tools/drawTools/vtoolalongline.h | 27 +++++----- tools/drawTools/vtoolbisector.h | 17 +++---- tools/drawTools/vtoolendline.cpp | 2 - tools/drawTools/vtoolheight.h | 1 - tools/drawTools/vtoolline.cpp | 1 - tools/drawTools/vtoollineintersect.cpp | 1 - tools/drawTools/vtoollineintersect.h | 19 ++++--- tools/drawTools/vtoollinepoint.cpp | 4 -- tools/drawTools/vtoollinepoint.h | 8 +-- tools/drawTools/vtoolnormal.h | 3 +- tools/drawTools/vtoolpoint.cpp | 8 --- tools/drawTools/vtoolpoint.h | 5 +- tools/drawTools/vtoolpointofintersection.h | 11 ++-- tools/drawTools/vtoolshoulderpoint.cpp | 1 - tools/drawTools/vtoolshoulderpoint.h | 18 +++---- tools/drawTools/vtoolsinglepoint.cpp | 5 -- tools/drawTools/vtoolspline.h | 4 +- tools/drawTools/vtoolsplinepath.cpp | 1 - tools/drawTools/vtooltriangle.h | 41 ++++++++------- tools/modelingTools/vmodelingalongline.cpp | 2 - tools/modelingTools/vmodelingalongline.h | 34 ++++++------- tools/modelingTools/vmodelingarc.cpp | 1 - tools/modelingTools/vmodelingarc.h | 32 ++++++------ tools/modelingTools/vmodelingbisector.h | 10 ++-- tools/modelingTools/vmodelingendline.h | 30 +++++------ tools/modelingTools/vmodelingheight.h | 9 ++-- tools/modelingTools/vmodelingline.cpp | 1 - tools/modelingTools/vmodelingline.h | 33 ++++++------ tools/modelingTools/vmodelinglineintersect.h | 44 ++++++++-------- tools/modelingTools/vmodelinglinepoint.cpp | 4 -- tools/modelingTools/vmodelinglinepoint.h | 7 ++- tools/modelingTools/vmodelingnormal.cpp | 1 - tools/modelingTools/vmodelingnormal.h | 14 +++-- tools/modelingTools/vmodelingpoint.cpp | 7 --- tools/modelingTools/vmodelingpoint.h | 5 +- tools/modelingTools/vmodelingpointofcontact.h | 14 +++-- .../modelingTools/vmodelingshoulderpoint.cpp | 2 - tools/modelingTools/vmodelingshoulderpoint.h | 34 ++++++------- tools/modelingTools/vmodelingspline.cpp | 3 -- tools/modelingTools/vmodelingspline.h | 49 +++++++++--------- tools/modelingTools/vmodelingsplinepath.cpp | 1 - tools/modelingTools/vmodelingsplinepath.h | 47 ++++++++--------- tools/modelingTools/vmodelingtool.cpp | 10 ---- tools/modelingTools/vmodelingtool.h | 11 ++-- tools/modelingTools/vmodelingtriangle.h | 37 +++++++------- tools/nodeDetails/vabstractnode.h | 3 +- tools/nodeDetails/vnodearc.h | 3 +- tools/nodeDetails/vnodepoint.h | 33 ++++++------ tools/nodeDetails/vnodespline.h | 19 ++++--- tools/nodeDetails/vnodesplinepath.h | 10 ++-- tools/vabstracttool.cpp | 9 ---- tools/vabstracttool.h | 51 +++++++++---------- tools/vdatatool.cpp | 4 -- tools/vdatatool.h | 7 ++- tools/vtooldetail.cpp | 1 - 62 files changed, 325 insertions(+), 475 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 72b05ef32..30192b049 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -21,16 +21,7 @@ #include "mainwindow.h" #include "ui_mainwindow.h" -#include -#include -#include -#include -#include -#include -#include -#include #include "geometry/vspline.h" -#include #include "exception/vexceptionobjecterror.h" #include "exception/vexceptionconversionerror.h" #include "exception/vexceptionemptyparameter.h" diff --git a/mainwindow.h b/mainwindow.h index fca2537a4..aac755e25 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -23,19 +23,14 @@ #define MAINWINDOW_H #include -#include -#include -#include -#include -#include #include "widgets/vmaingraphicsscene.h" #include "widgets/vmaingraphicsview.h" #include "widgets/vitem.h" #include "dialogs/dialogs.h" +#include "tools/vtooldetail.h" #include "tools/drawTools/drawtools.h" #include "tools/modelingTools/modelingtools.h" #include "xml/vdomdocument.h" -#include "tools/vtooldetail.h" namespace Ui { class MainWindow; diff --git a/tablewindow.cpp b/tablewindow.cpp index bf9c4d9a7..2e6960987 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -21,12 +21,8 @@ #include "tablewindow.h" #include "ui_tablewindow.h" -#include -#include #include "widgets/vtablegraphicsview.h" -#include #include "options.h" -#include TableWindow::TableWindow(QWidget *parent) : QMainWindow(parent), numberDetal(0), colission(0), ui(new Ui::TableWindow), diff --git a/tablewindow.h b/tablewindow.h index a8604a8bf..5c257c379 100644 --- a/tablewindow.h +++ b/tablewindow.h @@ -23,7 +23,6 @@ #define TABLEWINDOW_H #include -#include #include "widgets/vitem.h" namespace Ui { diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index 0e622413b..7a4efffbf 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vdrawtool.h" -#include qreal VDrawTool::factor = 1; @@ -32,12 +31,6 @@ VDrawTool::VDrawTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *pa connect(this->doc, &VDomDocument::ShowTool, this, &VDrawTool::ShowTool); } -VDrawTool::~VDrawTool(){ -} - -void VDrawTool::setDialog(){ -} - void VDrawTool::AddRecord(const qint64 id, Tool::Tools toolType, VDomDocument *doc){ qint64 cursor = doc->getCursor(); QVector *history = doc->getHistory(); @@ -56,10 +49,6 @@ void VDrawTool::AddRecord(const qint64 id, Tool::Tools toolType, VDomDocument *d } } -void VDrawTool::ignoreContextMenu(bool enable){ - ignoreContextMenuEvent = enable; -} - void VDrawTool::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ Q_UNUSED(id); Q_UNUSED(color); diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index 4ef092514..a0d037119 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -23,16 +23,15 @@ #define VDRAWTOOL_H #include "../vabstracttool.h" -#include class VDrawTool : public VAbstractTool{ Q_OBJECT public: VDrawTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); - virtual ~VDrawTool(); - virtual void setDialog(); + virtual ~VDrawTool() {} + virtual void setDialog() {} static void AddRecord(const qint64 id, Tool::Tools toolType, VDomDocument *doc); - void ignoreContextMenu(bool enable); + void ignoreContextMenu(bool enable) {ignoreContextMenuEvent = enable;} public slots: virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); virtual void ChangedActivDraw(const QString newName); diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index 905a5ea98..c155447d2 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -20,8 +20,6 @@ ****************************************************************************/ #include "vtoolalongline.h" -#include -#include #include "container/calculator.h" VToolAlongLine::VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index 4f5ddd04b..ca220d8ad 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -29,26 +29,25 @@ class VToolAlongLine : public VToolLinePoint{ Q_OBJECT public: VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, - const qint64 &firstPointId, const qint64 &secondPointId, - const QString &typeLine, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); + const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); - static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, - const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, - const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, + const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); - virtual void SetFactor(qreal factor); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + virtual void SetFactor(qreal factor); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 secondPointId; + qint64 secondPointId; QSharedPointer dialogAlongLine; }; diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index fa0bc9061..f527ce612 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -27,20 +27,19 @@ class VToolBisector : public VToolLinePoint{ public: - VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); - static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, - const QPointF &thirdPoint, const qreal& length); + VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, + const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, + const qint64 &thirdPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint, + const qreal& length); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, - const QString &pointName, const qreal &mx, const qreal &my, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index fd0802008..a4111bd7b 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -20,8 +20,6 @@ ****************************************************************************/ #include "vtoolendline.h" -#include -#include #include "widgets/vmaingraphicsscene.h" #include diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h index c3ab6d02f..43396e5f8 100644 --- a/tools/drawTools/vtoolheight.h +++ b/tools/drawTools/vtoolheight.h @@ -3,7 +3,6 @@ #include "vtoollinepoint.h" #include "dialogs/dialogheight.h" -#include class VToolHeight: public VToolLinePoint{ Q_OBJECT diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index ced59ed03..e8dfef50a 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vtoolline.h" -#include VToolLine::VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index 797ce2c26..7098b7d3f 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vtoollineintersect.h" -#include VToolLineIntersect::VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index 90e4d07f6..7f143f353 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -28,17 +28,16 @@ class VToolLineIntersect:public VToolPoint{ Q_OBJECT public: - VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, - const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); + VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, + const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data); - static void Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 &p2Line1Id, - const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, - const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 &p2Line1Id, const qint64 &p1Line2Id, + const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index af55544d4..95303198b 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -64,10 +64,6 @@ void VToolLinePoint::RefreshGeometry(){ } } -void VToolLinePoint::RemoveReferens(){ - doc->DecrementReferens(basePointId); -} - void VToolLinePoint::SetFactor(qreal factor){ VDrawTool::SetFactor(factor); RefreshGeometry(); diff --git a/tools/drawTools/vtoollinepoint.h b/tools/drawTools/vtoollinepoint.h index 3d82b33f5..51f830bf9 100644 --- a/tools/drawTools/vtoollinepoint.h +++ b/tools/drawTools/vtoollinepoint.h @@ -27,9 +27,9 @@ class VToolLinePoint : public VToolPoint{ Q_OBJECT public: - VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, - const qint64 &basePointId, const qreal &angle, QGraphicsItem * parent = 0); + VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, + const QString &formula, const qint64 &basePointId, const qreal &angle, + QGraphicsItem * parent = 0); public slots: virtual void ChangedActivDraw(const QString newName); virtual void SetFactor(qreal factor); @@ -40,7 +40,7 @@ protected: qint64 basePointId; QGraphicsLineItem *mainLine; virtual void RefreshGeometry(); - virtual void RemoveReferens(); + virtual void RemoveReferens() {doc->DecrementReferens(basePointId);} private: Q_DISABLE_COPY(VToolLinePoint) }; diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index f7336cacf..2a1e14bab 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -30,8 +30,7 @@ class VToolNormal : public VToolLinePoint{ public: VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index faf1daf03..41c4ffcff 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -20,11 +20,6 @@ ****************************************************************************/ #include "vtoolpoint.h" -#include -#include -#include -#include - VToolPoint::VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem *parent):VDrawTool(doc, data, id), @@ -151,6 +146,3 @@ void VToolPoint::RefreshLine(){ lineName->setVisible(true); } } - -VToolPoint::~VToolPoint(){ -} diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index 35b8f1abd..7583e8e4a 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -28,9 +28,8 @@ class VToolPoint: public VDrawTool, public QGraphicsEllipseItem{ Q_OBJECT public: - VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, - QGraphicsItem * parent = 0); - virtual ~VToolPoint(); + VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem * parent = 0); + virtual ~VToolPoint(){} public slots: void NameChangePosition(const QPointF pos); virtual void ChangedActivDraw(const QString newName); diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h index 206ad322f..7737d45a5 100644 --- a/tools/drawTools/vtoolpointofintersection.h +++ b/tools/drawTools/vtoolpointofintersection.h @@ -7,15 +7,16 @@ class VToolPointOfIntersection : public VToolPoint{ Q_OBJECT public: - VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &pointName, const qint64 &firstPointId, - const qint64 &secondPointId, const qreal &mx, const qreal &my, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index bcb96974f..ea04c8889 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -33,7 +33,6 @@ VToolShoulderPoint::VToolShoulderPoint(VDomDocument *doc, VContainer *data, cons if(typeCreation == Tool::FromGui){ AddToFile(); } - } void VToolShoulderPoint::setDialog(){ diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index ccf92fe3e..9b5942fdc 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -27,19 +27,17 @@ class VToolShoulderPoint : public VToolLinePoint{ public: - VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, + const QString &formula, const qint64 &p1Line, const qint64 &p2Line, + const qint64 &pShoulder, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, const qreal &length); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data); - static void Create(const qint64 _id, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, const QString &typeLine, - const QString &pointName, const qreal &mx, const qreal &my, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 _id, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, + const qint64 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, + const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index d8c4d8327..92898ca84 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -20,11 +20,6 @@ ****************************************************************************/ #include "vtoolsinglepoint.h" -#include -#include -#include -#include -#include VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem * parent ):VToolPoint(doc, data, id, parent), diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index daddf741e..f3db13297 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -41,8 +41,8 @@ public: VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); signals: - void RefreshLine ( const qint32 &indexSpline, SplinePoint::Position position, - const QPointF &controlPoint, const QPointF &splinePoint ); + void RefreshLine ( const qint32 &indexSpline, SplinePoint::Position position, const QPointF &controlPoint, + const QPointF &splinePoint ); void setEnabledPoint ( bool enable ); public slots: virtual void FullUpdateFromFile (); diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index f13333e62..1bb2650b9 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vtoolsplinepath.h" -#include VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index 173af52cb..c3dc11f7d 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -7,32 +7,31 @@ class VToolTriangle : public VToolPoint{ Q_OBJECT public: - VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, - const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data); - static void Create(const qint64 _id, const QString &pointName, - const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, - const qint64 &secondPointId, const qreal &mx, const qreal &my, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); - static QPointF FindPoint(const QPointF axisP1, const QPointF axisP2, const QPointF firstPoint, + VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, + const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data); + static void Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, const qint64 &axisP2Id, + const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); + static QPointF FindPoint(const QPointF axisP1, const QPointF axisP2, const QPointF firstPoint, const QPointF secondPoint); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void RemoveReferens(); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); + virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); private: Q_DISABLE_COPY(VToolTriangle) - qint64 axisP1Id; - qint64 axisP2Id; - qint64 firstPointId; - qint64 secondPointId; + qint64 axisP1Id; + qint64 axisP2Id; + qint64 firstPointId; + qint64 secondPointId; QSharedPointer dialogTriangle; }; diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index 096ad37aa..58f746530 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -20,8 +20,6 @@ ****************************************************************************/ #include "vmodelingalongline.h" -#include -#include #include "container/calculator.h" VModelingAlongLine::VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index c5d88407d..582a1aebe 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -28,27 +28,25 @@ class VModelingAlongLine : public VModelingLinePoint{ Q_OBJECT public: - VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, - const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const QString &typeLine, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static VModelingAlongLine* Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data); - static VModelingAlongLine* Create(const qint64 _id, const QString &pointName, const QString &typeLine, - const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qreal &mx, const qreal &my, - VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, + const QString &formula, const qint64 &firstPointId, + const qint64 &secondPointId, const QString &typeLine, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingAlongLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); + static VModelingAlongLine* Create(const qint64 _id, const QString &pointName, const QString &typeLine, + const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, + const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 secondPointId; + qint64 secondPointId; QSharedPointer dialogAlongLine; }; diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index 372cb7fef..2e4b54c08 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vmodelingarc.h" -#include #include "container/calculator.h" VModelingArc::VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index e452f59e1..af1c5394b 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -30,26 +30,26 @@ class VModelingArc :public VModelingTool, public QGraphicsPathItem{ Q_OBJECT public: - VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static VModelingArc* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); - static VModelingArc* Create(const qint64 _id, const qint64 ¢er, const QString &radius, - const QString &f1, const QString &f2, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingArc* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); + static VModelingArc* Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, + const QString &f2, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void RemoveReferens(); private: QSharedPointer dialogArc; - void RefreshGeometry(); + void RefreshGeometry(); }; #endif // VMODELINGARC_H diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index 3c13a03e6..ae10c2a36 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -34,13 +34,11 @@ public: const qint64 &thirdPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); - static VModelingBisector* Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data); + static VModelingBisector* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingBisector* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, - const QString &typeLine, const QString &pointName, const qreal &mx, - const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, + const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index 6bd9d110b..27b771fc0 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -28,24 +28,22 @@ class VModelingEndLine : public VModelingLinePoint{ Q_OBJECT public: - VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, - const qreal &angle, const qint64 &basePointId, - Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static VModelingEndLine* Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data); - static VModelingEndLine* Create(const qint64 _id, const QString &pointName, const QString &typeLine, - const QString &formula, const qreal &angle, const qint64 &basePointId, - const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &typeLine, const QString &formula, const qreal &angle, + const qint64 &basePointId, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingEndLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); + static VModelingEndLine* Create(const qint64 _id, const QString &pointName, const QString &typeLine, + const QString &formula, const qreal &angle, const qint64 &basePointId, + const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); private: QSharedPointer dialogEndLine; }; diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index 7d2362b5a..d1e9bd58b 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -8,12 +8,11 @@ class VModelingHeight : public VModelingLinePoint{ Q_OBJECT public: VModelingHeight(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const qint64 &basePointId, - const qint64 &p1LineId, const qint64 &p2LineId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, + const qint64 &p2LineId, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); - static VModelingHeight* Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data); + static VModelingHeight* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingHeight* Create(const qint64 _id, const QString &pointName, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index ea09c70a7..a0a881429 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vmodelingline.h" -#include VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem *parent): diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index 881abda27..48dc239a6 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -29,26 +29,25 @@ class VModelingLine: public VModelingTool, public QGraphicsLineItem{ Q_OBJECT public: - VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static VModelingLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); - static VModelingLine* Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, + qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); + static VModelingLine* Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void RemoveReferens(); private: - qint64 firstPoint; - qint64 secondPoint; + qint64 firstPoint; + qint64 secondPoint; QSharedPointer dialogLine; }; diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index e2af48470..8808613b3 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -28,33 +28,29 @@ class VModelingLineIntersect:public VModelingPoint{ Q_OBJECT public: - VModelingLineIntersect(VDomDocument *doc, VContainer *data, - const qint64 &id, const qint64 &p1Line1, - const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, - Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); - static VModelingLineIntersect* Create(QSharedPointer &dialog, - VDomDocument *doc,VContainer *data); - static VModelingLineIntersect* Create(const qint64 _id, const qint64 &p1Line1Id, - const qint64 &p2Line1Id, const qint64 &p1Line2Id, - const qint64 &p2Line2Id, const QString &pointName, - const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, + const qint64 &p1Line1, const qint64 &p2Line1, + const qint64 &p1Line2, const qint64 &p2Line2, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingLineIntersect* Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data); + static VModelingLineIntersect* Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 &p2Line1Id, + const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, + const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 p1Line1; - qint64 p2Line1; - qint64 p1Line2; - qint64 p2Line2; + qint64 p1Line1; + qint64 p2Line1; + qint64 p1Line2; + qint64 p2Line2; QSharedPointer dialogLineIntersect; }; diff --git a/tools/modelingTools/vmodelinglinepoint.cpp b/tools/modelingTools/vmodelinglinepoint.cpp index c326a4079..36b3239a7 100644 --- a/tools/modelingTools/vmodelinglinepoint.cpp +++ b/tools/modelingTools/vmodelinglinepoint.cpp @@ -50,7 +50,3 @@ void VModelingLinePoint::RefreshGeometry(){ mainLine->setVisible(true); } } - -void VModelingLinePoint::RemoveReferens(){ - doc->DecrementReferens(basePointId); -} diff --git a/tools/modelingTools/vmodelinglinepoint.h b/tools/modelingTools/vmodelinglinepoint.h index 762ce1fc5..f3aede417 100644 --- a/tools/modelingTools/vmodelinglinepoint.h +++ b/tools/modelingTools/vmodelinglinepoint.h @@ -27,9 +27,8 @@ class VModelingLinePoint : public VModelingPoint{ Q_OBJECT public: - VModelingLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, - const qint64 &basePointId, const qreal &angle, + VModelingLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, + const QString &formula, const qint64 &basePointId, const qreal &angle, QGraphicsItem * parent = 0); protected: QString typeLine; @@ -38,7 +37,7 @@ protected: qint64 basePointId; QGraphicsLineItem *mainLine; virtual void RefreshGeometry(); - virtual void RemoveReferens(); + virtual void RemoveReferens() {doc->DecrementReferens(basePointId);} private: Q_DISABLE_COPY(VModelingLinePoint) }; diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index c0e76e68c..495bf935d 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -33,7 +33,6 @@ VModelingNormal::VModelingNormal(VDomDocument *doc, VContainer *data, const qint if(typeCreation == Tool::FromGui){ AddToFile(); } - } void VModelingNormal::setDialog(){ diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index 7d640421e..8adf0abbb 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -29,17 +29,15 @@ class VModelingNormal : public VModelingLinePoint{ Q_OBJECT public: VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, const QString &formula, - const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); + const QString &typeLine, const QString &formula, const qreal &angle, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingNormal* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingNormal* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const QString typeLine, - const QString pointName, const qreal angle, const qreal &mx, - const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const qint64 &secondPointId, const QString typeLine, const QString pointName, + const qreal angle, const qreal &mx, const qreal &my, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingpoint.cpp b/tools/modelingTools/vmodelingpoint.cpp index a6222e27b..5e78b7b65 100644 --- a/tools/modelingTools/vmodelingpoint.cpp +++ b/tools/modelingTools/vmodelingpoint.cpp @@ -20,10 +20,6 @@ ****************************************************************************/ #include "vmodelingpoint.h" -#include -#include -#include -#include #include "container/vpointf.h" VModelingPoint::VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, @@ -102,6 +98,3 @@ void VModelingPoint::RefreshLine(){ lineName->setVisible(true); } } - -VModelingPoint::~VModelingPoint(){ -} diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h index e3bef5073..1531cdb56 100644 --- a/tools/modelingTools/vmodelingpoint.h +++ b/tools/modelingTools/vmodelingpoint.h @@ -28,9 +28,8 @@ class VModelingPoint: public VModelingTool, public QGraphicsEllipseItem{ Q_OBJECT public: - VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, - QGraphicsItem * parent = 0); - virtual ~VModelingPoint(); + VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem * parent = 0); + virtual ~VModelingPoint() {} public slots: void NameChangePosition(const QPointF pos); virtual void FullUpdateFromGui(int result) = 0; diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index d8d4af4a4..4aca22725 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -28,15 +28,13 @@ class VModelingPointOfContact : public VModelingPoint{ Q_OBJECT public: - VModelingPointOfContact(VDomDocument *doc, VContainer *data, - const qint64 &id, const QString &radius, - const qint64 ¢er, const qint64 &firstPointId, - const qint64 &secondPointId, - Tool::Sources typeCreation, - QGraphicsItem * parent = 0); + VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, + const QString &radius, const qint64 ¢er, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); - static VModelingPointOfContact* Create(QSharedPointer &dialog, - VDomDocument *doc, VContainer *data); + static VModelingPointOfContact* Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data); static VModelingPointOfContact* Create(const qint64 _id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index c2c934bf0..737b6222a 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vmodelingshoulderpoint.h" -#include #include "../drawTools/vtoolshoulderpoint.h" #include @@ -34,7 +33,6 @@ VModelingShoulderPoint::VModelingShoulderPoint(VDomDocument *doc, VContainer *da if(typeCreation == Tool::FromGui){ AddToFile(); } - } void VModelingShoulderPoint::setDialog(){ diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index e4bc9b928..ec5e74727 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -28,30 +28,28 @@ class VModelingShoulderPoint : public VModelingLinePoint{ Q_OBJECT public: - VModelingShoulderPoint(VDomDocument *doc, VContainer *data, - const qint64 &id, const QString &typeLine, - const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, - Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - virtual void setDialog(); + VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, + const QString &formula, const qint64 &p1Line, const qint64 &p2Line, + const qint64 &pShoulder, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); static VModelingShoulderPoint* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingShoulderPoint* Create(const qint64 _id, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, - const QString &typeLine, const QString &pointName, const qreal &mx, - const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, const Tool::Sources &typeCreation); + const qint64 &p2Line, const qint64 &pShoulder, const QString &typeLine, + const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, + const Tool::Sources &typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void RemoveReferens(); private: - qint64 p2Line; - qint64 pShoulder; + qint64 p2Line; + qint64 pShoulder; QSharedPointer dialogShoulderPoint; }; diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index ccc1a8bb6..915c01d9b 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -20,11 +20,8 @@ ****************************************************************************/ #include "vmodelingspline.h" -#include -#include #include "geometry/vspline.h" - VModelingSpline::VModelingSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index bffdb148b..fb75685b3 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -31,37 +31,34 @@ class VModelingSpline:public VModelingTool, public QGraphicsPathItem{ Q_OBJECT public: - VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); - virtual void setDialog(); - static VModelingSpline* Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data); - static VModelingSpline* Create(const qint64 _id, const qint64 &p1, const qint64 &p4, - const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, - const qreal &angle2, const qreal &kCurve, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem * parent = 0 ); + virtual void setDialog(); + static VModelingSpline* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); + static VModelingSpline* Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, + const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation); signals: - void RefreshLine ( const qint32 &indexSpline, SplinePoint::Position position, - const QPointF &controlPoint, const QPointF &splinePoint ); - void setEnabledPoint ( bool enable ); + void RefreshLine (const qint32 &indexSpline, SplinePoint::Position position, + const QPointF &controlPoint, const QPointF &splinePoint ); + void setEnabledPoint ( bool enable ); public slots: - virtual void FullUpdateFromFile (); - virtual void FullUpdateFromGui ( int result ); - void ControlPointChangePosition ( const qint32 &indexSpline, - SplinePoint::Position position, - const QPointF pos); + virtual void FullUpdateFromFile (); + virtual void FullUpdateFromGui ( int result ); + void ControlPointChangePosition (const qint32 &indexSpline, SplinePoint::Position position, + const QPointF pos); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile (); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile (); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void RemoveReferens(); private: - QSharedPointer dialogSpline; + QSharedPointer dialogSpline; QVector controlPoints; - void RefreshGeometry (); + void RefreshGeometry (); }; #endif // VMODELINGSPLINE_H diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 75d4f6c98..141fa444d 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vmodelingsplinepath.h" -#include VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index c92a70204..823e6cfd5 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -30,38 +30,35 @@ class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem{ Q_OBJECT public: - VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static VModelingSplinePath* Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data); + VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingSplinePath* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSplinePath* Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); signals: - void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, - const QPointF &controlPoint, const QPointF &splinePoint); - void setEnabledPoint(bool enable); + void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, const QPointF &controlPoint, + const QPointF &splinePoint); + void setEnabledPoint(bool enable); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); - void ControlPointChangePosition(const qint32 &indexSpline, - SplinePoint::Position position, const QPointF pos); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); + void ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, + const QPointF pos); protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void RemoveReferens(); private: QSharedPointer dialogSplinePath; QVector controlPoints; - void RefreshGeometry(); - void AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint); - void UpdatePathPoint(QDomNode& node, VSplinePath &path); - void CorectControlPoints(const VSpline &spl, VSplinePath &splPath, - const qint32 &indexSpline); + void RefreshGeometry(); + void AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint); + void UpdatePathPoint(QDomNode& node, VSplinePath &path); + void CorectControlPoints(const VSpline &spl, VSplinePath &splPath, const qint32 &indexSpline); }; #endif // VMODELINGSPLINEPATH_H diff --git a/tools/modelingTools/vmodelingtool.cpp b/tools/modelingTools/vmodelingtool.cpp index 2dc6b5ad4..58d420c5f 100644 --- a/tools/modelingTools/vmodelingtool.cpp +++ b/tools/modelingTools/vmodelingtool.cpp @@ -27,16 +27,6 @@ VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false), ignoreFullU _referens = 0; } -VModelingTool::~VModelingTool(){ -} - -void VModelingTool::setDialog(){ -} - -void VModelingTool::ignoreContextMenu(bool enable){ - ignoreContextMenuEvent = enable; -} - void VModelingTool::AddToModeling(const QDomElement &domElement){ QDomElement modelingElement; bool ok = doc->GetActivModelingElement(modelingElement); diff --git a/tools/modelingTools/vmodelingtool.h b/tools/modelingTools/vmodelingtool.h index d19819378..359f7555a 100644 --- a/tools/modelingTools/vmodelingtool.h +++ b/tools/modelingTools/vmodelingtool.h @@ -25,14 +25,13 @@ #include "../vabstracttool.h" #include -class VModelingTool: public VAbstractTool -{ +class VModelingTool: public VAbstractTool{ Q_OBJECT public: - VModelingTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); - virtual ~VModelingTool(); - virtual void setDialog(); - void ignoreContextMenu(bool enable); + VModelingTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); + virtual ~VModelingTool(){} + virtual void setDialog(){} + inline void ignoreContextMenu(bool enable) {ignoreContextMenuEvent = enable;} public slots: virtual void FullUpdateFromGui(int result)=0; signals: diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index a43b73867..ab49870c5 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -8,31 +8,28 @@ class VModelingTriangle : public VModelingPoint{ Q_OBJECT public: - VModelingTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, - const qint64 &axisP1Id, const qint64 &axisP2Id, - const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); - virtual void setDialog(); - static VModelingTriangle* Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data); + VModelingTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, + const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + virtual void setDialog(); + static VModelingTriangle* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingTriangle* Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, - const qint64 &axisP2Id, const qint64 &firstPointId, - const qint64 &secondPointId, const qreal &mx, const qreal &my, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, + const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); + virtual void FullUpdateFromFile(); + virtual void FullUpdateFromGui(int result); protected: - virtual void RemoveReferens(); - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); + virtual void RemoveReferens(); + virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); + virtual void AddToFile(); private: Q_DISABLE_COPY(VModelingTriangle) - qint64 axisP1Id; - qint64 axisP2Id; - qint64 firstPointId; - qint64 secondPointId; + qint64 axisP1Id; + qint64 axisP2Id; + qint64 firstPointId; + qint64 secondPointId; QSharedPointer dialogTriangle; }; diff --git a/tools/nodeDetails/vabstractnode.h b/tools/nodeDetails/vabstractnode.h index 3cd1a63cc..adc93c20d 100644 --- a/tools/nodeDetails/vabstractnode.h +++ b/tools/nodeDetails/vabstractnode.h @@ -24,8 +24,7 @@ #include "../vabstracttool.h" -class VAbstractNode : public VAbstractTool -{ +class VAbstractNode : public VAbstractTool{ Q_OBJECT public: VAbstractNode(VDomDocument *doc, VContainer *data, qint64 id, qint64 idNode, diff --git a/tools/nodeDetails/vnodearc.h b/tools/nodeDetails/vnodearc.h index 6776776ad..9c072e176 100644 --- a/tools/nodeDetails/vnodearc.h +++ b/tools/nodeDetails/vnodearc.h @@ -25,8 +25,7 @@ #include "vabstractnode.h" #include -class VNodeArc :public VAbstractNode, public QGraphicsPathItem -{ +class VNodeArc :public VAbstractNode, public QGraphicsPathItem{ Q_OBJECT public: VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index f7e963a97..3ef5ae177 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -25,30 +25,27 @@ #include "vabstractnode.h" #include "widgets/vgraphicssimpletextitem.h" -class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem -{ +class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem{ Q_OBJECT public: - VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, - Draw::Draws typeobject, Tool::Sources typeCreation, - QGraphicsItem * parent = 0 ); - static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, - Draw::Draws typeobject, const Document::Documents &parse, - Tool::Sources typeCreation); + VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, + Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); + static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile(); - void NameChangePosition(const QPointF pos); + virtual void FullUpdateFromFile(); + void NameChangePosition(const QPointF pos); protected: - qreal radius; + qreal radius; VGraphicsSimpleTextItem *namePoint; QGraphicsLineItem *lineName; - virtual void AddToFile(); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void UpdateNamePosition(qreal mx, qreal my); - virtual void RefreshPointGeometry(const VPointF &point); - void RefreshLine(); + virtual void AddToFile(); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); + virtual void UpdateNamePosition(qreal mx, qreal my); + virtual void RefreshPointGeometry(const VPointF &point); + void RefreshLine(); private: Q_DISABLE_COPY(VNodePoint) }; diff --git a/tools/nodeDetails/vnodespline.h b/tools/nodeDetails/vnodespline.h index 5e076f9ec..2399d26e4 100644 --- a/tools/nodeDetails/vnodespline.h +++ b/tools/nodeDetails/vnodespline.h @@ -25,23 +25,22 @@ #include "vabstractnode.h" #include -class VNodeSpline:public VAbstractNode, public QGraphicsPathItem -{ +class VNodeSpline:public VAbstractNode, public QGraphicsPathItem{ Q_OBJECT public: - VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); - static VNodeSpline *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); + VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, + Tool::Sources typeCreation, QGraphicsItem * parent = 0); + static VNodeSpline *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: - virtual void FullUpdateFromFile (); + virtual void FullUpdateFromFile (); protected: - virtual void AddToFile (); - virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); + virtual void AddToFile (); + virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event ); virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); private: - void RefreshGeometry (); + void RefreshGeometry (); }; #endif // VNODESPLINE_H diff --git a/tools/nodeDetails/vnodesplinepath.h b/tools/nodeDetails/vnodesplinepath.h index 21b09dd36..9541a805e 100644 --- a/tools/nodeDetails/vnodesplinepath.h +++ b/tools/nodeDetails/vnodesplinepath.h @@ -25,15 +25,13 @@ #include "vabstractnode.h" #include -class VNodeSplinePath : public VAbstractNode, public QGraphicsPathItem -{ +class VNodeSplinePath : public VAbstractNode, public QGraphicsPathItem{ Q_OBJECT public: VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, Tool::Sources typeCreation, - QGraphicsItem * parent = 0); - static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); + Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, + const Document::Documents &parse, Tool::Sources typeCreation); public slots: virtual void FullUpdateFromFile(); protected: diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index 61709d7b5..49350a622 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -20,7 +20,6 @@ ****************************************************************************/ #include "vabstracttool.h" -#include VAbstractTool::VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent): VDataTool(data, parent), doc(doc), id(id), baseColor(Qt::black), currentColor(Qt::black){ @@ -132,10 +131,6 @@ QPointF VAbstractTool::addVector(QPointF p, QPointF p1, QPointF p2, qreal k){ return QPointF (p.x() + (p2.x() - p1.x()) * k, p.y() + (p2.y() - p1.y()) * k); } -const VContainer *VAbstractTool::getData()const{ - return &data; -} - void VAbstractTool::RemoveAllChild(QDomElement &domElement){ if ( domElement.hasChildNodes() ){ while ( domElement.childNodes().length() >= 1 ){ @@ -150,7 +145,3 @@ void VAbstractTool::LineCoefficients(const QLineF &line, qreal *a, qreal *b, qre *b = line.p1().x() - line.p2().x(); *c = - *a * line.p1().x() - *b * line.p1().y(); } - -qint64 VAbstractTool::getId() const{ - return id; -} diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index fc7d1e809..8b70a3258 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -22,40 +22,39 @@ #ifndef VABSTRACTTOOL_H #define VABSTRACTTOOL_H -#include "xml/vdomdocument.h" #include "vdatatool.h" +#include class VAbstractTool: public VDataTool{ Q_OBJECT public: - VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); - virtual ~VAbstractTool(); - static QPointF LineIntersectRect(QRectF rec, QLineF line); - static qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, - QPointF &p2); - static QPointF ClosestPoint(QLineF line, QPointF p); - static QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k); - qint64 getId() const; - static void LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c); + VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); + virtual ~VAbstractTool(); + static QPointF LineIntersectRect(QRectF rec, QLineF line); + static qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, QPointF &p2); + static QPointF ClosestPoint(QLineF line, QPointF p); + static QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k); + inline qint64 getId() const {return id;} + static void LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c); public slots: - virtual void FullUpdateFromFile()=0; + virtual void FullUpdateFromFile()=0; signals: - void toolhaveChange(); - void ChoosedTool(qint64 id, Scene::Scenes type); - void FullUpdateTree(); + void toolhaveChange(); + void ChoosedTool(qint64 id, Scene::Scenes type); + void FullUpdateTree(); protected: - VDomDocument *doc; - const qint64 id; - const Qt::GlobalColor baseColor; - Qt::GlobalColor currentColor; - virtual void AddToFile()=0; - void AddAttribute(QDomElement &domElement, const QString &name, const qint64 &value); - void AddAttribute(QDomElement &domElement, const QString &name, const qint32 &value); - void AddAttribute(QDomElement &domElement, const QString &name, const qreal &value); - void AddAttribute(QDomElement &domElement, const QString &name, const QString &value); - const VContainer *getData() const; - virtual void RemoveReferens(){} - void RemoveAllChild(QDomElement &domElement); + VDomDocument *doc; + const qint64 id; + const Qt::GlobalColor baseColor; + Qt::GlobalColor currentColor; + virtual void AddToFile()=0; + void AddAttribute(QDomElement &domElement, const QString &name, const qint64 &value); + void AddAttribute(QDomElement &domElement, const QString &name, const qint32 &value); + void AddAttribute(QDomElement &domElement, const QString &name, const qreal &value); + void AddAttribute(QDomElement &domElement, const QString &name, const QString &value); + inline const VContainer *getData() const {return &data;} + virtual void RemoveReferens(){} + void RemoveAllChild(QDomElement &domElement); private: Q_DISABLE_COPY(VAbstractTool) }; diff --git a/tools/vdatatool.cpp b/tools/vdatatool.cpp index eb5d6cf20..4c6bab8cc 100644 --- a/tools/vdatatool.cpp +++ b/tools/vdatatool.cpp @@ -27,10 +27,6 @@ VDataTool &VDataTool::operator =(const VDataTool &tool){ return *this; } -void VDataTool::setData(const VContainer *value){ - data = *value; -} - void VDataTool::decrementReferens(){ if(_referens > 0){ --_referens; diff --git a/tools/vdatatool.h b/tools/vdatatool.h index eed3f4e60..2234f557f 100644 --- a/tools/vdatatool.h +++ b/tools/vdatatool.h @@ -22,18 +22,17 @@ #ifndef VDATATOOL_H #define VDATATOOL_H -#include "container/vcontainer.h" +#include //We need QObject class because we use qobject_cast. class VDataTool : public QObject{ Q_OBJECT public: - explicit VDataTool(VContainer *data, QObject *parent = 0) - : QObject(parent), data(*data), _referens(1){} + explicit VDataTool(VContainer *data, QObject *parent = 0): QObject(parent), data(*data), _referens(1){} virtual ~VDataTool(){} VDataTool &operator= (const VDataTool &tool); inline VContainer getData() const { return data; } - void setData(const VContainer *value); + inline void setData(const VContainer *value) {data = *value;} virtual inline qint64 referens() const {return _referens;} virtual inline void incrementReferens(){++_referens;} virtual void decrementReferens(); diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 81a9a3fbd..560659796 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -21,7 +21,6 @@ #include "vtooldetail.h" #include "nodeDetails/nodedetails.h" -#include #include "modelingTools/vmodelingtool.h" #include "modelingTools/modelingtools.h" From e5cf9a9ca43b8b869074d0d3765049448a335098 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 27 Oct 2013 13:59:34 +0200 Subject: [PATCH 46/83] GNU General Public License. --HG-- branch : develop --- dialogs/dialogheight.h | 21 +++++++++++++++++++++ dialogs/dialogtriangle.h | 21 +++++++++++++++++++++ tools/drawTools/vtoolheight.h | 21 +++++++++++++++++++++ tools/drawTools/vtooltriangle.h | 21 +++++++++++++++++++++ tools/modelingTools/vmodelingheight.h | 21 +++++++++++++++++++++ tools/modelingTools/vmodelingtriangle.h | 21 +++++++++++++++++++++ 6 files changed, 126 insertions(+) diff --git a/dialogs/dialogheight.h b/dialogs/dialogheight.h index d2eaa2022..933b2d786 100644 --- a/dialogs/dialogheight.h +++ b/dialogs/dialogheight.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef DIALOGHEIGHT_H #define DIALOGHEIGHT_H diff --git a/dialogs/dialogtriangle.h b/dialogs/dialogtriangle.h index 2ec3df1a2..13b7c0c9d 100644 --- a/dialogs/dialogtriangle.h +++ b/dialogs/dialogtriangle.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef DIALOGTRIANGLE_H #define DIALOGTRIANGLE_H diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h index 43396e5f8..197909888 100644 --- a/tools/drawTools/vtoolheight.h +++ b/tools/drawTools/vtoolheight.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef VTOOLHEIGHT_H #define VTOOLHEIGHT_H diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index c3dc11f7d..1c69603ed 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Tox is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef VTOOLTRIANGLE_H #define VTOOLTRIANGLE_H diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index d1e9bd58b..42e6ec2c2 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Tox is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef VMODELINGHEIGHT_H #define VMODELINGHEIGHT_H diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index ab49870c5..4ae18f5cc 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Tox is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef VMODELINGTRIANGLE_H #define VMODELINGTRIANGLE_H From 36143a93ecb3a2f9a8ae03b1096025ad3704b9fc Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 27 Oct 2013 14:36:29 +0200 Subject: [PATCH 47/83] Error in license. --HG-- branch : develop --- container/calculator.cpp | 2 +- container/calculator.h | 2 +- container/vcontainer.cpp | 2 +- container/vcontainer.h | 2 +- container/vincrementtablerow.cpp | 2 +- container/vincrementtablerow.h | 2 +- container/vpointf.cpp | 2 +- container/vpointf.h | 2 +- container/vstandarttablecell.cpp | 2 +- container/vstandarttablecell.h | 2 +- dialogs/dialogalongline.cpp | 2 +- dialogs/dialogalongline.h | 2 +- dialogs/dialogarc.cpp | 2 +- dialogs/dialogarc.h | 2 +- dialogs/dialogbisector.cpp | 2 +- dialogs/dialogbisector.h | 2 +- dialogs/dialogdetail.cpp | 2 +- dialogs/dialogdetail.h | 2 +- dialogs/dialogendline.cpp | 2 +- dialogs/dialogendline.h | 2 +- dialogs/dialoghistory.cpp | 2 +- dialogs/dialoghistory.h | 2 +- dialogs/dialogincrements.cpp | 2 +- dialogs/dialogincrements.h | 2 +- dialogs/dialogline.cpp | 2 +- dialogs/dialogline.h | 2 +- dialogs/dialoglineintersect.cpp | 2 +- dialogs/dialoglineintersect.h | 2 +- dialogs/dialognormal.cpp | 2 +- dialogs/dialognormal.h | 2 +- dialogs/dialogpointofcontact.cpp | 2 +- dialogs/dialogpointofcontact.h | 2 +- dialogs/dialogs.h | 2 +- dialogs/dialogshoulderpoint.cpp | 2 +- dialogs/dialogshoulderpoint.h | 2 +- dialogs/dialogsinglepoint.cpp | 2 +- dialogs/dialogsinglepoint.h | 2 +- dialogs/dialogspline.cpp | 2 +- dialogs/dialogspline.h | 2 +- dialogs/dialogsplinepath.cpp | 2 +- dialogs/dialogsplinepath.h | 2 +- dialogs/dialogtool.cpp | 2 +- dialogs/dialogtool.h | 2 +- exception/vexception.cpp | 2 +- exception/vexception.h | 2 +- exception/vexceptionbadid.cpp | 2 +- exception/vexceptionbadid.h | 2 +- exception/vexceptionconversionerror.cpp | 2 +- exception/vexceptionconversionerror.h | 2 +- exception/vexceptionemptyparameter.cpp | 2 +- exception/vexceptionemptyparameter.h | 2 +- exception/vexceptionobjecterror.cpp | 2 +- exception/vexceptionobjecterror.h | 2 +- exception/vexceptionwrongparameterid.cpp | 2 +- exception/vexceptionwrongparameterid.h | 2 +- geometry/varc.cpp | 2 +- geometry/varc.h | 2 +- geometry/vdetail.cpp | 2 +- geometry/vdetail.h | 2 +- geometry/vnodedetail.cpp | 2 +- geometry/vnodedetail.h | 2 +- geometry/vspline.cpp | 2 +- geometry/vspline.h | 2 +- geometry/vsplinepath.cpp | 2 +- geometry/vsplinepath.h | 2 +- geometry/vsplinepoint.cpp | 2 +- geometry/vsplinepoint.h | 2 +- main.cpp | 2 +- mainwindow.cpp | 2 +- mainwindow.h | 2 +- options.h | 2 +- stable.h | 2 +- tablewindow.cpp | 2 +- tablewindow.h | 2 +- tools/drawTools/drawtools.h | 2 +- tools/drawTools/vdrawtool.cpp | 2 +- tools/drawTools/vdrawtool.h | 2 +- tools/drawTools/vtoolalongline.cpp | 2 +- tools/drawTools/vtoolalongline.h | 2 +- tools/drawTools/vtoolarc.cpp | 2 +- tools/drawTools/vtoolarc.h | 2 +- tools/drawTools/vtoolbisector.cpp | 2 +- tools/drawTools/vtoolbisector.h | 2 +- tools/drawTools/vtoolendline.cpp | 2 +- tools/drawTools/vtoolendline.h | 2 +- tools/drawTools/vtoolline.cpp | 2 +- tools/drawTools/vtoolline.h | 2 +- tools/drawTools/vtoollineintersect.cpp | 2 +- tools/drawTools/vtoollineintersect.h | 2 +- tools/drawTools/vtoollinepoint.cpp | 2 +- tools/drawTools/vtoollinepoint.h | 2 +- tools/drawTools/vtoolnormal.cpp | 2 +- tools/drawTools/vtoolnormal.h | 2 +- tools/drawTools/vtoolpoint.cpp | 2 +- tools/drawTools/vtoolpoint.h | 2 +- tools/drawTools/vtoolpointofcontact.cpp | 2 +- tools/drawTools/vtoolpointofcontact.h | 2 +- tools/drawTools/vtoolshoulderpoint.cpp | 2 +- tools/drawTools/vtoolshoulderpoint.h | 2 +- tools/drawTools/vtoolsinglepoint.cpp | 2 +- tools/drawTools/vtoolsinglepoint.h | 2 +- tools/drawTools/vtoolspline.cpp | 2 +- tools/drawTools/vtoolspline.h | 2 +- tools/drawTools/vtoolsplinepath.cpp | 2 +- tools/drawTools/vtoolsplinepath.h | 2 +- tools/drawTools/vtooltriangle.h | 2 +- tools/modelingTools/modelingtools.h | 2 +- tools/modelingTools/vmodelingalongline.cpp | 2 +- tools/modelingTools/vmodelingalongline.h | 2 +- tools/modelingTools/vmodelingarc.cpp | 2 +- tools/modelingTools/vmodelingarc.h | 2 +- tools/modelingTools/vmodelingbisector.cpp | 2 +- tools/modelingTools/vmodelingbisector.h | 2 +- tools/modelingTools/vmodelingendline.cpp | 2 +- tools/modelingTools/vmodelingendline.h | 2 +- tools/modelingTools/vmodelingheight.h | 2 +- tools/modelingTools/vmodelingline.cpp | 2 +- tools/modelingTools/vmodelingline.h | 2 +- tools/modelingTools/vmodelinglineintersect.cpp | 2 +- tools/modelingTools/vmodelinglineintersect.h | 2 +- tools/modelingTools/vmodelinglinepoint.cpp | 2 +- tools/modelingTools/vmodelinglinepoint.h | 2 +- tools/modelingTools/vmodelingnormal.cpp | 2 +- tools/modelingTools/vmodelingnormal.h | 2 +- tools/modelingTools/vmodelingpoint.cpp | 2 +- tools/modelingTools/vmodelingpoint.h | 2 +- tools/modelingTools/vmodelingpointofcontact.cpp | 2 +- tools/modelingTools/vmodelingpointofcontact.h | 2 +- tools/modelingTools/vmodelingshoulderpoint.cpp | 2 +- tools/modelingTools/vmodelingshoulderpoint.h | 2 +- tools/modelingTools/vmodelingspline.cpp | 2 +- tools/modelingTools/vmodelingspline.h | 2 +- tools/modelingTools/vmodelingsplinepath.cpp | 2 +- tools/modelingTools/vmodelingsplinepath.h | 2 +- tools/modelingTools/vmodelingtool.cpp | 2 +- tools/modelingTools/vmodelingtool.h | 2 +- tools/modelingTools/vmodelingtriangle.h | 2 +- tools/nodeDetails/nodedetails.h | 2 +- tools/nodeDetails/vabstractnode.cpp | 2 +- tools/nodeDetails/vabstractnode.h | 2 +- tools/nodeDetails/vnodearc.cpp | 2 +- tools/nodeDetails/vnodearc.h | 2 +- tools/nodeDetails/vnodepoint.cpp | 2 +- tools/nodeDetails/vnodepoint.h | 2 +- tools/nodeDetails/vnodespline.cpp | 2 +- tools/nodeDetails/vnodespline.h | 2 +- tools/nodeDetails/vnodesplinepath.cpp | 2 +- tools/nodeDetails/vnodesplinepath.h | 2 +- tools/tools.h | 2 +- tools/vabstracttool.cpp | 2 +- tools/vabstracttool.h | 2 +- tools/vdatatool.cpp | 2 +- tools/vdatatool.h | 2 +- tools/vtooldetail.cpp | 2 +- tools/vtooldetail.h | 2 +- widgets/vapplication.cpp | 2 +- widgets/vcontrolpointspline.cpp | 2 +- widgets/vcontrolpointspline.h | 2 +- widgets/vgraphicssimpletextitem.cpp | 2 +- widgets/vgraphicssimpletextitem.h | 2 +- widgets/vitem.cpp | 2 +- widgets/vitem.h | 2 +- widgets/vmaingraphicsscene.cpp | 2 +- widgets/vmaingraphicsscene.h | 2 +- widgets/vmaingraphicsview.cpp | 2 +- widgets/vmaingraphicsview.h | 2 +- widgets/vtablegraphicsview.cpp | 2 +- widgets/vtablegraphicsview.h | 2 +- xml/vdomdocument.cpp | 2 +- xml/vdomdocument.h | 2 +- xml/vtoolrecord.cpp | 2 +- xml/vtoolrecord.h | 2 +- 172 files changed, 172 insertions(+), 172 deletions(-) diff --git a/container/calculator.cpp b/container/calculator.cpp index fb9642d57..36e7202e9 100644 --- a/container/calculator.cpp +++ b/container/calculator.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/container/calculator.h b/container/calculator.h index d8b3f518b..607dd648e 100644 --- a/container/calculator.h +++ b/container/calculator.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index a951bb167..7b94c7ab2 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/container/vcontainer.h b/container/vcontainer.h index dbd9c82b6..94c02498e 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/container/vincrementtablerow.cpp b/container/vincrementtablerow.cpp index f6ba763cc..e6e3670a4 100644 --- a/container/vincrementtablerow.cpp +++ b/container/vincrementtablerow.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/container/vincrementtablerow.h b/container/vincrementtablerow.h index 592fe6140..f04abd8bf 100644 --- a/container/vincrementtablerow.h +++ b/container/vincrementtablerow.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/container/vpointf.cpp b/container/vpointf.cpp index b9ae72544..14f5aa2d6 100644 --- a/container/vpointf.cpp +++ b/container/vpointf.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/container/vpointf.h b/container/vpointf.h index 5282ed5fe..d51c13789 100644 --- a/container/vpointf.h +++ b/container/vpointf.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/container/vstandarttablecell.cpp b/container/vstandarttablecell.cpp index 59ead8631..1eb2ff2f9 100644 --- a/container/vstandarttablecell.cpp +++ b/container/vstandarttablecell.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/container/vstandarttablecell.h b/container/vstandarttablecell.h index f94186b52..d74f683ad 100644 --- a/container/vstandarttablecell.h +++ b/container/vstandarttablecell.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index c0724f951..969107db7 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index 5020e17de..4b13fb25d 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogarc.cpp b/dialogs/dialogarc.cpp index adb2ac91b..dbd6eff99 100644 --- a/dialogs/dialogarc.cpp +++ b/dialogs/dialogarc.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogarc.h b/dialogs/dialogarc.h index 53467f108..302737d50 100644 --- a/dialogs/dialogarc.h +++ b/dialogs/dialogarc.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogbisector.cpp b/dialogs/dialogbisector.cpp index 5b22c2f4a..e975b8559 100644 --- a/dialogs/dialogbisector.cpp +++ b/dialogs/dialogbisector.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogbisector.h b/dialogs/dialogbisector.h index e237cfbb8..87b409421 100644 --- a/dialogs/dialogbisector.h +++ b/dialogs/dialogbisector.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index caaa1bf78..fb66961c5 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogdetail.h b/dialogs/dialogdetail.h index 00ceb22b9..43a518e90 100644 --- a/dialogs/dialogdetail.h +++ b/dialogs/dialogdetail.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogendline.cpp b/dialogs/dialogendline.cpp index d415e84c5..011784d5c 100644 --- a/dialogs/dialogendline.cpp +++ b/dialogs/dialogendline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogendline.h b/dialogs/dialogendline.h index a793ca85a..4996f8fb8 100644 --- a/dialogs/dialogendline.h +++ b/dialogs/dialogendline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index e8f78704d..80b71d293 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialoghistory.h b/dialogs/dialoghistory.h index 65dc1c1ce..bd650452e 100644 --- a/dialogs/dialoghistory.h +++ b/dialogs/dialoghistory.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index b103273d4..86f2348c6 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h index e5ac8262a..a9f5d9e8a 100644 --- a/dialogs/dialogincrements.h +++ b/dialogs/dialogincrements.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogline.cpp b/dialogs/dialogline.cpp index ed6db782e..a94b65fd5 100644 --- a/dialogs/dialogline.cpp +++ b/dialogs/dialogline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogline.h b/dialogs/dialogline.h index 8a19cec33..99bc99d1a 100644 --- a/dialogs/dialogline.h +++ b/dialogs/dialogline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialoglineintersect.cpp b/dialogs/dialoglineintersect.cpp index 9e8d2b8ff..347c45815 100644 --- a/dialogs/dialoglineintersect.cpp +++ b/dialogs/dialoglineintersect.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialoglineintersect.h b/dialogs/dialoglineintersect.h index 5d1ce01c5..34cb19aeb 100644 --- a/dialogs/dialoglineintersect.h +++ b/dialogs/dialoglineintersect.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialognormal.cpp b/dialogs/dialognormal.cpp index c52340ba9..0b467145e 100644 --- a/dialogs/dialognormal.cpp +++ b/dialogs/dialognormal.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialognormal.h b/dialogs/dialognormal.h index f96b5b39e..e1f685e7f 100644 --- a/dialogs/dialognormal.h +++ b/dialogs/dialognormal.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogpointofcontact.cpp b/dialogs/dialogpointofcontact.cpp index d3ba3c5c4..d09b7b021 100644 --- a/dialogs/dialogpointofcontact.cpp +++ b/dialogs/dialogpointofcontact.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogpointofcontact.h b/dialogs/dialogpointofcontact.h index 68ee50e80..003c16001 100644 --- a/dialogs/dialogpointofcontact.h +++ b/dialogs/dialogpointofcontact.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogs.h b/dialogs/dialogs.h index 5d2e93329..82faf687b 100644 --- a/dialogs/dialogs.h +++ b/dialogs/dialogs.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogshoulderpoint.cpp b/dialogs/dialogshoulderpoint.cpp index 0429522ae..9c65ec76a 100644 --- a/dialogs/dialogshoulderpoint.cpp +++ b/dialogs/dialogshoulderpoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogshoulderpoint.h b/dialogs/dialogshoulderpoint.h index ed2cfb1cf..44b315738 100644 --- a/dialogs/dialogshoulderpoint.h +++ b/dialogs/dialogshoulderpoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogsinglepoint.cpp b/dialogs/dialogsinglepoint.cpp index 47ee98d79..c43c04e81 100644 --- a/dialogs/dialogsinglepoint.cpp +++ b/dialogs/dialogsinglepoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogsinglepoint.h b/dialogs/dialogsinglepoint.h index d60f8e2cd..3a4d1b860 100644 --- a/dialogs/dialogsinglepoint.h +++ b/dialogs/dialogsinglepoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogspline.cpp b/dialogs/dialogspline.cpp index 40bbe35db..08f8f331b 100644 --- a/dialogs/dialogspline.cpp +++ b/dialogs/dialogspline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogspline.h b/dialogs/dialogspline.h index 3aaf78a42..310a679dc 100644 --- a/dialogs/dialogspline.h +++ b/dialogs/dialogspline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index 848c0e7a9..e3d45bdd0 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogsplinepath.h b/dialogs/dialogsplinepath.h index 01ab75334..922351a31 100644 --- a/dialogs/dialogsplinepath.h +++ b/dialogs/dialogsplinepath.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index de54c2465..c527cb383 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index 9c418bd3b..02b3d56f6 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexception.cpp b/exception/vexception.cpp index ade9cb27d..a32b8ebde 100644 --- a/exception/vexception.cpp +++ b/exception/vexception.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexception.h b/exception/vexception.h index ad21054fb..28fa4c037 100644 --- a/exception/vexception.h +++ b/exception/vexception.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionbadid.cpp b/exception/vexceptionbadid.cpp index 6e6d13691..02bf10a76 100644 --- a/exception/vexceptionbadid.cpp +++ b/exception/vexceptionbadid.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionbadid.h b/exception/vexceptionbadid.h index 47a772c6b..89959d5d8 100644 --- a/exception/vexceptionbadid.h +++ b/exception/vexceptionbadid.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionconversionerror.cpp b/exception/vexceptionconversionerror.cpp index 6fca5172b..487d7ad3b 100644 --- a/exception/vexceptionconversionerror.cpp +++ b/exception/vexceptionconversionerror.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionconversionerror.h b/exception/vexceptionconversionerror.h index 3b011ed07..904093e63 100644 --- a/exception/vexceptionconversionerror.h +++ b/exception/vexceptionconversionerror.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionemptyparameter.cpp b/exception/vexceptionemptyparameter.cpp index b070a682f..31dc1550f 100644 --- a/exception/vexceptionemptyparameter.cpp +++ b/exception/vexceptionemptyparameter.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionemptyparameter.h b/exception/vexceptionemptyparameter.h index 694ab0913..f03be1cec 100644 --- a/exception/vexceptionemptyparameter.h +++ b/exception/vexceptionemptyparameter.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionobjecterror.cpp b/exception/vexceptionobjecterror.cpp index e3f4d833c..11d5be2b6 100644 --- a/exception/vexceptionobjecterror.cpp +++ b/exception/vexceptionobjecterror.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionobjecterror.h b/exception/vexceptionobjecterror.h index ab38f164e..db12bb943 100644 --- a/exception/vexceptionobjecterror.h +++ b/exception/vexceptionobjecterror.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionwrongparameterid.cpp b/exception/vexceptionwrongparameterid.cpp index 59dd94450..1ee8d090b 100644 --- a/exception/vexceptionwrongparameterid.cpp +++ b/exception/vexceptionwrongparameterid.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/exception/vexceptionwrongparameterid.h b/exception/vexceptionwrongparameterid.h index 1c4a9933c..6e81fcb43 100644 --- a/exception/vexceptionwrongparameterid.h +++ b/exception/vexceptionwrongparameterid.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/varc.cpp b/geometry/varc.cpp index 99721616a..cff5c6119 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/varc.h b/geometry/varc.h index 964b68a52..1de78e3fd 100644 --- a/geometry/varc.h +++ b/geometry/varc.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vdetail.cpp b/geometry/vdetail.cpp index 9003d35e5..2b4433444 100644 --- a/geometry/vdetail.cpp +++ b/geometry/vdetail.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vdetail.h b/geometry/vdetail.h index cb31ceee8..f042f93a9 100644 --- a/geometry/vdetail.h +++ b/geometry/vdetail.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vnodedetail.cpp b/geometry/vnodedetail.cpp index 50a5b5424..33a5a1407 100644 --- a/geometry/vnodedetail.cpp +++ b/geometry/vnodedetail.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vnodedetail.h b/geometry/vnodedetail.h index d28068ba2..1b433aaa9 100644 --- a/geometry/vnodedetail.h +++ b/geometry/vnodedetail.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index f15abbde9..137a47483 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vspline.h b/geometry/vspline.h index b91d0b88a..55affce82 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index e58269751..bfd448753 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index 7a8ba8daa..d8012b1ce 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vsplinepoint.cpp b/geometry/vsplinepoint.cpp index ab071e509..93ad612ab 100644 --- a/geometry/vsplinepoint.cpp +++ b/geometry/vsplinepoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/geometry/vsplinepoint.h b/geometry/vsplinepoint.h index ae9ffaeb5..58fb845c8 100644 --- a/geometry/vsplinepoint.h +++ b/geometry/vsplinepoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/main.cpp b/main.cpp index 5f8fea974..0ff386dd9 100644 --- a/main.cpp +++ b/main.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/mainwindow.cpp b/mainwindow.cpp index 30192b049..8da0b92c5 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/mainwindow.h b/mainwindow.h index aac755e25..7de1307cf 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/options.h b/options.h index 5e1a70fab..06dcc5a69 100644 --- a/options.h +++ b/options.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/stable.h b/stable.h index fba2585c6..32c6762e7 100644 --- a/stable.h +++ b/stable.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tablewindow.cpp b/tablewindow.cpp index 2e6960987..12ca8f48a 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tablewindow.h b/tablewindow.h index 5c257c379..bda643db8 100644 --- a/tablewindow.h +++ b/tablewindow.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/drawtools.h b/tools/drawTools/drawtools.h index 0b07ebc2b..4889ad878 100644 --- a/tools/drawTools/drawtools.h +++ b/tools/drawTools/drawtools.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index 7a4efffbf..81938c85a 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index a0d037119..c9a05e2f6 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index c155447d2..f4fe35812 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index ca220d8ad..b9a1e16e9 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index a5e845d25..863289812 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index bca594770..fb99e11ed 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index d88229457..5f34e8843 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index f527ce612..90fd1a7f6 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index a4111bd7b..d73906144 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index 7b9a5e39b..38e637544 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index e8dfef50a..207ff1e81 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index bc9976805..e7ccbfe9f 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index 7098b7d3f..38e3cf305 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index 7f143f353..e42cca66c 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index 95303198b..cb30cd388 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoollinepoint.h b/tools/drawTools/vtoollinepoint.h index 51f830bf9..b349fac6c 100644 --- a/tools/drawTools/vtoollinepoint.h +++ b/tools/drawTools/vtoollinepoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 2ff7c233d..25915ee63 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 2a1e14bab..4ac03cff7 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index 41c4ffcff..17bf97489 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index 7583e8e4a..ddbc0159e 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index 0f212993f..a6213071b 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index de7390549..d7720cddc 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index ea04c8889..c344a36f6 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index 9b5942fdc..913fff10c 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index 92898ca84..98cd0bd4f 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index ee9b7bcf3..4571757af 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 00d3478fb..699c8143b 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index f3db13297..ead6779a0 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index 1bb2650b9..6eda29244 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index b614f8896..3fbec5490 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index 1c69603ed..9cf84d9ca 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/modelingtools.h b/tools/modelingTools/modelingtools.h index 2fbf1dfad..b7c755edc 100644 --- a/tools/modelingTools/modelingtools.h +++ b/tools/modelingTools/modelingtools.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index 58f746530..8678c20b6 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index 582a1aebe..5f47e88d9 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index 2e4b54c08..f2cc19d4d 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index af1c5394b..e7d0f1401 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index f42616157..830ef7447 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index ae10c2a36..f672e9c55 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index a45cc8ba2..475ec9b3c 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index 27b771fc0..fd81cd062 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index 42e6ec2c2..f9fbdd7ab 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index a0a881429..92e556189 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index 48dc239a6..98ec7041f 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp index 0ae7c31a3..5464fc9b4 100644 --- a/tools/modelingTools/vmodelinglineintersect.cpp +++ b/tools/modelingTools/vmodelinglineintersect.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index 8808613b3..b090e5a2e 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelinglinepoint.cpp b/tools/modelingTools/vmodelinglinepoint.cpp index 36b3239a7..361144935 100644 --- a/tools/modelingTools/vmodelinglinepoint.cpp +++ b/tools/modelingTools/vmodelinglinepoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelinglinepoint.h b/tools/modelingTools/vmodelinglinepoint.h index f3aede417..2fc252b99 100644 --- a/tools/modelingTools/vmodelinglinepoint.h +++ b/tools/modelingTools/vmodelinglinepoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index 495bf935d..5943e8e5c 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index 8adf0abbb..4e21102d5 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingpoint.cpp b/tools/modelingTools/vmodelingpoint.cpp index 5e78b7b65..cfa4ec3f9 100644 --- a/tools/modelingTools/vmodelingpoint.cpp +++ b/tools/modelingTools/vmodelingpoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h index 1531cdb56..6a68b5d80 100644 --- a/tools/modelingTools/vmodelingpoint.h +++ b/tools/modelingTools/vmodelingpoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index c0024457f..8758a4c52 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index 4aca22725..0f1516a67 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index 737b6222a..c18ab5003 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index ec5e74727..679d5e85c 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index 915c01d9b..b2df795d0 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index fb75685b3..49e9f3da8 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 141fa444d..0c95438fc 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index 823e6cfd5..4cb25f16d 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingtool.cpp b/tools/modelingTools/vmodelingtool.cpp index 58d420c5f..fd38f2088 100644 --- a/tools/modelingTools/vmodelingtool.cpp +++ b/tools/modelingTools/vmodelingtool.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingtool.h b/tools/modelingTools/vmodelingtool.h index 359f7555a..ff7b4da89 100644 --- a/tools/modelingTools/vmodelingtool.h +++ b/tools/modelingTools/vmodelingtool.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index 4ae18f5cc..a9f5176ec 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/nodedetails.h b/tools/nodeDetails/nodedetails.h index a331e94b2..e9ed16c37 100644 --- a/tools/nodeDetails/nodedetails.h +++ b/tools/nodeDetails/nodedetails.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vabstractnode.cpp b/tools/nodeDetails/vabstractnode.cpp index ddd667825..1f4bab332 100644 --- a/tools/nodeDetails/vabstractnode.cpp +++ b/tools/nodeDetails/vabstractnode.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vabstractnode.h b/tools/nodeDetails/vabstractnode.h index adc93c20d..85d0a714c 100644 --- a/tools/nodeDetails/vabstractnode.h +++ b/tools/nodeDetails/vabstractnode.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vnodearc.cpp b/tools/nodeDetails/vnodearc.cpp index a7f6913a6..bc43e151b 100644 --- a/tools/nodeDetails/vnodearc.cpp +++ b/tools/nodeDetails/vnodearc.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vnodearc.h b/tools/nodeDetails/vnodearc.h index 9c072e176..e4a214928 100644 --- a/tools/nodeDetails/vnodearc.h +++ b/tools/nodeDetails/vnodearc.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vnodepoint.cpp b/tools/nodeDetails/vnodepoint.cpp index 0d8355e8f..b5d568743 100644 --- a/tools/nodeDetails/vnodepoint.cpp +++ b/tools/nodeDetails/vnodepoint.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index 3ef5ae177..783023fee 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vnodespline.cpp b/tools/nodeDetails/vnodespline.cpp index b48470f83..2614ab2f3 100644 --- a/tools/nodeDetails/vnodespline.cpp +++ b/tools/nodeDetails/vnodespline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vnodespline.h b/tools/nodeDetails/vnodespline.h index 2399d26e4..47513764e 100644 --- a/tools/nodeDetails/vnodespline.h +++ b/tools/nodeDetails/vnodespline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vnodesplinepath.cpp b/tools/nodeDetails/vnodesplinepath.cpp index f476cb11a..8dd7f4e37 100644 --- a/tools/nodeDetails/vnodesplinepath.cpp +++ b/tools/nodeDetails/vnodesplinepath.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/nodeDetails/vnodesplinepath.h b/tools/nodeDetails/vnodesplinepath.h index 9541a805e..40d85b582 100644 --- a/tools/nodeDetails/vnodesplinepath.h +++ b/tools/nodeDetails/vnodesplinepath.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/tools.h b/tools/tools.h index 0c2a63142..998771f91 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index 49350a622..f932b0e06 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index 8b70a3258..a57b5f254 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/vdatatool.cpp b/tools/vdatatool.cpp index 4c6bab8cc..60dba8c40 100644 --- a/tools/vdatatool.cpp +++ b/tools/vdatatool.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/vdatatool.h b/tools/vdatatool.h index 2234f557f..f0519762f 100644 --- a/tools/vdatatool.h +++ b/tools/vdatatool.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 560659796..1b85a6a3a 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index a0441e48f..bca7778f5 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vapplication.cpp b/widgets/vapplication.cpp index e78345d00..e53617b6f 100644 --- a/widgets/vapplication.cpp +++ b/widgets/vapplication.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vcontrolpointspline.cpp b/widgets/vcontrolpointspline.cpp index 8daf75079..cda4f792d 100644 --- a/widgets/vcontrolpointspline.cpp +++ b/widgets/vcontrolpointspline.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h index 977d246e0..9ed7e1cbb 100644 --- a/widgets/vcontrolpointspline.h +++ b/widgets/vcontrolpointspline.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vgraphicssimpletextitem.cpp b/widgets/vgraphicssimpletextitem.cpp index d0b9bb3f7..52a74973e 100644 --- a/widgets/vgraphicssimpletextitem.cpp +++ b/widgets/vgraphicssimpletextitem.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vgraphicssimpletextitem.h b/widgets/vgraphicssimpletextitem.h index 6f9dc20ef..61bcd9471 100644 --- a/widgets/vgraphicssimpletextitem.h +++ b/widgets/vgraphicssimpletextitem.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vitem.cpp b/widgets/vitem.cpp index 4f4b58f4a..d9b508003 100644 --- a/widgets/vitem.cpp +++ b/widgets/vitem.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vitem.h b/widgets/vitem.h index 7317bb315..ccf47413f 100644 --- a/widgets/vitem.h +++ b/widgets/vitem.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vmaingraphicsscene.cpp b/widgets/vmaingraphicsscene.cpp index d81f3c53e..dc3010ca0 100644 --- a/widgets/vmaingraphicsscene.cpp +++ b/widgets/vmaingraphicsscene.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vmaingraphicsscene.h b/widgets/vmaingraphicsscene.h index ecf28a06d..63522396e 100644 --- a/widgets/vmaingraphicsscene.h +++ b/widgets/vmaingraphicsscene.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index 6de8dc1b6..acfca1764 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vmaingraphicsview.h b/widgets/vmaingraphicsview.h index df53f39cb..d0035c7de 100644 --- a/widgets/vmaingraphicsview.h +++ b/widgets/vmaingraphicsview.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vtablegraphicsview.cpp b/widgets/vtablegraphicsview.cpp index 0fa974bda..609bb1ec3 100644 --- a/widgets/vtablegraphicsview.cpp +++ b/widgets/vtablegraphicsview.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/widgets/vtablegraphicsview.h b/widgets/vtablegraphicsview.h index d1f2363a2..8b52ac2a7 100644 --- a/widgets/vtablegraphicsview.h +++ b/widgets/vtablegraphicsview.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 1e2d048dc..7dc3e5807 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index 4f3ce2564..8f9f5709d 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/xml/vtoolrecord.cpp b/xml/vtoolrecord.cpp index 64bd06127..881a484d9 100644 --- a/xml/vtoolrecord.cpp +++ b/xml/vtoolrecord.cpp @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. diff --git a/xml/vtoolrecord.h b/xml/vtoolrecord.h index add61c98a..ce598c1e0 100644 --- a/xml/vtoolrecord.h +++ b/xml/vtoolrecord.h @@ -9,7 +9,7 @@ ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. ** - ** Tox is distributed in the hope that it will be useful, + ** Valentina is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. From 8e07ed5fd4aa2b0e7f7821ec3361c51120bb2517 Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 27 Oct 2013 15:50:00 +0200 Subject: [PATCH 48/83] Refactoring. --HG-- branch : develop --- tools/drawTools/vdrawtool.cpp | 2 +- version.h | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index 81938c85a..933dbdba2 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -88,7 +88,7 @@ void VDrawTool::AddToCalculation(const QDomElement &domElement){ calcElement.insertAfter(domElement,refElement); doc->setCursor(0); } else { - qCritical()<<"Не можу знайти елемент після якого потрібно вставляти."<< Q_FUNC_INFO; + qCritical()< Date: Mon, 28 Oct 2013 17:45:27 +0200 Subject: [PATCH 49/83] Refactoring. --HG-- branch : develop --- geometry/vspline.cpp | 74 ++++++++++++++--------------- geometry/vspline.h | 18 +++---- mainwindow.cpp | 11 ++--- tools/drawTools/vdrawtool.h | 12 +++++ tools/drawTools/vtoolalongline.cpp | 1 - tools/drawTools/vtoolarc.cpp | 25 ++++------ tools/drawTools/vtoolline.cpp | 23 +++------ tools/drawTools/vtoollinepoint.cpp | 6 +-- tools/drawTools/vtoolpoint.cpp | 43 ++++++----------- tools/drawTools/vtoolspline.cpp | 28 ++++------- tools/drawTools/vtoolsplinepath.cpp | 28 ++++------- tools/drawTools/vtooltriangle.cpp | 2 +- tools/vtooldetail.cpp | 5 +- 13 files changed, 115 insertions(+), 161 deletions(-) diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 137a47483..1273a7f30 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -586,44 +586,44 @@ QPainterPath VSpline::GetPath() const{ 2 - 1 real root + complex roots imaginary part is zero (i.e. 2 real roots). */ -qint32 VSpline::Cubic(qreal *x, qreal a, qreal b, qreal c){ - qreal q,r,r2,q3; +//qint32 VSpline::Cubic(qreal *x, qreal a, qreal b, qreal c){ +// qreal q,r,r2,q3; - q = (a*a - 3.*b)/9.; - r = (a*(2.*a*a - 9.*b) + 27.*c)/54.; - r2 = r*r; - q3 = pow(q,3); - if(r2GetNameActivDraw(); QInputDialog *dlg = new QInputDialog(this); @@ -206,9 +206,8 @@ void MainWindow::OptionDraw(){ } template -void MainWindow::SetToolButton(bool checked, Tool::Tools t, const QString &cursor, - const QString &toolTip, QSharedPointer &dialog, - Func closeDialogSlot){ +void MainWindow::SetToolButton(bool checked, Tool::Tools t, const QString &cursor, const QString &toolTip, + QSharedPointer &dialog, Func closeDialogSlot){ if(checked){ CanselTool(); tool = t; @@ -223,14 +222,14 @@ void MainWindow::SetToolButton(bool checked, Tool::Tools t, const QString &curso connect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &Dialog::UpdateList); } else { if(QToolButton *tButton = qobject_cast< QToolButton * >(this->sender())){ + Q_ASSERT(tButton != 0); tButton->setChecked(true); } } } template -void MainWindow::AddToolToDetail(T *tool, const qint64 &id, Tool::Tools typeTool, - const qint64 &idDetail){ +void MainWindow::AddToolToDetail(T *tool, const qint64 &id, Tool::Tools typeTool, const qint64 &idDetail){ QHash* tools = doc->getTools(); VToolDetail *det = qobject_cast(tools->value(idDetail)); Q_ASSERT(det != 0); diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index c9a05e2f6..da654fb42 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -99,6 +99,18 @@ protected: } } } + template + void ShowItem(Item *item, qint64 id, Qt::GlobalColor color, bool enable){ + Q_ASSERT(item != 0); + if(id == item->id){ + if(enable == false){ + currentColor = baseColor; + } else { + currentColor = color; + } + item->setPen(QPen(currentColor, widthHairLine/factor)); + } + } }; #endif // VDRAWTOOL_H diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index f4fe35812..8bfebd8a3 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -56,7 +56,6 @@ void VToolAlongLine::FullUpdateFromGui(int result){ domElement.setAttribute("secondPoint", QString().setNum(dialogAlongLine->getSecondPointId())); emit FullUpdateTree(); } - } dialogAlongLine.clear(); } diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index 863289812..f73d8f4bc 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -125,31 +125,22 @@ void VToolArc::FullUpdateFromGui(int result){ } void VToolArc::ChangedActivDraw(const QString newName){ + bool selectable = false; if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine/factor)); - this->setFlag(QGraphicsItem::ItemIsSelectable, true); - this->setAcceptHoverEvents(true); + selectable = true; currentColor = Qt::black; - VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine/factor)); - this->setFlag(QGraphicsItem::ItemIsSelectable, false); - this->setAcceptHoverEvents (false); + selectable = false; currentColor = Qt::gray; - VDrawTool::ChangedActivDraw(newName); } + this->setPen(QPen(currentColor, widthHairLine/factor)); + this->setFlag(QGraphicsItem::ItemIsSelectable, selectable); + this->setAcceptHoverEvents (selectable); + VDrawTool::ChangedActivDraw(newName); } void VToolArc::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ - if(id == this->id){ - if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine/factor)); - currentColor = baseColor; - } else { - this->setPen(QPen(color, widthHairLine/factor)); - currentColor = color; - } - } + ShowItem(this, id, color, enable); } void VToolArc::SetFactor(qreal factor){ diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 207ff1e81..62236ecca 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -100,15 +100,7 @@ void VToolLine::FullUpdateFromGui(int result){ } void VToolLine::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ - if(id == this->id){ - if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine/factor)); - currentColor = baseColor; - } else { - this->setPen(QPen(color, widthHairLine/factor)); - currentColor = color; - } - } + ShowItem(this, id, color, enable); } void VToolLine::SetFactor(qreal factor){ @@ -117,24 +109,23 @@ void VToolLine::SetFactor(qreal factor){ } void VToolLine::ChangedActivDraw(const QString newName){ + bool selectable = false; if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine/factor)); - this->setAcceptHoverEvents (true); + selectable = true; currentColor = Qt::black; - VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine/factor)); - this->setAcceptHoverEvents (false); + selectable = false; currentColor = Qt::gray; - VDrawTool::ChangedActivDraw(newName); } + this->setPen(QPen(currentColor, widthHairLine/factor)); + this->setAcceptHoverEvents (selectable); + VDrawTool::ChangedActivDraw(newName); } void VToolLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ ContextMenu(dialogLine, this, event); } - void VToolLine::AddToFile(){ QDomElement domElement = doc->createElement("line"); AddAttribute(domElement, "id", id); diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index cb30cd388..e7742599e 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -41,14 +41,12 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 void VToolLinePoint::ChangedActivDraw(const QString newName){ if(nameActivDraw == newName){ - mainLine->setPen(QPen(Qt::black, widthHairLine/factor)); currentColor = Qt::black; - VToolPoint::ChangedActivDraw(newName); } else { - mainLine->setPen(QPen(Qt::gray, widthHairLine/factor)); currentColor = Qt::gray; - VToolPoint::ChangedActivDraw(newName); } + mainLine->setPen(QPen(currentColor, widthHairLine/factor)); + VToolPoint::ChangedActivDraw(newName); } void VToolLinePoint::RefreshGeometry(){ diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index 17bf97489..eb53afb10 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -54,43 +54,28 @@ void VToolPoint::UpdateNamePosition(qreal mx, qreal my){ } void VToolPoint::ChangedActivDraw(const QString newName){ + bool selectable = false; if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine/factor)); - this->setFlag(QGraphicsItem::ItemIsSelectable, true); - this->setAcceptHoverEvents(true); - namePoint->setFlag(QGraphicsItem::ItemIsMovable, true); - namePoint->setFlag(QGraphicsItem::ItemIsSelectable, true); - namePoint->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); - namePoint->setBrush(QBrush(Qt::black)); - namePoint->setAcceptHoverEvents(true); - lineName->setPen(QPen(Qt::black, widthHairLine/factor)); + selectable = true; currentColor = Qt::black; - VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine/factor)); - this->setFlag(QGraphicsItem::ItemIsSelectable, false); - this->setAcceptHoverEvents (false); - namePoint->setFlag(QGraphicsItem::ItemIsMovable, false); - namePoint->setFlag(QGraphicsItem::ItemIsSelectable, false); - namePoint->setFlag(QGraphicsItem::ItemSendsGeometryChanges, false); - namePoint->setBrush(QBrush(Qt::gray)); - namePoint->setAcceptHoverEvents(false); - lineName->setPen(QPen(Qt::gray, widthHairLine/factor)); + selectable = false; currentColor = Qt::gray; - VDrawTool::ChangedActivDraw(newName); } + this->setPen(QPen(currentColor, widthHairLine/factor)); + this->setFlag(QGraphicsItem::ItemIsSelectable, selectable); + this->setAcceptHoverEvents (selectable); + namePoint->setFlag(QGraphicsItem::ItemIsMovable, selectable); + namePoint->setFlag(QGraphicsItem::ItemIsSelectable, selectable); + namePoint->setFlag(QGraphicsItem::ItemSendsGeometryChanges, selectable); + namePoint->setBrush(QBrush(currentColor)); + namePoint->setAcceptHoverEvents(selectable); + lineName->setPen(QPen(currentColor, widthHairLine/factor)); + VDrawTool::ChangedActivDraw(newName); } void VToolPoint::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ - if(id == this->id){ - if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine/factor)); - currentColor = baseColor; - } else { - this->setPen(QPen(color, widthHairLine/factor)); - currentColor = color; - } - } + ShowItem(this, id, color, enable); } void VToolPoint::SetFactor(qreal factor){ diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 699c8143b..a38b40740 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -246,33 +246,23 @@ void VToolSpline::RefreshGeometry(){ void VToolSpline::ChangedActivDraw(const QString newName){ + bool selectable = false; if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine/factor)); - this->setFlag(QGraphicsItem::ItemIsSelectable, true); - this->setAcceptHoverEvents(true); + selectable = true; currentColor = Qt::black; - emit setEnabledPoint(true); - VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine/factor)); - this->setFlag(QGraphicsItem::ItemIsSelectable, false); - this->setAcceptHoverEvents (false); + selectable = false; currentColor = Qt::gray; - emit setEnabledPoint(false); - VDrawTool::ChangedActivDraw(newName); } + this->setPen(QPen(currentColor, widthHairLine/factor)); + this->setFlag(QGraphicsItem::ItemIsSelectable, selectable); + this->setAcceptHoverEvents (selectable); + emit setEnabledPoint(selectable); + VDrawTool::ChangedActivDraw(newName); } void VToolSpline::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ - if(id == this->id){ - if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine/factor)); - currentColor = baseColor; - } else { - this->setPen(QPen(color, widthHairLine/factor)); - currentColor = color; - } - } + ShowItem(this, id, color, enable); } void VToolSpline::SetFactor(qreal factor){ diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index 6eda29244..301dc0520 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -187,33 +187,23 @@ void VToolSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path){ } void VToolSplinePath::ChangedActivDraw(const QString newName){ + bool selectable = false; if(nameActivDraw == newName){ - this->setPen(QPen(Qt::black, widthHairLine/factor)); - this->setFlag(QGraphicsItem::ItemIsSelectable, true); - this->setAcceptHoverEvents(true); + selectable = true; currentColor = Qt::black; - emit setEnabledPoint(true); - VDrawTool::ChangedActivDraw(newName); } else { - this->setPen(QPen(Qt::gray, widthHairLine/factor)); - this->setFlag(QGraphicsItem::ItemIsSelectable, false); - this->setAcceptHoverEvents (false); + selectable = false; currentColor = Qt::gray; - emit setEnabledPoint(false); - VDrawTool::ChangedActivDraw(newName); } + this->setPen(QPen(currentColor, widthHairLine/factor)); + this->setFlag(QGraphicsItem::ItemIsSelectable, selectable); + this->setAcceptHoverEvents (selectable); + emit setEnabledPoint(selectable); + VDrawTool::ChangedActivDraw(newName); } void VToolSplinePath::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ - if(id == this->id){ - if(enable == false){ - this->setPen(QPen(baseColor, widthHairLine/factor)); - currentColor = baseColor; - } else { - this->setPen(QPen(color, widthHairLine/factor)); - currentColor = color; - } - } + ShowItem(this, id, color, enable); } void VToolSplinePath::SetFactor(qreal factor){ diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index 79fd2c3d2..260961412 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -95,8 +95,8 @@ QPointF VToolTriangle::FindPoint(const QPointF axisP1, const QPointF axisP2, con } } if(c*c < a*a + b*b){ - return line.p2(); qWarning()<()), - sceneDetails(scene){ + VMainGraphicsScene *scene, QGraphicsItem *parent) :VAbstractTool(doc, data, id), + QGraphicsPathItem(parent), dialogDetail(QSharedPointer()), sceneDetails(scene){ VDetail detail = data->GetDetail(id); QHash* tools = doc->getTools(); Q_ASSERT(tools != 0); From f9f724fcabcf40a224ecdd9043f80ddadd0b1922 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 28 Oct 2013 19:27:31 +0200 Subject: [PATCH 50/83] Refactoring. --HG-- branch : develop --- dialogs/dialogsinglepoint.cpp | 19 +++++++++---------- mainwindow.cpp | 11 +++++------ tablewindow.cpp | 2 +- tools/drawTools/vtoolbisector.cpp | 11 +++++------ tools/drawTools/vtoolshoulderpoint.cpp | 4 ++-- tools/modelingTools/vmodelingarc.cpp | 10 +++------- tools/modelingTools/vmodelingbisector.cpp | 6 +++--- .../modelingTools/vmodelinglineintersect.cpp | 4 ++-- tools/modelingTools/vmodelingnormal.cpp | 4 ++-- .../modelingTools/vmodelingpointofcontact.cpp | 4 ++-- .../modelingTools/vmodelingshoulderpoint.cpp | 4 ++-- widgets/vcontrolpointspline.cpp | 2 +- 12 files changed, 37 insertions(+), 44 deletions(-) diff --git a/dialogs/dialogsinglepoint.cpp b/dialogs/dialogsinglepoint.cpp index c43c04e81..9bb6914d1 100644 --- a/dialogs/dialogsinglepoint.cpp +++ b/dialogs/dialogsinglepoint.cpp @@ -26,8 +26,8 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent) : DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogSinglePoint), name(QString()), point(QPointF()){ ui->setupUi(this); - ui->doubleSpinBoxX->setRange(0,PaperSize/PrintDPI*25.4); - ui->doubleSpinBoxY->setRange(0,PaperSize/PrintDPI*25.4); + ui->doubleSpinBoxX->setRange(0,toMM(PaperSize)); + ui->doubleSpinBoxY->setRange(0,toMM(PaperSize)); bOk = ui->buttonBox->button(QDialogButtonBox::Ok); labelEditNamePoint = ui->labelEditName; flagName = false; @@ -40,18 +40,17 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent) : void DialogSinglePoint::mousePress(QPointF scenePos){ if(isInitialized == false){ - ui->doubleSpinBoxX->setValue(scenePos.x()/PrintDPI*25.4); - ui->doubleSpinBoxY->setValue(scenePos.y()/PrintDPI*25.4); + ui->doubleSpinBoxX->setValue(toMM(scenePos.x())); + ui->doubleSpinBoxY->setValue(toMM(scenePos.y())); this->show(); } else { - ui->doubleSpinBoxX->setValue(scenePos.x()/PrintDPI*25.4); - ui->doubleSpinBoxY->setValue(scenePos.y()/PrintDPI*25.4); + ui->doubleSpinBoxX->setValue(toMM(scenePos.x())); + ui->doubleSpinBoxY->setValue(toMM(scenePos.y())); } } void DialogSinglePoint::DialogAccepted(){ - point = QPointF(ui->doubleSpinBoxX->value()*PrintDPI/25.4, - ui->doubleSpinBoxY->value()*PrintDPI/25.4); + point = QPointF(toPixel(ui->doubleSpinBoxX->value()), toPixel(ui->doubleSpinBoxY->value())); name = ui->lineEditName->text(); emit DialogClosed(QDialog::Accepted); } @@ -61,8 +60,8 @@ void DialogSinglePoint::setData(const QString name, const QPointF point){ this->point = point; isInitialized = true; ui->lineEditName->setText(name); - ui->doubleSpinBoxX->setValue(point.x()/PrintDPI*25.4); - ui->doubleSpinBoxY->setValue(point.y()/PrintDPI*25.4); + ui->doubleSpinBoxX->setValue(toMM(point.x())); + ui->doubleSpinBoxY->setValue(toMM(point.y())); } DialogSinglePoint::~DialogSinglePoint(){ diff --git a/mainwindow.cpp b/mainwindow.cpp index 622c1adbc..25a070910 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -151,12 +151,11 @@ void MainWindow::ActionNewDraw(){ comboBoxDraws->setCurrentIndex(index); currentDrawChanged( index ); } - connect(comboBoxDraws, static_cast(&QComboBox::currentIndexChanged), - this, &MainWindow::currentDrawChanged); + connect(comboBoxDraws, static_cast(&QComboBox::currentIndexChanged), this, + &MainWindow::currentDrawChanged); data->ClearObject(); //Create single point - qint64 id = data->AddPoint(VPointF((10+comboBoxDraws->count()*5)*PrintDPI/25.4, 10*PrintDPI/25.4, "А", 5, - 10)); + qint64 id = data->AddPoint(VPointF(toPixel((10+comboBoxDraws->count()*5)), toPixel(10), "А", 5, 10)); VToolSinglePoint *spoint = new VToolSinglePoint(doc, data, id, Tool::FromGui); sceneDraw->addItem(spoint); connect(spoint, &VToolPoint::ChoosedTool, sceneDraw, &VMainGraphicsScene::ChoosedItem); @@ -664,8 +663,8 @@ void MainWindow::currentDrawChanged( int index ){ void MainWindow::mouseMove(QPointF scenePos){ QString string = QString("%1, %2") - .arg(static_cast(scenePos.x()/PrintDPI*25.4)) - .arg(static_cast(scenePos.y()/PrintDPI*25.4)); + .arg(static_cast(toMM(scenePos.x()))) + .arg(static_cast(toMM(scenePos.y()))); mouseCoordinate->setText(string); } diff --git a/tablewindow.cpp b/tablewindow.cpp index 12ca8f48a..c23c5c1f1 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -35,7 +35,7 @@ TableWindow::TableWindow(QWidget *parent) : ui->statusBar->addWidget(numberDetal); ui->statusBar->addWidget(colission); outItems = collidingItems = false; - //sceneRect = QRectF(0, 0, 203*PrintDPI/25.4, 287*PrintDPI/25.4); + //sceneRect = QRectF(0, 0, toPixel(203), toPixel(287)); sceneRect = QRectF(0, 0, toPixel(823), toPixel(1171)); currentScene = new QGraphicsScene(sceneRect); QBrush *brush = new QBrush(); diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 5f34e8843..5be60dd00 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -90,7 +90,7 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 qreal result = cal.eval(formula, &errorMsg); if(errorMsg.isEmpty()){ QPointF fPoint = VToolBisector::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), - thirdPoint.toQPointF(), result*PrintDPI/25.4); + thirdPoint.toQPointF(), toPixel(result)); qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); @@ -104,9 +104,8 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 } VDrawTool::AddRecord(id, Tool::BisectorTool, doc); if(parse == Document::FullParse){ - VToolBisector *point = new VToolBisector(doc, data, id, typeLine, formula, - firstPointId, secondPointId, thirdPointId, - typeCreation); + VToolBisector *point = new VToolBisector(doc, data, id, typeLine, formula, firstPointId, secondPointId, + thirdPointId, typeCreation); scene->addItem(point); connect(point, &VToolBisector::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(point, &VToolBisector::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); @@ -163,8 +162,8 @@ void VToolBisector::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "bisector"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "typeLine", typeLine); AddAttribute(domElement, "length", formula); diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index c344a36f6..ec4749c51 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -53,7 +53,7 @@ QPointF VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Li QLineF line = QLineF(p1Line, p2Line); qreal dist = line.length(); if(dist>length){ - qDebug()<<"A3П2="<AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index f2cc19d4d..575dbcf7e 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -25,14 +25,10 @@ VModelingArc::VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogArc(QSharedPointer()){ - VArc arc = data->GetModelingArc(id); - QPainterPath path; - path.addPath(arc.GetPath()); - path.setFillRule( Qt::WindingFill ); - this->setPath(path); - this->setPen(QPen(Qt::black, widthHairLine)); + this->setPen(QPen(baseColor, widthHairLine)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); + RefreshGeometry(); if(typeCreation == Tool::FromGui){ AddToFile(); @@ -68,7 +64,7 @@ VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const QString errorMsg; qreal result = cal.eval(radius, &errorMsg); if(errorMsg.isEmpty()){ - calcRadius = result*PrintDPI/25.4; + calcRadius = toPixel(result); } errorMsg.clear(); diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index 830ef7447..9a2a2349b 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -78,7 +78,7 @@ VModelingBisector *VModelingBisector::Create(const qint64 _id, const QString &fo qreal result = cal.eval(formula, &errorMsg); if(errorMsg.isEmpty()){ QPointF fPoint = VToolBisector::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), - thirdPoint.toQPointF(), result*PrintDPI/25.4); + thirdPoint.toQPointF(), toPixel(result)); qint64 id = _id; if(typeCreation == Tool::FromGui){ id = data->AddModelingPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); @@ -140,8 +140,8 @@ void VModelingBisector::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "bisector"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "typeLine", typeLine); AddAttribute(domElement, "length", formula); diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp index 5464fc9b4..611749379 100644 --- a/tools/modelingTools/vmodelinglineintersect.cpp +++ b/tools/modelingTools/vmodelinglineintersect.cpp @@ -135,8 +135,8 @@ void VModelingLineIntersect::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "lineIntersect"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "p1Line1", p1Line1); AddAttribute(domElement, "p2Line1", p2Line1); diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index 5943e8e5c..72ebc2b65 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -135,8 +135,8 @@ void VModelingNormal::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "normal"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "typeLine", typeLine); AddAttribute(domElement, "length", formula); diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index 8758a4c52..9ea8c6935 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -134,8 +134,8 @@ void VModelingPointOfContact::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "pointOfContact"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "radius", radius); AddAttribute(domElement, "center", center); diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index c18ab5003..ebb6e38df 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -140,8 +140,8 @@ void VModelingShoulderPoint::AddToFile(){ AddAttribute(domElement, "id", id); AddAttribute(domElement, "type", "shoulder"); AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", point.mx()/PrintDPI*25.4); - AddAttribute(domElement, "my", point.my()/PrintDPI*25.4); + AddAttribute(domElement, "mx", toMM(point.mx())); + AddAttribute(domElement, "my", toMM(point.my())); AddAttribute(domElement, "typeLine", typeLine); AddAttribute(domElement, "length", formula); diff --git a/widgets/vcontrolpointspline.cpp b/widgets/vcontrolpointspline.cpp index cda4f792d..4e3e378b9 100644 --- a/widgets/vcontrolpointspline.cpp +++ b/widgets/vcontrolpointspline.cpp @@ -24,7 +24,7 @@ VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position, const QPointF &controlPoint, const QPointF &splinePoint, QGraphicsItem *parent):QGraphicsEllipseItem(parent), - radius(1.5*PrintDPI/25.4), controlLine(0), indexSpline(indexSpline), position(position){ + radius(toPixel(1.5)), controlLine(0), indexSpline(indexSpline), position(position){ //create circle QRectF rec = QRectF(0, 0, radius*2, radius*2); rec.translate(-rec.center().x(), -rec.center().y()); From 1539ba0c476cfb174f7fdd48228a1a49a6ad9ac1 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 29 Oct 2013 15:45:07 +0200 Subject: [PATCH 51/83] Static attribute of xml. --HG-- branch : develop --- tools/drawTools/vdrawtool.cpp | 2 +- tools/drawTools/vtoolalongline.cpp | 40 +++++---- tools/drawTools/vtoolalongline.h | 1 + tools/drawTools/vtoolarc.cpp | 25 +++--- tools/drawTools/vtoolarc.h | 2 + tools/drawTools/vtoolbisector.cpp | 46 +++++----- tools/drawTools/vtoolbisector.h | 1 + tools/drawTools/vtoolendline.cpp | 40 +++++---- tools/drawTools/vtoolendline.h | 1 + tools/drawTools/vtoolheight.cpp | 40 +++++---- tools/drawTools/vtoolheight.h | 1 + tools/drawTools/vtoolline.cpp | 18 ++-- tools/drawTools/vtoolline.h | 1 + tools/drawTools/vtoollineintersect.cpp | 40 +++++---- tools/drawTools/vtoollineintersect.h | 1 + tools/drawTools/vtoollinepoint.cpp | 4 +- tools/drawTools/vtoolnormal.cpp | 46 +++++----- tools/drawTools/vtoolnormal.h | 1 + tools/drawTools/vtoolpoint.cpp | 6 +- tools/drawTools/vtoolpoint.h | 1 + tools/drawTools/vtoolpointofcontact.cpp | 40 +++++---- tools/drawTools/vtoolpointofcontact.h | 1 + tools/drawTools/vtoolpointofintersection.cpp | 28 +++--- tools/drawTools/vtoolpointofintersection.h | 1 + tools/drawTools/vtoolshoulderpoint.cpp | 47 +++++----- tools/drawTools/vtoolshoulderpoint.h | 1 + tools/drawTools/vtoolsinglepoint.cpp | 28 +++--- tools/drawTools/vtoolsinglepoint.h | 1 + tools/drawTools/vtoolspline.cpp | 47 +++++----- tools/drawTools/vtoolspline.h | 2 + tools/drawTools/vtoolsplinepath.cpp | 33 +++---- tools/drawTools/vtoolsplinepath.h | 2 + tools/drawTools/vtooltriangle.cpp | 40 +++++---- tools/drawTools/vtooltriangle.h | 1 + tools/modelingTools/vmodelingalongline.cpp | 40 +++++---- tools/modelingTools/vmodelingalongline.h | 1 + tools/modelingTools/vmodelingarc.cpp | 25 +++--- tools/modelingTools/vmodelingarc.h | 2 + tools/modelingTools/vmodelingbisector.cpp | 46 +++++----- tools/modelingTools/vmodelingbisector.h | 1 + tools/modelingTools/vmodelingendline.cpp | 40 +++++---- tools/modelingTools/vmodelingendline.h | 1 + tools/modelingTools/vmodelingheight.cpp | 40 +++++---- tools/modelingTools/vmodelingheight.h | 1 + tools/modelingTools/vmodelingline.cpp | 18 ++-- tools/modelingTools/vmodelingline.h | 2 + .../modelingTools/vmodelinglineintersect.cpp | 40 +++++---- tools/modelingTools/vmodelinglineintersect.h | 1 + tools/modelingTools/vmodelinglinepoint.cpp | 4 +- tools/modelingTools/vmodelingnormal.cpp | 46 +++++----- tools/modelingTools/vmodelingnormal.h | 1 + tools/modelingTools/vmodelingpoint.cpp | 6 +- tools/modelingTools/vmodelingpoint.h | 1 + .../modelingTools/vmodelingpointofcontact.cpp | 40 +++++---- tools/modelingTools/vmodelingpointofcontact.h | 1 + .../vmodelingpointofintersection.cpp | 28 +++--- .../vmodelingpointofintersection.h | 1 + .../modelingTools/vmodelingshoulderpoint.cpp | 46 +++++----- tools/modelingTools/vmodelingshoulderpoint.h | 1 + tools/modelingTools/vmodelingspline.cpp | 52 +++++------ tools/modelingTools/vmodelingspline.h | 2 + tools/modelingTools/vmodelingsplinepath.cpp | 33 +++---- tools/modelingTools/vmodelingsplinepath.h | 2 + tools/modelingTools/vmodelingtriangle.cpp | 68 +++++++-------- tools/modelingTools/vmodelingtriangle.h | 1 + tools/nodeDetails/vabstractnode.cpp | 13 ++- tools/nodeDetails/vabstractnode.h | 4 + tools/nodeDetails/vnodearc.cpp | 15 ++-- tools/nodeDetails/vnodearc.h | 2 + tools/nodeDetails/vnodepoint.cpp | 23 ++--- tools/nodeDetails/vnodepoint.h | 2 + tools/nodeDetails/vnodespline.cpp | 15 ++-- tools/nodeDetails/vnodespline.h | 2 + tools/nodeDetails/vnodesplinepath.cpp | 15 ++-- tools/nodeDetails/vnodesplinepath.h | 2 + tools/vabstracttool.cpp | 66 ++++++++------ tools/vabstracttool.h | 55 ++++++++++-- tools/vtooldetail.cpp | 86 +++++++++++-------- tools/vtooldetail.h | 9 ++ 79 files changed, 845 insertions(+), 644 deletions(-) diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index 933dbdba2..b6290d45a 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -92,7 +92,7 @@ void VDrawTool::AddToCalculation(const QDomElement &domElement){ } } } else { - qCritical()<<"Can't find tag Calculation"<< Q_FUNC_INFO; + qCritical()<elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - basePointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + basePointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } RefreshGeometry(); } @@ -49,11 +51,11 @@ void VToolAlongLine::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogAlongLine->getPointName()); - domElement.setAttribute("typeLine", dialogAlongLine->getTypeLine()); - domElement.setAttribute("length", dialogAlongLine->getFormula()); - domElement.setAttribute("firstPoint", QString().setNum(dialogAlongLine->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogAlongLine->getSecondPointId())); + domElement.setAttribute(AttrName, dialogAlongLine->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogAlongLine->getTypeLine()); + domElement.setAttribute(AttrLength, dialogAlongLine->getFormula()); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogAlongLine->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogAlongLine->getSecondPointId())); emit FullUpdateTree(); } } @@ -71,18 +73,18 @@ void VToolAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VToolAlongLine::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "alongLine"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "firstPoint", basePointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrFirstPoint, basePointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index b9a1e16e9..35734aab9 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -38,6 +38,7 @@ public: const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index f73d8f4bc..149560c3d 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -22,6 +22,9 @@ #include "vtoolarc.h" #include "container/calculator.h" +const QString VToolArc::TagName = QStringLiteral("arc"); +const QString VToolArc::ToolType = QStringLiteral("simple"); + VToolArc::VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogArc(QSharedPointer()){ @@ -114,10 +117,10 @@ void VToolArc::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("center", QString().setNum(dialogArc->GetCenter())); - domElement.setAttribute("radius", dialogArc->GetRadius()); - domElement.setAttribute("angle1", dialogArc->GetF1()); - domElement.setAttribute("angle2", dialogArc->GetF2()); + domElement.setAttribute(AttrCenter, QString().setNum(dialogArc->GetCenter())); + domElement.setAttribute(AttrRadius, dialogArc->GetRadius()); + domElement.setAttribute(AttrAngle1, dialogArc->GetF1()); + domElement.setAttribute(AttrAngle2, dialogArc->GetF2()); emit FullUpdateTree(); } } @@ -154,14 +157,14 @@ void VToolArc::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VToolArc::AddToFile(){ VArc arc = VAbstractTool::data.GetArc(id); - QDomElement domElement = doc->createElement("arc"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "simple"); - AddAttribute(domElement, "center", arc.GetCenter()); - AddAttribute(domElement, "radius", arc.GetFormulaRadius()); - AddAttribute(domElement, "angle1", arc.GetFormulaF1()); - AddAttribute(domElement, "angle2", arc.GetFormulaF2()); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrCenter, arc.GetCenter()); + AddAttribute(domElement, AttrRadius, arc.GetFormulaRadius()); + AddAttribute(domElement, AttrAngle1, arc.GetFormulaF1()); + AddAttribute(domElement, AttrAngle2, arc.GetFormulaF2()); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index fb99e11ed..a743b96e1 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -38,6 +38,8 @@ public: static void Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 5be60dd00..9e21737ab 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -22,6 +22,8 @@ #include "vtoolbisector.h" #include +const QString VToolBisector::ToolType = QStringLiteral("bisector"); + VToolBisector::VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, @@ -121,11 +123,11 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 void VToolBisector::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - firstPointId = domElement.attribute("firstPoint", "").toLongLong(); - basePointId = domElement.attribute("secondPoint", "").toLongLong(); - thirdPointId = domElement.attribute("thirdPoint", "").toLongLong(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + basePointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); + thirdPointId = domElement.attribute(AttrThirdPoint, "").toLongLong(); } RefreshGeometry(); } @@ -134,12 +136,12 @@ void VToolBisector::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogBisector->getPointName()); - domElement.setAttribute("typeLine", dialogBisector->getTypeLine()); - domElement.setAttribute("length", dialogBisector->getFormula()); - domElement.setAttribute("firstPoint", QString().setNum(dialogBisector->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogBisector->getSecondPointId())); - domElement.setAttribute("thirdPoint", QString().setNum(dialogBisector->getThirdPointId())); + domElement.setAttribute(AttrName, dialogBisector->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogBisector->getTypeLine()); + domElement.setAttribute(AttrLength, dialogBisector->getFormula()); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogBisector->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogBisector->getSecondPointId())); + domElement.setAttribute(AttrThirdPoint, QString().setNum(dialogBisector->getThirdPointId())); emit FullUpdateTree(); } } @@ -157,19 +159,19 @@ void VToolBisector::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VToolBisector::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "bisector"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "firstPoint", firstPointId); - AddAttribute(domElement, "secondPoint", basePointId); - AddAttribute(domElement, "thirdPoint", thirdPointId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrFirstPoint, firstPointId); + AddAttribute(domElement, AttrSecondPoint, basePointId); + AddAttribute(domElement, AttrThirdPoint, thirdPointId); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 90fd1a7f6..6e0603f01 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -40,6 +40,7 @@ public: const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index d73906144..d2b58d931 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -23,6 +23,8 @@ #include "widgets/vmaingraphicsscene.h" #include +const QString VToolEndLine::ToolType = QStringLiteral("endLine"); + VToolEndLine::VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, Tool::Sources typeCreation, QGraphicsItem *parent): @@ -96,10 +98,10 @@ void VToolEndLine::Create(const qint64 _id, const QString &pointName, const QStr void VToolEndLine::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - basePointId = domElement.attribute("basePoint", "").toLongLong(); - angle = domElement.attribute("angle", "").toInt(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + basePointId = domElement.attribute(AttrBasePoint, "").toLongLong(); + angle = domElement.attribute(AttrAngle, "").toInt(); } RefreshGeometry(); } @@ -112,11 +114,11 @@ void VToolEndLine::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogEndLine->getPointName()); - domElement.setAttribute("typeLine", dialogEndLine->getTypeLine()); - domElement.setAttribute("length", dialogEndLine->getFormula()); - domElement.setAttribute("angle", QString().setNum(dialogEndLine->getAngle())); - domElement.setAttribute("basePoint", QString().setNum(dialogEndLine->getBasePointId())); + domElement.setAttribute(AttrName, dialogEndLine->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogEndLine->getTypeLine()); + domElement.setAttribute(AttrLength, dialogEndLine->getFormula()); + domElement.setAttribute(AttrAngle, QString().setNum(dialogEndLine->getAngle())); + domElement.setAttribute(AttrBasePoint, QString().setNum(dialogEndLine->getBasePointId())); emit FullUpdateTree(); } } @@ -125,18 +127,18 @@ void VToolEndLine::FullUpdateFromGui(int result){ void VToolEndLine::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "endLine"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "angle", angle); - AddAttribute(domElement, "basePoint", basePointId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrAngle, angle); + AddAttribute(domElement, AttrBasePoint, basePointId); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index 38e637544..75ce3cfeb 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -38,6 +38,7 @@ public: const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolheight.cpp b/tools/drawTools/vtoolheight.cpp index 3779eebfe..0ab9ff998 100644 --- a/tools/drawTools/vtoolheight.cpp +++ b/tools/drawTools/vtoolheight.cpp @@ -1,5 +1,7 @@ #include "vtoolheight.h" +const QString VToolHeight::ToolType = QStringLiteral("height"); + VToolHeight::VToolHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, Tool::Sources typeCreation, QGraphicsItem * parent) @@ -90,10 +92,10 @@ QPointF VToolHeight::FindPoint(const QLineF &line, const QPointF &point){ void VToolHeight::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - basePointId = domElement.attribute("basePoint", "").toLongLong(); - p1LineId = domElement.attribute("p1Line", "").toLongLong(); - p2LineId = domElement.attribute("p2Line", "").toLongLong(); + typeLine = domElement.attribute(AttrTypeLine, ""); + basePointId = domElement.attribute(AttrBasePoint, "").toLongLong(); + p1LineId = domElement.attribute(AttrP1Line, "").toLongLong(); + p2LineId = domElement.attribute(AttrP2Line, "").toLongLong(); } RefreshGeometry(); @@ -103,11 +105,11 @@ void VToolHeight::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogHeight->getPointName()); - domElement.setAttribute("typeLine", dialogHeight->getTypeLine()); - domElement.setAttribute("basePoint", QString().setNum(dialogHeight->getBasePointId())); - domElement.setAttribute("p1Line", QString().setNum(dialogHeight->getP1LineId())); - domElement.setAttribute("p2Line", QString().setNum(dialogHeight->getP2LineId())); + domElement.setAttribute(AttrName, dialogHeight->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogHeight->getTypeLine()); + domElement.setAttribute(AttrBasePoint, QString().setNum(dialogHeight->getBasePointId())); + domElement.setAttribute(AttrP1Line, QString().setNum(dialogHeight->getP1LineId())); + domElement.setAttribute(AttrP2Line, QString().setNum(dialogHeight->getP2LineId())); emit FullUpdateTree(); } } @@ -120,18 +122,18 @@ void VToolHeight::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VToolHeight::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "height"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "basePoint", basePointId); - AddAttribute(domElement, "p1Line", p1LineId); - AddAttribute(domElement, "p2Line", p2LineId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrBasePoint, basePointId); + AddAttribute(domElement, AttrP1Line, p1LineId); + AddAttribute(domElement, AttrP2Line, p2LineId); AddToCalculation(domElement); diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h index 197909888..06158aca4 100644 --- a/tools/drawTools/vtoolheight.h +++ b/tools/drawTools/vtoolheight.h @@ -39,6 +39,7 @@ public: const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); static QPointF FindPoint(const QLineF &line, const QPointF &point); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 62236ecca..98d24fb94 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -21,6 +21,8 @@ #include "vtoolline.h" +const QString VToolLine::TagName = QStringLiteral("line"); + VToolLine::VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint), @@ -91,8 +93,8 @@ void VToolLine::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("firstPoint", QString().setNum(dialogLine->getFirstPoint())); - domElement.setAttribute("secondPoint", QString().setNum(dialogLine->getSecondPoint())); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogLine->getFirstPoint())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogLine->getSecondPoint())); emit FullUpdateTree(); } } @@ -127,10 +129,10 @@ void VToolLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ } void VToolLine::AddToFile(){ - QDomElement domElement = doc->createElement("line"); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "firstPoint", firstPoint); - AddAttribute(domElement, "secondPoint", secondPoint); + QDomElement domElement = doc->createElement(TagName); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrFirstPoint, firstPoint); + AddAttribute(domElement, AttrSecondPoint, secondPoint); AddToCalculation(domElement); } @@ -153,8 +155,8 @@ void VToolLine::RemoveReferens(){ void VToolLine::RefreshGeometry(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - firstPoint = domElement.attribute("firstPoint", "").toLongLong(); - secondPoint = domElement.attribute("secondPoint", "").toLongLong(); + firstPoint = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPoint = domElement.attribute(AttrSecondPoint, "").toLongLong(); } VPointF first = VAbstractTool::data.GetPoint(firstPoint); VPointF second = VAbstractTool::data.GetPoint(secondPoint); diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index e7ccbfe9f..c88e6fb21 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -37,6 +37,7 @@ public: static void Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; public slots: virtual void FullUpdateFromFile(); virtual void ChangedActivDraw(const QString newName); diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index 38e3cf305..b0eb6696a 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -21,6 +21,8 @@ #include "vtoollineintersect.h" +const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect"); + VToolLineIntersect::VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2, Tool::Sources typeCreation, @@ -109,10 +111,10 @@ void VToolLineIntersect::Create(const qint64 _id, const qint64 &p1Line1Id, const void VToolLineIntersect::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - p1Line1 = domElement.attribute("p1Line1", "").toLongLong(); - p2Line1 = domElement.attribute("p2Line1", "").toLongLong(); - p1Line2 = domElement.attribute("p1Line2", "").toLongLong(); - p2Line2 = domElement.attribute("p2Line2", "").toLongLong(); + p1Line1 = domElement.attribute(AttrP1Line1, "").toLongLong(); + p2Line1 = domElement.attribute(AttrP2Line1, "").toLongLong(); + p1Line2 = domElement.attribute(AttrP1Line2, "").toLongLong(); + p2Line2 = domElement.attribute(AttrP2Line2, "").toLongLong(); } RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } @@ -121,11 +123,11 @@ void VToolLineIntersect::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogLineIntersect->getPointName()); - domElement.setAttribute("p1Line1", QString().setNum(dialogLineIntersect->getP1Line1())); - domElement.setAttribute("p2Line1", QString().setNum(dialogLineIntersect->getP2Line1())); - domElement.setAttribute("p1Line2", QString().setNum(dialogLineIntersect->getP1Line2())); - domElement.setAttribute("p2Line2", QString().setNum(dialogLineIntersect->getP2Line2())); + domElement.setAttribute(AttrName, dialogLineIntersect->getPointName()); + domElement.setAttribute(AttrP1Line1, QString().setNum(dialogLineIntersect->getP1Line1())); + domElement.setAttribute(AttrP2Line1, QString().setNum(dialogLineIntersect->getP2Line1())); + domElement.setAttribute(AttrP1Line2, QString().setNum(dialogLineIntersect->getP1Line2())); + domElement.setAttribute(AttrP2Line2, QString().setNum(dialogLineIntersect->getP2Line2())); emit FullUpdateTree(); } } @@ -143,18 +145,18 @@ void VToolLineIntersect::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) void VToolLineIntersect::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "lineIntersect"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "p1Line1", p1Line1); - AddAttribute(domElement, "p2Line1", p2Line1); - AddAttribute(domElement, "p1Line2", p1Line2); - AddAttribute(domElement, "p2Line2", p2Line2); + AddAttribute(domElement, AttrP1Line1, p1Line1); + AddAttribute(domElement, AttrP2Line1, p2Line1); + AddAttribute(domElement, AttrP1Line2, p1Line2); + AddAttribute(domElement, AttrP2Line2, p2Line2); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index e42cca66c..2cea55c28 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -38,6 +38,7 @@ public: const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index e7742599e..3c5c11785 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -32,7 +32,7 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 mainLine = new QGraphicsLineItem(QLineF(point1 - point2, QPointF()), this); mainLine->setPen(QPen(Qt::black, widthHairLine/factor)); mainLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); - if(typeLine == "none"){ + if(typeLine == TypeLineNone){ mainLine->setVisible(false); } else { mainLine->setVisible(true); @@ -55,7 +55,7 @@ void VToolLinePoint::RefreshGeometry(){ QPointF point = VDrawTool::data.GetPoint(id).toQPointF(); QPointF basePoint = VDrawTool::data.GetPoint(basePointId).toQPointF(); mainLine->setLine(QLineF(basePoint - point, QPointF())); - if(typeLine == "none"){ + if(typeLine == TypeLineNone){ mainLine->setVisible(false); } else { mainLine->setVisible(true); diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 25915ee63..0dd4fd809 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -22,6 +22,8 @@ #include "vtoolnormal.h" #include +const QString VToolNormal::ToolType = QStringLiteral("normal"); + VToolNormal::VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent): @@ -110,11 +112,11 @@ QPointF VToolNormal::FindPoint(const QPointF &firstPoint, const QPointF &secondP void VToolNormal::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - basePointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); - angle = domElement.attribute("angle", "").toDouble(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + basePointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); + angle = domElement.attribute(AttrAngle, "").toDouble(); } RefreshGeometry(); } @@ -123,12 +125,12 @@ void VToolNormal::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogNormal->getPointName()); - domElement.setAttribute("typeLine", dialogNormal->getTypeLine()); - domElement.setAttribute("length", dialogNormal->getFormula()); - domElement.setAttribute("angle", QString().setNum(dialogNormal->getAngle())); - domElement.setAttribute("firstPoint", QString().setNum(dialogNormal->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogNormal->getSecondPointId())); + domElement.setAttribute(AttrName, dialogNormal->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogNormal->getTypeLine()); + domElement.setAttribute(AttrLength, dialogNormal->getFormula()); + domElement.setAttribute(AttrAngle, QString().setNum(dialogNormal->getAngle())); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogNormal->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogNormal->getSecondPointId())); emit FullUpdateTree(); } } @@ -146,19 +148,19 @@ void VToolNormal::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VToolNormal::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "normal"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "angle", angle); - AddAttribute(domElement, "firstPoint", basePointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrAngle, angle); + AddAttribute(domElement, AttrFirstPoint, basePointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 4ac03cff7..3370d2c90 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -41,6 +41,7 @@ public: Tool::Sources typeCreation); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const qreal &length, const qreal &angle = 0); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index eb53afb10..fc94cd91a 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -21,6 +21,8 @@ #include "vtoolpoint.h" +const QString VToolPoint::TagName = QStringLiteral("point"); + VToolPoint::VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsEllipseItem(parent), radius(toPixel(2)), namePoint(0), lineName(0){ @@ -47,8 +49,8 @@ void VToolPoint::NameChangePosition(const QPointF pos){ void VToolPoint::UpdateNamePosition(qreal mx, qreal my){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("mx", QString().setNum(toMM(mx))); - domElement.setAttribute("my", QString().setNum(toMM(my))); + domElement.setAttribute(AttrMx, QString().setNum(toMM(mx))); + domElement.setAttribute(AttrMy, QString().setNum(toMM(my))); emit toolhaveChange(); } } diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index ddbc0159e..924f5c593 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -30,6 +30,7 @@ class VToolPoint: public VDrawTool, public QGraphicsEllipseItem{ public: VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem * parent = 0); virtual ~VToolPoint(){} + static const QString TagName; public slots: void NameChangePosition(const QPointF pos); virtual void ChangedActivDraw(const QString newName); diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index a6213071b..f068aecb2 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -22,6 +22,8 @@ #include "vtoolpointofcontact.h" #include +const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); + VToolPointOfContact::VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, @@ -128,10 +130,10 @@ void VToolPointOfContact::Create(const qint64 _id, const QString &radius, const void VToolPointOfContact::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - radius = domElement.attribute("radius", ""); - center = domElement.attribute("center", "").toLongLong(); - firstPointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + radius = domElement.attribute(AttrRadius, ""); + center = domElement.attribute(AttrCenter, "").toLongLong(); + firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } @@ -140,11 +142,11 @@ void VToolPointOfContact::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogPointOfContact->getPointName()); - domElement.setAttribute("radius", dialogPointOfContact->getRadius()); - domElement.setAttribute("center", QString().setNum(dialogPointOfContact->getCenter())); - domElement.setAttribute("firstPoint", QString().setNum(dialogPointOfContact->getFirstPoint())); - domElement.setAttribute("secondPoint", QString().setNum(dialogPointOfContact->getSecondPoint())); + domElement.setAttribute(AttrName, dialogPointOfContact->getPointName()); + domElement.setAttribute(AttrRadius, dialogPointOfContact->getRadius()); + domElement.setAttribute(AttrCenter, QString().setNum(dialogPointOfContact->getCenter())); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogPointOfContact->getFirstPoint())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogPointOfContact->getSecondPoint())); emit FullUpdateTree(); } } @@ -162,18 +164,18 @@ void VToolPointOfContact::contextMenuEvent(QGraphicsSceneContextMenuEvent *event void VToolPointOfContact::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "pointOfContact"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "radius", radius); - AddAttribute(domElement, "center", center); - AddAttribute(domElement, "firstPoint", firstPointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrRadius, radius); + AddAttribute(domElement, AttrCenter, center); + AddAttribute(domElement, AttrFirstPoint, firstPointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index d7720cddc..852329aa5 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -40,6 +40,7 @@ public: const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolpointofintersection.cpp b/tools/drawTools/vtoolpointofintersection.cpp index 10ef3c214..ceff574c3 100644 --- a/tools/drawTools/vtoolpointofintersection.cpp +++ b/tools/drawTools/vtoolpointofintersection.cpp @@ -1,5 +1,7 @@ #include "vtoolpointofintersection.h" +const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection"); + VToolPointOfIntersection::VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) @@ -61,8 +63,8 @@ void VToolPointOfIntersection::Create(const qint64 _id, const QString &pointName void VToolPointOfIntersection::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - firstPointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } VToolPoint::RefreshPointGeometry(VDrawTool::data.GetPoint(id)); } @@ -71,9 +73,9 @@ void VToolPointOfIntersection::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogPointOfIntersection->getPointName()); - domElement.setAttribute("firstPoint", QString().setNum(dialogPointOfIntersection->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogPointOfIntersection->getSecondPointId())); + domElement.setAttribute(AttrName, dialogPointOfIntersection->getPointName()); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogPointOfIntersection->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogPointOfIntersection->getSecondPointId())); emit FullUpdateTree(); } } @@ -91,16 +93,16 @@ void VToolPointOfIntersection::contextMenuEvent(QGraphicsSceneContextMenuEvent * void VToolPointOfIntersection::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "pointOfIntersection"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "firstPoint", firstPointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrFirstPoint, firstPointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h index 7737d45a5..6aa69cd3c 100644 --- a/tools/drawTools/vtoolpointofintersection.h +++ b/tools/drawTools/vtoolpointofintersection.h @@ -17,6 +17,7 @@ public: const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index ec4749c51..77b2510e9 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -20,9 +20,10 @@ ****************************************************************************/ #include "vtoolshoulderpoint.h" -#include #include +const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); + VToolShoulderPoint::VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, @@ -129,11 +130,11 @@ void VToolShoulderPoint::Create(const qint64 _id, const QString &formula, const void VToolShoulderPoint::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - basePointId = domElement.attribute("p1Line", "").toLongLong(); - p2Line = domElement.attribute("p2Line", "").toLongLong(); - pShoulder = domElement.attribute("pShoulder", "").toLongLong(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + basePointId = domElement.attribute(AttrP1Line, "").toLongLong(); + p2Line = domElement.attribute(AttrP2Line, "").toLongLong(); + pShoulder = domElement.attribute(AttrPShoulder, "").toLongLong(); } RefreshGeometry(); } @@ -142,12 +143,12 @@ void VToolShoulderPoint::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogShoulderPoint->getPointName()); - domElement.setAttribute("typeLine", dialogShoulderPoint->getTypeLine()); - domElement.setAttribute("length", dialogShoulderPoint->getFormula()); - domElement.setAttribute("p1Line", QString().setNum(dialogShoulderPoint->getP1Line())); - domElement.setAttribute("p2Line", QString().setNum(dialogShoulderPoint->getP2Line())); - domElement.setAttribute("pShoulder", QString().setNum(dialogShoulderPoint->getPShoulder())); + domElement.setAttribute(AttrName, dialogShoulderPoint->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogShoulderPoint->getTypeLine()); + domElement.setAttribute(AttrLength, dialogShoulderPoint->getFormula()); + domElement.setAttribute(AttrP1Line, QString().setNum(dialogShoulderPoint->getP1Line())); + domElement.setAttribute(AttrP2Line, QString().setNum(dialogShoulderPoint->getP2Line())); + domElement.setAttribute(AttrPShoulder, QString().setNum(dialogShoulderPoint->getPShoulder())); emit FullUpdateTree(); } } @@ -165,19 +166,19 @@ void VToolShoulderPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) void VToolShoulderPoint::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "shoulder"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "p1Line", basePointId); - AddAttribute(domElement, "p2Line", p2Line); - AddAttribute(domElement, "pShoulder", pShoulder); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrP1Line, basePointId); + AddAttribute(domElement, AttrP2Line, p2Line); + AddAttribute(domElement, AttrPShoulder, pShoulder); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index 913fff10c..c56277620 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -39,6 +39,7 @@ public: const qint64 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index 98cd0bd4f..79f39759e 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -21,6 +21,8 @@ #include "vtoolsinglepoint.h" +const QString VToolSinglePoint::ToolType = QStringLiteral("single"); + VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem * parent ):VToolPoint(doc, data, id, parent), dialogSinglePoint(QSharedPointer()){ @@ -42,15 +44,15 @@ void VToolSinglePoint::setDialog(){ void VToolSinglePoint::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "single"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "x", toMM(point.x())); - AddAttribute(domElement, "y", toMM(point.y())); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrX, toMM(point.x())); + AddAttribute(domElement, AttrY, toMM(point.y())); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); AddToCalculation(domElement); } @@ -72,8 +74,8 @@ QVariant VToolSinglePoint::itemChange(QGraphicsItem::GraphicsItemChange change, QPointF newPos = value.toPointF(); QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("x", QString().setNum(toMM(newPos.x()))); - domElement.setAttribute("y", QString().setNum(toMM(newPos.y()))); + domElement.setAttribute(AttrX, QString().setNum(toMM(newPos.x()))); + domElement.setAttribute(AttrY, QString().setNum(toMM(newPos.y()))); //I don't now why but signal does not work. doc->FullUpdateTree(); } @@ -101,9 +103,9 @@ void VToolSinglePoint::FullUpdateFromGui(int result){ QString name = dialogSinglePoint->getName(); QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", name); - domElement.setAttribute("x", QString().setNum(toMM(p.x()))); - domElement.setAttribute("y", QString().setNum(toMM(p.y()))); + domElement.setAttribute(AttrName, name); + domElement.setAttribute(AttrX, QString().setNum(toMM(p.x()))); + domElement.setAttribute(AttrY, QString().setNum(toMM(p.y()))); //I don't now why but signal does not work. doc->FullUpdateTree(); } diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index 4571757af..65b9365cc 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -31,6 +31,7 @@ public: VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index a38b40740..60ed17a35 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -20,9 +20,10 @@ ****************************************************************************/ #include "vtoolspline.h" -#include #include "geometry/vspline.h" +const QString VToolSpline::TagName = QStringLiteral("spline"); +const QString VToolSpline::ToolType = QStringLiteral("simple"); VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, @@ -141,13 +142,13 @@ void VToolSpline::FullUpdateFromGui(int result){ controlPoints[1]->pos(), dialogSpline->getP4(), dialogSpline->getKCurve()); QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("point1", QString().setNum(spl.GetP1())); - domElement.setAttribute("point4", QString().setNum(spl.GetP4())); - domElement.setAttribute("angle1", QString().setNum(spl.GetAngle1())); - domElement.setAttribute("angle2", QString().setNum(spl.GetAngle2())); - domElement.setAttribute("kAsm1", QString().setNum(spl.GetKasm1())); - domElement.setAttribute("kAsm2", QString().setNum(spl.GetKasm2())); - domElement.setAttribute("kCurve", QString().setNum(spl.GetKcurve())); + domElement.setAttribute(AttrPoint1, QString().setNum(spl.GetP1())); + domElement.setAttribute(AttrPoint4, QString().setNum(spl.GetP4())); + domElement.setAttribute(AttrAngle1, QString().setNum(spl.GetAngle1())); + domElement.setAttribute(AttrAngle2, QString().setNum(spl.GetAngle2())); + domElement.setAttribute(AttrKAsm1, QString().setNum(spl.GetKasm1())); + domElement.setAttribute(AttrKAsm2, QString().setNum(spl.GetKasm2())); + domElement.setAttribute(AttrKCurve, QString().setNum(spl.GetKcurve())); emit FullUpdateTree(); } } @@ -165,11 +166,11 @@ void VToolSpline::ControlPointChangePosition(const qint32 &indexSpline, SplinePo } QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("angle1", QString().setNum(spl.GetAngle1())); - domElement.setAttribute("angle2", QString().setNum(spl.GetAngle2())); - domElement.setAttribute("kAsm1", QString().setNum(spl.GetKasm1())); - domElement.setAttribute("kAsm2", QString().setNum(spl.GetKasm2())); - domElement.setAttribute("kCurve", QString().setNum(spl.GetKcurve())); + domElement.setAttribute(AttrAngle1, QString().setNum(spl.GetAngle1())); + domElement.setAttribute(AttrAngle2, QString().setNum(spl.GetAngle2())); + domElement.setAttribute(AttrKAsm1, QString().setNum(spl.GetKasm1())); + domElement.setAttribute(AttrKAsm2, QString().setNum(spl.GetKasm2())); + domElement.setAttribute(AttrKCurve, QString().setNum(spl.GetKcurve())); emit FullUpdateTree(); } } @@ -180,17 +181,17 @@ void VToolSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VToolSpline::AddToFile(){ VSpline spl = VAbstractTool::data.GetSpline(id); - QDomElement domElement = doc->createElement("spline"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "simple"); - AddAttribute(domElement, "point1", spl.GetP1()); - AddAttribute(domElement, "point4", spl.GetP4()); - AddAttribute(domElement, "angle1", spl.GetAngle1()); - AddAttribute(domElement, "angle2", spl.GetAngle2()); - AddAttribute(domElement, "kAsm1", spl.GetKasm1()); - AddAttribute(domElement, "kAsm2", spl.GetKasm2()); - AddAttribute(domElement, "kCurve", spl.GetKcurve()); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrPoint1, spl.GetP1()); + AddAttribute(domElement, AttrPoint4, spl.GetP4()); + AddAttribute(domElement, AttrAngle1, spl.GetAngle1()); + AddAttribute(domElement, AttrAngle2, spl.GetAngle2()); + AddAttribute(domElement, AttrKAsm1, spl.GetKasm1()); + AddAttribute(domElement, AttrKAsm2, spl.GetKasm2()); + AddAttribute(domElement, AttrKCurve, spl.GetKcurve()); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index ead6779a0..a298b7ae4 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -40,6 +40,8 @@ public: const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; signals: void RefreshLine ( const qint32 &indexSpline, SplinePoint::Position position, const QPointF &controlPoint, const QPointF &splinePoint ); diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index 301dc0520..3e8cb0bee 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -21,6 +21,9 @@ #include "vtoolsplinepath.h" +const QString VToolSplinePath::TagName = QStringLiteral("spline"); +const QString VToolSplinePath::ToolType = QStringLiteral("path"); + VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), @@ -129,7 +132,7 @@ void VToolSplinePath::FullUpdateFromGui(int result){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("kCurve", QString().setNum(splPath.getKCurve())); + domElement.setAttribute(AttrKCurve, QString().setNum(splPath.getKCurve())); UpdatePathPoint(domElement, splPath); emit FullUpdateTree(); } @@ -152,7 +155,7 @@ void VToolSplinePath::ControlPointChangePosition(const qint32 &indexSpline, Spli CorectControlPoints(spl, splPath, indexSpline); QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("kCurve", QString().setNum(splPath.getKCurve())); + domElement.setAttribute(AttrKCurve, QString().setNum(splPath.getKCurve())); UpdatePathPoint(domElement, splPath); emit FullUpdateTree(); } @@ -178,10 +181,10 @@ void VToolSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path){ QDomElement domElement = nodeList.at(i).toElement(); if(!domElement.isNull()){ VSplinePoint p = path[i]; - domElement.setAttribute("pSpline", QString().setNum(p.P())); - domElement.setAttribute("kAsm1", QString().setNum(p.KAsm1())); - domElement.setAttribute("kAsm2", QString().setNum(p.KAsm2())); - domElement.setAttribute("angle", QString().setNum(p.Angle2())); + domElement.setAttribute(AttrPSpline, QString().setNum(p.P())); + domElement.setAttribute(AttrKAsm1, QString().setNum(p.KAsm1())); + domElement.setAttribute(AttrKAsm2, QString().setNum(p.KAsm2())); + domElement.setAttribute(AttrAngle, QString().setNum(p.Angle2())); } } } @@ -217,11 +220,11 @@ void VToolSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VToolSplinePath::AddToFile(){ VSplinePath splPath = VAbstractTool::data.GetSplinePath(id); - QDomElement domElement = doc->createElement("spline"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "path"); - AddAttribute(domElement, "kCurve", splPath.getKCurve()); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrKCurve, splPath.getKCurve()); for(qint32 i = 0; i < splPath.CountPoint(); ++i){ AddPathPoint(domElement, splPath[i]); @@ -231,12 +234,12 @@ void VToolSplinePath::AddToFile(){ } void VToolSplinePath::AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint){ - QDomElement pathPoint = doc->createElement("pathPoint"); + QDomElement pathPoint = doc->createElement(AttrPathPoint); - AddAttribute(pathPoint, "pSpline", splPoint.P()); - AddAttribute(pathPoint, "kAsm1", splPoint.KAsm1()); - AddAttribute(pathPoint, "kAsm2", splPoint.KAsm2()); - AddAttribute(pathPoint, "angle", splPoint.Angle2()); + AddAttribute(pathPoint, AttrPSpline, splPoint.P()); + AddAttribute(pathPoint, AttrKAsm1, splPoint.KAsm1()); + AddAttribute(pathPoint, AttrKAsm2, splPoint.KAsm2()); + AddAttribute(pathPoint, AttrAngle, splPoint.Angle2()); domElement.appendChild(pathPoint); } diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index 3fbec5490..3bc9974e5 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -38,6 +38,8 @@ public: static void Create(const qint64 _id, const VSplinePath &path, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; signals: void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, const QPointF &controlPoint, const QPointF &splinePoint); diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index 260961412..6c9c74b3b 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -1,5 +1,7 @@ #include "vtooltriangle.h" +const QString VToolTriangle::ToolType = QStringLiteral("triangle"); + VToolTriangle::VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) @@ -104,10 +106,10 @@ QPointF VToolTriangle::FindPoint(const QPointF axisP1, const QPointF axisP2, con void VToolTriangle::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - axisP1Id = domElement.attribute("axisP1", "").toLongLong(); - axisP2Id = domElement.attribute("axisP2", "").toLongLong(); - firstPointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + axisP1Id = domElement.attribute(AttrAxisP1, "").toLongLong(); + axisP2Id = domElement.attribute(AttrAxisP2, "").toLongLong(); + firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } VToolPoint::RefreshPointGeometry(VDrawTool::data.GetPoint(id)); } @@ -116,11 +118,11 @@ void VToolTriangle::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogTriangle->getPointName()); - domElement.setAttribute("axisP1", QString().setNum(dialogTriangle->getAxisP1Id())); - domElement.setAttribute("axisP2", QString().setNum(dialogTriangle->getAxisP2Id())); - domElement.setAttribute("firstPoint", QString().setNum(dialogTriangle->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogTriangle->getSecondPointId())); + domElement.setAttribute(AttrName, dialogTriangle->getPointName()); + domElement.setAttribute(AttrAxisP1, QString().setNum(dialogTriangle->getAxisP1Id())); + domElement.setAttribute(AttrAxisP2, QString().setNum(dialogTriangle->getAxisP2Id())); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogTriangle->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogTriangle->getSecondPointId())); emit FullUpdateTree(); } @@ -141,18 +143,18 @@ void VToolTriangle::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VToolTriangle::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "triangle"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "axisP1", axisP1Id); - AddAttribute(domElement, "axisP2", axisP2Id); - AddAttribute(domElement, "firstPoint", firstPointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrAxisP1, axisP1Id); + AddAttribute(domElement, AttrAxisP2, axisP2Id); + AddAttribute(domElement, AttrFirstPoint, firstPointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToCalculation(domElement); } diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index 9cf84d9ca..63b07c06a 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -40,6 +40,7 @@ public: const Document::Documents &parse, Tool::Sources typeCreation); static QPointF FindPoint(const QPointF axisP1, const QPointF axisP2, const QPointF firstPoint, const QPointF secondPoint); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index 8678c20b6..30da7536d 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -22,6 +22,8 @@ #include "vmodelingalongline.h" #include "container/calculator.h" +const QString VModelingAlongLine::ToolType = QStringLiteral("alongLine"); + VModelingAlongLine::VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, @@ -37,10 +39,10 @@ VModelingAlongLine::VModelingAlongLine(VDomDocument *doc, VContainer *data, qint void VModelingAlongLine::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - basePointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + basePointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } RefreshGeometry(); } @@ -49,11 +51,11 @@ void VModelingAlongLine::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogAlongLine->getPointName()); - domElement.setAttribute("typeLine", dialogAlongLine->getTypeLine()); - domElement.setAttribute("length", dialogAlongLine->getFormula()); - domElement.setAttribute("firstPoint", QString().setNum(dialogAlongLine->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogAlongLine->getSecondPointId())); + domElement.setAttribute(AttrName, dialogAlongLine->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogAlongLine->getTypeLine()); + domElement.setAttribute(AttrLength, dialogAlongLine->getFormula()); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogAlongLine->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogAlongLine->getSecondPointId())); emit FullUpdateTree(); } @@ -67,18 +69,18 @@ void VModelingAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) void VModelingAlongLine::AddToFile(){ VPointF point = VAbstractTool::data.GetModelingPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "alongLine"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "firstPoint", basePointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrFirstPoint, basePointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index 5f47e88d9..eceb805b3 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -38,6 +38,7 @@ public: const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index 575dbcf7e..6181db5c7 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -22,6 +22,9 @@ #include "vmodelingarc.h" #include "container/calculator.h" +const QString VModelingArc::TagName = QStringLiteral("arc"); +const QString VModelingArc::ToolType = QStringLiteral("simple"); + VModelingArc::VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogArc(QSharedPointer()){ @@ -106,10 +109,10 @@ void VModelingArc::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("center", QString().setNum(dialogArc->GetCenter())); - domElement.setAttribute("radius", dialogArc->GetRadius()); - domElement.setAttribute("angle1", dialogArc->GetF1()); - domElement.setAttribute("angle2", dialogArc->GetF2()); + domElement.setAttribute(AttrCenter, QString().setNum(dialogArc->GetCenter())); + domElement.setAttribute(AttrRadius, dialogArc->GetRadius()); + domElement.setAttribute(AttrAngle1, dialogArc->GetF1()); + domElement.setAttribute(AttrAngle2, dialogArc->GetF2()); emit FullUpdateTree(); } } @@ -122,14 +125,14 @@ void VModelingArc::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VModelingArc::AddToFile(){ VArc arc = VAbstractTool::data.GetModelingArc(id); - QDomElement domElement = doc->createElement("arc"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "simple"); - AddAttribute(domElement, "center", arc.GetCenter()); - AddAttribute(domElement, "radius", arc.GetFormulaRadius()); - AddAttribute(domElement, "angle1", arc.GetFormulaF1()); - AddAttribute(domElement, "angle2", arc.GetFormulaF2()); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrCenter, arc.GetCenter()); + AddAttribute(domElement, AttrRadius, arc.GetFormulaRadius()); + AddAttribute(domElement, AttrAngle1, arc.GetFormulaF1()); + AddAttribute(domElement, AttrAngle2, arc.GetFormulaF2()); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index e7d0f1401..18c20f897 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -37,6 +37,8 @@ public: static VModelingArc* Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index 9a2a2349b..fa84f937b 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -23,6 +23,8 @@ #include "../drawTools/vtoolbisector.h" #include +const QString VModelingBisector::ToolType = QStringLiteral("bisector"); + VModelingBisector::VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, @@ -104,11 +106,11 @@ VModelingBisector *VModelingBisector::Create(const qint64 _id, const QString &fo void VModelingBisector::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - firstPointId = domElement.attribute("firstPoint", "").toLongLong(); - basePointId = domElement.attribute("secondPoint", "").toLongLong(); - thirdPointId = domElement.attribute("thirdPoint", "").toLongLong(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + basePointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); + thirdPointId = domElement.attribute(AttrThirdPoint, "").toLongLong(); } RefreshGeometry(); } @@ -117,12 +119,12 @@ void VModelingBisector::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogBisector->getPointName()); - domElement.setAttribute("typeLine", dialogBisector->getTypeLine()); - domElement.setAttribute("length", dialogBisector->getFormula()); - domElement.setAttribute("firstPoint", QString().setNum(dialogBisector->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogBisector->getSecondPointId())); - domElement.setAttribute("thirdPoint", QString().setNum(dialogBisector->getThirdPointId())); + domElement.setAttribute(AttrName, dialogBisector->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogBisector->getTypeLine()); + domElement.setAttribute(AttrLength, dialogBisector->getFormula()); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogBisector->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogBisector->getSecondPointId())); + domElement.setAttribute(AttrThirdPoint, QString().setNum(dialogBisector->getThirdPointId())); emit FullUpdateTree(); } } @@ -135,19 +137,19 @@ void VModelingBisector::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VModelingBisector::AddToFile(){ VPointF point = VAbstractTool::data.GetModelingPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "bisector"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "firstPoint", firstPointId); - AddAttribute(domElement, "secondPoint", basePointId); - AddAttribute(domElement, "thirdPoint", thirdPointId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrFirstPoint, firstPointId); + AddAttribute(domElement, AttrSecondPoint, basePointId); + AddAttribute(domElement, AttrThirdPoint, thirdPointId); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index f672e9c55..2a84ac1fc 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -39,6 +39,7 @@ public: const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index 475ec9b3c..fa4b51f5f 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -22,6 +22,8 @@ #include "vmodelingendline.h" #include +const QString VModelingEndLine::ToolType = QStringLiteral("endLine"); + VModelingEndLine::VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, Tool::Sources typeCreation, @@ -91,10 +93,10 @@ VModelingEndLine *VModelingEndLine::Create(const qint64 _id, const QString &poin void VModelingEndLine::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - basePointId = domElement.attribute("basePoint", "").toLongLong(); - angle = domElement.attribute("angle", "").toDouble(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + basePointId = domElement.attribute(AttrBasePoint, "").toLongLong(); + angle = domElement.attribute(AttrAngle, "").toDouble(); } RefreshGeometry(); } @@ -107,11 +109,11 @@ void VModelingEndLine::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogEndLine->getPointName()); - domElement.setAttribute("typeLine", dialogEndLine->getTypeLine()); - domElement.setAttribute("length", dialogEndLine->getFormula()); - domElement.setAttribute("angle", QString().setNum(dialogEndLine->getAngle())); - domElement.setAttribute("basePoint", QString().setNum(dialogEndLine->getBasePointId())); + domElement.setAttribute(AttrName, dialogEndLine->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogEndLine->getTypeLine()); + domElement.setAttribute(AttrLength, dialogEndLine->getFormula()); + domElement.setAttribute(AttrAngle, QString().setNum(dialogEndLine->getAngle())); + domElement.setAttribute(AttrBasePoint, QString().setNum(dialogEndLine->getBasePointId())); emit FullUpdateTree(); } } @@ -120,18 +122,18 @@ void VModelingEndLine::FullUpdateFromGui(int result){ void VModelingEndLine::AddToFile(){ VPointF point = VAbstractTool::data.GetModelingPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "endLine"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "angle", angle); - AddAttribute(domElement, "basePoint", basePointId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrAngle, angle); + AddAttribute(domElement, AttrBasePoint, basePointId); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index fd81cd062..edf57b266 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -38,6 +38,7 @@ public: const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingheight.cpp b/tools/modelingTools/vmodelingheight.cpp index 46e3d3565..cbf87545f 100644 --- a/tools/modelingTools/vmodelingheight.cpp +++ b/tools/modelingTools/vmodelingheight.cpp @@ -1,6 +1,8 @@ #include "vmodelingheight.h" #include "../drawTools/vtoolheight.h" +const QString VModelingHeight::ToolType = QStringLiteral("height"); + VModelingHeight::VModelingHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, Tool::Sources typeCreation, @@ -71,10 +73,10 @@ VModelingHeight *VModelingHeight::Create(const qint64 _id, const QString &pointN void VModelingHeight::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - basePointId = domElement.attribute("basePoint", "").toLongLong(); - p1LineId = domElement.attribute("p1Line", "").toLongLong(); - p2LineId = domElement.attribute("p2Line", "").toLongLong(); + typeLine = domElement.attribute(AttrTypeLine, ""); + basePointId = domElement.attribute(AttrBasePoint, "").toLongLong(); + p1LineId = domElement.attribute(AttrP1Line, "").toLongLong(); + p2LineId = domElement.attribute(AttrP2Line, "").toLongLong(); } RefreshGeometry(); } @@ -83,11 +85,11 @@ void VModelingHeight::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogHeight->getPointName()); - domElement.setAttribute("typeLine", dialogHeight->getTypeLine()); - domElement.setAttribute("basePoint", QString().setNum(dialogHeight->getBasePointId())); - domElement.setAttribute("p1Line", QString().setNum(dialogHeight->getP1LineId())); - domElement.setAttribute("p2Line", QString().setNum(dialogHeight->getP2LineId())); + domElement.setAttribute(AttrName, dialogHeight->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogHeight->getTypeLine()); + domElement.setAttribute(AttrBasePoint, QString().setNum(dialogHeight->getBasePointId())); + domElement.setAttribute(AttrP1Line, QString().setNum(dialogHeight->getP1LineId())); + domElement.setAttribute(AttrP2Line, QString().setNum(dialogHeight->getP2LineId())); emit FullUpdateTree(); } } @@ -100,18 +102,18 @@ void VModelingHeight::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VModelingHeight::AddToFile(){ VPointF point = VAbstractTool::data.GetModelingPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "endLine"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "basePoint", basePointId); - AddAttribute(domElement, "p1Line", p1LineId); - AddAttribute(domElement, "p2Line", p2LineId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrBasePoint, basePointId); + AddAttribute(domElement, AttrP1Line, p1LineId); + AddAttribute(domElement, AttrP2Line, p2LineId); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index f9fbdd7ab..7ad09f6e3 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -38,6 +38,7 @@ public: const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index 92e556189..6acd7cdd7 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -21,6 +21,8 @@ #include "vmodelingline.h" +const QString VModelingLine::TagName = QStringLiteral("line"); + VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem *parent): VModelingTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), @@ -79,8 +81,8 @@ VModelingLine *VModelingLine::Create(const qint64 &_id, const qint64 &firstPoint void VModelingLine::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - firstPoint = domElement.attribute("firstPoint", "").toLongLong(); - secondPoint = domElement.attribute("secondPoint", "").toLongLong(); + firstPoint = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPoint = domElement.attribute(AttrSecondPoint, "").toLongLong(); } VPointF first = VAbstractTool::data.GetModelingPoint(firstPoint); VPointF second = VAbstractTool::data.GetModelingPoint(secondPoint); @@ -91,8 +93,8 @@ void VModelingLine::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("firstPoint", QString().setNum(dialogLine->getFirstPoint())); - domElement.setAttribute("secondPoint", QString().setNum(dialogLine->getSecondPoint())); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogLine->getFirstPoint())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogLine->getSecondPoint())); emit FullUpdateTree(); } } @@ -104,10 +106,10 @@ void VModelingLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ } void VModelingLine::AddToFile(){ - QDomElement domElement = doc->createElement("line"); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "firstPoint", firstPoint); - AddAttribute(domElement, "secondPoint", secondPoint); + QDomElement domElement = doc->createElement(TagName); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrFirstPoint, firstPoint); + AddAttribute(domElement, AttrSecondPoint, secondPoint); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index 98ec7041f..8bee26207 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -36,6 +36,8 @@ public: static VModelingLine* Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp index 611749379..af78014b6 100644 --- a/tools/modelingTools/vmodelinglineintersect.cpp +++ b/tools/modelingTools/vmodelinglineintersect.cpp @@ -21,6 +21,8 @@ #include "vmodelinglineintersect.h" +const QString VModelingLineIntersect::ToolType = QStringLiteral("lineIntersect"); + VModelingLineIntersect::VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem *parent): @@ -101,10 +103,10 @@ VModelingLineIntersect *VModelingLineIntersect::Create(const qint64 _id, const q void VModelingLineIntersect::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - p1Line1 = domElement.attribute("p1Line1", "").toLongLong(); - p2Line1 = domElement.attribute("p2Line1", "").toLongLong(); - p1Line2 = domElement.attribute("p1Line2", "").toLongLong(); - p2Line2 = domElement.attribute("p2Line2", "").toLongLong(); + p1Line1 = domElement.attribute(AttrP1Line1, "").toLongLong(); + p2Line1 = domElement.attribute(AttrP2Line1, "").toLongLong(); + p1Line2 = domElement.attribute(AttrP1Line2, "").toLongLong(); + p2Line2 = domElement.attribute(AttrP2Line2, "").toLongLong(); } RefreshPointGeometry(VAbstractTool::data.GetModelingPoint(id)); } @@ -113,11 +115,11 @@ void VModelingLineIntersect::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogLineIntersect->getPointName()); - domElement.setAttribute("p1Line1", QString().setNum(dialogLineIntersect->getP1Line1())); - domElement.setAttribute("p2Line1", QString().setNum(dialogLineIntersect->getP2Line1())); - domElement.setAttribute("p1Line2", QString().setNum(dialogLineIntersect->getP1Line2())); - domElement.setAttribute("p2Line2", QString().setNum(dialogLineIntersect->getP2Line2())); + domElement.setAttribute(AttrName, dialogLineIntersect->getPointName()); + domElement.setAttribute(AttrP1Line1, QString().setNum(dialogLineIntersect->getP1Line1())); + domElement.setAttribute(AttrP2Line1, QString().setNum(dialogLineIntersect->getP2Line1())); + domElement.setAttribute(AttrP1Line2, QString().setNum(dialogLineIntersect->getP1Line2())); + domElement.setAttribute(AttrP2Line2, QString().setNum(dialogLineIntersect->getP2Line2())); emit FullUpdateTree(); } } @@ -130,18 +132,18 @@ void VModelingLineIntersect::contextMenuEvent(QGraphicsSceneContextMenuEvent *ev void VModelingLineIntersect::AddToFile(){ VPointF point = VAbstractTool::data.GetModelingPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "lineIntersect"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "p1Line1", p1Line1); - AddAttribute(domElement, "p2Line1", p2Line1); - AddAttribute(domElement, "p1Line2", p1Line2); - AddAttribute(domElement, "p2Line2", p2Line2); + AddAttribute(domElement, AttrP1Line1, p1Line1); + AddAttribute(domElement, AttrP2Line1, p2Line1); + AddAttribute(domElement, AttrP1Line2, p1Line2); + AddAttribute(domElement, AttrP2Line2, p2Line2); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index b090e5a2e..7051104d1 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -39,6 +39,7 @@ public: const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelinglinepoint.cpp b/tools/modelingTools/vmodelinglinepoint.cpp index 361144935..e8c05adb2 100644 --- a/tools/modelingTools/vmodelinglinepoint.cpp +++ b/tools/modelingTools/vmodelinglinepoint.cpp @@ -32,7 +32,7 @@ VModelingLinePoint::VModelingLinePoint(VDomDocument *doc, VContainer *data, cons mainLine = new QGraphicsLineItem(QLineF(point1 - point2, QPointF()), this); mainLine->setPen(QPen(Qt::black, widthHairLine)); mainLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); - if(typeLine == "none"){ + if(typeLine == TypeLineNone){ mainLine->setVisible(false); } else { mainLine->setVisible(true); @@ -44,7 +44,7 @@ void VModelingLinePoint::RefreshGeometry(){ QPointF point = VModelingTool::data.GetModelingPoint(id).toQPointF(); QPointF basePoint = VModelingTool::data.GetModelingPoint(basePointId).toQPointF(); mainLine->setLine(QLineF(basePoint - point, QPointF())); - if(typeLine == "none"){ + if(typeLine == TypeLineNone){ mainLine->setVisible(false); } else { mainLine->setVisible(true); diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index 72ebc2b65..c9a9c2cad 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -23,6 +23,8 @@ #include "../drawTools/vtoolnormal.h" #include +const QString VModelingNormal::ToolType = QStringLiteral("normal"); + VModelingNormal::VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, @@ -99,11 +101,11 @@ VModelingNormal *VModelingNormal::Create(const qint64 _id, const QString &formul void VModelingNormal::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - basePointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); - angle = domElement.attribute("angle", "").toInt(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + basePointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); + angle = domElement.attribute(AttrAngle, "").toInt(); } RefreshGeometry(); } @@ -112,12 +114,12 @@ void VModelingNormal::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogNormal->getPointName()); - domElement.setAttribute("typeLine", dialogNormal->getTypeLine()); - domElement.setAttribute("length", dialogNormal->getFormula()); - domElement.setAttribute("angle", QString().setNum(dialogNormal->getAngle())); - domElement.setAttribute("firstPoint", QString().setNum(dialogNormal->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogNormal->getSecondPointId())); + domElement.setAttribute(AttrName, dialogNormal->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogNormal->getTypeLine()); + domElement.setAttribute(AttrLength, dialogNormal->getFormula()); + domElement.setAttribute(AttrAngle, QString().setNum(dialogNormal->getAngle())); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogNormal->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogNormal->getSecondPointId())); emit FullUpdateTree(); } } @@ -130,19 +132,19 @@ void VModelingNormal::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VModelingNormal::AddToFile(){ VPointF point = VAbstractTool::data.GetModelingPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "normal"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "angle", angle); - AddAttribute(domElement, "firstPoint", basePointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrAngle, angle); + AddAttribute(domElement, AttrFirstPoint, basePointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index 4e21102d5..c1ef9c146 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -38,6 +38,7 @@ public: const qint64 &secondPointId, const QString typeLine, const QString pointName, const qreal angle, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingpoint.cpp b/tools/modelingTools/vmodelingpoint.cpp index cfa4ec3f9..4bb1741fa 100644 --- a/tools/modelingTools/vmodelingpoint.cpp +++ b/tools/modelingTools/vmodelingpoint.cpp @@ -22,6 +22,8 @@ #include "vmodelingpoint.h" #include "container/vpointf.h" +const QString VModelingPoint::TagName = QStringLiteral("point"); + VModelingPoint::VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsEllipseItem(parent), radius(toPixel(1.5)), namePoint(0), lineName(0){ @@ -49,8 +51,8 @@ void VModelingPoint::NameChangePosition(const QPointF pos){ void VModelingPoint::UpdateNamePosition(qreal mx, qreal my){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("mx", QString().setNum(toMM(mx))); - domElement.setAttribute("my", QString().setNum(toMM(my))); + domElement.setAttribute(AttrMx, QString().setNum(toMM(mx))); + domElement.setAttribute(AttrMy, QString().setNum(toMM(my))); emit toolhaveChange(); } } diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h index 6a68b5d80..03a8abe6c 100644 --- a/tools/modelingTools/vmodelingpoint.h +++ b/tools/modelingTools/vmodelingpoint.h @@ -30,6 +30,7 @@ class VModelingPoint: public VModelingTool, public QGraphicsEllipseItem{ public: VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem * parent = 0); virtual ~VModelingPoint() {} + static const QString TagName; public slots: void NameChangePosition(const QPointF pos); virtual void FullUpdateFromGui(int result) = 0; diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index 9ea8c6935..11e9bd5ac 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -23,6 +23,8 @@ #include "../drawTools/vtoolpointofcontact.h" #include +const QString VModelingPointOfContact::ToolType = QStringLiteral("pointOfContact"); + VModelingPointOfContact::VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, @@ -100,10 +102,10 @@ VModelingPointOfContact *VModelingPointOfContact::Create(const qint64 _id, const void VModelingPointOfContact::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - radius = domElement.attribute("radius", ""); - center = domElement.attribute("center", "").toLongLong(); - firstPointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + radius = domElement.attribute(AttrRadius, ""); + center = domElement.attribute(AttrCenter, "").toLongLong(); + firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } RefreshPointGeometry(VAbstractTool::data.GetModelingPoint(id)); } @@ -112,11 +114,11 @@ void VModelingPointOfContact::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogPointOfContact->getPointName()); - domElement.setAttribute("radius", dialogPointOfContact->getRadius()); - domElement.setAttribute("center", QString().setNum(dialogPointOfContact->getCenter())); - domElement.setAttribute("firstPoint", QString().setNum(dialogPointOfContact->getFirstPoint())); - domElement.setAttribute("secondPoint", QString().setNum(dialogPointOfContact->getSecondPoint())); + domElement.setAttribute(AttrName, dialogPointOfContact->getPointName()); + domElement.setAttribute(AttrRadius, dialogPointOfContact->getRadius()); + domElement.setAttribute(AttrCenter, QString().setNum(dialogPointOfContact->getCenter())); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogPointOfContact->getFirstPoint())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogPointOfContact->getSecondPoint())); emit FullUpdateTree(); } } @@ -129,18 +131,18 @@ void VModelingPointOfContact::contextMenuEvent(QGraphicsSceneContextMenuEvent *e void VModelingPointOfContact::AddToFile(){ VPointF point = VAbstractTool::data.GetModelingPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "pointOfContact"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "radius", radius); - AddAttribute(domElement, "center", center); - AddAttribute(domElement, "firstPoint", firstPointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrRadius, radius); + AddAttribute(domElement, AttrCenter, center); + AddAttribute(domElement, AttrFirstPoint, firstPointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index 0f1516a67..6eebac9ec 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -40,6 +40,7 @@ public: const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingpointofintersection.cpp b/tools/modelingTools/vmodelingpointofintersection.cpp index 70d4db79d..e22e97c7b 100644 --- a/tools/modelingTools/vmodelingpointofintersection.cpp +++ b/tools/modelingTools/vmodelingpointofintersection.cpp @@ -1,5 +1,7 @@ #include "vmodelingpointofintersection.h" +const QString VModelingPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection"); + VModelingPointOfIntersection::VModelingPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) @@ -60,8 +62,8 @@ VModelingPointOfIntersection *VModelingPointOfIntersection::Create(const qint64 void VModelingPointOfIntersection::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - firstPointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } VModelingPoint::RefreshPointGeometry(VModelingTool::data.GetPoint(id)); } @@ -70,9 +72,9 @@ void VModelingPointOfIntersection::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogPointOfIntersection->getPointName()); - domElement.setAttribute("firstPoint", QString().setNum(dialogPointOfIntersection->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogPointOfIntersection->getSecondPointId())); + domElement.setAttribute(AttrName, dialogPointOfIntersection->getPointName()); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogPointOfIntersection->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogPointOfIntersection->getSecondPointId())); emit FullUpdateTree(); } } @@ -90,16 +92,16 @@ void VModelingPointOfIntersection::contextMenuEvent(QGraphicsSceneContextMenuEve void VModelingPointOfIntersection::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "pointOfIntersection"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "firstPoint", firstPointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrFirstPoint, firstPointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingpointofintersection.h b/tools/modelingTools/vmodelingpointofintersection.h index 1c4c94397..b2c00f4f2 100644 --- a/tools/modelingTools/vmodelingpointofintersection.h +++ b/tools/modelingTools/vmodelingpointofintersection.h @@ -18,6 +18,7 @@ public: const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index ebb6e38df..d0f32ebfb 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -23,6 +23,8 @@ #include "../drawTools/vtoolshoulderpoint.h" #include +const QString VModelingShoulderPoint::ToolType = QStringLiteral("shoulder"); + VModelingShoulderPoint::VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, @@ -104,11 +106,11 @@ VModelingShoulderPoint *VModelingShoulderPoint::Create(const qint64 _id, const Q void VModelingShoulderPoint::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - typeLine = domElement.attribute("typeLine", ""); - formula = domElement.attribute("length", ""); - basePointId = domElement.attribute("p1Line", "").toLongLong(); - p2Line = domElement.attribute("p2Line", "").toLongLong(); - pShoulder = domElement.attribute("pShoulder", "").toLongLong(); + typeLine = domElement.attribute(AttrTypeLine, ""); + formula = domElement.attribute(AttrLength, ""); + basePointId = domElement.attribute(AttrP1Line, "").toLongLong(); + p2Line = domElement.attribute(AttrP2Line, "").toLongLong(); + pShoulder = domElement.attribute(AttrPShoulder, "").toLongLong(); } RefreshGeometry(); } @@ -117,12 +119,12 @@ void VModelingShoulderPoint::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogShoulderPoint->getPointName()); - domElement.setAttribute("typeLine", dialogShoulderPoint->getTypeLine()); - domElement.setAttribute("length", dialogShoulderPoint->getFormula()); - domElement.setAttribute("p1Line", QString().setNum(dialogShoulderPoint->getP1Line())); - domElement.setAttribute("p2Line", QString().setNum(dialogShoulderPoint->getP2Line())); - domElement.setAttribute("pShoulder", QString().setNum(dialogShoulderPoint->getPShoulder())); + domElement.setAttribute(AttrName, dialogShoulderPoint->getPointName()); + domElement.setAttribute(AttrTypeLine, dialogShoulderPoint->getTypeLine()); + domElement.setAttribute(AttrLength, dialogShoulderPoint->getFormula()); + domElement.setAttribute(AttrP1Line, QString().setNum(dialogShoulderPoint->getP1Line())); + domElement.setAttribute(AttrP2Line, QString().setNum(dialogShoulderPoint->getP2Line())); + domElement.setAttribute(AttrPShoulder, QString().setNum(dialogShoulderPoint->getPShoulder())); emit FullUpdateTree(); } } @@ -135,19 +137,19 @@ void VModelingShoulderPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *ev void VModelingShoulderPoint::AddToFile(){ VPointF point = VAbstractTool::data.GetModelingPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "shoulder"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "typeLine", typeLine); - AddAttribute(domElement, "length", formula); - AddAttribute(domElement, "p1Line", basePointId); - AddAttribute(domElement, "p2Line", p2Line); - AddAttribute(domElement, "pShoulder", pShoulder); + AddAttribute(domElement, AttrTypeLine, typeLine); + AddAttribute(domElement, AttrLength, formula); + AddAttribute(domElement, AttrP1Line, basePointId); + AddAttribute(domElement, AttrP2Line, p2Line); + AddAttribute(domElement, AttrPShoulder, pShoulder); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index 679d5e85c..a9cee71cd 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -40,6 +40,7 @@ public: const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index b2df795d0..4cd48e3c8 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -22,9 +22,11 @@ #include "vmodelingspline.h" #include "geometry/vspline.h" -VModelingSpline::VModelingSpline(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, - QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), +const QString VModelingSpline::TagName = QStringLiteral("spline"); +const QString VModelingSpline::ToolType = QStringLiteral("simple"); + +VModelingSpline::VModelingSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSpline(QSharedPointer()), controlPoints(QVector()){ ignoreFullUpdate = true; VSpline spl = data->GetModelingSpline(id); @@ -135,13 +137,13 @@ void VModelingSpline::FullUpdateFromGui(int result){ dialogSpline->getKCurve()); QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("point1", QString().setNum(spl.GetP1())); - domElement.setAttribute("point4", QString().setNum(spl.GetP4())); - domElement.setAttribute("angle1", QString().setNum(spl.GetAngle1())); - domElement.setAttribute("angle2", QString().setNum(spl.GetAngle2())); - domElement.setAttribute("kAsm1", QString().setNum(spl.GetKasm1())); - domElement.setAttribute("kAsm2", QString().setNum(spl.GetKasm2())); - domElement.setAttribute("kCurve", QString().setNum(spl.GetKcurve())); + domElement.setAttribute(AttrPoint1, QString().setNum(spl.GetP1())); + domElement.setAttribute(AttrPoint4, QString().setNum(spl.GetP4())); + domElement.setAttribute(AttrAngle1, QString().setNum(spl.GetAngle1())); + domElement.setAttribute(AttrAngle2, QString().setNum(spl.GetAngle2())); + domElement.setAttribute(AttrKAsm1, QString().setNum(spl.GetKasm1())); + domElement.setAttribute(AttrKAsm2, QString().setNum(spl.GetKasm2())); + domElement.setAttribute(AttrKCurve, QString().setNum(spl.GetKcurve())); emit FullUpdateTree(); } } @@ -159,11 +161,11 @@ void VModelingSpline::ControlPointChangePosition(const qint32 &indexSpline, Spli } QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("angle1", QString().setNum(spl.GetAngle1())); - domElement.setAttribute("angle2", QString().setNum(spl.GetAngle2())); - domElement.setAttribute("kAsm1", QString().setNum(spl.GetKasm1())); - domElement.setAttribute("kAsm2", QString().setNum(spl.GetKasm2())); - domElement.setAttribute("kCurve", QString().setNum(spl.GetKcurve())); + domElement.setAttribute(AttrAngle1, QString().setNum(spl.GetAngle1())); + domElement.setAttribute(AttrAngle2, QString().setNum(spl.GetAngle2())); + domElement.setAttribute(AttrKAsm1, QString().setNum(spl.GetKasm1())); + domElement.setAttribute(AttrKAsm2, QString().setNum(spl.GetKasm2())); + domElement.setAttribute(AttrKCurve, QString().setNum(spl.GetKcurve())); emit FullUpdateTree(); } } @@ -174,17 +176,17 @@ void VModelingSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VModelingSpline::AddToFile(){ VSpline spl = VAbstractTool::data.GetModelingSpline(id); - QDomElement domElement = doc->createElement("spline"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "simple"); - AddAttribute(domElement, "point1", spl.GetP1()); - AddAttribute(domElement, "point4", spl.GetP4()); - AddAttribute(domElement, "angle1", spl.GetAngle1()); - AddAttribute(domElement, "angle2", spl.GetAngle2()); - AddAttribute(domElement, "kAsm1", spl.GetKasm1()); - AddAttribute(domElement, "kAsm2", spl.GetKasm2()); - AddAttribute(domElement, "kCurve", spl.GetKcurve()); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrPoint1, spl.GetP1()); + AddAttribute(domElement, AttrPoint4, spl.GetP4()); + AddAttribute(domElement, AttrAngle1, spl.GetAngle1()); + AddAttribute(domElement, AttrAngle2, spl.GetAngle2()); + AddAttribute(domElement, AttrKAsm1, spl.GetKasm1()); + AddAttribute(domElement, AttrKAsm2, spl.GetKasm2()); + AddAttribute(domElement, AttrKCurve, spl.GetKcurve()); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index 49e9f3da8..b4417fb66 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -39,6 +39,8 @@ public: const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; signals: void RefreshLine (const qint32 &indexSpline, SplinePoint::Position position, const QPointF &controlPoint, const QPointF &splinePoint ); diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 0c95438fc..04e1d5c01 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -21,6 +21,9 @@ #include "vmodelingsplinepath.h" +const QString VModelingSplinePath::TagName = QStringLiteral("spline"); +const QString VModelingSplinePath::ToolType = QStringLiteral("path"); + VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, QGraphicsItem *parent):VModelingTool(doc, data, id), @@ -125,7 +128,7 @@ void VModelingSplinePath::FullUpdateFromGui(int result){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("kCurve", QString().setNum(splPath.getKCurve())); + domElement.setAttribute(AttrKCurve, QString().setNum(splPath.getKCurve())); UpdatePathPoint(domElement, splPath); emit FullUpdateTree(); } @@ -148,7 +151,7 @@ void VModelingSplinePath::ControlPointChangePosition(const qint32 &indexSpline, CorectControlPoints(spl, splPath, indexSpline); QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("kCurve", QString().setNum(splPath.getKCurve())); + domElement.setAttribute(AttrKCurve, QString().setNum(splPath.getKCurve())); UpdatePathPoint(domElement, splPath); emit FullUpdateTree(); } @@ -174,10 +177,10 @@ void VModelingSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path){ QDomElement domElement = nodeList.at(i).toElement(); if(!domElement.isNull()){ VSplinePoint p = path[i]; - domElement.setAttribute("pSpline", QString().setNum(p.P())); - domElement.setAttribute("kAsm1", QString().setNum(p.KAsm1())); - domElement.setAttribute("kAsm2", QString().setNum(p.KAsm2())); - domElement.setAttribute("angle", QString().setNum(p.Angle2())); + domElement.setAttribute(AttrPSpline, QString().setNum(p.P())); + domElement.setAttribute(AttrKAsm1, QString().setNum(p.KAsm1())); + domElement.setAttribute(AttrKAsm2, QString().setNum(p.KAsm2())); + domElement.setAttribute(AttrAngle, QString().setNum(p.Angle2())); } } } @@ -188,11 +191,11 @@ void VModelingSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event void VModelingSplinePath::AddToFile(){ VSplinePath splPath = VAbstractTool::data.GetModelingSplinePath(id); - QDomElement domElement = doc->createElement("spline"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "path"); - AddAttribute(domElement, "kCurve", splPath.getKCurve()); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrKCurve, splPath.getKCurve()); for(qint32 i = 0; i < splPath.CountPoint(); ++i){ AddPathPoint(domElement, splPath[i]); @@ -202,12 +205,12 @@ void VModelingSplinePath::AddToFile(){ } void VModelingSplinePath::AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint){ - QDomElement pathPoint = doc->createElement("pathPoint"); + QDomElement pathPoint = doc->createElement(AttrPathPoint); - AddAttribute(pathPoint, "pSpline", splPoint.P()); - AddAttribute(pathPoint, "kAsm1", splPoint.KAsm1()); - AddAttribute(pathPoint, "kAsm2", splPoint.KAsm2()); - AddAttribute(pathPoint, "angle", splPoint.Angle2()); + AddAttribute(pathPoint, AttrPSpline, splPoint.P()); + AddAttribute(pathPoint, AttrKAsm1, splPoint.KAsm1()); + AddAttribute(pathPoint, AttrKAsm2, splPoint.KAsm2()); + AddAttribute(pathPoint, AttrAngle, splPoint.Angle2()); domElement.appendChild(pathPoint); } diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index 4cb25f16d..19f44235f 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -36,6 +36,8 @@ public: static VModelingSplinePath* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSplinePath* Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; signals: void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, const QPointF &controlPoint, const QPointF &splinePoint); diff --git a/tools/modelingTools/vmodelingtriangle.cpp b/tools/modelingTools/vmodelingtriangle.cpp index feeb7c1c5..7a3d91838 100644 --- a/tools/modelingTools/vmodelingtriangle.cpp +++ b/tools/modelingTools/vmodelingtriangle.cpp @@ -1,15 +1,15 @@ #include "vmodelingtriangle.h" #include "../drawTools/vtooltriangle.h" -VModelingTriangle::VModelingTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, - const qint64 &axisP1Id, const qint64 &axisP2Id, - const qint64 &firstPointId, const qint64 &secondPointId, +const QString VModelingTriangle::ToolType = QStringLiteral("triangle"); + +VModelingTriangle::VModelingTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, + const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) - :VModelingPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), - firstPointId(firstPointId), secondPointId(secondPointId), - dialogTriangle(QSharedPointer()) { + :VModelingPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), firstPointId(firstPointId), + secondPointId(secondPointId), dialogTriangle(QSharedPointer()) { if(typeCreation == Tool::FromGui){ - AddToFile(); + AddToFile(); } } @@ -30,15 +30,14 @@ VModelingTriangle *VModelingTriangle::Create(QSharedPointer &dia qint64 firstPointId = dialog->getFirstPointId(); qint64 secondPointId = dialog->getSecondPointId(); QString pointName = dialog->getPointName(); - return Create(0, pointName, axisP1Id, axisP2Id, firstPointId, secondPointId, 5, 10, doc, data, - Document::FullParse, Tool::FromGui); + return Create(0, pointName, axisP1Id, axisP2Id, firstPointId, secondPointId, 5, 10, doc, data, Document::FullParse, + Tool::FromGui); } -VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &pointName, - const qint64 &axisP1Id, const qint64 &axisP2Id, - const qint64 &firstPointId, const qint64 &secondPointId, - const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, +VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, + const qint64 &axisP2Id, const qint64 &firstPointId, + const qint64 &secondPointId, const qreal &mx, const qreal &my, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ VModelingTriangle *tool = 0; VPointF axisP1 = data->GetPoint(axisP1Id); @@ -58,8 +57,7 @@ VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &po } } if(parse == Document::FullParse){ - tool = new VModelingTriangle(doc, data, id, axisP1Id, axisP2Id, firstPointId, - secondPointId, typeCreation); + tool = new VModelingTriangle(doc, data, id, axisP1Id, axisP2Id, firstPointId, secondPointId, typeCreation); doc->AddTool(id, tool); doc->IncrementReferens(axisP1Id); doc->IncrementReferens(axisP2Id); @@ -72,10 +70,10 @@ VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &po void VModelingTriangle::FullUpdateFromFile(){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - axisP1Id = domElement.attribute("axisP1", "").toLongLong(); - axisP2Id = domElement.attribute("axisP2", "").toLongLong(); - firstPointId = domElement.attribute("firstPoint", "").toLongLong(); - secondPointId = domElement.attribute("secondPoint", "").toLongLong(); + axisP1Id = domElement.attribute(AttrAxisP1, "").toLongLong(); + axisP2Id = domElement.attribute(AttrAxisP2, "").toLongLong(); + firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); + secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } VModelingPoint::RefreshPointGeometry(VModelingTool::data.GetPoint(id)); } @@ -84,11 +82,11 @@ void VModelingTriangle::FullUpdateFromGui(int result){ if(result == QDialog::Accepted){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("name", dialogTriangle->getPointName()); - domElement.setAttribute("axisP1", QString().setNum(dialogTriangle->getAxisP1Id())); - domElement.setAttribute("axisP2", QString().setNum(dialogTriangle->getAxisP2Id())); - domElement.setAttribute("firstPoint", QString().setNum(dialogTriangle->getFirstPointId())); - domElement.setAttribute("secondPoint", QString().setNum(dialogTriangle->getSecondPointId())); + domElement.setAttribute(AttrName, dialogTriangle->getPointName()); + domElement.setAttribute(AttrAxisP1, QString().setNum(dialogTriangle->getAxisP1Id())); + domElement.setAttribute(AttrAxisP2, QString().setNum(dialogTriangle->getAxisP2Id())); + domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogTriangle->getFirstPointId())); + domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogTriangle->getSecondPointId())); emit FullUpdateTree(); } @@ -109,18 +107,18 @@ void VModelingTriangle::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ void VModelingTriangle::AddToFile(){ VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "triangle"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrName, point.name()); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); - AddAttribute(domElement, "axisP1", axisP1Id); - AddAttribute(domElement, "axisP2", axisP2Id); - AddAttribute(domElement, "firstPoint", firstPointId); - AddAttribute(domElement, "secondPoint", secondPointId); + AddAttribute(domElement, AttrAxisP1, axisP1Id); + AddAttribute(domElement, AttrAxisP2, axisP2Id); + AddAttribute(domElement, AttrFirstPoint, firstPointId); + AddAttribute(domElement, AttrSecondPoint, secondPointId); AddToModeling(domElement); } diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index a9f5176ec..069544bd7 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -38,6 +38,7 @@ public: const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); diff --git a/tools/nodeDetails/vabstractnode.cpp b/tools/nodeDetails/vabstractnode.cpp index 1f4bab332..2e671ea9d 100644 --- a/tools/nodeDetails/vabstractnode.cpp +++ b/tools/nodeDetails/vabstractnode.cpp @@ -22,9 +22,14 @@ #include "vabstractnode.h" #include -VAbstractNode::VAbstractNode(VDomDocument *doc, VContainer *data, qint64 id, qint64 idNode, - Draw::Draws typeobject, QObject *parent) : - VAbstractTool(doc, data, id, parent), idNode(idNode), typeobject(typeobject){ +const QString VAbstractNode::AttrIdObject = QStringLiteral("idObject"); +const QString VAbstractNode::AttrTypeObject = QStringLiteral("typeObject"); +const QString VAbstractNode::TypeObjectCalculation = QStringLiteral("Calculation"); +const QString VAbstractNode::TypeObjectModeling = QStringLiteral("Modeling"); + +VAbstractNode::VAbstractNode(VDomDocument *doc, VContainer *data, qint64 id, qint64 idNode, Draw::Draws typeobject, + QObject *parent) : VAbstractTool(doc, data, id, parent), idNode(idNode), + typeobject(typeobject){ _referens = 0; } @@ -34,7 +39,7 @@ void VAbstractNode::AddToModeling(const QDomElement &domElement){ if(ok){ modelingElement.appendChild(domElement); } else { - qCritical()<<"Can't find tag Modeling"<< Q_FUNC_INFO; + qCritical()<createElement("arc"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "modeling"); - AddAttribute(domElement, "idObject", idNode); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrIdObject, idNode); if(typeobject == Draw::Calculation){ - AddAttribute(domElement, "typeObject", "Calculation"); + AddAttribute(domElement, AttrTypeObject, TypeObjectCalculation); } else { - AddAttribute(domElement, "typeObject", "Modeling"); + AddAttribute(domElement, AttrTypeObject, ToolType ); } AddToModeling(domElement); diff --git a/tools/nodeDetails/vnodearc.h b/tools/nodeDetails/vnodearc.h index e4a214928..e206e2c6a 100644 --- a/tools/nodeDetails/vnodearc.h +++ b/tools/nodeDetails/vnodearc.h @@ -32,6 +32,8 @@ public: Tool::Sources typeCreation, QGraphicsItem * parent = 0); static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); protected: diff --git a/tools/nodeDetails/vnodepoint.cpp b/tools/nodeDetails/vnodepoint.cpp index b5d568743..c5b1056f8 100644 --- a/tools/nodeDetails/vnodepoint.cpp +++ b/tools/nodeDetails/vnodepoint.cpp @@ -21,6 +21,9 @@ #include "vnodepoint.h" +const QString VNodePoint::TagName = QStringLiteral("point"); +const QString VNodePoint::ToolType = QStringLiteral("modeling"); + VNodePoint::VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem *parent) :VAbstractNode(doc, data, id, idPoint, typeobject), QGraphicsEllipseItem(parent), @@ -57,18 +60,18 @@ void VNodePoint::FullUpdateFromFile(){ void VNodePoint::AddToFile(){ VPointF point = VAbstractTool::data.GetModelingPoint(id); - QDomElement domElement = doc->createElement("point"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "modeling"); - AddAttribute(domElement, "idObject", idNode); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrIdObject, idNode); if(typeobject == Draw::Calculation){ - AddAttribute(domElement, "typeObject", "Calculation"); + AddAttribute(domElement, AttrTypeObject, TypeObjectCalculation); } else { - AddAttribute(domElement, "typeObject", "Modeling"); + AddAttribute(domElement, AttrTypeObject, TypeObjectModeling); } - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); + AddAttribute(domElement, AttrMx, toMM(point.mx())); + AddAttribute(domElement, AttrMy, toMM(point.my())); AddToModeling(domElement); } @@ -104,8 +107,8 @@ void VNodePoint::NameChangePosition(const QPointF pos){ void VNodePoint::UpdateNamePosition(qreal mx, qreal my){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("mx", QString().setNum(toMM(mx))); - domElement.setAttribute("my", QString().setNum(toMM(my))); + domElement.setAttribute(AttrMx, QString().setNum(toMM(mx))); + domElement.setAttribute(AttrMy, QString().setNum(toMM(my))); emit toolhaveChange(); } } diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index 783023fee..e1a6d75e0 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -32,6 +32,8 @@ public: Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); void NameChangePosition(const QPointF pos); diff --git a/tools/nodeDetails/vnodespline.cpp b/tools/nodeDetails/vnodespline.cpp index 2614ab2f3..cf6092c73 100644 --- a/tools/nodeDetails/vnodespline.cpp +++ b/tools/nodeDetails/vnodespline.cpp @@ -21,6 +21,9 @@ #include "vnodespline.h" +const QString VNodeSpline::TagName = QStringLiteral("spline"); +const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline"); + VNodeSpline::VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent) : VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent){ @@ -53,15 +56,15 @@ void VNodeSpline::FullUpdateFromFile(){ } void VNodeSpline::AddToFile(){ - QDomElement domElement = doc->createElement("spline"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "modelingSpline"); - AddAttribute(domElement, "idObject", idNode); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrIdObject, idNode); if(typeobject == Draw::Calculation){ - AddAttribute(domElement, "typeObject", "Calculation"); + AddAttribute(domElement, AttrTypeObject, TypeObjectCalculation); } else { - AddAttribute(domElement, "typeObject", "Modeling"); + AddAttribute(domElement, AttrTypeObject, TypeObjectModeling); } AddToModeling(domElement); diff --git a/tools/nodeDetails/vnodespline.h b/tools/nodeDetails/vnodespline.h index 47513764e..3e1d381bc 100644 --- a/tools/nodeDetails/vnodespline.h +++ b/tools/nodeDetails/vnodespline.h @@ -32,6 +32,8 @@ public: Tool::Sources typeCreation, QGraphicsItem * parent = 0); static VNodeSpline *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; public slots: virtual void FullUpdateFromFile (); protected: diff --git a/tools/nodeDetails/vnodesplinepath.cpp b/tools/nodeDetails/vnodesplinepath.cpp index 8dd7f4e37..07ac92b53 100644 --- a/tools/nodeDetails/vnodesplinepath.cpp +++ b/tools/nodeDetails/vnodesplinepath.cpp @@ -21,6 +21,9 @@ #include "vnodesplinepath.h" +const QString VNodeSplinePath::TagName = QStringLiteral("spline"); +const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); + VNodeSplinePath::VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent) : @@ -57,15 +60,15 @@ void VNodeSplinePath::FullUpdateFromFile(){ } void VNodeSplinePath::AddToFile(){ - QDomElement domElement = doc->createElement("spline"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "modelingPath"); - AddAttribute(domElement, "idObject", idNode); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrType, ToolType); + AddAttribute(domElement, AttrIdObject, idNode); if(typeobject == Draw::Calculation){ - AddAttribute(domElement, "typeObject", "Calculation"); + AddAttribute(domElement, AttrTypeObject, TypeObjectCalculation); } else { - AddAttribute(domElement, "typeObject", "Modeling"); + AddAttribute(domElement, AttrTypeObject, TypeObjectModeling); } AddToModeling(domElement); diff --git a/tools/nodeDetails/vnodesplinepath.h b/tools/nodeDetails/vnodesplinepath.h index 40d85b582..5e623b65c 100644 --- a/tools/nodeDetails/vnodesplinepath.h +++ b/tools/nodeDetails/vnodesplinepath.h @@ -32,6 +32,8 @@ public: Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent = 0); static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); + static const QString TagName; + static const QString ToolType; public slots: virtual void FullUpdateFromFile(); protected: diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index f932b0e06..42677bc56 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -21,6 +21,43 @@ #include "vabstracttool.h" +const QString VAbstractTool::AttrId = QStringLiteral("id"); +const QString VAbstractTool::AttrType = QStringLiteral("type"); +const QString VAbstractTool::AttrMx = QStringLiteral("mx"); +const QString VAbstractTool::AttrMy = QStringLiteral("my"); +const QString VAbstractTool::AttrName = QStringLiteral("name"); +const QString VAbstractTool::AttrX = QStringLiteral("x"); +const QString VAbstractTool::AttrY = QStringLiteral("y"); +const QString VAbstractTool::AttrTypeLine = QStringLiteral("typeLine"); +const QString VAbstractTool::AttrLength = QStringLiteral("length"); +const QString VAbstractTool::AttrBasePoint = QStringLiteral("basePoint"); +const QString VAbstractTool::AttrFirstPoint = QStringLiteral("firstPoint"); +const QString VAbstractTool::AttrSecondPoint = QStringLiteral("secondPoint"); +const QString VAbstractTool::AttrThirdPoint = QStringLiteral("thirdPoint"); +const QString VAbstractTool::AttrCenter = QStringLiteral("center"); +const QString VAbstractTool::AttrRadius = QStringLiteral("radius"); +const QString VAbstractTool::AttrAngle = QStringLiteral("angle"); +const QString VAbstractTool::AttrAngle1 = QStringLiteral("angle1"); +const QString VAbstractTool::AttrAngle2 = QStringLiteral("angle2"); +const QString VAbstractTool::AttrP1Line = QStringLiteral("p1Line"); +const QString VAbstractTool::AttrP2Line = QStringLiteral("p2Line"); +const QString VAbstractTool::AttrP1Line1 = QStringLiteral("p1Line1"); +const QString VAbstractTool::AttrP2Line1 = QStringLiteral("p2Line1"); +const QString VAbstractTool::AttrP1Line2 = QStringLiteral("p1Line2"); +const QString VAbstractTool::AttrP2Line2 = QStringLiteral("p2Line2"); +const QString VAbstractTool::AttrPShoulder = QStringLiteral("pShoulder"); +const QString VAbstractTool::AttrPoint1 = QStringLiteral("point1"); +const QString VAbstractTool::AttrPoint4 = QStringLiteral("point4"); +const QString VAbstractTool::AttrKAsm1 = QStringLiteral("kAsm1"); +const QString VAbstractTool::AttrKAsm2 = QStringLiteral("kAsm2"); +const QString VAbstractTool::AttrKCurve = QStringLiteral("kCurve"); +const QString VAbstractTool::AttrPathPoint = QStringLiteral("pathPoint"); +const QString VAbstractTool::AttrPSpline = QStringLiteral("pSpline"); +const QString VAbstractTool::AttrAxisP1 = QStringLiteral("axisP1"); +const QString VAbstractTool::AttrAxisP2 = QStringLiteral("axisP2"); +const QString VAbstractTool::TypeLineNone = QStringLiteral("none"); +const QString VAbstractTool::TypeLineLine = QStringLiteral("hair"); + VAbstractTool::VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent): VDataTool(data, parent), doc(doc), id(id), baseColor(Qt::black), currentColor(Qt::black){ @@ -29,33 +66,6 @@ VAbstractTool::VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QOb connect(this, &VAbstractTool::FullUpdateTree, this->doc, &VDomDocument::FullUpdateTree); } -void VAbstractTool::AddAttribute(QDomElement &domElement, const QString &name, const qint64 &value){ - QDomAttr domAttr = doc->createAttribute(name); - domAttr.setValue(QString().setNum(value)); - domElement.setAttributeNode(domAttr); -} - -void VAbstractTool::AddAttribute(QDomElement &domElement, const QString &name, const qint32 &value){ - QDomAttr domAttr = doc->createAttribute(name); - domAttr.setValue(QString().setNum(value)); - domElement.setAttributeNode(domAttr); -} - -void VAbstractTool::AddAttribute(QDomElement &domElement, const QString &name, const qreal &value){ - QDomAttr domAttr = doc->createAttribute(name); - domAttr.setValue(QString().setNum(value)); - domElement.setAttributeNode(domAttr); -} - -void VAbstractTool::AddAttribute(QDomElement &domElement, const QString &name, const QString &value){ - QDomAttr domAttr = doc->createAttribute(name); - domAttr.setValue(value); - domElement.setAttributeNode(domAttr); -} - -VAbstractTool::~VAbstractTool(){ -} - QPointF VAbstractTool::LineIntersectRect(QRectF rec, QLineF line){ qreal x1, y1, x2, y2; rec.getCoords(&x1, &y1, &x2, &y2); @@ -76,7 +86,7 @@ QPointF VAbstractTool::LineIntersectRect(QRectF rec, QLineF line){ if ( type == QLineF::BoundedIntersection ){ return point; } - Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "Немає точки перетину."); + Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "There is no point of intersection."); return point; } diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index a57b5f254..0b25f29f9 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -29,13 +29,49 @@ class VAbstractTool: public VDataTool{ Q_OBJECT public: VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); - virtual ~VAbstractTool(); + virtual ~VAbstractTool() {} static QPointF LineIntersectRect(QRectF rec, QLineF line); static qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, QPointF &p2); static QPointF ClosestPoint(QLineF line, QPointF p); static QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k); inline qint64 getId() const {return id;} static void LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c); + static const QString AttrId; + static const QString AttrType; + static const QString AttrMx; + static const QString AttrMy; + static const QString AttrName; + static const QString AttrX; + static const QString AttrY; + static const QString AttrTypeLine; + static const QString AttrLength; + static const QString AttrBasePoint; + static const QString AttrFirstPoint; + static const QString AttrSecondPoint; + static const QString AttrThirdPoint; + static const QString AttrCenter; + static const QString AttrRadius; + static const QString AttrAngle; + static const QString AttrAngle1; + static const QString AttrAngle2; + static const QString AttrP1Line; + static const QString AttrP2Line; + static const QString AttrP1Line1; + static const QString AttrP2Line1; + static const QString AttrP1Line2; + static const QString AttrP2Line2; + static const QString AttrPShoulder; + static const QString AttrPoint1; + static const QString AttrPoint4; + static const QString AttrKAsm1; + static const QString AttrKAsm2; + static const QString AttrKCurve; + static const QString AttrPathPoint; + static const QString AttrPSpline; + static const QString AttrAxisP1; + static const QString AttrAxisP2; + static const QString TypeLineNone; + static const QString TypeLineLine; public slots: virtual void FullUpdateFromFile()=0; signals: @@ -48,14 +84,23 @@ protected: const Qt::GlobalColor baseColor; Qt::GlobalColor currentColor; virtual void AddToFile()=0; - void AddAttribute(QDomElement &domElement, const QString &name, const qint64 &value); - void AddAttribute(QDomElement &domElement, const QString &name, const qint32 &value); - void AddAttribute(QDomElement &domElement, const QString &name, const qreal &value); - void AddAttribute(QDomElement &domElement, const QString &name, const QString &value); inline const VContainer *getData() const {return &data;} virtual void RemoveReferens(){} void RemoveAllChild(QDomElement &domElement); + template + void AddAttribute(QDomElement &domElement, const QString &name, const T &value){ + QDomAttr domAttr = doc->createAttribute(name); + domAttr.setValue(QString().setNum(value)); + domElement.setAttributeNode(domAttr); + } private: Q_DISABLE_COPY(VAbstractTool) }; + +template <> +inline void VAbstractTool::AddAttribute(QDomElement &domElement, const QString &name, const QString &value){ + QDomAttr domAttr = doc->createAttribute(name); + domAttr.setValue(value); + domElement.setAttributeNode(domAttr); +} #endif // VABSTRACTTOOL_H diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 3129d847b..36dd521f6 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -24,6 +24,16 @@ #include "modelingTools/vmodelingtool.h" #include "modelingTools/modelingtools.h" +const QString VToolDetail::TagName = QStringLiteral("detail"); +const QString VToolDetail::TagNode = QStringLiteral("node"); +const QString VToolDetail::AttrSupplement = QStringLiteral("supplement"); +const QString VToolDetail::AttrClosed = QStringLiteral("closed"); +const QString VToolDetail::AttrWidth = QStringLiteral("width"); +const QString VToolDetail::AttrIdObject = QStringLiteral("idObject"); +const QString VToolDetail::AttrNodeType = QStringLiteral("nodeType"); +const QString VToolDetail::NodeTypeContour = QStringLiteral("Contour"); +const QString VToolDetail::NodeTypeModeling = QStringLiteral("Modeling"); + VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, Tool::Sources typeCreation, VMainGraphicsScene *scene, QGraphicsItem *parent) :VAbstractTool(doc, data, id), QGraphicsPathItem(parent), dialogDetail(QSharedPointer()), sceneDetails(scene){ @@ -290,10 +300,10 @@ void VToolDetail::FullUpdateFromGui(int result){ QDomElement domElement = doc->elementById(QString().setNum(id)); if(domElement.isElement()){ VDetail det = dialogDetail->getDetails(); - domElement.setAttribute("name", det.getName()); - domElement.setAttribute("supplement", QString().setNum(det.getSupplement())); - domElement.setAttribute("closed", QString().setNum(det.getClosed())); - domElement.setAttribute("width", QString().setNum(det.getWidth())); + domElement.setAttribute(AttrName, det.getName()); + domElement.setAttribute(AttrSupplement, QString().setNum(det.getSupplement())); + domElement.setAttribute(AttrClosed, QString().setNum(det.getClosed())); + domElement.setAttribute(AttrWidth, QString().setNum(det.getWidth())); RemoveAllChild(domElement); for(qint32 i = 0; i < det.CountNode(); ++i){ AddNode(domElement, det[i]); @@ -306,15 +316,15 @@ void VToolDetail::FullUpdateFromGui(int result){ void VToolDetail::AddToFile(){ VDetail detail = VAbstractTool::data.GetDetail(id); - QDomElement domElement = doc->createElement("detail"); + QDomElement domElement = doc->createElement(TagName); - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "name", detail.getName()); - AddAttribute(domElement, "mx", toMM(detail.getMx())); - AddAttribute(domElement, "my", toMM(detail.getMy())); - AddAttribute(domElement, "supplement", detail.getSupplement()); - AddAttribute(domElement, "closed", detail.getClosed()); - AddAttribute(domElement, "width", detail.getWidth()); + AddAttribute(domElement, AttrId, id); + AddAttribute(domElement, AttrName, detail.getName()); + AddAttribute(domElement, AttrMx, toMM(detail.getMx())); + AddAttribute(domElement, AttrMy, toMM(detail.getMy())); + AddAttribute(domElement, AttrSupplement, detail.getSupplement()); + AddAttribute(domElement, AttrClosed, detail.getClosed()); + AddAttribute(domElement, AttrWidth, detail.getWidth()); for(qint32 i = 0; i < detail.CountNode(); ++i){ AddNode(domElement, detail[i]); @@ -334,8 +344,8 @@ QVariant VToolDetail::itemChange(QGraphicsItem::GraphicsItemChange change, const //qDebug()<elementById(QString().setNum(id)); if(domElement.isElement()){ - domElement.setAttribute("mx", QString().setNum(toMM(newPos.x()))); - domElement.setAttribute("my", QString().setNum(toMM(newPos.y()))); + domElement.setAttribute(AttrMx, QString().setNum(toMM(newPos.x()))); + domElement.setAttribute(AttrMy, QString().setNum(toMM(newPos.y()))); //I don't now why but signal does not work. doc->FullUpdateTree(); } @@ -398,70 +408,70 @@ void VToolDetail::RemoveReferens(){ } void VToolDetail::AddNode(QDomElement &domElement, VNodeDetail &node){ - QDomElement nod = doc->createElement("node"); + QDomElement nod = doc->createElement(TagNode); - AddAttribute(nod, "idObject", node.getId()); - AddAttribute(nod, "mx", toMM(node.getMx())); - AddAttribute(nod, "my", toMM(node.getMy())); + AddAttribute(nod, AttrIdObject, node.getId()); + AddAttribute(nod, AttrMx, toMM(node.getMx())); + AddAttribute(nod, AttrMy, toMM(node.getMy())); if(node.getTypeNode() == NodeDetail::Contour){ - AddAttribute(nod, "nodeType", "Contour"); + AddAttribute(nod, AttrNodeType, NodeTypeContour); } else { - AddAttribute(nod, "nodeType", "Modeling"); + AddAttribute(nod, AttrNodeType, NodeTypeModeling); } switch(node.getTypeTool()){ case(Tool::AlongLineTool): - AddAttribute(nod, "type", "AlongLineTool"); + AddAttribute(nod, AttrType, QStringLiteral("AlongLineTool")); break; case(Tool::ArcTool): - AddAttribute(nod, "type", "ArcTool"); + AddAttribute(nod, AttrType, QStringLiteral("ArcTool")); break; case(Tool::BisectorTool): - AddAttribute(nod, "type", "BisectorTool"); + AddAttribute(nod, AttrType, QStringLiteral("BisectorTool")); break; case(Tool::EndLineTool): - AddAttribute(nod, "type", "EndLineTool"); + AddAttribute(nod, AttrType, QStringLiteral("EndLineTool")); break; case(Tool::LineIntersectTool): - AddAttribute(nod, "type", "LineIntersectTool"); + AddAttribute(nod, AttrType, QStringLiteral("LineIntersectTool")); break; case(Tool::LineTool): - AddAttribute(nod, "type", "LineTool"); + AddAttribute(nod, AttrType, QStringLiteral("LineTool")); break; case(Tool::NodeArc): - AddAttribute(nod, "type", "NodeArc"); + AddAttribute(nod, AttrType, QStringLiteral("NodeArc")); break; case(Tool::NodePoint): - AddAttribute(nod, "type", "NodePoint"); + AddAttribute(nod, AttrType, QStringLiteral("NodePoint")); break; case(Tool::NodeSpline): - AddAttribute(nod, "type", "NodeSpline"); + AddAttribute(nod, AttrType, QStringLiteral("NodeSpline")); break; case(Tool::NodeSplinePath): - AddAttribute(nod, "type", "NodeSplinePath"); + AddAttribute(nod, AttrType, QStringLiteral("NodeSplinePath")); break; case(Tool::NormalTool): - AddAttribute(nod, "type", "NormalTool"); + AddAttribute(nod, AttrType, QStringLiteral("NormalTool")); break; case(Tool::PointOfContact): - AddAttribute(nod, "type", "PointOfContact"); + AddAttribute(nod, AttrType, QStringLiteral("PointOfContact")); break; case(Tool::ShoulderPointTool): - AddAttribute(nod, "type", "ShoulderPointTool"); + AddAttribute(nod, AttrType, QStringLiteral("ShoulderPointTool")); break; case(Tool::SplinePathTool): - AddAttribute(nod, "type", "SplinePathTool"); + AddAttribute(nod, AttrType, QStringLiteral("SplinePathTool")); break; case(Tool::SplineTool): - AddAttribute(nod, "type", "SplineTool"); + AddAttribute(nod, AttrType, QStringLiteral("SplineTool")); break; case(Tool::Height): - AddAttribute(nod, "type", "Height"); + AddAttribute(nod, AttrType, QStringLiteral("Height")); break; case(Tool::Triangle): - AddAttribute(nod, "type", "Triangle"); + AddAttribute(nod, AttrType, QStringLiteral("Triangle")); break; case(Tool::PointOfIntersection): - AddAttribute(nod, "type", "PointOfIntersection"); + AddAttribute(nod, AttrType, QStringLiteral("PointOfIntersection")); break; default: qWarning()<<"May be wrong tool type!!! Ignoring."< Date: Tue, 29 Oct 2013 15:47:49 +0200 Subject: [PATCH 52/83] Missed license. --HG-- branch : develop --- tools/modelingTools/vmodelingheight.cpp | 21 +++++++++++++++++++++ tools/modelingTools/vmodelingtriangle.cpp | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/tools/modelingTools/vmodelingheight.cpp b/tools/modelingTools/vmodelingheight.cpp index cbf87545f..b71a69276 100644 --- a/tools/modelingTools/vmodelingheight.cpp +++ b/tools/modelingTools/vmodelingheight.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "vmodelingheight.h" #include "../drawTools/vtoolheight.h" diff --git a/tools/modelingTools/vmodelingtriangle.cpp b/tools/modelingTools/vmodelingtriangle.cpp index 7a3d91838..2e068ab85 100644 --- a/tools/modelingTools/vmodelingtriangle.cpp +++ b/tools/modelingTools/vmodelingtriangle.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "vmodelingtriangle.h" #include "../drawTools/vtooltriangle.h" From 04140824cdfda1962334076d6f624d00b890bd54 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 29 Oct 2013 17:01:56 +0200 Subject: [PATCH 53/83] New template InitTool. --HG-- branch : develop --- tools/drawTools/vdrawtool.h | 2 - tools/modelingTools/vmodelingtool.h | 2 - tools/vabstracttool.h | 1 + tools/vtooldetail.cpp | 138 ++++++++-------------------- tools/vtooldetail.h | 2 + 5 files changed, 39 insertions(+), 106 deletions(-) diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index da654fb42..e761422ee 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -38,8 +38,6 @@ public slots: void ChangedNameDraw(const QString oldName, const QString newName); virtual void FullUpdateFromGui(int result)=0; virtual void SetFactor(qreal factor); -signals: - void RemoveTool(QGraphicsItem *tool); protected: bool ignoreContextMenuEvent; bool ignoreFullUpdate; diff --git a/tools/modelingTools/vmodelingtool.h b/tools/modelingTools/vmodelingtool.h index ff7b4da89..014ff996d 100644 --- a/tools/modelingTools/vmodelingtool.h +++ b/tools/modelingTools/vmodelingtool.h @@ -34,8 +34,6 @@ public: inline void ignoreContextMenu(bool enable) {ignoreContextMenuEvent = enable;} public slots: virtual void FullUpdateFromGui(int result)=0; -signals: - void RemoveTool(QGraphicsItem *tool); protected: bool ignoreContextMenuEvent; bool ignoreFullUpdate; diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index 0b25f29f9..511e43f31 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -78,6 +78,7 @@ signals: void toolhaveChange(); void ChoosedTool(qint64 id, Scene::Scenes type); void FullUpdateTree(); + void RemoveTool(QGraphicsItem *tool); protected: VDomDocument *doc; const qint64 id; diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 36dd521f6..6f0138518 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -38,150 +38,73 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, VMainGraphicsScene *scene, QGraphicsItem *parent) :VAbstractTool(doc, data, id), QGraphicsPathItem(parent), dialogDetail(QSharedPointer()), sceneDetails(scene){ VDetail detail = data->GetDetail(id); - QHash* tools = doc->getTools(); - Q_ASSERT(tools != 0); for(qint32 i = 0; i< detail.CountNode(); ++i){ switch(detail[i].getTypeTool()){ case(Tool::NodePoint):{ - VNodePoint *point = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(point != 0); - connect(point, &VNodePoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - point->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::NodeArc):{ - VNodeArc *arc = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(arc != 0); - connect(arc, &VNodeArc::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - arc->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::NodeSpline):{ - VNodeSpline *spl = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(spl != 0); - connect(spl, &VNodeSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - spl->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::NodeSplinePath):{ - VNodeSplinePath *splPath = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(splPath != 0); - connect(splPath, &VNodeSplinePath::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - splPath->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::AlongLineTool):{ - VModelingAlongLine *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingAlongLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingAlongLine::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::ArcTool):{ - VModelingArc *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingArc::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingArc::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::BisectorTool):{ - VModelingBisector *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingBisector::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingBisector::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::EndLineTool):{ - VModelingEndLine *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingEndLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingEndLine::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::LineIntersectTool):{ - VModelingLineIntersect *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingLineIntersect::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingLineIntersect::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::LineTool):{ - VModelingLine *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingLine::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingLine::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + InitTool(scene, detail[i]); break; } case(Tool::NormalTool):{ - VModelingNormal *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingNormal::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingNormal::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + InitTool(scene, detail[i]); break; } - case(Tool::PointOfContact):{ - VModelingPointOfContact *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingPointOfContact::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingPointOfContact::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + case(Tool::PointOfContact): + InitTool(scene, detail[i]); break; - } - case(Tool::ShoulderPointTool):{ - VModelingShoulderPoint *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingShoulderPoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingShoulderPoint::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + case(Tool::ShoulderPointTool): + InitTool(scene, detail[i]); break; - } - case(Tool::SplinePathTool):{ - VModelingSplinePath *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingSplinePath::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingSplinePath::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + case(Tool::SplinePathTool): + InitTool(scene, detail[i]); break; - } - case(Tool::SplineTool):{ - VModelingSpline *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingSpline::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + case(Tool::SplineTool): + InitTool(scene, detail[i]); break; - } - case(Tool::Height):{ - VModelingHeight *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingHeight::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingHeight::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + case(Tool::Height): + InitTool(scene, detail[i]); break; - } - case(Tool::Triangle):{ - VModelingTriangle *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingTriangle::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingTriangle::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + case(Tool::Triangle): + InitTool(scene, detail[i]); break; - } - case(Tool::PointOfIntersection):{ - VModelingPointOfIntersection *tool = qobject_cast(tools->value(detail[i].getId())); - Q_ASSERT(tool != 0); - connect(tool, &VModelingPointOfIntersection::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); - connect(tool, &VModelingPointOfIntersection::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); - tool->setParentItem(this); + case(Tool::PointOfIntersection): + InitTool(scene, detail[i]); break; - } default: qWarning()<<"Get wrong tool type. Ignore."; break; @@ -484,3 +407,14 @@ void VToolDetail::RefreshGeometry(){ QPainterPath path = VAbstractTool::data.ContourPath(id); this->setPath(path); } + +template +void VToolDetail::InitTool(VMainGraphicsScene *scene, const VNodeDetail &node){ + QHash* tools = doc->getTools(); + Q_ASSERT(tools != 0); + Tool *tool = qobject_cast(tools->value(node.getId())); + Q_ASSERT(tool != 0); + connect(tool, &Tool::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); + connect(tool, &Tool::RemoveTool, scene, &VMainGraphicsScene::RemoveTool); + tool->setParentItem(this); +} diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index 6708c76a2..4a877e8e6 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -77,6 +77,8 @@ private: VMainGraphicsScene *sceneDetails; void RefreshGeometry (); void AddNode(QDomElement &domElement, VNodeDetail &node); + template + void InitTool(VMainGraphicsScene *scene, const VNodeDetail &node); }; #endif // VTOOLDETAIL_H From beddcb69b8c0c5f223e1daa9f87fe431d8362cba Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 29 Oct 2013 17:17:47 +0200 Subject: [PATCH 54/83] New template ClosedDialog. --HG-- branch : develop --- mainwindow.cpp | 160 +++++++++---------------------------------------- mainwindow.h | 2 + 2 files changed, 29 insertions(+), 133 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 25a070910..536c86482 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -235,21 +235,26 @@ void MainWindow::AddToolToDetail(T *tool, const qint64 &id, Tool::Tools typeTool det->AddTool(tool, id, typeTool); } +template +void MainWindow::ClosedDialog(QSharedPointer &dialog, int result){ + if(result == QDialog::Accepted){ + if(mode == Draw::Calculation){ + DrawTool::Create(dialog, currentScene, doc, data); + } else { + ModelingTool *endLine = ModelingTool::Create(dialog, doc, data); + AddToolToDetail(endLine, endLine->getId(), tool, dialog->getIdDetail()); + } + } + ArrowTool(); +} + void MainWindow::ToolEndLine(bool checked){ SetToolButton(checked, Tool::EndLineTool, ":/cursor/endline_cursor.png", tr("Select point"), dialogEndLine, &MainWindow::ClosedDialogEndLine); } void MainWindow::ClosedDialogEndLine(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolEndLine::Create(dialogEndLine, currentScene, doc, data); - } else { - VModelingEndLine *endLine = VModelingEndLine::Create(dialogEndLine, doc, data); - AddToolToDetail(endLine, endLine->getId(), Tool::EndLineTool, dialogEndLine->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogEndLine, result); } void MainWindow::ToolLine(bool checked){ @@ -258,15 +263,7 @@ void MainWindow::ToolLine(bool checked){ } void MainWindow::ClosedDialogLine(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolLine::Create(dialogLine, currentScene, doc, data); - } else { - VModelingLine *line = VModelingLine::Create(dialogLine, doc, data); - AddToolToDetail(line, line->getId(), Tool::LineTool, dialogLine->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogLine, result); } void MainWindow::ToolAlongLine(bool checked){ @@ -275,15 +272,7 @@ void MainWindow::ToolAlongLine(bool checked){ } void MainWindow::ClosedDialogAlongLine(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolAlongLine::Create(dialogAlongLine, currentScene, doc, data); - } else{ - VModelingAlongLine *point = VModelingAlongLine::Create(dialogAlongLine, doc, data); - AddToolToDetail(point, point->getId(), Tool::AlongLineTool, dialogAlongLine->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogAlongLine, result); } void MainWindow::ToolShoulderPoint(bool checked){ @@ -293,16 +282,7 @@ void MainWindow::ToolShoulderPoint(bool checked){ } void MainWindow::ClosedDialogShoulderPoint(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolShoulderPoint::Create(dialogShoulderPoint, currentScene, doc, data); - } else { - VModelingShoulderPoint *point = VModelingShoulderPoint::Create(dialogShoulderPoint, doc, data); - AddToolToDetail(point, point->getId(), Tool::ShoulderPointTool, - dialogShoulderPoint->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogShoulderPoint, result); } void MainWindow::ToolNormal(bool checked){ @@ -311,15 +291,7 @@ void MainWindow::ToolNormal(bool checked){ } void MainWindow::ClosedDialogNormal(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolNormal::Create(dialogNormal, currentScene, doc, data); - } else { - VModelingNormal *point = VModelingNormal::Create(dialogNormal, doc, data); - AddToolToDetail(point, point->getId(), Tool::NormalTool, dialogNormal->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogNormal, result); } void MainWindow::ToolBisector(bool checked){ @@ -328,15 +300,7 @@ void MainWindow::ToolBisector(bool checked){ } void MainWindow::ClosedDialogBisector(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolBisector::Create(dialogBisector, currentScene, doc, data); - } else { - VModelingBisector *point = VModelingBisector::Create(dialogBisector, doc, data); - AddToolToDetail(point, point->getId(), Tool::BisectorTool, dialogBisector->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogBisector, result); } void MainWindow::ToolLineIntersect(bool checked){ @@ -346,17 +310,7 @@ void MainWindow::ToolLineIntersect(bool checked){ } void MainWindow::ClosedDialogLineIntersect(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolLineIntersect::Create(dialogLineIntersect, currentScene, doc, data); - } else { - VModelingLineIntersect *point = VModelingLineIntersect::Create(dialogLineIntersect, doc, - data); - AddToolToDetail(point, point->getId(), Tool::LineIntersectTool, - dialogLineIntersect->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogLineIntersect, result); } void MainWindow::ToolSpline(bool checked){ @@ -365,15 +319,7 @@ void MainWindow::ToolSpline(bool checked){ } void MainWindow::ClosedDialogSpline(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolSpline::Create(dialogSpline, currentScene, doc, data); - } else { - VModelingSpline *spl = VModelingSpline::Create(dialogSpline, doc, data); - AddToolToDetail(spl, spl->getId(), Tool::SplineTool, dialogSpline->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogSpline, result); } void MainWindow::ToolArc(bool checked){ @@ -382,15 +328,7 @@ void MainWindow::ToolArc(bool checked){ } void MainWindow::ClosedDialogArc(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolArc::Create(dialogArc, currentScene, doc, data); - } else { - VModelingArc *arc = VModelingArc::Create(dialogArc, doc, data); - AddToolToDetail(arc, arc->getId(), Tool::ArcTool, dialogArc->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogArc, result); } void MainWindow::ToolSplinePath(bool checked){ @@ -400,15 +338,7 @@ void MainWindow::ToolSplinePath(bool checked){ } void MainWindow::ClosedDialogSplinePath(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolSplinePath::Create(dialogSplinePath, currentScene, doc, data); - } else { - VModelingSplinePath *spl = VModelingSplinePath::Create(dialogSplinePath, doc, data); - AddToolToDetail(spl, spl->getId(), Tool::SplinePathTool, dialogSplinePath->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogSplinePath, result); } void MainWindow::ToolPointOfContact(bool checked){ @@ -418,17 +348,7 @@ void MainWindow::ToolPointOfContact(bool checked){ } void MainWindow::ClosedDialogPointOfContact(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolPointOfContact::Create(dialogPointOfContact, currentScene, doc, data); - } else { - VModelingPointOfContact *point = VModelingPointOfContact::Create(dialogPointOfContact, doc, - data); - AddToolToDetail(point, point->getId(), Tool::PointOfContact, - dialogPointOfContact->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogPointOfContact, result); } void MainWindow::ToolDetail(bool checked){ @@ -464,15 +384,7 @@ void MainWindow::ToolHeight(bool checked){ } void MainWindow::ClosedDialogHeight(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolHeight::Create(dialogHeight, currentScene, doc, data); - } else { - VModelingHeight *point = VModelingHeight::Create(dialogHeight, doc, data); - AddToolToDetail(point, point->getId(), Tool::Height, dialogHeight->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogHeight, result); } void MainWindow::ToolTriangle(bool checked){ @@ -481,15 +393,7 @@ void MainWindow::ToolTriangle(bool checked){ } void MainWindow::ClosedDialogTriangle(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolTriangle::Create(dialogTriangle, currentScene, doc, data); - } else { - VModelingTriangle *point = VModelingTriangle::Create(dialogTriangle, doc, data); - AddToolToDetail(point, point->getId(), Tool::Triangle, dialogTriangle->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogTriangle, result); } void MainWindow::ToolPointOfIntersection(bool checked){ @@ -499,17 +403,7 @@ void MainWindow::ToolPointOfIntersection(bool checked){ } void MainWindow::ClosedDialogPointOfIntersection(int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ - VToolPointOfIntersection::Create(dialogPointOfIntersection, currentScene, doc, data); - } else { - VModelingPointOfIntersection *point = VModelingPointOfIntersection::Create(dialogPointOfIntersection, - doc, data); - AddToolToDetail(point, point->getId(), Tool::PointOfIntersection, - dialogPointOfIntersection->getIdDetail()); - } - } - ArrowTool(); + ClosedDialog(dialogPointOfIntersection, result); } void MainWindow::About(){ diff --git a/mainwindow.h b/mainwindow.h index 7de1307cf..76a331375 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -159,6 +159,8 @@ private: template void AddToolToDetail(T *tool, const qint64 &id, Tool::Tools typeTool, const qint64 &idDetail); + template + void ClosedDialog(QSharedPointer &dialog, int result); bool SafeSaveing(const QString &fileName)const; void AutoSavePattern(); }; From 3c6212b7e1933de4f9e38c159888cfc429270985 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 29 Oct 2013 19:46:58 +0200 Subject: [PATCH 55/83] . --HG-- branch : develop --- tools/vabstracttool.cpp | 70 ++-- tools/vtooldetail.cpp | 49 +-- translations/valentina_ru.ts | 787 +++++++++++++++++++++++++---------- translations/valentina_uk.ts | 785 ++++++++++++++++++++++++---------- 4 files changed, 1169 insertions(+), 522 deletions(-) diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index 42677bc56..634a3a73f 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -21,42 +21,42 @@ #include "vabstracttool.h" -const QString VAbstractTool::AttrId = QStringLiteral("id"); -const QString VAbstractTool::AttrType = QStringLiteral("type"); -const QString VAbstractTool::AttrMx = QStringLiteral("mx"); -const QString VAbstractTool::AttrMy = QStringLiteral("my"); -const QString VAbstractTool::AttrName = QStringLiteral("name"); -const QString VAbstractTool::AttrX = QStringLiteral("x"); -const QString VAbstractTool::AttrY = QStringLiteral("y"); -const QString VAbstractTool::AttrTypeLine = QStringLiteral("typeLine"); -const QString VAbstractTool::AttrLength = QStringLiteral("length"); -const QString VAbstractTool::AttrBasePoint = QStringLiteral("basePoint"); -const QString VAbstractTool::AttrFirstPoint = QStringLiteral("firstPoint"); +const QString VAbstractTool::AttrId = QStringLiteral("id"); +const QString VAbstractTool::AttrType = QStringLiteral("type"); +const QString VAbstractTool::AttrMx = QStringLiteral("mx"); +const QString VAbstractTool::AttrMy = QStringLiteral("my"); +const QString VAbstractTool::AttrName = QStringLiteral("name"); +const QString VAbstractTool::AttrX = QStringLiteral("x"); +const QString VAbstractTool::AttrY = QStringLiteral("y"); +const QString VAbstractTool::AttrTypeLine = QStringLiteral("typeLine"); +const QString VAbstractTool::AttrLength = QStringLiteral("length"); +const QString VAbstractTool::AttrBasePoint = QStringLiteral("basePoint"); +const QString VAbstractTool::AttrFirstPoint = QStringLiteral("firstPoint"); const QString VAbstractTool::AttrSecondPoint = QStringLiteral("secondPoint"); -const QString VAbstractTool::AttrThirdPoint = QStringLiteral("thirdPoint"); -const QString VAbstractTool::AttrCenter = QStringLiteral("center"); -const QString VAbstractTool::AttrRadius = QStringLiteral("radius"); -const QString VAbstractTool::AttrAngle = QStringLiteral("angle"); -const QString VAbstractTool::AttrAngle1 = QStringLiteral("angle1"); -const QString VAbstractTool::AttrAngle2 = QStringLiteral("angle2"); -const QString VAbstractTool::AttrP1Line = QStringLiteral("p1Line"); -const QString VAbstractTool::AttrP2Line = QStringLiteral("p2Line"); -const QString VAbstractTool::AttrP1Line1 = QStringLiteral("p1Line1"); -const QString VAbstractTool::AttrP2Line1 = QStringLiteral("p2Line1"); -const QString VAbstractTool::AttrP1Line2 = QStringLiteral("p1Line2"); -const QString VAbstractTool::AttrP2Line2 = QStringLiteral("p2Line2"); -const QString VAbstractTool::AttrPShoulder = QStringLiteral("pShoulder"); -const QString VAbstractTool::AttrPoint1 = QStringLiteral("point1"); -const QString VAbstractTool::AttrPoint4 = QStringLiteral("point4"); -const QString VAbstractTool::AttrKAsm1 = QStringLiteral("kAsm1"); -const QString VAbstractTool::AttrKAsm2 = QStringLiteral("kAsm2"); -const QString VAbstractTool::AttrKCurve = QStringLiteral("kCurve"); -const QString VAbstractTool::AttrPathPoint = QStringLiteral("pathPoint"); -const QString VAbstractTool::AttrPSpline = QStringLiteral("pSpline"); -const QString VAbstractTool::AttrAxisP1 = QStringLiteral("axisP1"); -const QString VAbstractTool::AttrAxisP2 = QStringLiteral("axisP2"); -const QString VAbstractTool::TypeLineNone = QStringLiteral("none"); -const QString VAbstractTool::TypeLineLine = QStringLiteral("hair"); +const QString VAbstractTool::AttrThirdPoint = QStringLiteral("thirdPoint"); +const QString VAbstractTool::AttrCenter = QStringLiteral("center"); +const QString VAbstractTool::AttrRadius = QStringLiteral("radius"); +const QString VAbstractTool::AttrAngle = QStringLiteral("angle"); +const QString VAbstractTool::AttrAngle1 = QStringLiteral("angle1"); +const QString VAbstractTool::AttrAngle2 = QStringLiteral("angle2"); +const QString VAbstractTool::AttrP1Line = QStringLiteral("p1Line"); +const QString VAbstractTool::AttrP2Line = QStringLiteral("p2Line"); +const QString VAbstractTool::AttrP1Line1 = QStringLiteral("p1Line1"); +const QString VAbstractTool::AttrP2Line1 = QStringLiteral("p2Line1"); +const QString VAbstractTool::AttrP1Line2 = QStringLiteral("p1Line2"); +const QString VAbstractTool::AttrP2Line2 = QStringLiteral("p2Line2"); +const QString VAbstractTool::AttrPShoulder = QStringLiteral("pShoulder"); +const QString VAbstractTool::AttrPoint1 = QStringLiteral("point1"); +const QString VAbstractTool::AttrPoint4 = QStringLiteral("point4"); +const QString VAbstractTool::AttrKAsm1 = QStringLiteral("kAsm1"); +const QString VAbstractTool::AttrKAsm2 = QStringLiteral("kAsm2"); +const QString VAbstractTool::AttrKCurve = QStringLiteral("kCurve"); +const QString VAbstractTool::AttrPathPoint = QStringLiteral("pathPoint"); +const QString VAbstractTool::AttrPSpline = QStringLiteral("pSpline"); +const QString VAbstractTool::AttrAxisP1 = QStringLiteral("axisP1"); +const QString VAbstractTool::AttrAxisP2 = QStringLiteral("axisP2"); +const QString VAbstractTool::TypeLineNone = QStringLiteral("none"); +const QString VAbstractTool::TypeLineLine = QStringLiteral("hair"); VAbstractTool::VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent): VDataTool(data, parent), doc(doc), id(id), baseColor(Qt::black), currentColor(Qt::black){ diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 6f0138518..de0d48269 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -24,14 +24,14 @@ #include "modelingTools/vmodelingtool.h" #include "modelingTools/modelingtools.h" -const QString VToolDetail::TagName = QStringLiteral("detail"); -const QString VToolDetail::TagNode = QStringLiteral("node"); -const QString VToolDetail::AttrSupplement = QStringLiteral("supplement"); -const QString VToolDetail::AttrClosed = QStringLiteral("closed"); -const QString VToolDetail::AttrWidth = QStringLiteral("width"); -const QString VToolDetail::AttrIdObject = QStringLiteral("idObject"); -const QString VToolDetail::AttrNodeType = QStringLiteral("nodeType"); -const QString VToolDetail::NodeTypeContour = QStringLiteral("Contour"); +const QString VToolDetail::TagName = QStringLiteral("detail"); +const QString VToolDetail::TagNode = QStringLiteral("node"); +const QString VToolDetail::AttrSupplement = QStringLiteral("supplement"); +const QString VToolDetail::AttrClosed = QStringLiteral("closed"); +const QString VToolDetail::AttrWidth = QStringLiteral("width"); +const QString VToolDetail::AttrIdObject = QStringLiteral("idObject"); +const QString VToolDetail::AttrNodeType = QStringLiteral("nodeType"); +const QString VToolDetail::NodeTypeContour = QStringLiteral("Contour"); const QString VToolDetail::NodeTypeModeling = QStringLiteral("Modeling"); VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, Tool::Sources typeCreation, @@ -40,50 +40,39 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, VDetail detail = data->GetDetail(id); for(qint32 i = 0; i< detail.CountNode(); ++i){ switch(detail[i].getTypeTool()){ - case(Tool::NodePoint):{ + case(Tool::NodePoint): InitTool(scene, detail[i]); break; - } - case(Tool::NodeArc):{ + case(Tool::NodeArc): InitTool(scene, detail[i]); break; - } - case(Tool::NodeSpline):{ + case(Tool::NodeSpline): InitTool(scene, detail[i]); break; - } - case(Tool::NodeSplinePath):{ + case(Tool::NodeSplinePath): InitTool(scene, detail[i]); break; - } - case(Tool::AlongLineTool):{ + case(Tool::AlongLineTool): InitTool(scene, detail[i]); break; - } - case(Tool::ArcTool):{ + case(Tool::ArcTool): InitTool(scene, detail[i]); break; - } - case(Tool::BisectorTool):{ + case(Tool::BisectorTool): InitTool(scene, detail[i]); break; - } - case(Tool::EndLineTool):{ + case(Tool::EndLineTool): InitTool(scene, detail[i]); break; - } - case(Tool::LineIntersectTool):{ + case(Tool::LineIntersectTool): InitTool(scene, detail[i]); break; - } - case(Tool::LineTool):{ + case(Tool::LineTool): InitTool(scene, detail[i]); break; - } - case(Tool::NormalTool):{ + case(Tool::NormalTool): InitTool(scene, detail[i]); break; - } case(Tool::PointOfContact): InitTool(scene, detail[i]); break; diff --git a/translations/valentina_ru.ts b/translations/valentina_ru.ts index a6b0c678c..72d64a1ff 100644 --- a/translations/valentina_ru.ts +++ b/translations/valentina_ru.ts @@ -120,7 +120,7 @@ - + Select second point of line @@ -264,7 +264,7 @@ - + Value angle of line. @@ -398,12 +398,12 @@ - + Select second point of angle - + Select third point of angle @@ -416,22 +416,51 @@ Деталь - - Name detail - Имя детали + + Bias X + - + + Bias Y + + + + + Option + + + + + Name of detail + + + + + Supplement for seams + + + + + Width + + + + Name detail + Имя детали + + + Closed Замкнутая - + Get wrong scene object. Ignore. - + Get wrong tools. Ignore. @@ -558,6 +587,57 @@ + + DialogHeight + + + Dialog + + + + + Name new point + Имя новой точки + + + + Base point + Базовая точка + + + + + + + First point of line + + + + + Second point of line + + + + + Type line + Тип линии + + + + Show line from first point to our point + + + + + Select first point of line + + + + + Select second point of line + + + DialogHistory @@ -567,7 +647,7 @@ - + Tool Инструмент @@ -628,7 +708,17 @@ - + + Point of perpendical from point %1 to line %2_%3 + + + + + Triangle: axis %1_%2, points %3 and %4 + + + + Get wrong tool type. Ignore. @@ -648,23 +738,23 @@ - - - + + + Denotation Обозначение - + The calculated value Расчитаное значение - - - + + + Base value Базовое значение @@ -680,97 +770,102 @@ - - - - - + + + + + Description Опис - - - + + + In size В размерах - - - + + + In growth В ростах - - + + ... - + Lines Линии - - + + Line Линия - + Length of the line Длина линии - + Curves Кривые - - + + Curve Кривая - + Length of the curve Длина кривой - + Arcs Дуги - - + + Arc Дуга - + Length of arc Длина дуги - + Denotation %1 - - + + Can't convert toDouble value. + + + + + Calculated value - - - + + + Length Длина @@ -793,7 +888,7 @@ Вторая точка - + Select second point @@ -833,17 +928,17 @@ Вторая линия - + Select second point of first line - + Select first point of second line - + Select second point of second line @@ -970,7 +1065,7 @@ - + Select second point of line @@ -1084,16 +1179,54 @@ - + Select second point of line - + Select point of center of arc + + DialogPointOfIntersection + + + Dialog + + + + + Name new point + Имя новой точки + + + + Point vertically + + + + + First point of angle + + + + + Point horizontally + + + + + Second point of angle + + + + + Select point horizontally + + + DialogShoulderPoint @@ -1200,12 +1333,12 @@ - + Select second point of line - + Select point of shoulder @@ -1338,7 +1471,7 @@ Коефициент кривизные кривой - + Select point of curve path @@ -1346,33 +1479,114 @@ DialogTool - + Wrong details id. - - - + + + Line Линия - - + + No line - + + Can't find point by name + + + + Error - + + Growth + + + + + Size + + + + Line length + + + Arc length + + + + + Curve length + + + + + DialogTriangle + + + Dialog + + + + + Name new point + Имя новой точки + + + + First point of axis + + + + + + + + First point of line + + + + + Second point of axis + + + + + First point + Первая точка + + + + Second point + Вторая точка + + + + Select second point of axis + + + + + Select first point + + + + + Select second point + + MainWindow @@ -1392,7 +1606,7 @@ Точка - + Tool point of normal. @@ -1403,12 +1617,15 @@ - - - - - - + + + + + + + + + ... @@ -1418,459 +1635,496 @@ - + Tool point on the end line. - + Tool point along line. - + Tool point of bisector. - + Tool point of contact. - + + Tool point of height. + + + + + Tool triangle. + + + + Tools for creating lines. - + Line Линия - + Tool line. - + Tool point of line intersection. - + Tools for creating curves. - + Curve Кривая - + Tool curve. - + Tool path curve. - + Tools for creating arcs. - + Arc Дуга - + Tool arc. - + Tools for creating details. - + Detail Деталь - + Tool new detail. - + File - + Help - + Drawing - + toolBar - + toolBar_2 - + toolBar_3 - + New Новое - + Create a new pattern Создать новое лекало - + Open Открыть - + Open file with pattern Открыть файл с лекалом - + Save Сохранить - + Save pattern Сохранить лекало - - + + Save as Сохранить как - + Save not yet saved pattern Сохранить еще не сохраненное лекало - + Draw Рисование - + Draw mode Режим рисования - + Details Детали - + Deatils mode Режим деталей - - + + Tools pointer Инструмент указатель - + New drawing Новый чертеж - + Add new drawing Добавить новый чертеж - - + + Change the name of drawing Изменить имя чертежа - + Table of variables Таблица переменных - + Tables of variables Таблици переменных - + History История - + Layout Роскладка - + Create layout Создать раскладку - - + + About Qt - - + + About Valentina - + Exit - + Drawing %1 Чертеж %1 - - + + Drawing: Чертеж: - + Enter a name for the drawing. Введите имя чертежа. - - + + Error. Drawing of same name already exists. Ошибка. Чертеж с таким именем уже существует. - + Error creating drawing with the name Ошибка создания чертежа с именем - + Enter a new name for the drawing. Введите новое имя для чертежа. - + Error saving change!!! - + Can't save new name of drawing - - + + Select point - + Select first point - - - + + + Select first point of line - + Select first point of angle - + Select first point of first line - + Select first point curve - + Select point of center of arc - + Select point of curve path - - Valentina v.0.1.0 - - - - + The pattern has been modified. - + Do you want to save your changes? - + Growth: Рост: - + Size: Размер: - + Drawing: Чертеж: - + Lekalo files (*.xml);;All files (*.*) - - + + Lekalo files (*.xml) Файл лекала (*.xml) - + Error saving file. Can't save file. - + Open file Открыть файл - + Got empty file name. - + Could not copy temp file to pattern file - + Could not remove pattern file - + Can't open pattern file. File name empty Не могу открыть файл лекала. Пустое имя файла - - - - - - - + + + + + + + + Error! Ошибка! - + Create new drawing for start working. - + Select points, arcs, curves clockwise. - + + Select base point + + + + + Select first point of axis + + + + + Select point vertically + + + + + Based on Qt %2 (32 bit) + + + + + Built on %3 at %4 + + + + + <h1>%1</h1> %2 <br/><br/> %3 <br/><br/> %4 + + + + Error parsing file. Ошибка парсинга файла. - + Error can't convert value. Ошибка, не могу конвертовать значение. - + Error empty parameter. Ошибка, пустой параметр. - + Error wrong id. Ошибка, неправильный id. - + + Error don't unique id. - + Error parsing pattern file. Ошибка парсинга файла лекала. - + Error in line %1 column %2 Ошибка в линии %1 столбец %2 @@ -1894,6 +2148,7 @@ + Save layout Создать раскладку @@ -1966,55 +2221,63 @@ Стоп - + SVG Generator Example Drawing SVG Generator Example Drawing - + An SVG drawing created by the SVG Generator Example provided with Qt. An SVG drawing created by the SVG Generator Example provided with Qt. + + VAbstractNode + + + Can't find tag Modeling + + + VApplication - - - - - - + + + + + + Error! Ошибка! - + Error parsing file. Program will be terminated. Ошибка парсинга файла. Програма будет закрыта. - + Error bad id. Program will be terminated. Ошибка, неправильный id. Програма будет закрыта. - + Error can't convert value. Program will be terminated. Ошибка не могу конвертировать значение. Програма будет закрыта. - + Error empty parameter. Program will be terminated. Ошибка пустой параметр. Програма будет закрыта. - + Error wrong id. Program will be terminated. Ошибка неправельный id. Програма будет закрыта. - + Something wrong!! @@ -2022,17 +2285,17 @@ VArc - + Can't find id = %1 in table. - + Angle of arc can't be 0 degree. - + Arc have not this number of part. @@ -2040,7 +2303,7 @@ VContainer - + Can't find object Не могу найти объект @@ -2048,122 +2311,137 @@ VDomDocument - + Got wrong parameter id. Need only id > 0. Получен неправельный параметр id. Допустимы только id > 0. - + Can't convert toLongLong parameter Не могу конвертировать toLongLong параметр - + Got empty parameter Получен пустой параметр - + Can't convert toDouble parameter Не могу конвертировать toDouble параметр - + This id is not unique. - + Error creating or updating detail Ошибка создания или обновления детали - + Error creating or updating single point Ошибка создания или обновления базовой точки - + Error creating or updating point of end line Ошибка создания или обновления точки на конце линии - + Error creating or updating point along line Ошибка создания или обновления точки вдоль линии - + Error creating or updating point of shoulder Ошибка создания или обновления точки плеча - + Error creating or updating point of normal Ошибка создания или обновления точки нормали - + Error creating or updating point of bisector Ошибка создания или обновления точки бисектрисы - + Error creating or updating point of lineintersection Ошибка создания или обновления точки пересичения линий - + Error creating or updating point of contact Ошибка создания или обновления точки прикосновения - + Error creating or updating modeling point Ошибка создания или обновления точки + Error creating or updating height + + + + + Error creating or updating triangle + + + + + Error creating or updating point of intersection + + + + Error creating or updating line Ошибка создания или обновления линии - + Error creating or updating simple curve Ошибка создания или обновления кривой - + Error creating or updating curve path Ошибка создания или обновления сложной кривой - + Error creating or updating modeling simple curve Ошибка создания или обновления модельной кривой - + Error creating or updating modeling curve path Ошибка создания или обновления сложной модельной кривой - + Error creating or updating simple arc Ошибка создания или обновления дуги - + Error creating or updating modeling arc Ошибка создания или обновления модельной дуги - + Error! Ошибка! - + Error parsing file. Ошибка парсинга файла. @@ -2184,28 +2462,77 @@ Delete Удалить + + + Can not find the element after which you want to insert. + + + + + Can't find tag Calculation + + + + + VModelingTool + + + Option + + + + + Delete + Удалить + VSplinePath - + Not enough points to create the spline. Не достаточно точок для создания кривой. - - - + + + This spline is not exist. Такой кривой не существует. + + VTableGraphicsView + + + detail don't find + + + + + detail find + + + VToolDetail - + + Options + Параметры + + + Delete Удалить + + VToolTriangle + + + Can't find point. + + + diff --git a/translations/valentina_uk.ts b/translations/valentina_uk.ts index dbbfe8910..6d8446548 100644 --- a/translations/valentina_uk.ts +++ b/translations/valentina_uk.ts @@ -120,7 +120,7 @@ Змінні. Подвійний клік для вибору. - + Select second point of line Виберіть другу точку лінії @@ -264,7 +264,7 @@ Змінні - + Value angle of line. Значення дуги лінії. @@ -398,12 +398,12 @@ Змінні. Подвійний клік для вибору. - + Select second point of angle Виберіть другу точку кута - + Select third point of angle Виберіть третю точку кута @@ -416,22 +416,51 @@ Деталь - - Name detail - Ім'я деталі + + Bias X + - + + Bias Y + + + + + Option + + + + + Name of detail + + + + + Supplement for seams + + + + + Width + + + + Name detail + Ім'я деталі + + + Closed Замкнена - + Get wrong scene object. Ignore. Отримано непаравильний об'єкт сцени. Ігноровано. - + Get wrong tools. Ignore. Отримано неправильний інструмент. Ігноровано. @@ -558,6 +587,57 @@ Змінні. Подвійний клік для вибору. + + DialogHeight + + + Dialog + + + + + Name new point + Ім'я нової точки + + + + Base point + Базова точка + + + + + + + First point of line + Перша точка лінії + + + + Second point of line + Друга точка лінії + + + + Type line + Тип лінії + + + + Show line from first point to our point + Показати лінію від першої точки до нашої точки + + + + Select first point of line + Виберість першу точку лінії + + + + Select second point of line + Виберіть другу точку лінії + + DialogHistory @@ -567,7 +647,7 @@ - + Tool Інструмент @@ -628,7 +708,17 @@ %4 - Точка дотику дуги з центром в точці %1 і лінії %2_%3 - + + Point of perpendical from point %1 to line %2_%3 + + + + + Triangle: axis %1_%2, points %3 and %4 + + + + Get wrong tool type. Ignore. Отримано неправильний тип інструменту. Ігноруємо. @@ -648,23 +738,23 @@ - - - + + + Denotation Позначення - + The calculated value Розраховане значення - - - + + + Base value Базове значення @@ -680,97 +770,102 @@ - - - - - + + + + + Description Опис - - - + + + In size В розмірах - - - + + + In growth В ростах - - + + ... - + Lines Лінії - - + + Line Лінія - + Length of the line Довжина лінії - + Curves Криві - - + + Curve Крива - + Length of the curve Довжина кривої - + Arcs Дуги - - + + Arc Дуга - + Length of arc Довжина дуги - + Denotation %1 Позначення %1 - - + + Can't convert toDouble value. + + + + + Calculated value Розраховане значення - - - + + + Length Довжина @@ -793,7 +888,7 @@ Друга точка - + Select second point Виберіть другу точку @@ -833,17 +928,17 @@ Друга лінія - + Select second point of first line Виберіть другу точка першої лінії - + Select first point of second line Виберіть першу точку другої лінії - + Select second point of second line Виберіть другу точку другої лінії @@ -970,7 +1065,7 @@ Змінні. Подвійний клік для вибору. - + Select second point of line Виберіть другу точку лінії @@ -1084,16 +1179,54 @@ Змінні. Подвійний клік для вибору. - + Select second point of line Виберіть другу точку лінії - + Select point of center of arc Виберіть точку центру дуги + + DialogPointOfIntersection + + + Dialog + + + + + Name new point + Ім'я нової точки + + + + Point vertically + + + + + First point of angle + Перша точка кута + + + + Point horizontally + + + + + Second point of angle + Друга точка кута + + + + Select point horizontally + + + DialogShoulderPoint @@ -1200,12 +1333,12 @@ Змінні. Подвійний клік для вибору. - + Select second point of line Виберіть другу точку лінії - + Select point of shoulder Виберіть точку плеча @@ -1338,7 +1471,7 @@ Коефіцієнт кривизни кривої - + Select point of curve path Виберіть точку складної кривої @@ -1346,33 +1479,114 @@ DialogTool - + Wrong details id. Неправильний id деталі. - - - + + + Line Лінія - - + + No line Без лінії - + + Can't find point by name + + + + Error Помилка - + + Growth + + + + + Size + + + + Line length Довжина лінії + + + Arc length + + + + + Curve length + + + + + DialogTriangle + + + Dialog + + + + + Name new point + Ім'я нової точки + + + + First point of axis + + + + + + + + First point of line + Перша точка лінії + + + + Second point of axis + + + + + First point + Перша точка + + + + Second point + Друга точка + + + + Select second point of axis + + + + + Select first point + Виберість першу точку + + + + Select second point + Виберіть другу точку + MainWindow @@ -1392,7 +1606,7 @@ Точка - + Tool point of normal. Інструмент точка перпендикуляра. @@ -1403,12 +1617,15 @@ - - - - - - + + + + + + + + + ... @@ -1418,332 +1635,342 @@ Інструмент точка плеча. - + Tool point on the end line. Інструмент точка на кінці лінії. - + Tool point along line. Інструмент точка вздовж лінії. - + Tool point of bisector. Інструмент точка бісектриси кута. - + Tool point of contact. Інструмент точка дотику. - + + Tool point of height. + + + + + Tool triangle. + + + + Tools for creating lines. Інструменти для створення ліній. - + Line Лінія - + Tool line. Інструмент лінія. - + Tool point of line intersection. Інструмент точка перетину ліній. - + Tools for creating curves. Інструменти для створення кривих. - + Curve Крива - + Tool curve. Інструмент крива. - + Tool path curve. Інструмент складна крива. - + Tools for creating arcs. Інструменти для створення дуг. - + Arc Дуга - + Tool arc. Інструмент дуга. - + Tools for creating details. Інструменти для створення деталей. - + Detail Деталь - + Tool new detail. Інструмент нова деталь. - + File Файл - + Help Допомога - + Drawing Креслення - + toolBar - + toolBar_2 - + toolBar_3 - + New Новий - + Create a new pattern Створити нове лекало - + Open Відкрити - + Open file with pattern Відкрити файл з лекалами - + Save Зберегти - + Save pattern Зберегти лекало - - + + Save as Зберегти як - + Save not yet saved pattern Зберегти ще не збережене лекало - + Draw Малювання - + Draw mode Режим малювання - + Details Деталь - + Deatils mode Режим деталей - - + + Tools pointer Інструмент вказівник - + New drawing Нове креслення - + Add new drawing Додати нове креслення - - + + Change the name of drawing Змінити ім'я креслення - + Table of variables Таблиця змінних - + Tables of variables Таблиці змінних - + History Історія - + Layout Розкладки - + Create layout Створити розкладку - - + + About Qt Про Qt - - + + About Valentina Про Valentina - + Exit Вихід - + Drawing %1 Креслення %1 - - + + Drawing: Креслення: - + Enter a name for the drawing. Введіть ім'я креслення. - - + + Error. Drawing of same name already exists. Помилка. Креслення з таким ім'ям вже існує. - + Error creating drawing with the name Помилка створення креслення з ім'ям - + Enter a new name for the drawing. Введіть нове ім'я креслення. - + Error saving change!!! - + Can't save new name of drawing - - + + Select point Виберість точку - + Select first point Виберість першу точку - - - + + + Select first point of line Виберість першу точку лінії - + Select first point of angle Виберіть першу точку кута - + Select first point of first line Виберіть першу точку першої лінії - + Select first point curve Виберіть першу точку кривої - + Select point of center of arc Виберіть точку центру дуги - + Select point of curve path Виберіть точку складної кривої @@ -1752,129 +1979,160 @@ Виберіть точки, дуги, криві і д - Valentina v.0.1.0 - Valentina v.0.1.0 + Valentina v.0.1.0 - + The pattern has been modified. Лекало було зміненно. - + Do you want to save your changes? Ви хочете зберегти зміни? - + Growth: Зріст: - + Size: Розмір: - + Drawing: Креслення: - + Lekalo files (*.xml);;All files (*.*) Файли лекала (*.xml);;Всі файли (*.*) - - + + Lekalo files (*.xml) Файл лекала (*.xml) - + Error saving file. Can't save file. Помилка збереження файлу. Не можу зберегти файл. - + Open file Відкрити файл - + Got empty file name. Отримано пусте імя файлу. - + Could not copy temp file to pattern file Не можу копіювати тимчасовий файл до файлу лекала - + Could not remove pattern file Не можу видалити файл лекала - + Can't open pattern file. File name empty Не можу відкрити файл лекала. Пусте ім'я файлу - - - - - - - + + + + + + + + Error! Помилка! - + Create new drawing for start working. Створіть нове креслення для початку роботи. - + Select points, arcs, curves clockwise. Виберіть точки, дуги, криві загодинниковою стрілкою. - + + Select base point + + + + + Select first point of axis + + + + + Select point vertically + + + + + Based on Qt %2 (32 bit) + + + + + Built on %3 at %4 + + + + + <h1>%1</h1> %2 <br/><br/> %3 <br/><br/> %4 + + + + Error parsing file. Помилка парсингу файла. - + Error can't convert value. Помилка, не можу конвертувати значення. - + Error empty parameter. Помилка, пустий параметр. - + Error wrong id. Помикла, неправильний id. - + + Error don't unique id. Помилка, не унікальний id. - + Error parsing pattern file. Помилка парсінгу файлу лекала. - + Error in line %1 column %2 Помилка в лінії %1 стовпчик %2 @@ -1898,6 +2156,7 @@ + Save layout Зберегти розкладку @@ -1970,55 +2229,63 @@ Зупинити - + SVG Generator Example Drawing - + An SVG drawing created by the SVG Generator Example provided with Qt. + + VAbstractNode + + + Can't find tag Modeling + + + VApplication - - - - - - + + + + + + Error! Помилка! - + Error parsing file. Program will be terminated. Помилка парсінгу файла. Програма буде закрита. - + Error bad id. Program will be terminated. Помилка неправильний id. Програма буде закрита. - + Error can't convert value. Program will be terminated. Помилка конвертації значення. Програма буде закрита. - + Error empty parameter. Program will be terminated. Помилка пустий параметр. Програма буде закрита. - + Error wrong id. Program will be terminated. Помилка неправильний id. Програма буде закрита. - + Something wrong!! @@ -2026,17 +2293,17 @@ VArc - + Can't find id = %1 in table. - + Angle of arc can't be 0 degree. - + Arc have not this number of part. @@ -2044,7 +2311,7 @@ VContainer - + Can't find object Не можу знайти об'єкт @@ -2052,122 +2319,137 @@ VDomDocument - + Got wrong parameter id. Need only id > 0. Отримано неправильний id. Допускаються тільки id > 0. - + Can't convert toLongLong parameter Не можу конвертувати toLongLong параметру - + Got empty parameter Отримано пустий параметр - + Can't convert toDouble parameter Не можу конвертувати toDouble параметру - + This id is not unique. Цей id не унікальний. - + Error creating or updating detail Помилка створення чи оновлення деталі - + Error creating or updating single point Помилка створення чи оновлення простої точки - + Error creating or updating point of end line Помилка створення чи оновлення точки кінця відрізку - + Error creating or updating point along line Помилка створення чи оновлення точки вздовж лінії - + Error creating or updating point of shoulder Помилка створення чи оновлення точки плеча - + Error creating or updating point of normal Помилка створення чи оновлення точки нормалі - + Error creating or updating point of bisector Помилка створення чи оновлення точки бісектриси - + Error creating or updating point of lineintersection Помилка створення чи оновлення точки перетину ліній - + Error creating or updating point of contact Помилка створення чи оновлення точки дотику - + Error creating or updating modeling point Помилка створення чи оновлення модельної точки + Error creating or updating height + + + + + Error creating or updating triangle + + + + + Error creating or updating point of intersection + + + + Error creating or updating line Помилка створення чи оновлення лінії - + Error creating or updating simple curve Помилка створення чи оновлення кривої - + Error creating or updating curve path Помилка створення чи оновлення шляху кривих - + Error creating or updating modeling simple curve Помилка створення чи оновлення модельної кривої - + Error creating or updating modeling curve path Помилка створення чи оновлення модельного шляху кривих - + Error creating or updating simple arc Помилка створення чи оновлення дуги - + Error creating or updating modeling arc Помилка створення чи оновлення модельної дуги - + Error! Помилка! - + Error parsing file. Помилка парсингу файла. @@ -2188,28 +2470,77 @@ Delete Видалити + + + Can not find the element after which you want to insert. + + + + + Can't find tag Calculation + + + + + VModelingTool + + + Option + + + + + Delete + Видалити + VSplinePath - + Not enough points to create the spline. Не достатньо точок для створення кривої. - - - + + + This spline is not exist. Такий сплайн не існує. + + VTableGraphicsView + + + detail don't find + + + + + detail find + + + VToolDetail - + + Options + Параметри + + + Delete Видалити + + VToolTriangle + + + Can't find point. + + + From 9ae8671ee46b58a8f571c9552f2a55e11e3b75b0 Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 29 Oct 2013 19:49:19 +0200 Subject: [PATCH 56/83] Preparation for new version. --HG-- branch : develop --- version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.h b/version.h index 24e0c06b5..f988bb497 100644 --- a/version.h +++ b/version.h @@ -4,7 +4,7 @@ #include extern const int MAJOR_VERSION = 0; -extern const int MINOR_VERSION = 1; +extern const int MINOR_VERSION = 2; extern const int DEBUG_VERSION = 0; extern const QString APP_VERSION(QStringLiteral("%1.%2.%3").arg(MAJOR_VERSION).arg(MINOR_VERSION).arg(DEBUG_VERSION)); From 6de60a4644dc710c4af982adaa485e6698dd3cdc Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 4 Nov 2013 22:35:15 +0200 Subject: [PATCH 57/83] New coding standart with Vera++. --HG-- branch : develop --- container/calculator.cpp | 172 ++-- container/calculator.h | 8 +- container/vcontainer.cpp | 628 ++++++++----- container/vcontainer.h | 5 +- container/vincrementtablerow.cpp | 12 +- container/vincrementtablerow.h | 3 +- container/vpointf.cpp | 3 +- container/vpointf.h | 3 +- container/vstandarttablecell.cpp | 9 +- container/vstandarttablecell.h | 3 +- dialogs/dialogalongline.cpp | 68 +- dialogs/dialogalongline.h | 12 +- dialogs/dialogarc.cpp | 98 +- dialogs/dialogarc.h | 8 +- dialogs/dialogbisector.cpp | 77 +- dialogs/dialogbisector.h | 9 +- dialogs/dialogdetail.cpp | 192 ++-- dialogs/dialogdetail.h | 9 +- dialogs/dialogendline.cpp | 53 +- dialogs/dialogendline.h | 13 +- dialogs/dialogheight.cpp | 94 +- dialogs/dialogheight.h | 10 +- dialogs/dialoghistory.cpp | 132 ++- dialogs/dialoghistory.h | 8 +- dialogs/dialogincrements.cpp | 125 ++- dialogs/dialogincrements.h | 10 +- dialogs/dialogline.cpp | 63 +- dialogs/dialogline.h | 13 +- dialogs/dialoglineintersect.cpp | 105 ++- dialogs/dialoglineintersect.h | 10 +- dialogs/dialognormal.cpp | 71 +- dialogs/dialognormal.h | 11 +- dialogs/dialogpointofcontact.cpp | 71 +- dialogs/dialogpointofcontact.h | 4 +- dialogs/dialogpointofintersection.cpp | 62 +- dialogs/dialogpointofintersection.h | 10 +- dialogs/dialogshoulderpoint.cpp | 77 +- dialogs/dialogshoulderpoint.h | 8 +- dialogs/dialogsinglepoint.cpp | 33 +- dialogs/dialogsinglepoint.h | 10 +- dialogs/dialogspline.cpp | 84 +- dialogs/dialogspline.h | 21 +- dialogs/dialogsplinepath.cpp | 86 +- dialogs/dialogsplinepath.h | 8 +- dialogs/dialogtool.cpp | 304 ++++--- dialogs/dialogtool.h | 6 +- dialogs/dialogtriangle.cpp | 104 ++- dialogs/dialogtriangle.h | 11 +- exception/vexception.cpp | 8 +- exception/vexception.h | 3 +- exception/vexceptionbadid.cpp | 11 +- exception/vexceptionbadid.h | 13 +- exception/vexceptionconversionerror.cpp | 8 +- exception/vexceptionconversionerror.h | 6 +- exception/vexceptionemptyparameter.cpp | 15 +- exception/vexceptionemptyparameter.h | 11 +- exception/vexceptionobjecterror.cpp | 26 +- exception/vexceptionobjecterror.h | 8 +- exception/vexceptionuniqueid.cpp | 11 +- exception/vexceptionuniqueid.h | 7 +- exception/vexceptionwrongparameterid.cpp | 13 +- exception/vexceptionwrongparameterid.h | 7 +- geometry/varc.cpp | 136 +-- geometry/varc.h | 9 +- geometry/vdetail.cpp | 35 +- geometry/vdetail.h | 6 +- geometry/vnodedetail.cpp | 19 +- geometry/vnodedetail.h | 6 +- geometry/vspline.cpp | 533 ++++++----- geometry/vspline.h | 15 +- geometry/vsplinepath.cpp | 92 +- geometry/vsplinepath.h | 10 +- geometry/vsplinepoint.cpp | 20 +- geometry/vsplinepoint.h | 3 +- main.cpp | 63 +- mainwindow.cpp | 735 +++++++++------ mainwindow.h | 17 +- options.h | 65 +- tablewindow.cpp | 197 ++-- tablewindow.h | 8 +- tools/drawTools/vdrawtool.cpp | 74 +- tools/drawTools/vdrawtool.h | 50 +- tools/drawTools/vtoolalongline.cpp | 78 +- tools/drawTools/vtoolalongline.h | 5 +- tools/drawTools/vtoolarc.cpp | 111 ++- tools/drawTools/vtoolarc.h | 3 +- tools/drawTools/vtoolbisector.cpp | 92 +- tools/drawTools/vtoolbisector.h | 3 +- tools/drawTools/vtoolendline.cpp | 62 +- tools/drawTools/vtoolendline.h | 3 +- tools/drawTools/vtoolheight.cpp | 65 +- tools/drawTools/vtoolheight.h | 3 +- tools/drawTools/vtoolline.cpp | 82 +- tools/drawTools/vtoolline.h | 3 +- tools/drawTools/vtoollineintersect.cpp | 81 +- tools/drawTools/vtoollineintersect.h | 3 +- tools/drawTools/vtoollinepoint.cpp | 36 +- tools/drawTools/vtoollinepoint.h | 5 +- tools/drawTools/vtoolnormal.cpp | 83 +- tools/drawTools/vtoolnormal.h | 3 +- tools/drawTools/vtoolpoint.cpp | 56 +- tools/drawTools/vtoolpoint.h | 3 +- tools/drawTools/vtoolpointofcontact.cpp | 89 +- tools/drawTools/vtoolpointofcontact.h | 3 +- tools/drawTools/vtoolpointofintersection.cpp | 54 +- tools/drawTools/vtoolpointofintersection.h | 3 +- tools/drawTools/vtoolshoulderpoint.cpp | 100 +- tools/drawTools/vtoolshoulderpoint.h | 3 +- tools/drawTools/vtoolsinglepoint.cpp | 71 +- tools/drawTools/vtoolsinglepoint.h | 3 +- tools/drawTools/vtoolspline.cpp | 121 ++- tools/drawTools/vtoolspline.h | 3 +- tools/drawTools/vtoolsplinepath.cpp | 143 +-- tools/drawTools/vtoolsplinepath.h | 3 +- tools/drawTools/vtooltriangle.cpp | 75 +- tools/drawTools/vtooltriangle.h | 3 +- tools/modelingTools/vmodelingalongline.cpp | 87 +- tools/modelingTools/vmodelingalongline.h | 3 +- tools/modelingTools/vmodelingarc.cpp | 91 +- tools/modelingTools/vmodelingarc.h | 3 +- tools/modelingTools/vmodelingbisector.cpp | 77 +- tools/modelingTools/vmodelingbisector.h | 3 +- tools/modelingTools/vmodelingendline.cpp | 61 +- tools/modelingTools/vmodelingendline.h | 3 +- tools/modelingTools/vmodelingheight.cpp | 52 +- tools/modelingTools/vmodelingheight.h | 3 +- tools/modelingTools/vmodelingline.cpp | 59 +- tools/modelingTools/vmodelingline.h | 3 +- .../modelingTools/vmodelinglineintersect.cpp | 75 +- tools/modelingTools/vmodelinglineintersect.h | 3 +- tools/modelingTools/vmodelinglinepoint.cpp | 24 +- tools/modelingTools/vmodelinglinepoint.h | 3 +- tools/modelingTools/vmodelingnormal.cpp | 90 +- tools/modelingTools/vmodelingnormal.h | 3 +- tools/modelingTools/vmodelingpoint.cpp | 40 +- tools/modelingTools/vmodelingpoint.h | 3 +- .../modelingTools/vmodelingpointofcontact.cpp | 78 +- tools/modelingTools/vmodelingpointofcontact.h | 3 +- .../vmodelingpointofintersection.cpp | 57 +- .../vmodelingpointofintersection.h | 3 +- .../modelingTools/vmodelingshoulderpoint.cpp | 80 +- tools/modelingTools/vmodelingshoulderpoint.h | 3 +- tools/modelingTools/vmodelingspline.cpp | 101 ++- tools/modelingTools/vmodelingspline.h | 3 +- tools/modelingTools/vmodelingsplinepath.cpp | 133 ++- tools/modelingTools/vmodelingsplinepath.h | 3 +- tools/modelingTools/vmodelingtool.cpp | 30 +- tools/modelingTools/vmodelingtool.h | 37 +- tools/modelingTools/vmodelingtriangle.cpp | 54 +- tools/modelingTools/vmodelingtriangle.h | 3 +- tools/nodeDetails/vabstractnode.cpp | 30 +- tools/nodeDetails/vabstractnode.h | 3 +- tools/nodeDetails/vnodearc.cpp | 48 +- tools/nodeDetails/vnodearc.h | 3 +- tools/nodeDetails/vnodepoint.cpp | 71 +- tools/nodeDetails/vnodepoint.h | 3 +- tools/nodeDetails/vnodespline.cpp | 48 +- tools/nodeDetails/vnodespline.h | 3 +- tools/nodeDetails/vnodesplinepath.cpp | 51 +- tools/nodeDetails/vnodesplinepath.h | 3 +- tools/vabstracttool.cpp | 77 +- tools/vabstracttool.h | 9 +- tools/vdatatool.cpp | 9 +- tools/vdatatool.h | 5 +- tools/vtooldetail.cpp | 473 +++++----- tools/vtooldetail.h | 9 +- version.h | 3 +- widgets/doubledelegate.cpp | 14 +- widgets/doubledelegate.h | 3 +- widgets/vapplication.cpp | 27 +- widgets/vapplication.h | 3 +- widgets/vcontrolpointspline.cpp | 68 +- widgets/vcontrolpointspline.h | 3 +- widgets/vgraphicssimpletextitem.cpp | 20 +- widgets/vgraphicssimpletextitem.h | 3 +- widgets/vitem.cpp | 34 +- widgets/vitem.h | 3 +- widgets/vmaingraphicsscene.cpp | 21 +- widgets/vmaingraphicsscene.h | 3 +- widgets/vmaingraphicsview.cpp | 69 +- widgets/vmaingraphicsview.h | 3 +- widgets/vtablegraphicsview.cpp | 156 ++-- widgets/vtablegraphicsview.h | 7 +- xml/vdomdocument.cpp | 856 ++++++++++++------ xml/vdomdocument.h | 11 +- xml/vtoolrecord.cpp | 9 +- xml/vtoolrecord.h | 3 +- 187 files changed, 6296 insertions(+), 3772 deletions(-) diff --git a/container/calculator.cpp b/container/calculator.cpp index 36e7202e9..1ba0a8477 100644 --- a/container/calculator.cpp +++ b/container/calculator.cpp @@ -30,11 +30,8 @@ #define FINISHED 10 #define EOL 9 -Calculator::Calculator(const VContainer *data):errorMsg(0), token(QString()), tok(0), token_type(0), - prog(QString()), index(0), data(data), debugFormula(QString()){ -} - -qreal Calculator::eval(QString prog, QString *errorMsg){ +qreal Calculator::eval(QString prog, QString *errorMsg) +{ this->errorMsg = errorMsg; this->errorMsg->clear(); debugFormula.clear(); @@ -48,10 +45,12 @@ qreal Calculator::eval(QString prog, QString *errorMsg){ return result; } -qreal Calculator::get_exp(){ +qreal Calculator::get_exp() +{ qreal result = 0; get_token(); - if(token.isEmpty()) { + if (token.isEmpty()) + { serror(2); return 0; } @@ -62,38 +61,44 @@ qreal Calculator::get_exp(){ } /* Сложение или вычитание двух термов */ -void Calculator::level2(qreal *result){ +void Calculator::level2(qreal *result) +{ QChar op; qreal hold; level3(result); - while((op=token[0]) == '+' || op == '-') { + while ((op=token[0]) == '+' || op == '-') + { get_token(); level3(&hold); - arith(op,result,&hold); + arith(op, result, &hold); } } /* Вычисление произведения или частного двух фвкторов */ -void Calculator::level3(qreal *result){ +void Calculator::level3(qreal *result) +{ QChar op; qreal hold; level4(result); - while((op = token[0]) == '*' || op == '/' || op == '%') { + while ((op = token[0]) == '*' || op == '/' || op == '%') + { get_token(); level4(&hold); - arith(op,result,&hold); + arith(op, result, &hold); } } /* Обработка степени числа (целочисленной) */ -void Calculator::level4(qreal *result){ +void Calculator::level4(qreal *result) +{ qreal hold; level5(result); - if(token[0] == '^') { + if (token[0] == '^') + { get_token(); level4(&hold); arith('^', result, &hold); @@ -101,35 +106,45 @@ void Calculator::level4(qreal *result){ } /* Унарный + или - */ -void Calculator::level5(qreal *result){ +void Calculator::level5(qreal *result) +{ QChar op; op = '\0'; - if((token_type==DELIMITER) && (token[0]=='+' || token[0]=='-')) { + if ((token_type==DELIMITER) && (token[0]=='+' || token[0]=='-')) + { op = token[0]; get_token(); } level6(result); - if(op != '\0') + if (op != '\0') + { unary(op, result); + } } /* Обработка выражения в круглых скобках */ -void Calculator::level6(qreal *result){ - if((token[0] == '(') && (token_type == DELIMITER)) { +void Calculator::level6(qreal *result) +{ + if ((token[0] == '(') && (token_type == DELIMITER)) + { get_token(); level2(result); - if(token[0] != ')') + if (token[0] != ')') + { serror(1); + } get_token(); } else primitive(result); } /* Определение значения переменной по ее имени */ -void Calculator::primitive(qreal *result){ +void Calculator::primitive(qreal *result) +{ QString str; - switch(token_type) { + switch (token_type) + { case VARIABLE: *result = find_var(token); str = QString("%1").arg(*result, 0, 'f', 3); @@ -148,10 +163,12 @@ void Calculator::primitive(qreal *result){ } /* Выполнение специфицированной арифметики */ -void Calculator::arith(QChar o, qreal *r, qreal *h){ +void Calculator::arith(QChar o, qreal *r, qreal *h) +{ qreal t;//, ex; - switch(o.toLatin1()) { + switch (o.toLatin1()) + { case '-': *r = *r-*h; break; @@ -177,21 +194,26 @@ void Calculator::arith(QChar o, qreal *r, qreal *h){ // } // for(t=*h-1; t>0; --t) // *r = (*r) * ex; - break; - } + break; + } } /* Изменение знака */ -void Calculator::unary(QChar o, qreal *r){ - if(o=='-') +void Calculator::unary(QChar o, qreal *r) +{ + if (o=='-') + { *r = -(*r); + } } /* Поиск значения переменной */ -qreal Calculator::find_var(QString s){ +qreal Calculator::find_var(QString s) +{ bool ok = false; qreal value = data->FindVar(s, &ok); - if(!ok){ + if (ok == false) + { qDebug()<clear(); *errorMsg = e[error]; - qDebug()</*%^=()",c) || c=='\n' || c=='\r' || c=='\0') +bool Calculator::isdelim(QChar c) +{ + if (StrChr(" ;,+-<>/*%^=()", c) || c=='\n' || c=='\r' || c=='\0') + { return true; + } return false; } /* Возвращает 1, если "с" пробел или табуляция */ -bool Calculator::iswhite(QChar c){ - if(c==' ' || c=='\t') +bool Calculator::iswhite(QChar c) +{ + if (c==' ' || c=='\t') + { return true; + } else + { return false; + } } -void Calculator::get_token(){ +void Calculator::get_token() +{ QString *temp; token_type=0; tok=0; token.clear(); temp=&token; - if(prog[index]=='\0') { /* Конец файла */ + if (prog[index]=='\0') + { /* Конец файла */ token="\0"; tok=FINISHED; token_type=DELIMITER; return; } - while(iswhite(prog[index])) ++index; /* пропуск пробелов */ + while (iswhite(prog[index])) + { + ++index; /* пропуск пробелов */ + } - if(prog[index]=='\r') { /* crtl */ + if (prog[index]=='\r') + { /* crtl */ ++index; ++index; tok= EOL; token='\r'; token.append('\n');token.append("\0"); @@ -273,7 +312,8 @@ void Calculator::get_token(){ return; } - if(StrChr("+-*^/%=;(),><", prog[index])) { /* разделитель */ + if (StrChr("+-*^/%=;(),><", prog[index])) + { /* разделитель */ *temp=prog[index]; index++; /* переход на следующую позицию */ temp->append("\0"); @@ -281,20 +321,26 @@ void Calculator::get_token(){ debugFormula.append(token); return; } - if(prog[index]=='"') { /* строка в кавычках */ + if (prog[index]=='"') + { /* строка в кавычках */ index++; - while(prog[index] != '"' && prog[index] != '\r'){ + while (prog[index] != '"' && prog[index] != '\r') + { temp->append(prog[index]); index++; } - if(prog[index]=='\r') + if (prog[index]=='\r') + { serror(1); + } index++;temp->append("\0"); token_type=QUOTE; return; } - if(prog[index].isDigit()) { /* число */ - while(!isdelim(prog[index])){ + if (prog[index].isDigit()) + { /* число */ + while (isdelim(prog[index]) == false) + { temp->append(prog[index]); index++; } @@ -303,8 +349,10 @@ void Calculator::get_token(){ return; } - if(prog[index].isPrint()) { /* переменная или команда */ - while(!isdelim(prog[index])){ + if (prog[index].isPrint()) + { /* переменная или команда */ + while (isdelim(prog[index]) == false) + { temp->append(prog[index]); index++; } @@ -313,22 +361,30 @@ void Calculator::get_token(){ temp->append("\0"); /* Просматривается, если строка есть команда или переменная */ - if(token_type==STRING) { + if (token_type==STRING) + { tok=look_up(token); /* преобразование во внутренний формат */ - if(!tok) + if (tok == false) + { token_type = VARIABLE; - else token_type = COMMAND; /* это команда */ - } + } + else + { + token_type = COMMAND; /* это команда */ + } + } return; } -bool Calculator::StrChr(QString string, QChar c){ +bool Calculator::StrChr(QString string, QChar c) +{ return string.contains(c, Qt::CaseInsensitive); } /* Возвращает лексему обратно во входной поток */ -void Calculator::putback(){ +void Calculator::putback() +{ QString t; t = token; index = index - t.size(); diff --git a/container/calculator.h b/container/calculator.h index 607dd648e..6fa29c3ed 100644 --- a/container/calculator.h +++ b/container/calculator.h @@ -28,13 +28,15 @@ * @brief The Calculator клас калькулятора формул лекал. Виконує розрахунок формул з підставлянням * значеннь зміних. */ -class Calculator{ +class Calculator +{ public: /** * @brief Calculator конструктор класу. Використовується при розрахунку лекала. * @param data покажчик на контейнер змінних */ - explicit Calculator(const VContainer *data); + explicit Calculator(const VContainer *data):errorMsg(0), token(QString()), tok(0), token_type(0), prog(QString()), + index(0), data(data), debugFormula(QString()){} /** * @brief eval виконує розрахунок формули. * @param prog рядко в якому зберігається формула. @@ -143,7 +145,7 @@ private: qreal find_var(QString s); void serror(qint32 error); /** - * @brief look_up пошук відповідного внутрішнього формату для теперішньої лексеми в таблиці лексем. текущей лексемы в таблице лексем + * @brief look_up пошук відповідного внутрішнього формату для теперішньої лексеми в таблиці лексем. * @param s ім'я лексеми. * @return внутрішній номер лексеми. */ diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 7b94c7ab2..2a6daca3d 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -24,7 +24,8 @@ qint64 VContainer::_id = 0; -VContainer::VContainer():base(QHash()), points(QHash()), +VContainer::VContainer() + :base(QHash()), points(QHash()), modelingPoints(QHash()), standartTable(QHash()), incrementTable(QHash()), lengthLines(QHash()), lineAngles(QHash()), splines(QHash()), @@ -32,18 +33,21 @@ VContainer::VContainer():base(QHash()), points(QHash()), arcs(QHash()), modelingArcs(QHash()), lengthArcs(QHash()), splinePaths(QHash()), modelingSplinePaths(QHash()), - details(QHash()){ + details(QHash()) +{ SetSize(500); SetGrowth(1760); CreateManTableIGroup (); } -VContainer &VContainer::operator =(const VContainer &data){ +VContainer &VContainer::operator =(const VContainer &data) +{ setData(data); return *this; } -VContainer::VContainer(const VContainer &data):base(QHash()), points(QHash()), +VContainer::VContainer(const VContainer &data) + :base(QHash()), points(QHash()), modelingPoints(QHash()), standartTable(QHash()), incrementTable(QHash()), lengthLines(QHash()), lineAngles(QHash()), splines(QHash()), @@ -51,11 +55,13 @@ VContainer::VContainer(const VContainer &data):base(QHash()), p lengthSplines(QHash()), arcs(QHash()), modelingArcs(QHash()), lengthArcs(QHash()), splinePaths(QHash()), modelingSplinePaths(QHash()), - details(QHash()){ + details(QHash()) +{ setData(data); } -void VContainer::setData(const VContainer &data){ +void VContainer::setData(const VContainer &data) +{ base = *data.DataBase(); points = *data.DataPoints(); modelingPoints = *data.DataModelingPoints(); @@ -75,158 +81,201 @@ void VContainer::setData(const VContainer &data){ } template -val VContainer::GetObject(const QHash &obj, key id){ - if(obj.contains(id)){ +val VContainer::GetObject(const QHash &obj, key id) +{ + if (obj.contains(id)) + { return obj.value(id); - } else { + } + else + { throw VExceptionBadId(tr("Can't find object"), id); } } -VStandartTableCell VContainer::GetStandartTableCell(const QString &name) const{ - Q_ASSERT(!name.isEmpty()); +VStandartTableCell VContainer::GetStandartTableCell(const QString &name) const +{ + Q_ASSERT(name.isEmpty()==false); return GetObject(standartTable, name); } -VIncrementTableRow VContainer::GetIncrementTableRow(const QString& name) const{ - Q_ASSERT(!name.isEmpty()); +VIncrementTableRow VContainer::GetIncrementTableRow(const QString& name) const +{ + Q_ASSERT(name.isEmpty()==false); return GetObject(incrementTable, name); } -qreal VContainer::GetLine(const QString &name) const{ - Q_ASSERT(!name.isEmpty()); +qreal VContainer::GetLine(const QString &name) const +{ + Q_ASSERT(name.isEmpty()==false); return GetObject(lengthLines, name); } -qreal VContainer::GetLengthArc(const QString &name) const{ - Q_ASSERT(!name.isEmpty()); +qreal VContainer::GetLengthArc(const QString &name) const +{ + Q_ASSERT(name.isEmpty()==false); return GetObject(lengthArcs, name); } -qreal VContainer::GetLengthSpline(const QString &name) const{ - Q_ASSERT(!name.isEmpty()); +qreal VContainer::GetLengthSpline(const QString &name) const +{ + Q_ASSERT(name.isEmpty()==false); return GetObject(lengthSplines, name); } -qreal VContainer::GetLineAngle(const QString &name) const{ - Q_ASSERT(!name.isEmpty()); +qreal VContainer::GetLineAngle(const QString &name) const +{ + Q_ASSERT(name.isEmpty()==false); return GetObject(lineAngles, name); } -qint64 VContainer::AddPoint(const VPointF &point){ +qint64 VContainer::AddPoint(const VPointF &point) +{ return AddObject(points, point); } -qint64 VContainer::AddModelingPoint(const VPointF &point){ -return AddObject(modelingPoints, point); +qint64 VContainer::AddModelingPoint(const VPointF &point) +{ + return AddObject(modelingPoints, point); } -qint64 VContainer::AddDetail(const VDetail &detail){ +qint64 VContainer::AddDetail(const VDetail &detail) +{ return AddObject(details, detail); } -qint64 VContainer::getNextId(){ +qint64 VContainer::getNextId() +{ _id++; return _id; } -void VContainer::UpdateId(qint64 newId){ - if(newId > _id){ +void VContainer::UpdateId(qint64 newId) +{ + if (newId > _id) + { _id = newId; } } -QPainterPath VContainer::ContourPath(qint64 idDetail) const{ +QPainterPath VContainer::ContourPath(qint64 idDetail) const +{ VDetail detail = GetDetail(idDetail); QVector points; QVector pointsEkv; - for(qint32 i = 0; i< detail.CountNode(); ++i){ - switch(detail[i].getTypeTool()){ - case(Tool::NodePoint):{ - VPointF point = GetModelingPoint(detail[i].getId()); - points.append(point.toQPointF()); - if(detail.getSupplement() == true){ - QPointF pEkv = point.toQPointF(); - pEkv.setX(pEkv.x()+detail[i].getMx()); - pEkv.setY(pEkv.y()+detail[i].getMy()); - pointsEkv.append(pEkv); - } - } - break; - case(Tool::NodeArc):{ - VArc arc = GetModelingArc(detail[i].getId()); - qreal len1 = GetLengthContour(points, arc.GetPoints()); - qreal lenReverse = GetLengthContour(points, GetReversePoint(arc.GetPoints())); - if(len1 <= lenReverse){ - points << arc.GetPoints(); - if(detail.getSupplement() == true){ - pointsEkv << biasPoints(arc.GetPoints(), detail[i].getMx(), detail[i].getMy()); + for (qint32 i = 0; i< detail.CountNode(); ++i) + { + switch (detail[i].getTypeTool()) + { + case (Tool::NodePoint): + { + VPointF point = GetModelingPoint(detail[i].getId()); + points.append(point.toQPointF()); + if (detail.getSupplement() == true) + { + QPointF pEkv = point.toQPointF(); + pEkv.setX(pEkv.x()+detail[i].getMx()); + pEkv.setY(pEkv.y()+detail[i].getMy()); + pointsEkv.append(pEkv); } - } else { - points << GetReversePoint(arc.GetPoints()); - if(detail.getSupplement() == true){ - pointsEkv << biasPoints(GetReversePoint(arc.GetPoints()), detail[i].getMx(), + } + break; + case (Tool::NodeArc): + { + VArc arc = GetModelingArc(detail[i].getId()); + qreal len1 = GetLengthContour(points, arc.GetPoints()); + qreal lenReverse = GetLengthContour(points, GetReversePoint(arc.GetPoints())); + if (len1 <= lenReverse) + { + points << arc.GetPoints(); + if (detail.getSupplement() == true) + { + pointsEkv << biasPoints(arc.GetPoints(), detail[i].getMx(), detail[i].getMy()); + } + } + else + { + points << GetReversePoint(arc.GetPoints()); + if (detail.getSupplement() == true) + { + pointsEkv << biasPoints(GetReversePoint(arc.GetPoints()), detail[i].getMx(), detail[i].getMy()); + } + } + } + break; + case (Tool::NodeSpline): + { + VSpline spline = GetModelingSpline(detail[i].getId()); + qreal len1 = GetLengthContour(points, spline.GetPoints()); + qreal lenReverse = GetLengthContour(points, GetReversePoint(spline.GetPoints())); + if (len1 <= lenReverse) + { + points << spline.GetPoints(); + if (detail.getSupplement() == true) + { + pointsEkv << biasPoints(spline.GetPoints(), detail[i].getMx(), detail[i].getMy()); + } + } + else + { + points << GetReversePoint(spline.GetPoints()); + if (detail.getSupplement() == true) + { + pointsEkv << biasPoints(GetReversePoint(spline.GetPoints()), detail[i].getMx(), detail[i].getMy()); + } } } - } break; - case(Tool::NodeSpline):{ - VSpline spline = GetModelingSpline(detail[i].getId()); - qreal len1 = GetLengthContour(points, spline.GetPoints()); - qreal lenReverse = GetLengthContour(points, GetReversePoint(spline.GetPoints())); - if(len1 <= lenReverse){ - points << spline.GetPoints(); - if(detail.getSupplement() == true){ - pointsEkv << biasPoints(spline.GetPoints(), detail[i].getMx(), detail[i].getMy()); + case (Tool::NodeSplinePath): + { + VSplinePath splinePath = GetModelingSplinePath(detail[i].getId()); + qreal len1 = GetLengthContour(points, splinePath.GetPathPoints()); + qreal lenReverse = GetLengthContour(points, GetReversePoint(splinePath.GetPathPoints())); + if (len1 <= lenReverse) + { + points << splinePath.GetPathPoints(); + if (detail.getSupplement() == true) + { + pointsEkv << biasPoints(splinePath.GetPathPoints(), detail[i].getMx(), detail[i].getMy()); + } } - } else { - points << GetReversePoint(spline.GetPoints()); - if(detail.getSupplement() == true){ - pointsEkv << biasPoints(GetReversePoint(spline.GetPoints()), detail[i].getMx(), - detail[i].getMy()); + else + { + points << GetReversePoint(splinePath.GetPathPoints()); + if (detail.getSupplement() == true) + { + pointsEkv << biasPoints(GetReversePoint(splinePath.GetPathPoints()), detail[i].getMx(), + detail[i].getMy()); + } } } + break; + case (Tool::SplineTool): + break;//Nothing to do, just ignore. + default: + qWarning()<<"Get wrong tool type. Ignore."< VContainer::biasPoints(const QVector &points, const qreal &mx, const qreal &my) const{ +QVector VContainer::biasPoints(const QVector &points, const qreal &mx, const qreal &my) const +{ QVector p; - for(qint32 i = 0; i < points.size(); ++i){ + for (qint32 i = 0; i < points.size(); ++i) + { QPointF point = points.at(i); point.setX(point.x() + mx); - point.setY(point.x() + my); + point.setY(point.y() + my); p.append(point); } return p; } -QPainterPath VContainer::Equidistant(QVector points, const Detail::Equidistant &eqv, - const qreal &width) const{ +QPainterPath VContainer::Equidistant(QVector points, const Detail::Equidistant &eqv, const qreal &width) const +{ QPainterPath ekv; QVector ekvPoints; - if ( points.size() < 3 ){ + if ( points.size() < 3 ) + { qDebug()<<"Not enough points for build equidistant.\n"; return ekv; } - for (qint32 i = 0; i < points.size(); ++i ){ - if(i != points.size()-1){ - if(points[i] == points[i+1]){ + for (qint32 i = 0; i < points.size(); ++i ) + { + if (i != points.size()-1) + { + if (points[i] == points[i+1]) + { points.remove(i+1); } - } else { - if(points[i] == points[0]){ + } + else + { + if (points[i] == points[0]) + { points.remove(i); } } } - if(eqv == Detail::CloseEquidistant){ + if (eqv == Detail::CloseEquidistant) + { points.append(points.at(0)); } - for (qint32 i = 0; i < points.size(); ++i ){ - if ( i == 0 && eqv == Detail::CloseEquidistant){//перша точка, ламана замкнена - ekvPoints< points, const Detail::Equi } ekvPoints = CheckLoops(ekvPoints); ekv.moveTo(ekvPoints[0]); - for (qint32 i = 1; i < ekvPoints.count(); ++i){ + for (qint32 i = 1; i < ekvPoints.count(); ++i) + { ekv.lineTo(ekvPoints[i]); } return ekv; } -QLineF VContainer::ParallelLine(const QLineF &line, qreal width){ +QLineF VContainer::ParallelLine(const QLineF &line, qreal width) +{ Q_ASSERT(width > 0); - QLineF paralel = QLineF (SingleParallelPoint(line, 90, width), - SingleParallelPoint(QLineF(line.p2(), line.p1()), -90, width)); + QLineF paralel = QLineF (SingleParallelPoint(line, 90, width), SingleParallelPoint(QLineF(line.p2(), line.p1()), + -90, width)); return paralel; } -QPointF VContainer::SingleParallelPoint(const QLineF &line, const qreal &angle, const qreal &width){ +QPointF VContainer::SingleParallelPoint(const QLineF &line, const qreal &angle, const qreal &width) +{ Q_ASSERT(width > 0); - QLineF l = line; - l.setAngle( l.angle() + angle ); - l.setLength( width ); - return l.p2(); + QLineF pLine = line; + pLine.setAngle( pLine.angle() + angle ); + pLine.setLength( width ); + return pLine.p2(); } -QVector VContainer::EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width) const{ +QVector VContainer::EkvPoint(const QLineF &line1, const QLineF &line2, const qreal &width) const +{ Q_ASSERT(width > 0); QVector points; - if(line1.p2() != line2.p2()){ + if (line1.p2() != line2.p2()) + { qWarning()<<"Last point of two lines must be equal."; } QPointF CrosPoint; QLineF bigLine1 = ParallelLine(line1, width ); QLineF bigLine2 = ParallelLine(QLineF(line2.p2(), line2.p1()), width ); QLineF::IntersectType type = bigLine1.intersect( bigLine2, &CrosPoint ); - switch(type){ - case(QLineF::BoundedIntersection): - points.append(CrosPoint); - return points; - break; - case(QLineF::UnboundedIntersection):{ - QLineF line( line1.p2(), CrosPoint ); - if(line.length() > width + toPixel(8)){ - QLineF l; - l = QLineF(bigLine1.p2(), CrosPoint); - l.setLength(width); - points.append(l.p2()); - - l = QLineF(bigLine2.p1(), CrosPoint); - l.setLength(width); - points.append(l.p2()); - } else { + switch (type) + { + case (QLineF::BoundedIntersection): points.append(CrosPoint); return points; + break; + case (QLineF::UnboundedIntersection): + { + QLineF line( line1.p2(), CrosPoint ); + if (line.length() > width + toPixel(8)) + { + QLineF lineL; + lineL = QLineF(bigLine1.p2(), CrosPoint); + lineL.setLength(width); + points.append(lineL.p2()); + + lineL = QLineF(bigLine2.p1(), CrosPoint); + lineL.setLength(width); + points.append(lineL.p2()); + } + else + { + points.append(CrosPoint); + return points; + } + break; } - break; - } - case(QLineF::NoIntersection): - /*If we have correct lines this means lines lie on a line.*/ - points.append(bigLine1.p2()); - return points; - break; + case (QLineF::NoIntersection): + /*If we have correct lines this means lines lie on a line.*/ + points.append(bigLine1.p2()); + return points; + break; } return points; } -QVector VContainer::CheckLoops(const QVector &points) const{ +QVector VContainer::CheckLoops(const QVector &points) const +{ QVector ekvPoints; /*If we got less than 4 points no need seek loops.*/ - if(points.size() < 4){ + if (points.size() < 4) + { return ekvPoints; } bool closed = false; - if(points.at(0) == points.at(points.size()-1)){ + if (points.at(0) == points.at(points.size()-1)) + { closed = true; } qint32 i, j; - for(i = 0; i < points.size(); ++i){ + for (i = 0; i < points.size(); ++i) + { /*Last three points no need check.*/ - if(i >= points.size()-3){ + if (i >= points.size()-3) + { ekvPoints.append(points.at(i)); continue; } QPointF crosPoint; QLineF::IntersectType intersect = QLineF::NoIntersection; - QLineF line1(points.at(i),points.at(i+1)); - for(j = i+2; j < points.size()-1; ++j){ - QLineF line2(points.at(j),points.at(j+1)); + QLineF line1(points.at(i), points.at(i+1)); + for (j = i+2; j < points.size()-1; ++j) + { + QLineF line2(points.at(j), points.at(j+1)); intersect = line1.intersect(line2, &crosPoint); - if(intersect == QLineF::BoundedIntersection){ + if (intersect == QLineF::BoundedIntersection) + { break; } } - if(intersect == QLineF::BoundedIntersection){ - if(i == 0 && j+1 == points.size()-1 && closed){ + if (intersect == QLineF::BoundedIntersection) + { + if (i == 0 && j+1 == points.size()-1 && closed) + { /*We got closed contour.*/ ekvPoints.append(points.at(i)); - } else { + } + else + { /*We found loop.*/ ekvPoints.append(points.at(i)); ekvPoints.append(crosPoint); ekvPoints.append(points.at(j+1)); i = j + 2; } - } else { + } + else + { /*We did not found loop.*/ ekvPoints.append(points.at(i)); } @@ -398,57 +487,67 @@ QVector VContainer::CheckLoops(const QVector &points) const{ return ekvPoints; } -void VContainer::PrepareDetails(QVector &list) const{ +void VContainer::PrepareDetails(QVector &list) const +{ QHashIterator iDetail(details); - while (iDetail.hasNext()) { + while (iDetail.hasNext()) + { iDetail.next(); list.append(new VItem(ContourPath(iDetail.key()), list.size())); } } template -void VContainer::UpdateObject(QHash &obj, const qint64 &id, const val& point){ +void VContainer::UpdateObject(QHash &obj, const qint64 &id, const val& point) +{ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); obj[id] = point; UpdateId(id); } -void VContainer::AddLengthSpline(const QString &name, const qreal &value){ - Q_ASSERT(!name.isEmpty()); +void VContainer::AddLengthSpline(const QString &name, const qreal &value) +{ + Q_ASSERT(name.isEmpty() == false); lengthSplines[name] = value; } -void VContainer::AddLengthArc(const qint64 ¢er, const qint64 &id){ +void VContainer::AddLengthArc(const qint64 ¢er, const qint64 &id) +{ AddLengthArc(GetNameArc(center, id), toMM(GetArc(id).GetLength())); } -void VContainer::AddLengthArc(const QString &name, const qreal &value){ - Q_ASSERT(!name.isEmpty()); +void VContainer::AddLengthArc(const QString &name, const qreal &value) +{ + Q_ASSERT(name.isEmpty() == false); lengthArcs[name] = value; } -void VContainer::AddLineAngle(const QString &name, const qreal &value){ - Q_ASSERT(!name.isEmpty()); +void VContainer::AddLineAngle(const QString &name, const qreal &value) +{ + Q_ASSERT(name.isEmpty() == false); lineAngles[name] = value; } -qreal VContainer::GetValueStandartTableCell(const QString& name) const{ +qreal VContainer::GetValueStandartTableCell(const QString& name) const +{ VStandartTableCell cell = GetStandartTableCell(name); - qreal k_size = ( static_cast (size()/10.0) - 50.0 ) / 2.0; + qreal k_size = ( static_cast (size()/10.0) - 50.0 ) / 2.0; qreal k_growth = ( static_cast (growth()/10.0) - 176.0 ) / 6.0; - qreal value = cell.GetBase() + k_size*cell.GetKsize() + k_growth*cell.GetKgrowth(); + qreal value = cell.GetBase() + k_size*cell.GetKsize() + k_growth*cell.GetKgrowth(); return value; } -qreal VContainer::GetValueIncrementTableRow(const QString& name) const{ +qreal VContainer::GetValueIncrementTableRow(const QString& name) const +{ VIncrementTableRow cell = GetIncrementTableRow(name); - qreal k_size = ( static_cast (size()/10.0) - 50.0 ) / 2.0; + qreal k_size = ( static_cast (size()/10.0) - 50.0 ) / 2.0; qreal k_growth = ( static_cast (growth()/10.0) - 176.0 ) / 6.0; qreal value = cell.getBase() + k_size*cell.getKsize() + k_growth*cell.getKgrowth(); return value; } -void VContainer::Clear(){ +void VContainer::Clear() +{ _id = 0; standartTable.clear(); incrementTable.clear(); @@ -464,40 +563,49 @@ void VContainer::Clear(){ CreateManTableIGroup (); } -void VContainer::ClearObject(){ +void VContainer::ClearObject() +{ points.clear(); splines.clear(); arcs.clear(); splinePaths.clear(); } -qreal VContainer::FindVar(const QString &name, bool *ok)const{ - if(base.contains(name)){ +qreal VContainer::FindVar(const QString &name, bool *ok)const +{ + if (base.contains(name)) + { *ok = true; return base.value(name); } - if(standartTable.contains(name)){ + if (standartTable.contains(name)) + { *ok = true; return GetValueStandartTableCell(name); } - if(incrementTable.contains(name)){ + if (incrementTable.contains(name)) + { *ok = true; return GetValueIncrementTableRow(name); } - if(lengthLines.contains(name)){ + if (lengthLines.contains(name)) + { *ok = true; return lengthLines.value(name); } - if(lengthArcs.contains(name)){ + if (lengthArcs.contains(name)) + { *ok = true; return lengthArcs.value(name); } - if(lineAngles.contains(name)){ + if (lineAngles.contains(name)) + { *ok = true; return lineAngles.value(name); } - if(lengthSplines.contains(name)){ + if (lengthSplines.contains(name)) + { *ok = true; return lengthSplines.value(name); } @@ -505,14 +613,18 @@ qreal VContainer::FindVar(const QString &name, bool *ok)const{ return 0; } -void VContainer::AddLine(const qint64 &firstPointId, const qint64 &secondPointId, Draw::Draws mode){ +void VContainer::AddLine(const qint64 &firstPointId, const qint64 &secondPointId, Draw::Draws mode) +{ QString nameLine = GetNameLine(firstPointId, secondPointId, mode); VPointF first; VPointF second; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { first = GetPoint(firstPointId); second = GetPoint(secondPointId); - } else { + } + else + { first = GetModelingPoint(firstPointId); second = GetModelingPoint(secondPointId); } @@ -521,91 +633,114 @@ void VContainer::AddLine(const qint64 &firstPointId, const qint64 &secondPointId AddLineAngle(nameLine, QLineF(first.toQPointF(), second.toQPointF()).angle()); } -qint64 VContainer::AddSpline(const VSpline &spl){ +qint64 VContainer::AddSpline(const VSpline &spl) +{ return AddObject(splines, spl); } -qint64 VContainer::AddModelingSpline(const VSpline &spl){ +qint64 VContainer::AddModelingSpline(const VSpline &spl) +{ return AddObject(modelingSplines, spl); } -qint64 VContainer::AddSplinePath(const VSplinePath &splPath){ +qint64 VContainer::AddSplinePath(const VSplinePath &splPath) +{ return AddObject(splinePaths, splPath); } -qint64 VContainer::AddModelingSplinePath(const VSplinePath &splPath){ +qint64 VContainer::AddModelingSplinePath(const VSplinePath &splPath) +{ return AddObject(modelingSplinePaths, splPath); } -qint64 VContainer::AddArc(const VArc &arc){ +qint64 VContainer::AddArc(const VArc &arc) +{ return AddObject(arcs, arc); } -qint64 VContainer::AddModelingArc(const VArc &arc){ +qint64 VContainer::AddModelingArc(const VArc &arc) +{ return AddObject(modelingArcs, arc); } template -qint64 VContainer::AddObject(QHash &obj, const val& value){ +qint64 VContainer::AddObject(QHash &obj, const val& value) +{ qint64 id = getNextId(); obj[id] = value; return id; } -QString VContainer::GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint, Draw::Draws mode) const{ +QString VContainer::GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint, Draw::Draws mode) const +{ VPointF first; VPointF second; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { first = GetPoint(firstPoint); second = GetPoint(secondPoint); - } else { + } + else + { first = GetModelingPoint(firstPoint); second = GetModelingPoint(secondPoint); } return QString("Line_%1_%2").arg(first.name(), second.name()); } -QString VContainer::GetNameLineAngle(const qint64 &firstPoint, const qint64 &secondPoint, - Draw::Draws mode) const{ +QString VContainer::GetNameLineAngle(const qint64 &firstPoint, const qint64 &secondPoint, Draw::Draws mode) const +{ VPointF first; VPointF second; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { first = GetPoint(firstPoint); second = GetPoint(secondPoint); - } else { + } + else + { first = GetModelingPoint(firstPoint); second = GetModelingPoint(secondPoint); } return QString("AngleLine_%1_%2").arg(first.name(), second.name()); } -QString VContainer::GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint, - Draw::Draws mode) const{ +QString VContainer::GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint, Draw::Draws mode) const +{ VPointF first; VPointF second; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { first = GetPoint(firstPoint); second = GetPoint(secondPoint); - } else { + } + else + { first = GetModelingPoint(firstPoint); second = GetModelingPoint(secondPoint); } return QString("Spl_%1_%2").arg(first.name(), second.name()); } -QString VContainer::GetNameSplinePath(const VSplinePath &path, Draw::Draws mode) const{ - if(path.Count() == 0){ +QString VContainer::GetNameSplinePath(const VSplinePath &path, Draw::Draws mode) const +{ + if (path.Count() == 0) + { return QString(); } QString name("SplPath"); - for(qint32 i = 1; i <= path.Count(); ++i){ + for (qint32 i = 1; i <= path.Count(); ++i) + { VSpline spl = path.GetSpline(i); VPointF first; VPointF second; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { first = GetPoint(spl.GetP1()); second = GetPoint(spl.GetP4()); - } else { + } + else + { first = GetModelingPoint(spl.GetP1()); second = GetModelingPoint(spl.GetP4()); } @@ -615,58 +750,73 @@ QString VContainer::GetNameSplinePath(const VSplinePath &path, Draw::Draws mode) return name; } -QString VContainer::GetNameArc(const qint64 ¢er, const qint64 &id, Draw::Draws mode) const{ +QString VContainer::GetNameArc(const qint64 ¢er, const qint64 &id, Draw::Draws mode) const +{ VPointF centerPoint; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { centerPoint = GetPoint(center); - } else { + } + else + { centerPoint = GetModelingPoint(center); } return QString ("Arc_%1_%2").arg(centerPoint.name()).arg(id); } -void VContainer::UpdatePoint(qint64 id, const VPointF &point){ +void VContainer::UpdatePoint(qint64 id, const VPointF &point) +{ UpdateObject(points, id, point); } -void VContainer::UpdateModelingPoint(qint64 id, const VPointF &point){ +void VContainer::UpdateModelingPoint(qint64 id, const VPointF &point) +{ UpdateObject(modelingPoints, id, point); } -void VContainer::UpdateDetail(qint64 id, const VDetail &detail){ +void VContainer::UpdateDetail(qint64 id, const VDetail &detail) +{ UpdateObject(details, id, detail); } -void VContainer::UpdateSpline(qint64 id, const VSpline &spl){ +void VContainer::UpdateSpline(qint64 id, const VSpline &spl) +{ UpdateObject(splines, id, spl); } -void VContainer::UpdateModelingSpline(qint64 id, const VSpline &spl){ +void VContainer::UpdateModelingSpline(qint64 id, const VSpline &spl) +{ UpdateObject(modelingSplines, id, spl); } -void VContainer::UpdateSplinePath(qint64 id, const VSplinePath &splPath){ +void VContainer::UpdateSplinePath(qint64 id, const VSplinePath &splPath) +{ UpdateObject(splinePaths, id, splPath); } -void VContainer::UpdateModelingSplinePath(qint64 id, const VSplinePath &splPath){ +void VContainer::UpdateModelingSplinePath(qint64 id, const VSplinePath &splPath) +{ UpdateObject(modelingSplinePaths, id, splPath); } -void VContainer::UpdateArc(qint64 id, const VArc &arc){ +void VContainer::UpdateArc(qint64 id, const VArc &arc) +{ UpdateObject(arcs, id, arc); } -void VContainer::UpdateModelingArc(qint64 id, const VArc &arc){ +void VContainer::UpdateModelingArc(qint64 id, const VArc &arc) +{ UpdateObject(modelingArcs, id, arc); } -void VContainer::AddLengthLine(const QString &name, const qreal &value){ - Q_ASSERT(!name.isEmpty()); +void VContainer::AddLengthLine(const QString &name, const qreal &value) +{ + Q_ASSERT(name.isEmpty() == false); lengthLines[name] = value; } -void VContainer::CreateManTableIGroup (){ +void VContainer::CreateManTableIGroup () +{ AddStandartTableCell("Pkor", VStandartTableCell(84, 0, 3)); AddStandartTableCell("Pkor", VStandartTableCell(84, 0, 3)); AddStandartTableCell("Vtos", VStandartTableCell(1450, 2, 51)); @@ -679,7 +829,7 @@ void VContainer::CreateManTableIGroup (){ AddStandartTableCell("Vzy", VStandartTableCell(1328, 0, 49)); AddStandartTableCell("Vlop", VStandartTableCell(1320, 0, 49)); AddStandartTableCell("Vps", VStandartTableCell(811, -1, 36)); - AddStandartTableCell("Ssh", VStandartTableCell(202,4, 1)); + AddStandartTableCell("Ssh", VStandartTableCell(202, 4, 1)); AddStandartTableCell("SgI", VStandartTableCell(517, 18, 2)); AddStandartTableCell("SgII", VStandartTableCell(522, 19, 1)); AddStandartTableCell("SgIII", VStandartTableCell(500, 20, 0)); @@ -723,20 +873,24 @@ void VContainer::CreateManTableIGroup (){ AddStandartTableCell("Sb", VStandartTableCell(504, 15, 4)); } -QVector VContainer::GetReversePoint(const QVector &points) const{ +QVector VContainer::GetReversePoint(const QVector &points) const +{ Q_ASSERT(points.size() > 0); QVector reversePoints; - for (qint32 i = points.size() - 1; i >= 0; --i) { + for (qint32 i = points.size() - 1; i >= 0; --i) + { reversePoints.append(points.at(i)); } return reversePoints; } -qreal VContainer::GetLengthContour(const QVector &contour, const QVector &newPoints) const{ +qreal VContainer::GetLengthContour(const QVector &contour, const QVector &newPoints) const +{ qreal length = 0; QVector points; points << contour << newPoints; - for (qint32 i = 0; i < points.size()-1; ++i) { + for (qint32 i = 0; i < points.size()-1; ++i) + { QLineF line(points.at(i), points.at(i+1)); length += line.length(); } diff --git a/container/vcontainer.h b/container/vcontainer.h index 94c02498e..5937bb03e 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -32,7 +32,8 @@ /** * @brief The VContainer class */ -class VContainer{ +class VContainer +{ Q_DECLARE_TR_FUNCTIONS(VContainer) public: /** @@ -168,7 +169,7 @@ private: void CreateManTableIGroup (); QVector GetReversePoint(const QVector &points)const; qreal GetLengthContour(const QVector &contour, const QVector &newPoints)const; - template static val GetObject(const QHash &obj, key id); + template static val GetObject(const QHash &obj, key id); template static void UpdateObject(QHash &obj, const qint64 &id, const val& point); template static qint64 AddObject(QHash &obj, const val& value); }; diff --git a/container/vincrementtablerow.cpp b/container/vincrementtablerow.cpp index e6e3670a4..e7adbca73 100644 --- a/container/vincrementtablerow.cpp +++ b/container/vincrementtablerow.cpp @@ -21,12 +21,8 @@ #include "vincrementtablerow.h" -VIncrementTableRow::VIncrementTableRow():id(0), base(0), ksize(0), kgrowth(0), description(QString()){ -} - -VIncrementTableRow::VIncrementTableRow(qint64 id, qreal base, qreal ksize, qreal kgrowth, - QString description):id(id), base(base), ksize(ksize), - kgrowth(kgrowth), description(description){ -} - +VIncrementTableRow::VIncrementTableRow() + :id(0), base(0), ksize(0), kgrowth(0), description(QString()){} +VIncrementTableRow::VIncrementTableRow(qint64 id, qreal base, qreal ksize, qreal kgrowth, QString description) + :id(id), base(base), ksize(ksize), kgrowth(kgrowth), description(description){} diff --git a/container/vincrementtablerow.h b/container/vincrementtablerow.h index f04abd8bf..c3d82b6d4 100644 --- a/container/vincrementtablerow.h +++ b/container/vincrementtablerow.h @@ -22,7 +22,8 @@ #ifndef VINCREMENTTABLEROW_H #define VINCREMENTTABLEROW_H -class VIncrementTableRow{ +class VIncrementTableRow +{ public: VIncrementTableRow(); VIncrementTableRow(qint64 id, qreal base, qreal ksize, qreal kgrowth, diff --git a/container/vpointf.cpp b/container/vpointf.cpp index 14f5aa2d6..bb5a2a8ad 100644 --- a/container/vpointf.cpp +++ b/container/vpointf.cpp @@ -21,7 +21,8 @@ #include "vpointf.h" -VPointF &VPointF::operator =(const VPointF &point){ +VPointF &VPointF::operator =(const VPointF &point) +{ _name = point.name(); _mx = point.mx(); _my = point.my(); diff --git a/container/vpointf.h b/container/vpointf.h index d51c13789..2a71599d0 100644 --- a/container/vpointf.h +++ b/container/vpointf.h @@ -22,7 +22,8 @@ #ifndef VPOINTF_H #define VPOINTF_H -class VPointF{ +class VPointF +{ public: inline VPointF () :_name(QString()), _mx(0), _my(0), _x(0), _y(0), mode(Draw::Calculation), idObject(0){} diff --git a/container/vstandarttablecell.cpp b/container/vstandarttablecell.cpp index 1eb2ff2f9..4f08ae346 100644 --- a/container/vstandarttablecell.cpp +++ b/container/vstandarttablecell.cpp @@ -21,9 +21,8 @@ #include "vstandarttablecell.h" -VStandartTableCell::VStandartTableCell():base(0), ksize(0), kgrowth(0), description(QString()){ -} +VStandartTableCell::VStandartTableCell() + :base(0), ksize(0), kgrowth(0), description(QString()){} -VStandartTableCell::VStandartTableCell(qint32 base, qreal ksize, qreal kgrowth, QString description):base(base), - ksize(ksize), kgrowth(kgrowth), description(description){ -} +VStandartTableCell::VStandartTableCell(qint32 base, qreal ksize, qreal kgrowth, QString description) + :base(base), ksize(ksize), kgrowth(kgrowth), description(description){} diff --git a/container/vstandarttablecell.h b/container/vstandarttablecell.h index d74f683ad..e5247f7a2 100644 --- a/container/vstandarttablecell.h +++ b/container/vstandarttablecell.h @@ -22,7 +22,8 @@ #ifndef VSTANDARTTABLECELL_H #define VSTANDARTTABLECELL_H -class VStandartTableCell{ +class VStandartTableCell +{ public: VStandartTableCell(); VStandartTableCell(qint32 base, qreal ksize, qreal kgrowth, QString description = QString()); diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index 969107db7..00846dfa9 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -22,9 +22,10 @@ #include "dialogalongline.h" #include "ui_dialogalongline.h" -DialogAlongLine::DialogAlongLine(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogAlongLine), number(0), pointName(QString()), - typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0){ +DialogAlongLine::DialogAlongLine(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogAlongLine), number(0), pointName(QString()), + typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0) +{ ui->setupUi(this); listWidget = ui->listWidget; labelResultCalculation = ui->labelResultCalculation; @@ -66,53 +67,69 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, Draw::Draws mode, QWidg connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogAlongLine::FormulaChanged); } -DialogAlongLine::~DialogAlongLine(){ +DialogAlongLine::~DialogAlongLine() +{ delete ui; } -void DialogAlongLine::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogAlongLine::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - if(number == 0){ + if (number == 0) + { qint32 index = ui->comboBoxFirstPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxFirstPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select second point of line")); return; } } - if(number == 1){ + if (number == 1) + { qint32 index = ui->comboBoxSecondPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxSecondPoint->setCurrentIndex(index); number = 0; emit ToolTip(""); } - if(!isInitialized){ + if (isInitialized == false) + { this->show(); } } } } -void DialogAlongLine::DialogAccepted(){ +void DialogAlongLine::DialogAccepted() +{ pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); formula = ui->lineEditFormula->text(); @@ -121,25 +138,30 @@ void DialogAlongLine::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogAlongLine::setSecondPointId(const qint64 &value, const qint64 &id){ +void DialogAlongLine::setSecondPointId(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -void DialogAlongLine::setFirstPointId(const qint64 &value, const qint64 &id){ +void DialogAlongLine::setFirstPointId(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -void DialogAlongLine::setFormula(const QString &value){ +void DialogAlongLine::setFormula(const QString &value) +{ formula = value; ui->lineEditFormula->setText(formula); } -void DialogAlongLine::setTypeLine(const QString &value){ +void DialogAlongLine::setTypeLine(const QString &value) +{ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -void DialogAlongLine::setPointName(const QString &value){ +void DialogAlongLine::setPointName(const QString &value) +{ pointName = value; ui->lineEditNamePoint->setText(pointName); } diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index 4b13fb25d..bda9b31f3 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -24,12 +24,14 @@ #include "dialogtool.h" -namespace Ui { -class DialogAlongLine; +namespace Ui +{ + class DialogAlongLine; } -class DialogAlongLine : public DialogTool{ - Q_OBJECT +class DialogAlongLine : public DialogTool +{ + Q_OBJECT public: DialogAlongLine(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); @@ -46,7 +48,7 @@ public: void setSecondPointId(const qint64 &value, const qint64 &id); public slots: virtual void ChoosedObject(qint64 id, Scene::Scenes type); - virtual void DialogAccepted(); + virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogAlongLine) Ui::DialogAlongLine *ui; diff --git a/dialogs/dialogarc.cpp b/dialogs/dialogarc.cpp index dbd6eff99..16989d44e 100644 --- a/dialogs/dialogarc.cpp +++ b/dialogs/dialogarc.cpp @@ -22,9 +22,10 @@ #include "dialogarc.h" #include "ui_dialogarc.h" -DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogArc), flagRadius(false), flagF1(false), flagF2(false), - timerRadius(0), timerF1(0), timerF2(0), center(0), radius(QString()), f1(QString()), f2(QString()){ +DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogArc), flagRadius(false), flagF1(false), flagF2(false), + timerRadius(0), timerF1(0), timerF2(0), center(0), radius(QString()), f1(QString()), f2(QString()) +{ ui->setupUi(this); timerRadius = new QTimer(this); @@ -77,47 +78,61 @@ DialogArc::DialogArc(const VContainer *data, Draw::Draws mode, QWidget *parent) connect(ui->lineEditF2, &QLineEdit::textChanged, this, &DialogArc::F2Changed); } -DialogArc::~DialogArc(){ +DialogArc::~DialogArc() +{ delete ui; } -void DialogArc::SetCenter(const qint64 &value){ +void DialogArc::SetCenter(const qint64 &value) +{ center = value; ChangeCurrentData(ui->comboBoxBasePoint, center); } -void DialogArc::SetF2(const QString &value){ +void DialogArc::SetF2(const QString &value) +{ f2 = value; ui->lineEditF2->setText(f2); } -void DialogArc::SetF1(const QString &value){ +void DialogArc::SetF1(const QString &value) +{ f1 = value; ui->lineEditF1->setText(f1); } -void DialogArc::SetRadius(const QString &value){ +void DialogArc::SetRadius(const QString &value) +{ radius = value; ui->lineEditRadius->setText(radius); } -void DialogArc::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogArc::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id)==false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } ChangeCurrentText(ui->comboBoxBasePoint, point.name()); @@ -126,7 +141,8 @@ void DialogArc::ChoosedObject(qint64 id, Scene::Scenes type){ } } -void DialogArc::DialogAccepted(){ +void DialogArc::DialogAccepted() +{ radius = ui->lineEditRadius->text(); f1 = ui->lineEditF1->text(); f2 = ui->lineEditF2->text(); @@ -134,12 +150,15 @@ void DialogArc::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogArc::ValChenged(int row){ - if(ui->listWidget->count() == 0){ +void DialogArc::ValChenged(int row) +{ + if (ui->listWidget->count() == 0) + { return; } QListWidgetItem *item = ui->listWidget->item( row ); - if(ui->radioButtonLineAngles->isChecked()){ + if (ui->radioButtonLineAngles->isChecked()) + { QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLineAngle(item->text())) .arg(tr("Value angle of line.")); ui->labelDescription->setText(desc); @@ -148,65 +167,78 @@ void DialogArc::ValChenged(int row){ DialogTool::ValChenged(row); } -void DialogArc::PutRadius(){ +void DialogArc::PutRadius() +{ PutValHere(ui->lineEditRadius, ui->listWidget); } -void DialogArc::PutF1(){ +void DialogArc::PutF1() +{ PutValHere(ui->lineEditF1, ui->listWidget); } -void DialogArc::PutF2(){ +void DialogArc::PutF2() +{ PutValHere(ui->lineEditF2, ui->listWidget); } -void DialogArc::LineAngles(){ +void DialogArc::LineAngles() +{ ShowLineAngles(); } -void DialogArc::RadiusChanged(){ +void DialogArc::RadiusChanged() +{ labelEditFormula = ui->labelEditRadius; ValFormulaChanged(flagRadius, ui->lineEditRadius, timerRadius); } -void DialogArc::F1Changed(){ +void DialogArc::F1Changed() +{ labelEditFormula = ui->labelEditF1; ValFormulaChanged(flagF1, ui->lineEditF1, timerF1); } -void DialogArc::F2Changed(){ +void DialogArc::F2Changed() +{ labelEditFormula = ui->labelEditF2; ValFormulaChanged(flagF2, ui->lineEditF2, timerF2); } -void DialogArc::CheckState(){ +void DialogArc::CheckState() +{ Q_ASSERT(bOk != 0); bOk->setEnabled(flagRadius && flagF1 && flagF2); } -void DialogArc::EvalRadius(){ +void DialogArc::EvalRadius() +{ labelEditFormula = ui->labelEditRadius; Eval(ui->lineEditRadius, flagRadius, timerRadius, ui->labelResultRadius); } -void DialogArc::EvalF1(){ +void DialogArc::EvalF1() +{ labelEditFormula = ui->labelEditF1; Eval(ui->lineEditF1, flagF1, timerF1, ui->labelResultF1); } -void DialogArc::EvalF2(){ +void DialogArc::EvalF2() +{ labelEditFormula = ui->labelEditF2; Eval(ui->lineEditF2, flagF2, timerF2, ui->labelResultF2); } -void DialogArc::ShowLineAngles(){ +void DialogArc::ShowLineAngles() +{ disconnect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogArc::ValChenged); ui->listWidget->clear(); connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogArc::ValChenged); const QHash *lineAnglesTable = data->DataLineAngles(); Q_ASSERT(lineAnglesTable != 0); QHashIterator i(*lineAnglesTable); - while (i.hasNext()) { + while (i.hasNext()) + { i.next(); QListWidgetItem *item = new QListWidgetItem(i.key()); diff --git a/dialogs/dialogarc.h b/dialogs/dialogarc.h index 302737d50..c701ba582 100644 --- a/dialogs/dialogarc.h +++ b/dialogs/dialogarc.h @@ -24,11 +24,13 @@ #include "dialogtool.h" -namespace Ui { -class DialogArc; +namespace Ui +{ + class DialogArc; } -class DialogArc : public DialogTool{ +class DialogArc : public DialogTool +{ Q_OBJECT public: DialogArc(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); diff --git a/dialogs/dialogbisector.cpp b/dialogs/dialogbisector.cpp index e975b8559..afd97c41c 100644 --- a/dialogs/dialogbisector.cpp +++ b/dialogs/dialogbisector.cpp @@ -22,9 +22,10 @@ #include "dialogbisector.h" #include "ui_dialogbisector.h" -DialogBisector::DialogBisector(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogBisector), number(0), pointName(QString()), - typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0), thirdPointId(0){ +DialogBisector::DialogBisector(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogBisector), number(0), pointName(QString()), + typeLine(QString()), formula(QString()), firstPointId(0), secondPointId(0), thirdPointId(0) +{ ui->setupUi(this); listWidget = ui->listWidget; labelResultCalculation = ui->labelResultCalculation; @@ -66,89 +67,113 @@ DialogBisector::DialogBisector(const VContainer *data, Draw::Draws mode, QWidget connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogBisector::FormulaChanged); } -DialogBisector::~DialogBisector(){ +DialogBisector::~DialogBisector() +{ delete ui; } -void DialogBisector::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogBisector::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - if(number == 0){ + if (number == 0) + { qint32 index = ui->comboBoxFirstPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxFirstPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select second point of angle")); return; } } - if(number == 1){ + if (number == 1) + { qint32 index = ui->comboBoxSecondPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxSecondPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select third point of angle")); return; } } - if(number == 2){ + if (number == 2) + { qint32 index = ui->comboBoxThirdPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxThirdPoint->setCurrentIndex(index); number = 0; emit ToolTip(""); } - if(!isInitialized){ + if (isInitialized == false) + { this->show(); } } } } -void DialogBisector::setPointName(const QString &value){ +void DialogBisector::setPointName(const QString &value) +{ pointName = value; ui->lineEditNamePoint->setText(pointName); } -void DialogBisector::setTypeLine(const QString &value){ +void DialogBisector::setTypeLine(const QString &value) +{ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -void DialogBisector::setFormula(const QString &value){ +void DialogBisector::setFormula(const QString &value) +{ formula = value; ui->lineEditFormula->setText(formula); } -void DialogBisector::setFirstPointId(const qint64 &value, const qint64 &id){ +void DialogBisector::setFirstPointId(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -void DialogBisector::setSecondPointId(const qint64 &value, const qint64 &id){ +void DialogBisector::setSecondPointId(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -void DialogBisector::setThirdPointId(const qint64 &value, const qint64 &id){ +void DialogBisector::setThirdPointId(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxThirdPoint, thirdPointId, value, id); } -void DialogBisector::DialogAccepted(){ +void DialogBisector::DialogAccepted() +{ pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); formula = ui->lineEditFormula->text(); diff --git a/dialogs/dialogbisector.h b/dialogs/dialogbisector.h index 87b409421..c9b0260dc 100644 --- a/dialogs/dialogbisector.h +++ b/dialogs/dialogbisector.h @@ -24,13 +24,14 @@ #include "dialogtool.h" -namespace Ui { -class DialogBisector; +namespace Ui +{ + class DialogBisector; } -class DialogBisector : public DialogTool{ +class DialogBisector : public DialogTool +{ Q_OBJECT - public: explicit DialogBisector(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index fb66961c5..add670998 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -21,8 +21,9 @@ #include "dialogdetail.h" -DialogDetail::DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(), details(VDetail()), supplement(true), closed(true){ +DialogDetail::DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(), details(VDetail()), supplement(true), closed(true) +{ ui.setupUi(this); labelEditNamePoint = ui.labelEditNameDetail; bOk = ui.buttonBox->button(QDialogButtonBox::Ok); @@ -42,43 +43,52 @@ DialogDetail::DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *pa connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged); } -void DialogDetail::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogDetail::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type != Scene::Line && type != Scene::Detail){ - switch(type){ - case(Scene::Arc): - NewItem(id, Tool::NodeArc, mode, NodeDetail::Contour); - break; - case(Scene::Point): - NewItem(id, Tool::NodePoint, mode, NodeDetail::Contour); - break; - case(Scene::Spline): - NewItem(id, Tool::NodeSpline, mode, NodeDetail::Contour); - break; - case(Scene::SplinePath): - NewItem(id, Tool::NodeSplinePath, mode, NodeDetail::Contour); - break; - default: - qWarning()<show(); } } -void DialogDetail::DialogAccepted(){ +void DialogDetail::DialogAccepted() +{ details.Clear(); - for(qint32 i = 0; i < ui.listWidget->count(); ++i){ + for (qint32 i = 0; i < ui.listWidget->count(); ++i) + { QListWidgetItem *item = ui.listWidget->item(i); details.append( qvariant_cast(item->data(Qt::UserRole))); } @@ -90,53 +100,71 @@ void DialogDetail::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogDetail::NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, qreal mx, - qreal my){ +void DialogDetail::NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, + qreal mx, qreal my) +{ QString name; - switch(typeTool){ - case(Tool::NodePoint):{ - VPointF point; - if(mode == Draw::Calculation){ - point = data->GetPoint(id); - } else { - point = data->GetModelingPoint(id); + switch (typeTool) + { + case (Tool::NodePoint): + { + VPointF point; + if (mode == Draw::Calculation) + { + point = data->GetPoint(id); + } + else + { + point = data->GetModelingPoint(id); + } + name = point.name(); + break; } - name = point.name(); - break; - } - case(Tool::NodeArc):{ - VArc arc; - if(mode == Draw::Calculation){ - arc = data->GetArc(id); - } else { - arc = data->GetModelingArc(id); + case (Tool::NodeArc): + { + VArc arc; + if (mode == Draw::Calculation) + { + arc = data->GetArc(id); + } + else + { + arc = data->GetModelingArc(id); + } + name = data->GetNameArc(arc.GetCenter(), id, mode); + break; } - name = data->GetNameArc(arc.GetCenter(), id, mode); - break; - } - case(Tool::NodeSpline):{ - VSpline spl; - if(mode == Draw::Calculation){ - spl = data->GetSpline(id); - } else { - spl = data->GetModelingSpline(id); + case (Tool::NodeSpline): + { + VSpline spl; + if (mode == Draw::Calculation) + { + spl = data->GetSpline(id); + } + else + { + spl = data->GetModelingSpline(id); + } + name = spl.GetName(); + break; } - name = spl.GetName(); - break; - } - case(Tool::NodeSplinePath):{ - VSplinePath splPath; - if(mode == Draw::Calculation){ - splPath = data->GetSplinePath(id); - } else { - splPath = data->GetModelingSplinePath(id); + case (Tool::NodeSplinePath): + { + VSplinePath splPath; + if (mode == Draw::Calculation) + { + splPath = data->GetSplinePath(id); + } + else + { + splPath = data->GetModelingSplinePath(id); + } + name = data->GetNameSplinePath(splPath, mode); + break; } - name = data->GetNameSplinePath(splPath, mode); - break; - } - default: - qWarning()<clear(); - for(qint32 i = 0; i < details.CountNode(); ++i){ - NewItem(details[i].getId(), details[i].getTypeTool(), details[i].getMode(), details[i].getTypeNode(), details[i].getMx(), - details[i].getMy()); + for (qint32 i = 0; i < details.CountNode(); ++i) + { + NewItem(details[i].getId(), details[i].getTypeTool(), details[i].getMode(), details[i].getTypeNode(), + details[i].getMx(), details[i].getMy()); } ui.lineEditNameDetail->setText(details.getName()); ui.checkBoxSeams->setChecked(details.getSupplement()); @@ -171,7 +201,8 @@ void DialogDetail::setDetails(const VDetail &value){ ui.listWidget->setFocus(Qt::OtherFocusReason); } -void DialogDetail::BiasXChanged(qreal d){ +void DialogDetail::BiasXChanged(qreal d) +{ qint32 row = ui.listWidget->currentRow(); QListWidgetItem *item = ui.listWidget->item( row ); VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); @@ -179,7 +210,8 @@ void DialogDetail::BiasXChanged(qreal d){ item->setData(Qt::UserRole, QVariant::fromValue(node)); } -void DialogDetail::BiasYChanged(qreal d){ +void DialogDetail::BiasYChanged(qreal d) +{ qint32 row = ui.listWidget->currentRow(); QListWidgetItem *item = ui.listWidget->item( row ); VNodeDetail node = qvariant_cast(item->data(Qt::UserRole)); @@ -187,18 +219,22 @@ void DialogDetail::BiasYChanged(qreal d){ item->setData(Qt::UserRole, QVariant::fromValue(node)); } -void DialogDetail::ClickedSeams(bool checked){ +void DialogDetail::ClickedSeams(bool checked) +{ supplement = checked; ui.checkBoxClosed->setEnabled(checked); ui.doubleSpinBoxSeams->setEnabled(checked); } -void DialogDetail::ClickedClosed(bool checked){ +void DialogDetail::ClickedClosed(bool checked) +{ closed = checked; } -void DialogDetail::ObjectChanged(int row){ - if(ui.listWidget->count() == 0){ +void DialogDetail::ObjectChanged(int row) +{ + if (ui.listWidget->count() == 0) + { return; } QListWidgetItem *item = ui.listWidget->item( row ); diff --git a/dialogs/dialogdetail.h b/dialogs/dialogdetail.h index 43a518e90..8a6a12cdf 100644 --- a/dialogs/dialogdetail.h +++ b/dialogs/dialogdetail.h @@ -25,8 +25,9 @@ #include "ui_dialogdetail.h" #include "dialogtool.h" -class DialogDetail : public DialogTool{ - Q_OBJECT +class DialogDetail : public DialogTool +{ + Q_OBJECT public: DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *parent = 0); inline VDetail getDetails() const {return details;} @@ -44,8 +45,8 @@ private: VDetail details; bool supplement; bool closed; - void NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, qreal mx = 0, - qreal my = 0); + void NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, + qreal mx = 0, qreal my = 0); }; #endif // DIALOGDETAIL_H diff --git a/dialogs/dialogendline.cpp b/dialogs/dialogendline.cpp index 011784d5c..9770166b0 100644 --- a/dialogs/dialogendline.cpp +++ b/dialogs/dialogendline.cpp @@ -22,9 +22,10 @@ #include "dialogendline.h" #include "ui_dialogendline.h" -DialogEndLine::DialogEndLine(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogEndLine), pointName(QString()), typeLine(QString()), - formula(QString()), angle(0), basePointId(0){ +DialogEndLine::DialogEndLine(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogEndLine), pointName(QString()), typeLine(QString()), + formula(QString()), angle(0), basePointId(0) +{ ui->setupUi(this); spinBoxAngle = ui->doubleSpinBoxAngle; listWidget = ui->listWidget; @@ -81,23 +82,32 @@ DialogEndLine::DialogEndLine(const VContainer *data, Draw::Draws mode, QWidget * connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogEndLine::FormulaChanged); } -void DialogEndLine::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogEndLine::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } ChangeCurrentText(ui->comboBoxBasePoint, point.name()); @@ -106,31 +116,37 @@ void DialogEndLine::ChoosedObject(qint64 id, Scene::Scenes type){ } } -void DialogEndLine::setPointName(const QString &value){ +void DialogEndLine::setPointName(const QString &value) +{ pointName = value; ui->lineEditNamePoint->setText(pointName); } -void DialogEndLine::setTypeLine(const QString &value){ +void DialogEndLine::setTypeLine(const QString &value) +{ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -void DialogEndLine::setFormula(const QString &value){ +void DialogEndLine::setFormula(const QString &value) +{ formula = value; ui->lineEditFormula->setText(formula); } -void DialogEndLine::setAngle(const qreal &value){ +void DialogEndLine::setAngle(const qreal &value) +{ angle = value; ui->doubleSpinBoxAngle->setValue(angle); } -void DialogEndLine::setBasePointId(const qint64 &value, const qint64 &id){ +void DialogEndLine::setBasePointId(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxBasePoint, basePointId, value, id); } -void DialogEndLine::DialogAccepted(){ +void DialogEndLine::DialogAccepted() +{ pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); formula = ui->lineEditFormula->text(); @@ -139,6 +155,7 @@ void DialogEndLine::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -DialogEndLine::~DialogEndLine(){ +DialogEndLine::~DialogEndLine() +{ delete ui; } diff --git a/dialogs/dialogendline.h b/dialogs/dialogendline.h index 4996f8fb8..489d264c4 100644 --- a/dialogs/dialogendline.h +++ b/dialogs/dialogendline.h @@ -24,15 +24,16 @@ #include "dialogtool.h" -namespace Ui { -class DialogEndLine; +namespace Ui +{ + class DialogEndLine; } -class DialogEndLine : public DialogTool{ - Q_OBJECT +class DialogEndLine : public DialogTool +{ + Q_OBJECT public: - explicit DialogEndLine(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); + DialogEndLine(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogEndLine(); inline QString getPointName() const {return pointName;} void setPointName(const QString &value); diff --git a/dialogs/dialogheight.cpp b/dialogs/dialogheight.cpp index 7024d94c1..4fdaa9761 100644 --- a/dialogs/dialogheight.cpp +++ b/dialogs/dialogheight.cpp @@ -1,9 +1,10 @@ #include "dialogheight.h" #include "ui_dialogheight.h" -DialogHeight::DialogHeight(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogHeight), number(0), pointName(QString()), - typeLine(QString()), basePointId(0), p1LineId(0), p2LineId(0){ +DialogHeight::DialogHeight(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogHeight), number(0), pointName(QString()), + typeLine(QString()), basePointId(0), p1LineId(0), p2LineId(0) +{ ui->setupUi(this); labelEditNamePoint = ui->labelEditNamePoint; bOk = ui->buttonBox->button(QDialogButtonBox::Ok); @@ -19,78 +20,96 @@ DialogHeight::DialogHeight(const VContainer *data, Draw::Draws mode, QWidget *pa connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogHeight::NamePointChanged); } -DialogHeight::~DialogHeight(){ +DialogHeight::~DialogHeight() +{ delete ui; } -void DialogHeight::setPointName(const QString &value){ +void DialogHeight::setPointName(const QString &value) +{ pointName = value; ui->lineEditNamePoint->setText(pointName); } -void DialogHeight::setTypeLine(const QString &value){ +void DialogHeight::setTypeLine(const QString &value) +{ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -void DialogHeight::setBasePointId(const qint64 &value, const qint64 &id){ +void DialogHeight::setBasePointId(const qint64 &value, const qint64 &id) +{ basePointId = value; setCurrentPointId(ui->comboBoxBasePoint, basePointId, value, id); } -void DialogHeight::setP1LineId(const qint64 &value, const qint64 &id){ +void DialogHeight::setP1LineId(const qint64 &value, const qint64 &id) +{ p1LineId = value; setCurrentPointId(ui->comboBoxP1Line, p1LineId, value, id); } -void DialogHeight::setP2LineId(const qint64 &value, const qint64 &id){ +void DialogHeight::setP2LineId(const qint64 &value, const qint64 &id) +{ p2LineId = value; setCurrentPointId(ui->comboBoxP2Line, p2LineId, value, id); } -void DialogHeight::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogHeight::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - switch(number){ - case(0): - ChangeCurrentText(ui->comboBoxBasePoint, point.name()); - number++; - emit ToolTip(tr("Select first point of line")); - break; - case(1): - ChangeCurrentText(ui->comboBoxP1Line, point.name()); - number++; - emit ToolTip(tr("Select second point of line")); - break; - case(2): - ChangeCurrentText(ui->comboBoxP2Line, point.name()); - number = 0; - emit ToolTip(tr("")); - if(!isInitialized){ - this->show(); - } - break; + switch (number) + { + case (0): + ChangeCurrentText(ui->comboBoxBasePoint, point.name()); + number++; + emit ToolTip(tr("Select first point of line")); + break; + case (1): + ChangeCurrentText(ui->comboBoxP1Line, point.name()); + number++; + emit ToolTip(tr("Select second point of line")); + break; + case (2): + ChangeCurrentText(ui->comboBoxP2Line, point.name()); + number = 0; + emit ToolTip(tr("")); + if (isInitialized == false) + { + this->show(); + } + break; } } } -void DialogHeight::DialogAccepted(){ +void DialogHeight::DialogAccepted() +{ pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); basePointId = getCurrentPointId(ui->comboBoxBasePoint); @@ -98,4 +117,3 @@ void DialogHeight::DialogAccepted(){ p2LineId = getCurrentPointId(ui->comboBoxP2Line); emit DialogClosed(QDialog::Accepted); } - diff --git a/dialogs/dialogheight.h b/dialogs/dialogheight.h index 933b2d786..e737ad5a3 100644 --- a/dialogs/dialogheight.h +++ b/dialogs/dialogheight.h @@ -24,14 +24,16 @@ #include "dialogtool.h" -namespace Ui { -class DialogHeight; +namespace Ui +{ + class DialogHeight; } -class DialogHeight : public DialogTool{ +class DialogHeight : public DialogTool +{ Q_OBJECT public: - explicit DialogHeight(const VContainer *data, Draw::Draws mode = Draw::Calculation, + DialogHeight(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogHeight(); inline QString getPointName() const {return pointName;} diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index 80b71d293..8b175b3f5 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -26,9 +26,10 @@ #include "geometry/vsplinepath.h" #include -DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent) : - DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogHistory), doc(doc), cursorRow(0), - cursorToolRecordRow(0){ +DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent) + :DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogHistory), doc(doc), cursorRow(0), + cursorToolRecordRow(0) +{ ui->setupUi(this); bOk = ui->buttonBox->button(QDialogButtonBox::Ok); connect(bOk, &QPushButton::clicked, this, &DialogHistory::DialogAccepted); @@ -42,19 +43,23 @@ DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *paren ShowPoint(); } -DialogHistory::~DialogHistory(){ +DialogHistory::~DialogHistory() +{ delete ui; } -void DialogHistory::DialogAccepted(){ +void DialogHistory::DialogAccepted() +{ QTableWidgetItem *item = ui->tableWidget->item(cursorToolRecordRow, 0); qint64 id = qvariant_cast(item->data(Qt::UserRole)); emit ShowHistoryTool(id, Qt::green, false); emit DialogClosed(QDialog::Accepted); } -void DialogHistory::cellClicked(int row, int column){ - if(column == 0){ +void DialogHistory::cellClicked(int row, int column) +{ + if (column == 0) + { QTableWidgetItem *item = ui->tableWidget->item(cursorRow, 0); item->setIcon(QIcon()); @@ -65,7 +70,9 @@ void DialogHistory::cellClicked(int row, int column){ disconnect(doc, &VDomDocument::ChangedCursor, this, &DialogHistory::ChangedCursor); doc->setCursor(id); connect(doc, &VDomDocument::ChangedCursor, this, &DialogHistory::ChangedCursor); - } else { + } + else + { QTableWidgetItem *item = ui->tableWidget->item(cursorToolRecordRow, 0); qint64 id = qvariant_cast(item->data(Qt::UserRole)); emit ShowHistoryTool(id, Qt::green, false); @@ -77,11 +84,14 @@ void DialogHistory::cellClicked(int row, int column){ } } -void DialogHistory::ChangedCursor(qint64 id){ - for(qint32 i = 0; i< ui->tableWidget->rowCount(); ++i){ +void DialogHistory::ChangedCursor(qint64 id) +{ + for (qint32 i = 0; i< ui->tableWidget->rowCount(); ++i) + { QTableWidgetItem *item = ui->tableWidget->item(i, 0); qint64 rId = qvariant_cast(item->data(Qt::UserRole)); - if(rId == id){ + if (rId == id) + { QTableWidgetItem *oldCursorItem = ui->tableWidget->item(cursorRow, 0); oldCursorItem->setIcon(QIcon()); cursorRow = i; @@ -90,20 +100,24 @@ void DialogHistory::ChangedCursor(qint64 id){ } } -void DialogHistory::UpdateHistory(){ +void DialogHistory::UpdateHistory() +{ FillTable(); InitialTable(); } -void DialogHistory::FillTable(){ +void DialogHistory::FillTable() +{ ui->tableWidget->clear(); QVector *history = doc->getHistory(); qint32 currentRow = -1; qint32 count = 0; ui->tableWidget->setRowCount(history->size()); - for(qint32 i = 0; i< history->size(); ++i){ + for (qint32 i = 0; i< history->size(); ++i) + { VToolRecord tool = history->at(i); - if(tool.getNameDraw() != doc->GetNameActivDraw()){ + if (tool.getNameDraw() != doc->GetNameActivDraw()) + { continue; } currentRow++; @@ -121,7 +135,8 @@ void DialogHistory::FillTable(){ ++count; } ui->tableWidget->setRowCount(count); - if(history->size()>0){ + if (history->size()>0) + { cursorRow = currentRow; QTableWidgetItem *item = ui->tableWidget->item(cursorRow, 0); item->setIcon(QIcon("://icon/32x32/put_after.png")); @@ -131,7 +146,8 @@ void DialogHistory::FillTable(){ ui->tableWidget->verticalHeader()->setDefaultSectionSize(20); } -QString DialogHistory::Record(const VToolRecord &tool){ +QString DialogHistory::Record(const VToolRecord &tool) +{ QString record = QString(); qint64 basePointId = 0; qint64 secondPointId = 0; @@ -143,7 +159,8 @@ QString DialogHistory::Record(const VToolRecord &tool){ qint64 p2Line2 = 0; qint64 center = 0; QDomElement domElement; - switch( tool.getTypeTool() ){ + switch ( tool.getTypeTool() ) + { case Tool::ArrowTool: break; case Tool::SinglePointTool: @@ -151,7 +168,8 @@ QString DialogHistory::Record(const VToolRecord &tool){ break; case Tool::EndLineTool: domElement = doc->elementById(QString().setNum(tool.getId())); - if(domElement.isElement()){ + if (domElement.isElement()) + { basePointId = domElement.attribute("basePoint", "").toLongLong(); } record = QString(tr("%1_%2 - Line from point %1 to point %2")).arg(data->GetPoint(basePointId).name(), @@ -159,7 +177,8 @@ QString DialogHistory::Record(const VToolRecord &tool){ break; case Tool::LineTool: domElement = doc->elementById(QString().setNum(tool.getId())); - if(domElement.isElement()){ + if (domElement.isElement()) + { firstPointId = domElement.attribute("firstPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong(); } @@ -168,7 +187,8 @@ QString DialogHistory::Record(const VToolRecord &tool){ break; case Tool::AlongLineTool: domElement = doc->elementById(QString().setNum(tool.getId())); - if(domElement.isElement()){ + if (domElement.isElement()) + { basePointId = domElement.attribute("firstPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong(); } @@ -181,7 +201,8 @@ QString DialogHistory::Record(const VToolRecord &tool){ break; case Tool::NormalTool: domElement = doc->elementById(QString().setNum(tool.getId())); - if(domElement.isElement()){ + if (domElement.isElement()) + { basePointId = domElement.attribute("firstPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong(); } @@ -191,7 +212,8 @@ QString DialogHistory::Record(const VToolRecord &tool){ break; case Tool::BisectorTool: domElement = doc->elementById(QString().setNum(tool.getId())); - if(domElement.isElement()){ + if (domElement.isElement()) + { firstPointId = domElement.attribute("firstPoint", "").toLongLong(); basePointId = domElement.attribute("secondPoint", "").toLongLong(); thirdPointId = domElement.attribute("thirdPoint", "").toLongLong(); @@ -203,7 +225,8 @@ QString DialogHistory::Record(const VToolRecord &tool){ break; case Tool::LineIntersectTool: domElement = doc->elementById(QString().setNum(tool.getId())); - if(domElement.isElement()){ + if (domElement.isElement()) + { p1Line1 = domElement.attribute("p1Line1", "").toLongLong(); p2Line1 = domElement.attribute("p2Line1", "").toLongLong(); p1Line2 = domElement.attribute("p1Line2", "").toLongLong(); @@ -213,69 +236,78 @@ QString DialogHistory::Record(const VToolRecord &tool){ data->GetPoint(p2Line1).name(), data->GetPoint(p1Line2).name(), data->GetPoint(p2Line2).name(), - data->GetPoint(tool.getId()).name()); + data->GetPoint(tool.getId()).name()); break; - case Tool::SplineTool:{ + case Tool::SplineTool: + { VSpline spl = data->GetSpline(tool.getId()); record = QString(tr("Curve %1_%2")).arg(data->GetPoint(spl.GetP1()).name(), data->GetPoint(spl.GetP4()).name()); } break; - case Tool::ArcTool:{ + case Tool::ArcTool: + { VArc arc = data->GetArc(tool.getId()); record = QString(tr("Arc with center in point %1")).arg(data->GetPoint(arc.GetCenter()).name()); } break; - case Tool::SplinePathTool:{ + case Tool::SplinePathTool: + { VSplinePath splPath = data->GetSplinePath(tool.getId()); QVector points = splPath.GetSplinePath(); - if(points.size() != 0 ){ + if (points.size() != 0 ) + { record = QString(tr("Curve point %1")).arg(data->GetPoint(points[0].P()).name()); - for(qint32 i = 1; i< points.size(); ++i){ + for (qint32 i = 1; i< points.size(); ++i) + { QString name = QString("_%1").arg(data->GetPoint(points[i].P()).name()); record.append(name); } } } - break; + break; case Tool::PointOfContact: domElement = doc->elementById(QString().setNum(tool.getId())); - if(domElement.isElement()){ + if (domElement.isElement()) + { center = domElement.attribute("center", "").toLongLong(); firstPointId = domElement.attribute("firstPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong(); } - record = QString(tr("%4 - Point of contact arc with center in point %1 and line %2_%3")).arg(data->GetPoint(center).name(), - data->GetPoint(firstPointId).name(), - data->GetPoint(secondPointId).name(), - data->GetPoint(tool.getId()).name()); + record = QString(tr("%4 - Point of contact arc with center in point %1 and line %2_%3")).arg( + data->GetPoint(center).name(), data->GetPoint(firstPointId).name(), + data->GetPoint(secondPointId).name(), data->GetPoint(tool.getId()).name()); break; - case Tool::Height:{ + case Tool::Height: + { qint64 p1LineId = 0; qint64 p2LineId = 0; domElement = doc->elementById(QString().setNum(tool.getId())); - if(domElement.isElement()){ + if (domElement.isElement()) + { basePointId = domElement.attribute("basePoint", "").toLongLong(); p1LineId = domElement.attribute("p1Line", "").toLongLong(); p2LineId = domElement.attribute("p2Line", "").toLongLong(); } - record = QString(tr("Point of perpendical from point %1 to line %2_%3")).arg(data->GetPoint(basePointId).name(), - data->GetPoint(p1LineId).name(), - data->GetPoint(p2LineId).name()); + record = QString(tr("Point of perpendical from point %1 to line %2_%3")).arg( + data->GetPoint(basePointId).name(), data->GetPoint(p1LineId).name(), + data->GetPoint(p2LineId).name()); break; } - case Tool::Triangle:{ + case Tool::Triangle: + { qint64 axisP1Id = 0; qint64 axisP2Id = 0; domElement = doc->elementById(QString().setNum(tool.getId())); - if(domElement.isElement()){ + if (domElement.isElement()) + { axisP1Id = domElement.attribute("axisP1", "").toLongLong(); axisP2Id = domElement.attribute("axisP2", "").toLongLong(); firstPointId = domElement.attribute("firstPoint", "").toLongLong(); secondPointId = domElement.attribute("secondPoint", "").toLongLong(); } record = QString(tr("Triangle: axis %1_%2, points %3 and %4")).arg( - data->GetPoint(axisP1Id).name(),data->GetPoint(axisP2Id).name(), + data->GetPoint(axisP1Id).name(), data->GetPoint(axisP2Id).name(), data->GetPoint(firstPointId).name(), data->GetPoint(secondPointId).name()); break; } @@ -286,15 +318,18 @@ QString DialogHistory::Record(const VToolRecord &tool){ return record; } -void DialogHistory::InitialTable(){ +void DialogHistory::InitialTable() +{ ui->tableWidget->setSortingEnabled(false); ui->tableWidget->setHorizontalHeaderItem(0, new QTableWidgetItem(" ")); ui->tableWidget->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Tool"))); } -void DialogHistory::ShowPoint(){ +void DialogHistory::ShowPoint() +{ QVector *history = doc->getHistory(); - if(history->size()>0){ + if (history->size()>0) + { QTableWidgetItem *item = ui->tableWidget->item(0, 1); item->setSelected(true); cursorToolRecordRow = 0; @@ -304,7 +339,8 @@ void DialogHistory::ShowPoint(){ } } -void DialogHistory::closeEvent(QCloseEvent *event){ +void DialogHistory::closeEvent(QCloseEvent *event) +{ QTableWidgetItem *item = ui->tableWidget->item(cursorToolRecordRow, 0); qint64 id = qvariant_cast(item->data(Qt::UserRole)); emit ShowHistoryTool(id, Qt::green, false); diff --git a/dialogs/dialoghistory.h b/dialogs/dialoghistory.h index bd650452e..c3b51156c 100644 --- a/dialogs/dialoghistory.h +++ b/dialogs/dialoghistory.h @@ -25,11 +25,13 @@ #include "dialogtool.h" #include "xml/vdomdocument.h" -namespace Ui { -class DialogHistory; +namespace Ui +{ + class DialogHistory; } -class DialogHistory : public DialogTool{ +class DialogHistory : public DialogTool +{ Q_OBJECT public: DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent = 0); diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 86f2348c6..0dd5e7298 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -24,9 +24,9 @@ #include #include -DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent) : - DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogIncrements), data(data), doc(doc), - row(0), column(0){ +DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent) + :DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogIncrements), data(data), doc(doc), row(0), column(0) +{ ui->setupUi(this); InitialStandartTable(); InitialIncrementTable(); @@ -58,12 +58,14 @@ DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget ui->tabWidget->setCurrentIndex(0); } -void DialogIncrements::FillStandartTable(){ +void DialogIncrements::FillStandartTable() +{ const QHash *standartTable = data->DataStandartTable(); qint32 currentRow = -1; QHashIterator i(*standartTable); ui->tableWidgetStandart->setRowCount ( standartTable->size() ); - while (i.hasNext()) { + while (i.hasNext()) + { i.next(); VStandartTableCell cell = i.value(); currentRow++; @@ -98,12 +100,14 @@ void DialogIncrements::FillStandartTable(){ ui->tableWidgetStandart->verticalHeader()->setDefaultSectionSize(20); } -void DialogIncrements::FillIncrementTable(){ +void DialogIncrements::FillIncrementTable() +{ const QHash *incrementTable = data->DataIncrementTable(); QHashIterator i(*incrementTable); QMap map; //Sorting QHash by id - while (i.hasNext()) { + while (i.hasNext()) + { i.next(); VIncrementTableRow cell = i.value(); map.insert(cell.getId(), i.key()); @@ -111,7 +115,8 @@ void DialogIncrements::FillIncrementTable(){ qint32 currentRow = -1; QMapIterator iMap(map); - while (iMap.hasNext()) { + while (iMap.hasNext()) + { iMap.next(); VIncrementTableRow cell = incrementTable->value(iMap.value()); currentRow++; @@ -147,7 +152,8 @@ void DialogIncrements::FillIncrementTable(){ item->setTextAlignment(Qt::AlignLeft); ui->tableWidgetIncrement->setItem(currentRow, 5, item); } - if(ui->tableWidgetIncrement->rowCount()>0){ + if (ui->tableWidgetIncrement->rowCount()>0) + { ui->toolButtonRemove->setEnabled(true); } ui->tableWidgetIncrement->resizeColumnsToContents(); @@ -155,19 +161,22 @@ void DialogIncrements::FillIncrementTable(){ ui->tableWidgetIncrement->setCurrentCell( row, column ); } -void DialogIncrements::FillLengthLines(){ +void DialogIncrements::FillLengthLines() +{ const QHash *linesTable = data->DataLengthLines(); QHashIterator iHash(*linesTable); QMap map; //Sorting QHash by name - while (iHash.hasNext()) { + while (iHash.hasNext()) + { iHash.next(); map.insert(iHash.key(), iHash.value()); } qint32 currentRow = -1; QMapIterator i(map); - while (i.hasNext()) { + while (i.hasNext()) + { i.next(); qreal length = i.value(); currentRow++; @@ -187,19 +196,22 @@ void DialogIncrements::FillLengthLines(){ ui->tableWidgetLines->verticalHeader()->setDefaultSectionSize(20); } -void DialogIncrements::FillLengthSplines(){ +void DialogIncrements::FillLengthSplines() +{ const QHash *splinesTable = data->DataLengthSplines(); QHashIterator iHash(*splinesTable); QMap map; //Sorting QHash by name - while (iHash.hasNext()) { + while (iHash.hasNext()) + { iHash.next(); map.insert(iHash.key(), iHash.value()); } qint32 currentRow = -1; QMapIterator i(map); - while (i.hasNext()) { + while (i.hasNext()) + { i.next(); qreal length = i.value(); currentRow++; @@ -219,19 +231,22 @@ void DialogIncrements::FillLengthSplines(){ ui->tableWidgetSplines->verticalHeader()->setDefaultSectionSize(20); } -void DialogIncrements::FillLengthArcs(){ +void DialogIncrements::FillLengthArcs() +{ const QHash *arcsTable = data->DataLengthArcs(); QHashIterator iHash(*arcsTable); QMap map; //Sorting QHash by name - while (iHash.hasNext()) { + while (iHash.hasNext()) + { iHash.next(); map.insert(iHash.key(), iHash.value()); } qint32 currentRow = -1; QMapIterator i(map); - while (i.hasNext()) { + while (i.hasNext()) + { i.next(); qreal length = i.value(); currentRow++; @@ -251,7 +266,8 @@ void DialogIncrements::FillLengthArcs(){ ui->tableWidgetArcs->verticalHeader()->setDefaultSectionSize(20); } -void DialogIncrements::FullUpdateFromFile(){ +void DialogIncrements::FullUpdateFromFile() +{ disconnect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this, &DialogIncrements::cellChanged); @@ -279,7 +295,8 @@ void DialogIncrements::FullUpdateFromFile(){ &DialogIncrements::cellChanged); } -void DialogIncrements::clickedToolButtonAdd(){ +void DialogIncrements::clickedToolButtonAdd() +{ disconnect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this, &DialogIncrements::cellChanged); ui->tableWidgetIncrement->setFocus(Qt::OtherFocusReason); @@ -288,10 +305,11 @@ void DialogIncrements::clickedToolButtonAdd(){ qint32 num = 1; QString name; - do{ + do + { name = QString(tr("Denotation %1")).arg(num); num++; - }while(data->IncrementTableContains(name)); + } while (data->IncrementTableContains(name)); qint64 id = data->getNextId(); qreal base = 0; @@ -340,7 +358,8 @@ void DialogIncrements::clickedToolButtonAdd(){ emit haveLiteChange(); } -void DialogIncrements::clickedToolButtonRemove(){ +void DialogIncrements::clickedToolButtonRemove() +{ disconnect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this, &DialogIncrements::cellChanged); QTableWidgetItem *item = ui->tableWidgetIncrement->currentItem(); @@ -349,12 +368,14 @@ void DialogIncrements::clickedToolButtonRemove(){ data->RemoveIncrementTableRow(itemName->text()); qint64 id = qvariant_cast(item->data(Qt::UserRole)); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { QDomNodeList list = doc->elementsByTagName("increments"); list.at(0).removeChild(domElement); } ui->tableWidgetIncrement->removeRow(row); - if(ui->tableWidgetIncrement->rowCount() == 0){ + if (ui->tableWidgetIncrement->rowCount() == 0) + { ui->toolButtonRemove->setEnabled(false); } connect(ui->tableWidgetIncrement, &QTableWidget::cellChanged, this, @@ -362,8 +383,9 @@ void DialogIncrements::clickedToolButtonRemove(){ emit haveLiteChange(); } -void DialogIncrements::AddIncrementToFile(qint64 id, QString name, qreal base, qreal ksize, - qreal kgrowth, QString description){ +void DialogIncrements::AddIncrementToFile(qint64 id, QString name, qreal base, qreal ksize, qreal kgrowth, + QString description) +{ QDomNodeList list = doc->elementsByTagName("increments"); QDomElement element = doc->createElement("increment"); @@ -394,18 +416,21 @@ void DialogIncrements::AddIncrementToFile(qint64 id, QString name, qreal base, q list.at(0).appendChild(element); } -void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ +void DialogIncrements::cellChanged ( qint32 row, qint32 column ) +{ QTableWidgetItem *item = 0; QTableWidgetItem *itemName = 0; qint64 id; QDomElement domElement; this->row = row; - switch(column) { + switch (column) + { case 0: item = ui->tableWidgetIncrement->item(row, 0); id = qvariant_cast(item->data(Qt::UserRole)); domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute("name", item->text()); data->ClearIncrementTable(); this->column = 2; @@ -417,14 +442,18 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ item = ui->tableWidgetIncrement->item(row, column); id = qvariant_cast(itemName->data(Qt::UserRole)); domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { bool ok = false; qreal value = item->text().toDouble(&ok); - if(ok){ + if (ok) + { domElement.setAttribute("base", value); this->column = 3; emit FullUpdateTree(); - } else { + } + else + { throw VException(tr("Can't convert toDouble value.")); } } @@ -434,7 +463,8 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ item = ui->tableWidgetIncrement->item(row, column); id = qvariant_cast(itemName->data(Qt::UserRole)); domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute("ksize", item->text().toDouble()); this->column = 4; emit FullUpdateTree(); @@ -445,7 +475,8 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ item = ui->tableWidgetIncrement->item(row, column); id = qvariant_cast(itemName->data(Qt::UserRole)); domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute("kgrowth", item->text().toDouble()); this->column = 5; emit FullUpdateTree(); @@ -456,7 +487,8 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ item = ui->tableWidgetIncrement->item(row, column); id = qvariant_cast(itemName->data(Qt::UserRole)); domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute("description", item->text()); VIncrementTableRow incr = data->GetIncrementTableRow(itemName->text()); incr.setDescription(item->text()); @@ -470,7 +502,8 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ){ } } -void DialogIncrements::InitialStandartTable(){ +void DialogIncrements::InitialStandartTable() +{ ui->tableWidgetStandart->setSortingEnabled(false); ui->tableWidgetStandart->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Denotation"))); ui->tableWidgetStandart->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Calculated value"))); @@ -480,7 +513,8 @@ void DialogIncrements::InitialStandartTable(){ ui->tableWidgetStandart->setHorizontalHeaderItem(5, new QTableWidgetItem(tr("Description"))); } -void DialogIncrements::InitialIncrementTable(){ +void DialogIncrements::InitialIncrementTable() +{ ui->tableWidgetIncrement->setSortingEnabled(false); ui->tableWidgetIncrement->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Denotation"))); ui->tableWidgetIncrement->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Calculated value"))); @@ -491,25 +525,30 @@ void DialogIncrements::InitialIncrementTable(){ ui->tableWidgetIncrement->verticalHeader()->setDefaultSectionSize(20); } -void DialogIncrements::InitialLinesTable(){ +void DialogIncrements::InitialLinesTable() +{ ui->tableWidgetLines->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Line"))); ui->tableWidgetLines->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Length"))); } -void DialogIncrements::InitialSplinesTable(){ +void DialogIncrements::InitialSplinesTable() +{ ui->tableWidgetSplines->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Curve"))); ui->tableWidgetSplines->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Length"))); } -void DialogIncrements::InitialArcsTable(){ +void DialogIncrements::InitialArcsTable() +{ ui->tableWidgetArcs->setHorizontalHeaderItem(0, new QTableWidgetItem(tr("Arc"))); ui->tableWidgetArcs->setHorizontalHeaderItem(1, new QTableWidgetItem(tr("Length"))); } -void DialogIncrements::DialogAccepted(){ +void DialogIncrements::DialogAccepted() +{ emit DialogClosed(QDialog::Accepted); } -DialogIncrements::~DialogIncrements(){ +DialogIncrements::~DialogIncrements() +{ delete ui; } diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h index a9f5d9e8a..bc4260052 100644 --- a/dialogs/dialogincrements.h +++ b/dialogs/dialogincrements.h @@ -25,12 +25,14 @@ #include "dialogtool.h" #include "xml/vdomdocument.h" -namespace Ui { -class DialogIncrements; +namespace Ui +{ + class DialogIncrements; } -class DialogIncrements : public DialogTool{ - Q_OBJECT +class DialogIncrements : public DialogTool +{ + Q_OBJECT public: DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent = 0); ~DialogIncrements(); diff --git a/dialogs/dialogline.cpp b/dialogs/dialogline.cpp index a94b65fd5..ecdf6cb9d 100644 --- a/dialogs/dialogline.cpp +++ b/dialogs/dialogline.cpp @@ -22,8 +22,9 @@ #include "dialogline.h" #include "ui_dialogline.h" -DialogLine::DialogLine(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogLine), number(0), firstPoint(0), secondPoint(0){ +DialogLine::DialogLine(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogLine), number(0), firstPoint(0), secondPoint(0) +{ ui->setupUi(this); bOk = ui->buttonBox->button(QDialogButtonBox::Ok); connect(bOk, &QPushButton::clicked, this, &DialogLine::DialogAccepted); @@ -34,30 +35,36 @@ DialogLine::DialogLine(const VContainer *data, Draw::Draws mode, QWidget *parent number = 0; } -DialogLine::~DialogLine(){ +DialogLine::~DialogLine() +{ delete ui; } -void DialogLine::setSecondPoint(const qint64 &value){ +void DialogLine::setSecondPoint(const qint64 &value) +{ secondPoint = value; VPointF point = data->GetPoint(value); qint32 index = ui->comboBoxSecondPoint->findText(point.name()); - if(index != -1){ + if (index != -1) + { ui->comboBoxSecondPoint->setCurrentIndex(index); } } -void DialogLine::setFirstPoint(const qint64 &value){ +void DialogLine::setFirstPoint(const qint64 &value) +{ firstPoint = value; VPointF point = data->GetPoint(value); qint32 index = ui->comboBoxFirstPoint->findText(point.name()); - if(index != -1){ + if (index != -1) + { ui->comboBoxFirstPoint->setCurrentIndex(index); } } -void DialogLine::DialogAccepted(){ +void DialogLine::DialogAccepted() +{ qint32 index = ui->comboBoxFirstPoint->currentIndex(); firstPoint = qvariant_cast(ui->comboBoxFirstPoint->itemData(index)); index = ui->comboBoxSecondPoint->currentIndex(); @@ -65,42 +72,56 @@ void DialogLine::DialogAccepted(){ DialogClosed(QDialog::Accepted); } -void DialogLine::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogLine::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - if(number == 0){ + if (number == 0) + { qint32 index = ui->comboBoxFirstPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxFirstPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select second point")); return; } } - if(number == 1){ + if (number == 1) + { qint32 index = ui->comboBoxSecondPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxSecondPoint->setCurrentIndex(index); number = 0; emit ToolTip(""); } - if(!isInitialized){ + if (isInitialized == false) + { this->show(); } } diff --git a/dialogs/dialogline.h b/dialogs/dialogline.h index 99bc99d1a..9957eca16 100644 --- a/dialogs/dialogline.h +++ b/dialogs/dialogline.h @@ -24,16 +24,17 @@ #include "dialogtool.h" -namespace Ui { -class DialogLine; +namespace Ui +{ + class DialogLine; } -class DialogLine : public DialogTool{ +class DialogLine : public DialogTool +{ Q_OBJECT public: - explicit DialogLine(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); - ~DialogLine(); + DialogLine(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); + ~DialogLine(); inline qint64 getFirstPoint() const {return firstPoint;} void setFirstPoint(const qint64 &value); inline qint64 getSecondPoint() const {return secondPoint;} diff --git a/dialogs/dialoglineintersect.cpp b/dialogs/dialoglineintersect.cpp index 347c45815..4961e0db3 100644 --- a/dialogs/dialoglineintersect.cpp +++ b/dialogs/dialoglineintersect.cpp @@ -22,9 +22,10 @@ #include "dialoglineintersect.h" #include "ui_dialoglineintersect.h" -DialogLineIntersect::DialogLineIntersect(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogLineIntersect), number(0), pointName(QString()), - p1Line1(0), p2Line1(0), p1Line2(0), p2Line2(0), flagPoint(true){ +DialogLineIntersect::DialogLineIntersect(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogLineIntersect), number(0), pointName(QString()), + p1Line1(0), p2Line1(0), p1Line2(0), p2Line2(0), flagPoint(true) +{ ui->setupUi(this); number = 0; bOk = ui->buttonBox->button(QDialogButtonBox::Ok); @@ -41,32 +42,44 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, Draw::Draws mod connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogLineIntersect::NamePointChanged); } -DialogLineIntersect::~DialogLineIntersect(){ +DialogLineIntersect::~DialogLineIntersect() +{ delete ui; } -void DialogLineIntersect::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogLineIntersect::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - if(number == 0){ + if (number == 0) + { qint32 index = ui->comboBoxP1Line1->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxP1Line1->setCurrentIndex(index); p1Line1 = id; number++; @@ -74,9 +87,11 @@ void DialogLineIntersect::ChoosedObject(qint64 id, Scene::Scenes type){ return; } } - if(number == 1){ + if (number == 1) + { qint32 index = ui->comboBoxP2Line1->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxP2Line1->setCurrentIndex(index); p2Line1 = id; number++; @@ -84,9 +99,11 @@ void DialogLineIntersect::ChoosedObject(qint64 id, Scene::Scenes type){ return; } } - if(number == 2){ + if (number == 2) + { qint32 index = ui->comboBoxP1Line2->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxP1Line2->setCurrentIndex(index); p1Line2 = id; number++; @@ -94,15 +111,18 @@ void DialogLineIntersect::ChoosedObject(qint64 id, Scene::Scenes type){ return; } } - if(number == 3){ + if (number == 3) + { qint32 index = ui->comboBoxP2Line2->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxP2Line2->setCurrentIndex(index); p2Line2 = id; number = 0; emit ToolTip(""); } - if(!isInitialized){ + if (isInitialized == false) + { flagPoint = CheckIntersecion(); CheckState(); this->show(); @@ -123,7 +143,8 @@ void DialogLineIntersect::ChoosedObject(qint64 id, Scene::Scenes type){ } } -void DialogLineIntersect::DialogAccepted(){ +void DialogLineIntersect::DialogAccepted() +{ pointName = ui->lineEditNamePoint->text(); p1Line1 = getCurrentPointId(ui->comboBoxP1Line1); p2Line1 = getCurrentPointId(ui->comboBoxP2Line1); @@ -132,36 +153,42 @@ void DialogLineIntersect::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogLineIntersect::P1Line1Changed( int index){ +void DialogLineIntersect::P1Line1Changed( int index) +{ p1Line1 = qvariant_cast(ui->comboBoxP1Line1->itemData(index)); flagPoint = CheckIntersecion(); CheckState(); } -void DialogLineIntersect::P2Line1Changed(int index){ +void DialogLineIntersect::P2Line1Changed(int index) +{ p2Line1 = qvariant_cast(ui->comboBoxP2Line1->itemData(index)); flagPoint = CheckIntersecion(); CheckState(); } -void DialogLineIntersect::P1Line2Changed(int index){ +void DialogLineIntersect::P1Line2Changed(int index) +{ p1Line2 = qvariant_cast(ui->comboBoxP1Line2->itemData(index)); flagPoint = CheckIntersecion(); CheckState(); } -void DialogLineIntersect::P2Line2Changed(int index){ +void DialogLineIntersect::P2Line2Changed(int index) +{ p2Line2 = qvariant_cast(ui->comboBoxP2Line2->itemData(index)); flagPoint = CheckIntersecion(); CheckState(); } -void DialogLineIntersect::CheckState(){ +void DialogLineIntersect::CheckState() +{ Q_ASSERT(bOk != 0); bOk->setEnabled(flagName && flagPoint); } -bool DialogLineIntersect::CheckIntersecion(){ +bool DialogLineIntersect::CheckIntersecion() +{ VPointF p1L1 = data->GetPoint(p1Line1); VPointF p2L1 = data->GetPoint(p2Line1); VPointF p1L2 = data->GetPoint(p1Line2); @@ -171,34 +198,42 @@ bool DialogLineIntersect::CheckIntersecion(){ QLineF line2(p1L2.toQPointF(), p2L2.toQPointF()); QPointF fPoint; QLineF::IntersectType intersect = line1.intersect(line2, &fPoint); - if(intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection){ + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) + { return true; - } else { + } + else + { return false; } } -void DialogLineIntersect::setP2Line2(const qint64 &value){ +void DialogLineIntersect::setP2Line2(const qint64 &value) +{ p2Line2 = value; ChangeCurrentData(ui->comboBoxP2Line2, value); } -void DialogLineIntersect::setP1Line2(const qint64 &value){ +void DialogLineIntersect::setP1Line2(const qint64 &value) +{ p1Line2 = value; ChangeCurrentData(ui->comboBoxP1Line2, value); } -void DialogLineIntersect::setP2Line1(const qint64 &value){ +void DialogLineIntersect::setP2Line1(const qint64 &value) +{ p2Line1 = value; ChangeCurrentData(ui->comboBoxP2Line1, value); } -void DialogLineIntersect::setP1Line1(const qint64 &value){ +void DialogLineIntersect::setP1Line1(const qint64 &value) +{ p1Line1 = value; ChangeCurrentData(ui->comboBoxP1Line1, value); } -void DialogLineIntersect::setPointName(const QString &value){ +void DialogLineIntersect::setPointName(const QString &value) +{ pointName = value; ui->lineEditNamePoint->setText(pointName); } diff --git a/dialogs/dialoglineintersect.h b/dialogs/dialoglineintersect.h index 34cb19aeb..9c5195df5 100644 --- a/dialogs/dialoglineintersect.h +++ b/dialogs/dialoglineintersect.h @@ -24,14 +24,16 @@ #include "dialogtool.h" -namespace Ui { -class DialogLineIntersect; +namespace Ui +{ + class DialogLineIntersect; } -class DialogLineIntersect : public DialogTool{ +class DialogLineIntersect : public DialogTool +{ Q_OBJECT public: - explicit DialogLineIntersect(const VContainer *data, Draw::Draws mode = Draw::Calculation, + DialogLineIntersect(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogLineIntersect(); inline qint64 getP1Line1() const {return p1Line1;} diff --git a/dialogs/dialognormal.cpp b/dialogs/dialognormal.cpp index 0b467145e..d13aeab95 100644 --- a/dialogs/dialognormal.cpp +++ b/dialogs/dialognormal.cpp @@ -22,9 +22,10 @@ #include "dialognormal.h" #include "ui_dialognormal.h" -DialogNormal::DialogNormal(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogNormal), number(0), pointName(QString()), - typeLine(QString()), formula(QString()), angle(0), firstPointId(0), secondPointId(0){ +DialogNormal::DialogNormal(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogNormal), number(0), pointName(QString()), + typeLine(QString()), formula(QString()), angle(0), firstPointId(0), secondPointId(0) +{ ui->setupUi(this); spinBoxAngle = ui->doubleSpinBoxAngle; listWidget = ui->listWidget; @@ -82,53 +83,69 @@ DialogNormal::DialogNormal(const VContainer *data, Draw::Draws mode, QWidget *pa connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogNormal::FormulaChanged); } -DialogNormal::~DialogNormal(){ +DialogNormal::~DialogNormal() +{ delete ui; } -void DialogNormal::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogNormal::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - if(number == 0){ + if (number == 0) + { qint32 index = ui->comboBoxFirstPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxFirstPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select second point of line")); return; } } - if(number == 1){ + if (number == 1) + { qint32 index = ui->comboBoxSecondPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxSecondPoint->setCurrentIndex(index); number = 0; emit ToolTip(""); } - if(!isInitialized){ + if (isInitialized == false) + { this->show(); } } } } -void DialogNormal::DialogAccepted(){ +void DialogNormal::DialogAccepted() +{ pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); formula = ui->lineEditFormula->text(); @@ -138,30 +155,36 @@ void DialogNormal::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogNormal::setSecondPointId(const qint64 &value, const qint64 &id){ +void DialogNormal::setSecondPointId(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -void DialogNormal::setFirstPointId(const qint64 &value, const qint64 &id){ +void DialogNormal::setFirstPointId(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -void DialogNormal::setAngle(const qreal &value){ +void DialogNormal::setAngle(const qreal &value) +{ angle = value; ui->doubleSpinBoxAngle->setValue(angle); } -void DialogNormal::setFormula(const QString &value){ +void DialogNormal::setFormula(const QString &value) +{ formula = value; ui->lineEditFormula->setText(formula); } -void DialogNormal::setTypeLine(const QString &value){ +void DialogNormal::setTypeLine(const QString &value) +{ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -void DialogNormal::setPointName(const QString &value){ +void DialogNormal::setPointName(const QString &value) +{ pointName = value; ui->lineEditNamePoint->setText(pointName); } diff --git a/dialogs/dialognormal.h b/dialogs/dialognormal.h index e1f685e7f..84a661522 100644 --- a/dialogs/dialognormal.h +++ b/dialogs/dialognormal.h @@ -24,15 +24,16 @@ #include "dialogtool.h" -namespace Ui { -class DialogNormal; +namespace Ui +{ + class DialogNormal; } -class DialogNormal : public DialogTool{ +class DialogNormal : public DialogTool +{ Q_OBJECT public: - explicit DialogNormal(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); + DialogNormal(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogNormal(); inline QString getPointName() const{return pointName;} void setPointName(const QString &value); diff --git a/dialogs/dialogpointofcontact.cpp b/dialogs/dialogpointofcontact.cpp index d09b7b021..6b551df7e 100644 --- a/dialogs/dialogpointofcontact.cpp +++ b/dialogs/dialogpointofcontact.cpp @@ -21,9 +21,10 @@ #include "dialogpointofcontact.h" -DialogPointOfContact::DialogPointOfContact(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(), number(0), pointName(QString()), radius(QString()), center(0), - firstPoint(0), secondPoint(0){ +DialogPointOfContact::DialogPointOfContact(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(), number(0), pointName(QString()), radius(QString()), center(0), + firstPoint(0), secondPoint(0) +{ ui.setupUi(this); listWidget = ui.listWidget; labelResultCalculation = ui.labelResultCalculation; @@ -64,58 +65,75 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, Draw::Draws m connect(ui.lineEditFormula, &QLineEdit::textChanged, this, &DialogPointOfContact::FormulaChanged); } -void DialogPointOfContact::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogPointOfContact::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - if(number == 0){ + if (number == 0) + { qint32 index = ui.comboBoxFirstPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui.comboBoxFirstPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select second point of line")); return; } } - if(number == 1){ + if (number == 1) + { qint32 index = ui.comboBoxSecondPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui.comboBoxSecondPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select point of center of arc")); return; } } - if(number == 2){ + if (number == 2) + { qint32 index = ui.comboBoxCenter->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui.comboBoxCenter->setCurrentIndex(index); number = 0; emit ToolTip(""); } - if(!isInitialized){ + if (isInitialized == false) + { this->show(); } } } } -void DialogPointOfContact::DialogAccepted(){ +void DialogPointOfContact::DialogAccepted() +{ pointName = ui.lineEditNamePoint->text(); radius = ui.lineEditFormula->text(); center = getCurrentPointId(ui.comboBoxCenter); @@ -124,25 +142,30 @@ void DialogPointOfContact::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogPointOfContact::setSecondPoint(const qint64 &value, const qint64 &id){ +void DialogPointOfContact::setSecondPoint(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui.comboBoxSecondPoint, secondPoint, value, id); } -void DialogPointOfContact::setFirstPoint(const qint64 &value, const qint64 &id){ +void DialogPointOfContact::setFirstPoint(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui.comboBoxFirstPoint, firstPoint, value, id); } -void DialogPointOfContact::setCenter(const qint64 &value, const qint64 &id){ +void DialogPointOfContact::setCenter(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui.comboBoxCenter, center, value, id); center = value; } -void DialogPointOfContact::setRadius(const QString &value){ +void DialogPointOfContact::setRadius(const QString &value) +{ radius = value; ui.lineEditFormula->setText(radius); } -void DialogPointOfContact::setPointName(const QString &value){ +void DialogPointOfContact::setPointName(const QString &value) +{ pointName = value; ui.lineEditNamePoint->setText(pointName); } diff --git a/dialogs/dialogpointofcontact.h b/dialogs/dialogpointofcontact.h index 003c16001..35af0835a 100644 --- a/dialogs/dialogpointofcontact.h +++ b/dialogs/dialogpointofcontact.h @@ -25,9 +25,9 @@ #include "ui_dialogpointofcontact.h" #include "dialogtool.h" -class DialogPointOfContact : public DialogTool{ +class DialogPointOfContact : public DialogTool +{ Q_OBJECT - public: DialogPointOfContact(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); diff --git a/dialogs/dialogpointofintersection.cpp b/dialogs/dialogpointofintersection.cpp index 1172284fe..bf6fff658 100644 --- a/dialogs/dialogpointofintersection.cpp +++ b/dialogs/dialogpointofintersection.cpp @@ -1,9 +1,10 @@ #include "dialogpointofintersection.h" #include "ui_dialogpointofintersection.h" -DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogPointOfIntersection), number(0), pointName(QString()), - firstPointId(0), secondPointId(0){ +DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogPointOfIntersection), number(0), pointName(QString()), + firstPointId(0), secondPointId(0) +{ ui->setupUi(this); labelEditNamePoint = ui->labelEditNamePoint; bOk = ui->buttonBox->button(QDialogButtonBox::Ok); @@ -17,70 +18,89 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, Dra connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogPointOfIntersection::NamePointChanged); } -DialogPointOfIntersection::~DialogPointOfIntersection(){ +DialogPointOfIntersection::~DialogPointOfIntersection() +{ delete ui; } -void DialogPointOfIntersection::setSecondPointId(const qint64 &value, const qint64 &id){ +void DialogPointOfIntersection::setSecondPointId(const qint64 &value, const qint64 &id) +{ secondPointId = value; setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -void DialogPointOfIntersection::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogPointOfIntersection::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - if(number == 0){ + if (number == 0) + { qint32 index = ui->comboBoxFirstPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxFirstPoint->setCurrentIndex(index); number++; emit ToolTip(tr("Select point horizontally")); return; } } - if(number == 1){ + if (number == 1) + { qint32 index = ui->comboBoxSecondPoint->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxSecondPoint->setCurrentIndex(index); number = 0; emit ToolTip(""); } - if(!isInitialized){ + if (isInitialized == false) + { this->show(); } } } } -void DialogPointOfIntersection::DialogAccepted(){ +void DialogPointOfIntersection::DialogAccepted() +{ pointName = ui->lineEditNamePoint->text(); firstPointId = getCurrentPointId(ui->comboBoxFirstPoint); secondPointId = getCurrentPointId(ui->comboBoxSecondPoint); emit DialogClosed(QDialog::Accepted); } -void DialogPointOfIntersection::setFirstPointId(const qint64 &value, const qint64 &id){ +void DialogPointOfIntersection::setFirstPointId(const qint64 &value, const qint64 &id) +{ firstPointId = value; setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -void DialogPointOfIntersection::setPointName(const QString &value){ +void DialogPointOfIntersection::setPointName(const QString &value) +{ pointName = value; ui->lineEditNamePoint->setText(pointName); } diff --git a/dialogs/dialogpointofintersection.h b/dialogs/dialogpointofintersection.h index 432105400..52a3ff7a2 100644 --- a/dialogs/dialogpointofintersection.h +++ b/dialogs/dialogpointofintersection.h @@ -3,12 +3,14 @@ #include "dialogtool.h" -namespace Ui { -class DialogPointOfIntersection; +namespace Ui +{ + class DialogPointOfIntersection; } -class DialogPointOfIntersection : public DialogTool{ - Q_OBJECT +class DialogPointOfIntersection : public DialogTool +{ + Q_OBJECT public: DialogPointOfIntersection(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); diff --git a/dialogs/dialogshoulderpoint.cpp b/dialogs/dialogshoulderpoint.cpp index 9c65ec76a..0224eb90b 100644 --- a/dialogs/dialogshoulderpoint.cpp +++ b/dialogs/dialogshoulderpoint.cpp @@ -22,9 +22,10 @@ #include "dialogshoulderpoint.h" #include "ui_dialogshoulderpoint.h" -DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogShoulderPoint), number(0), pointName(QString()), - typeLine(QString()), formula(QString()), p1Line(0), p2Line(0), pShoulder(0){ +DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogShoulderPoint), number(0), pointName(QString()), + typeLine(QString()), formula(QString()), p1Line(0), p2Line(0), pShoulder(0) +{ ui->setupUi(this); number = 0; listWidget = ui->listWidget; @@ -67,62 +68,80 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, Draw::Draws mod connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogShoulderPoint::FormulaChanged); } -DialogShoulderPoint::~DialogShoulderPoint(){ +DialogShoulderPoint::~DialogShoulderPoint() +{ delete ui; } -void DialogShoulderPoint::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogShoulderPoint::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - if(number == 0){ + if (number == 0) + { qint32 index = ui->comboBoxP1Line->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxP1Line->setCurrentIndex(index); number++; emit ToolTip(tr("Select second point of line")); return; } } - if(number == 1){ + if (number == 1) + { qint32 index = ui->comboBoxP2Line->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxP2Line->setCurrentIndex(index); number++; emit ToolTip(tr("Select point of shoulder")); return; } } - if(number == 2){ + if (number == 2) + { qint32 index = ui->comboBoxPShoulder->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxPShoulder->setCurrentIndex(index); number = 0; emit ToolTip(""); } - if(!isInitialized){ + if (isInitialized == false) + { this->show(); } } } } -void DialogShoulderPoint::DialogAccepted(){ +void DialogShoulderPoint::DialogAccepted() +{ pointName = ui->lineEditNamePoint->text(); typeLine = GetTypeLine(ui->comboBoxLineType); formula = ui->lineEditFormula->text(); @@ -132,29 +151,35 @@ void DialogShoulderPoint::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogShoulderPoint::setPShoulder(const qint64 &value, const qint64 &id){ +void DialogShoulderPoint::setPShoulder(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxPShoulder, pShoulder, value, id); } -void DialogShoulderPoint::setP2Line(const qint64 &value, const qint64 &id){ +void DialogShoulderPoint::setP2Line(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxP2Line, p2Line, value, id); } -void DialogShoulderPoint::setP1Line(const qint64 &value, const qint64 &id){ +void DialogShoulderPoint::setP1Line(const qint64 &value, const qint64 &id) +{ setCurrentPointId(ui->comboBoxP1Line, p1Line, value, id); } -void DialogShoulderPoint::setFormula(const QString &value){ +void DialogShoulderPoint::setFormula(const QString &value) +{ formula = value; ui->lineEditFormula->setText(formula); } -void DialogShoulderPoint::setTypeLine(const QString &value){ +void DialogShoulderPoint::setTypeLine(const QString &value) +{ typeLine = value; SetupTypeLine(ui->comboBoxLineType, value); } -void DialogShoulderPoint::setPointName(const QString &value){ +void DialogShoulderPoint::setPointName(const QString &value) +{ pointName = value; ui->lineEditNamePoint->setText(pointName); } diff --git a/dialogs/dialogshoulderpoint.h b/dialogs/dialogshoulderpoint.h index 44b315738..8d06393e6 100644 --- a/dialogs/dialogshoulderpoint.h +++ b/dialogs/dialogshoulderpoint.h @@ -24,11 +24,13 @@ #include "dialogtool.h" -namespace Ui { -class DialogShoulderPoint; +namespace Ui +{ + class DialogShoulderPoint; } -class DialogShoulderPoint : public DialogTool{ +class DialogShoulderPoint : public DialogTool +{ Q_OBJECT public: DialogShoulderPoint(const VContainer *data, Draw::Draws mode = Draw::Calculation, diff --git a/dialogs/dialogsinglepoint.cpp b/dialogs/dialogsinglepoint.cpp index 9bb6914d1..ddf12c14e 100644 --- a/dialogs/dialogsinglepoint.cpp +++ b/dialogs/dialogsinglepoint.cpp @@ -22,12 +22,13 @@ #include "dialogsinglepoint.h" #include "ui_dialogsinglepoint.h" -DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent) : - DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogSinglePoint), name(QString()), - point(QPointF()){ +DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent) + :DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogSinglePoint), name(QString()), + point(QPointF()) +{ ui->setupUi(this); - ui->doubleSpinBoxX->setRange(0,toMM(PaperSize)); - ui->doubleSpinBoxY->setRange(0,toMM(PaperSize)); + ui->doubleSpinBoxX->setRange(0, toMM(PaperSize)); + ui->doubleSpinBoxY->setRange(0, toMM(PaperSize)); bOk = ui->buttonBox->button(QDialogButtonBox::Ok); labelEditNamePoint = ui->labelEditName; flagName = false; @@ -35,27 +36,33 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent) : connect(bOk, &QPushButton::clicked, this, &DialogSinglePoint::DialogAccepted); QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); connect(bCansel, &QPushButton::clicked, this, &DialogSinglePoint::DialogRejected); - connect(ui->lineEditName,&QLineEdit::textChanged, this, &DialogSinglePoint::NamePointChanged); + connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogSinglePoint::NamePointChanged); } -void DialogSinglePoint::mousePress(QPointF scenePos){ - if(isInitialized == false){ +void DialogSinglePoint::mousePress(QPointF scenePos) +{ + if (isInitialized == false) + { ui->doubleSpinBoxX->setValue(toMM(scenePos.x())); ui->doubleSpinBoxY->setValue(toMM(scenePos.y())); this->show(); - } else { + } + else + { ui->doubleSpinBoxX->setValue(toMM(scenePos.x())); ui->doubleSpinBoxY->setValue(toMM(scenePos.y())); } } -void DialogSinglePoint::DialogAccepted(){ +void DialogSinglePoint::DialogAccepted() +{ point = QPointF(toPixel(ui->doubleSpinBoxX->value()), toPixel(ui->doubleSpinBoxY->value())); name = ui->lineEditName->text(); emit DialogClosed(QDialog::Accepted); } -void DialogSinglePoint::setData(const QString name, const QPointF point){ +void DialogSinglePoint::setData(const QString name, const QPointF point) +{ this->name = name; this->point = point; isInitialized = true; @@ -64,7 +71,7 @@ void DialogSinglePoint::setData(const QString name, const QPointF point){ ui->doubleSpinBoxY->setValue(toMM(point.y())); } -DialogSinglePoint::~DialogSinglePoint(){ +DialogSinglePoint::~DialogSinglePoint() +{ delete ui; } - diff --git a/dialogs/dialogsinglepoint.h b/dialogs/dialogsinglepoint.h index 3a4d1b860..48adcf8a9 100644 --- a/dialogs/dialogsinglepoint.h +++ b/dialogs/dialogsinglepoint.h @@ -24,12 +24,14 @@ #include "dialogtool.h" -namespace Ui { -class DialogSinglePoint; +namespace Ui +{ + class DialogSinglePoint; } -class DialogSinglePoint : public DialogTool{ - Q_OBJECT +class DialogSinglePoint : public DialogTool +{ + Q_OBJECT public: DialogSinglePoint(const VContainer *data, QWidget *parent = 0); void setData(const QString name, const QPointF point); diff --git a/dialogs/dialogspline.cpp b/dialogs/dialogspline.cpp index 08f8f331b..16baab710 100644 --- a/dialogs/dialogspline.cpp +++ b/dialogs/dialogspline.cpp @@ -22,58 +22,74 @@ #include "dialogspline.h" #include "ui_dialogspline.h" -DialogSpline::DialogSpline(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogSpline), number(0), p1(0), p4(0), angle1(0), angle2(0), - kAsm1(1), kAsm2(1), kCurve(1){ +DialogSpline::DialogSpline(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogSpline), number(0), p1(0), p4(0), angle1(0), angle2(0), + kAsm1(1), kAsm2(1), kCurve(1) +{ ui->setupUi(this); bOk = ui->buttonBox->button(QDialogButtonBox::Ok); connect(bOk, &QPushButton::clicked, this, &DialogSpline::DialogAccepted); QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel); connect(bCansel, &QPushButton::clicked, this, &DialogSpline::DialogRejected); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { FillComboBoxPoints(ui->comboBoxP1); FillComboBoxPoints(ui->comboBoxP4); } } -DialogSpline::~DialogSpline(){ +DialogSpline::~DialogSpline() +{ delete ui; } -void DialogSpline::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogSpline::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; FillComboBoxPoints(ui->comboBoxP1); FillComboBoxPoints(ui->comboBoxP4); return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - if(number == 0){ + if (number == 0) + { qint32 index = ui->comboBoxP1->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxP1->setCurrentIndex(index); number++; emit ToolTip(tr("Select last point of curve")); return; } } - if(number == 1){ + if (number == 1) + { qint32 index = ui->comboBoxP4->findText(point.name()); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found ui->comboBoxP4->setCurrentIndex(index); number = 0; emit ToolTip(""); @@ -81,24 +97,29 @@ void DialogSpline::ChoosedObject(qint64 id, Scene::Scenes type){ qint64 p1Id = qvariant_cast(ui->comboBoxP1->itemData(index)); QPointF p1; QPointF p4; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { p1 = data->GetPoint(p1Id).toQPointF(); p4 = data->GetPoint(id).toQPointF(); - } else { + } + else + { p1 = data->GetModelingPoint(p1Id).toQPointF(); p4 = data->GetModelingPoint(id).toQPointF(); } ui->spinBoxAngle1->setValue(static_cast(QLineF(p1, p4).angle())); ui->spinBoxAngle2->setValue(static_cast(QLineF(p4, p1).angle())); } - if(!isInitialized){ + if (isInitialized == false) + { this->show(); } } } } -void DialogSpline::DialogAccepted(){ +void DialogSpline::DialogAccepted() +{ p1 = getCurrentPointId(ui->comboBoxP1); p4 = getCurrentPointId(ui->comboBoxP4); angle1 = ui->spinBoxAngle1->value(); @@ -109,37 +130,44 @@ void DialogSpline::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogSpline::setKCurve(const qreal &value){ +void DialogSpline::setKCurve(const qreal &value) +{ kCurve = value; ui->doubleSpinBoxKcurve->setValue(value); } -void DialogSpline::setKAsm2(const qreal &value){ +void DialogSpline::setKAsm2(const qreal &value) +{ kAsm2 = value; ui->doubleSpinBoxKasm2->setValue(value); } -void DialogSpline::setKAsm1(const qreal &value){ +void DialogSpline::setKAsm1(const qreal &value) +{ kAsm1 = value; ui->doubleSpinBoxKasm1->setValue(value); } -void DialogSpline::setAngle2(const qreal &value){ +void DialogSpline::setAngle2(const qreal &value) +{ angle2 = value; ui->spinBoxAngle2->setValue(static_cast(value)); } -void DialogSpline::setAngle1(const qreal &value){ +void DialogSpline::setAngle1(const qreal &value) +{ angle1 = value; ui->spinBoxAngle1->setValue(static_cast(value)); } -void DialogSpline::setP4(const qint64 &value){ +void DialogSpline::setP4(const qint64 &value) +{ p4 = value; ChangeCurrentData(ui->comboBoxP4, value); } -void DialogSpline::setP1(const qint64 &value){ +void DialogSpline::setP1(const qint64 &value) +{ p1 = value; ChangeCurrentData(ui->comboBoxP1, value); } diff --git a/dialogs/dialogspline.h b/dialogs/dialogspline.h index 310a679dc..bcb69ce87 100644 --- a/dialogs/dialogspline.h +++ b/dialogs/dialogspline.h @@ -24,15 +24,16 @@ #include "dialogtool.h" -namespace Ui { -class DialogSpline; +namespace Ui +{ + class DialogSpline; } -class DialogSpline : public DialogTool{ - Q_OBJECT +class DialogSpline : public DialogTool +{ + Q_OBJECT public: - explicit DialogSpline(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); + DialogSpline(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogSpline(); inline qint64 getP1() const {return p1;} void setP1(const qint64 &value); @@ -55,10 +56,10 @@ private: Q_DISABLE_COPY(DialogSpline) Ui::DialogSpline *ui; qint32 number; - qint64 p1; // перша точка - qint64 p4; // четверта точка - qreal angle1; // кут нахилу дотичної в першій точці - qreal angle2; // кут нахилу дотичної в другій точці + qint64 p1; // перша точка + qint64 p4; // четверта точка + qreal angle1; // кут нахилу дотичної в першій точці + qreal angle2; // кут нахилу дотичної в другій точці qreal kAsm1; qreal kAsm2; qreal kCurve; diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index e3d45bdd0..d671ef182 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -23,8 +23,9 @@ #include "ui_dialogsplinepath.h" #include "geometry/vsplinepoint.h" -DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogSplinePath), path(VSplinePath()){ +DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogSplinePath), path(VSplinePath()) +{ ui->setupUi(this); bOk = ui->buttonBox->button(QDialogButtonBox::Ok); connect(bOk, &QPushButton::clicked, this, &DialogSplinePath::DialogAccepted); @@ -48,14 +49,17 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWi this, &DialogSplinePath::KAsm2Changed); } -DialogSplinePath::~DialogSplinePath(){ +DialogSplinePath::~DialogSplinePath() +{ delete ui; } -void DialogSplinePath::SetPath(const VSplinePath &value){ +void DialogSplinePath::SetPath(const VSplinePath &value) +{ this->path = value; - ui->listWidget->clear(); - for(qint32 i = 0; i < path.CountPoint(); ++i){ + ui->listWidget->clear(); + for (qint32 i = 0; i < path.CountPoint(); ++i) + { NewItem(path[i].P(), path[i].KAsm1(), path[i].Angle2(), path[i].KAsm2()); } ui->listWidget->setFocus(Qt::OtherFocusReason); @@ -63,28 +67,36 @@ void DialogSplinePath::SetPath(const VSplinePath &value){ } -void DialogSplinePath::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogSplinePath::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { NewItem(id, 1, 0, 1); emit ToolTip(tr("Select point of curve path")); this->show(); } } -void DialogSplinePath::DialogAccepted(){ +void DialogSplinePath::DialogAccepted() +{ path.Clear(); - for(qint32 i = 0; i < ui->listWidget->count(); ++i){ + for (qint32 i = 0; i < ui->listWidget->count(); ++i) + { QListWidgetItem *item = ui->listWidget->item(i); path.append( qvariant_cast(item->data(Qt::UserRole))); } @@ -93,8 +105,10 @@ void DialogSplinePath::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogSplinePath::PointChenged(int row){ - if(ui->listWidget->count() == 0){ +void DialogSplinePath::PointChenged(int row) +{ + if (ui->listWidget->count() == 0) + { return; } QListWidgetItem *item = ui->listWidget->item( row ); @@ -103,7 +117,8 @@ void DialogSplinePath::PointChenged(int row){ EnableFields(); } -void DialogSplinePath::currentPointChanged(int index){ +void DialogSplinePath::currentPointChanged(int index) +{ qint64 id = qvariant_cast(ui->comboBoxPoint->itemData(index)); qint32 row = ui->listWidget->currentRow(); QListWidgetItem *item = ui->listWidget->item( row ); @@ -114,15 +129,18 @@ void DialogSplinePath::currentPointChanged(int index){ item->setData(Qt::UserRole, QVariant::fromValue(p)); } -void DialogSplinePath::Angle1Changed(int index){ +void DialogSplinePath::Angle1Changed(int index) +{ SetAngle(index+180); } -void DialogSplinePath::Angle2Changed(int index){ +void DialogSplinePath::Angle2Changed(int index) +{ SetAngle(index); } -void DialogSplinePath::KAsm1Changed(qreal d){ +void DialogSplinePath::KAsm1Changed(qreal d) +{ qint32 row = ui->listWidget->currentRow(); QListWidgetItem *item = ui->listWidget->item( row ); VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); @@ -130,7 +148,8 @@ void DialogSplinePath::KAsm1Changed(qreal d){ item->setData(Qt::UserRole, QVariant::fromValue(p)); } -void DialogSplinePath::KAsm2Changed(qreal d){ +void DialogSplinePath::KAsm2Changed(qreal d) +{ qint32 row = ui->listWidget->currentRow(); QListWidgetItem *item = ui->listWidget->item( row ); VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); @@ -138,11 +157,15 @@ void DialogSplinePath::KAsm2Changed(qreal d){ item->setData(Qt::UserRole, QVariant::fromValue(p)); } -void DialogSplinePath::NewItem(qint64 id, qreal kAsm1, qreal angle, qreal kAsm2){ +void DialogSplinePath::NewItem(qint64 id, qreal kAsm1, qreal angle, qreal kAsm2) +{ VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } QListWidgetItem *item = new QListWidgetItem(point.name()); @@ -154,7 +177,8 @@ void DialogSplinePath::NewItem(qint64 id, qreal kAsm1, qreal angle, qreal kAsm2) EnableFields(); } -void DialogSplinePath::DataPoint(qint64 id, qreal kAsm1, qreal angle1, qreal kAsm2, qreal angle2){ +void DialogSplinePath::DataPoint(qint64 id, qreal kAsm1, qreal angle1, qreal kAsm2, qreal angle2) +{ disconnect(ui->comboBoxPoint, static_cast(&QComboBox::currentIndexChanged), this, &DialogSplinePath::currentPointChanged); disconnect(ui->spinBoxAngle1, static_cast(&QSpinBox::valueChanged), @@ -184,25 +208,29 @@ void DialogSplinePath::DataPoint(qint64 id, qreal kAsm1, qreal angle1, qreal kAs this, &DialogSplinePath::KAsm2Changed); } -void DialogSplinePath::EnableFields(){ +void DialogSplinePath::EnableFields() +{ ui->doubleSpinBoxKasm1->setEnabled(true); ui->spinBoxAngle1->setEnabled(true); ui->doubleSpinBoxKasm2->setEnabled(true); ui->spinBoxAngle2->setEnabled(true); qint32 row = ui->listWidget->currentRow(); - if(row == 0){ + if (row == 0) + { ui->doubleSpinBoxKasm1->setEnabled(false); ui->spinBoxAngle1->setEnabled(false); return; } - if(row == ui->listWidget->count()-1){ + if (row == ui->listWidget->count()-1) + { ui->doubleSpinBoxKasm2->setEnabled(false); ui->spinBoxAngle2->setEnabled(false); return; } } -void DialogSplinePath::SetAngle(qint32 angle){ +void DialogSplinePath::SetAngle(qint32 angle) +{ qint32 row = ui->listWidget->currentRow(); QListWidgetItem *item = ui->listWidget->item( row ); VSplinePoint p = qvariant_cast(item->data(Qt::UserRole)); diff --git a/dialogs/dialogsplinepath.h b/dialogs/dialogsplinepath.h index 922351a31..394e79356 100644 --- a/dialogs/dialogsplinepath.h +++ b/dialogs/dialogsplinepath.h @@ -25,11 +25,13 @@ #include "dialogtool.h" #include "geometry/vsplinepath.h" -namespace Ui { -class DialogSplinePath; +namespace Ui +{ + class DialogSplinePath; } -class DialogSplinePath : public DialogTool{ +class DialogSplinePath : public DialogTool +{ Q_OBJECT public: DialogSplinePath(const VContainer *data, Draw::Draws mode = Draw::Calculation, diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index c527cb383..3f3e0133a 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -22,60 +22,76 @@ #include "dialogtool.h" #include -DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent):QDialog(parent), data(data), - isInitialized(false), flagName(true), flagFormula(true), timerFormula(0), bOk(0), spinBoxAngle(0), - lineEditFormula(0), listWidget(0), labelResultCalculation(0), labelDescription(0), labelEditNamePoint(0), - labelEditFormula(0), radioButtonSizeGrowth(0), radioButtonStandartTable(0), radioButtonIncrements(0), - radioButtonLengthLine(0), radioButtonLengthArc(0), radioButtonLengthCurve(0), idDetail(0), mode(mode){ +DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent) + :QDialog(parent), data(data), isInitialized(false), flagName(true), flagFormula(true), timerFormula(0), bOk(0), + spinBoxAngle(0), lineEditFormula(0), listWidget(0), labelResultCalculation(0), labelDescription(0), + labelEditNamePoint(0), labelEditFormula(0), radioButtonSizeGrowth(0), radioButtonStandartTable(0), + radioButtonIncrements(0), radioButtonLengthLine(0), radioButtonLengthArc(0), radioButtonLengthCurve(0), + idDetail(0), mode(mode) +{ Q_ASSERT(data != 0); timerFormula = new QTimer(this); connect(timerFormula, &QTimer::timeout, this, &DialogTool::EvalFormula); } -void DialogTool::closeEvent(QCloseEvent *event){ +void DialogTool::closeEvent(QCloseEvent *event) +{ DialogClosed(QDialog::Rejected); event->accept(); } -void DialogTool::showEvent(QShowEvent *event){ +void DialogTool::showEvent(QShowEvent *event) +{ QDialog::showEvent( event ); - if( event->spontaneous() ){ + if ( event->spontaneous() ) + { return; } - if(isInitialized){ + if (isInitialized) + { return; } isInitialized = true;//first show windows are held } -void DialogTool::FillComboBoxPoints(QComboBox *box, const qint64 &id) const{ +void DialogTool::FillComboBoxPoints(QComboBox *box, const qint64 &id) const +{ box->clear(); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { const QHash *points = data->DataPoints(); QHashIterator i(*points); - while (i.hasNext()) { + while (i.hasNext()) + { i.next(); - if(i.key() != id){ + if (i.key() != id) + { VPointF point = i.value(); box->addItem(point.name(), i.key()); } } - } else { - if(idDetail <= 0){ + } + else + { + if (idDetail <= 0) + { qWarning()<GetDetail(idDetail); - for(qint32 i = 0; i< det.CountNode(); ++i){ - if(det[i].getTypeTool() == Tool::NodePoint || - det[i].getTypeTool() == Tool::AlongLineTool || - det[i].getTypeTool() == Tool::BisectorTool || - det[i].getTypeTool() == Tool::EndLineTool || - det[i].getTypeTool() == Tool::LineIntersectTool || - det[i].getTypeTool() == Tool::NormalTool || - det[i].getTypeTool() == Tool::PointOfContact || - det[i].getTypeTool() == Tool::ShoulderPointTool){ - if(det[i].getId() != id){ + for (qint32 i = 0; i< det.CountNode(); ++i) + { + if (det[i].getTypeTool() == Tool::NodePoint || + det[i].getTypeTool() == Tool::AlongLineTool || + det[i].getTypeTool() == Tool::BisectorTool || + det[i].getTypeTool() == Tool::EndLineTool || + det[i].getTypeTool() == Tool::LineIntersectTool || + det[i].getTypeTool() == Tool::NormalTool || + det[i].getTypeTool() == Tool::PointOfContact || + det[i].getTypeTool() == Tool::ShoulderPointTool) + { + if (det[i].getId() != id) + { VPointF point = data->GetModelingPoint(det[i].getId()); box->addItem(point.name(), det[i].getId()); } @@ -84,53 +100,70 @@ void DialogTool::FillComboBoxPoints(QComboBox *box, const qint64 &id) const{ } } -void DialogTool::FillComboBoxTypeLine(QComboBox *box) const{ +void DialogTool::FillComboBoxTypeLine(QComboBox *box) const +{ Q_ASSERT(box != 0); QStringList list; list<addItems(list); } -QString DialogTool::GetTypeLine(const QComboBox *box) const{ - if(box->currentText()==tr("Line")){ +QString DialogTool::GetTypeLine(const QComboBox *box) const +{ + if (box->currentText()==tr("Line")) + { return QString("hair"); - } else { + } + else + { return QString("none"); } } -void DialogTool::SetupTypeLine(QComboBox *box, const QString &value){ - if(value == "hair"){ +void DialogTool::SetupTypeLine(QComboBox *box, const QString &value) +{ + if (value == "hair") + { qint32 index = box->findText(tr("Line")); - if(index != -1){ + if (index != -1) + { box->setCurrentIndex(index); } } - if(value == "none"){ + if (value == "none") + { qint32 index = box->findText(tr("No line")); - if(index != -1){ + if (index != -1) + { box->setCurrentIndex(index); } } } -void DialogTool::ChangeCurrentText(QComboBox *box, const QString &value){ +void DialogTool::ChangeCurrentText(QComboBox *box, const QString &value) +{ qint32 index = box->findText(value); - if(index != -1){ + if (index != -1) + { box->setCurrentIndex(index); - } else { + } + else + { qWarning()<findData(value); - if(index != -1){ + if (index != -1) + { box->setCurrentIndex(index); } } -void DialogTool::PutValHere(QLineEdit *lineEdit, QListWidget *listWidget){ +void DialogTool::PutValHere(QLineEdit *lineEdit, QListWidget *listWidget) +{ Q_ASSERT(lineEdit != 0); Q_ASSERT(listWidget != 0); QListWidgetItem *item = listWidget->currentItem(); @@ -140,11 +173,13 @@ void DialogTool::PutValHere(QLineEdit *lineEdit, QListWidget *listWidget){ lineEdit->setCursorPosition(pos + item->text().size()); } -void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer){ +void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer) +{ Q_ASSERT(edit != 0); Q_ASSERT(timer != 0); Q_ASSERT(labelEditFormula != 0); - if(edit->text().isEmpty()){ + if (edit->text().isEmpty()) + { flag = false; CheckState(); QPalette palette = labelEditFormula->palette(); @@ -155,27 +190,34 @@ void DialogTool::ValFormulaChanged(bool &flag, QLineEdit *edit, QTimer *timer){ timer->start(1000); } -void DialogTool::Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label){ +void DialogTool::Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label) +{ Q_ASSERT(edit != 0); Q_ASSERT(timer != 0); Q_ASSERT(label != 0); Q_ASSERT(labelEditFormula != 0); QPalette palette = labelEditFormula->palette(); - if(edit->text().isEmpty()){ + if (edit->text().isEmpty()) + { flag = false; palette.setColor(labelEditFormula->foregroundRole(), Qt::red); - } else { + } + else + { Calculator cal(data); QString errorMsg; - qreal result = cal.eval(edit->text(),&errorMsg); - if(!errorMsg.isEmpty()){ + qreal result = cal.eval(edit->text(), &errorMsg); + if (errorMsg.isEmpty() == false) + { label->setText(tr("Error")); flag = false; palette.setColor(labelEditFormula->foregroundRole(), Qt::red); - } else { + } + else + { label->setText(QString().setNum(result)); flag = true; - palette.setColor(labelEditFormula->foregroundRole(), QColor(76,76,76)); + palette.setColor(labelEditFormula->foregroundRole(), QColor(76, 76, 76)); } } CheckState(); @@ -183,145 +225,177 @@ void DialogTool::Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label) labelEditFormula->setPalette(palette); } -void DialogTool::setCurrentPointId(QComboBox *box, qint64 &pointId, const qint64 &value, - const qint64 &id) const{ +void DialogTool::setCurrentPointId(QComboBox *box, qint64 &pointId, const qint64 &value, const qint64 &id) const +{ Q_ASSERT(box != 0); FillComboBoxPoints(box, id); pointId = value; ChangeCurrentData(box, value); } -qint64 DialogTool::getCurrentPointId(QComboBox *box) const{ +qint64 DialogTool::getCurrentPointId(QComboBox *box) const +{ Q_ASSERT(box != 0); qint32 index = box->currentIndex(); Q_ASSERT(index != -1); - if(index != -1){ + if (index != -1) + { return qvariant_cast(box->itemData(index)); - } else { + } + else + { return -1; } } -void DialogTool::CheckState(){ +void DialogTool::CheckState() +{ Q_ASSERT(bOk != 0); bOk->setEnabled(flagFormula && flagName); } -void DialogTool::ChoosedObject(qint64 id, Scene::Scenes type){ +void DialogTool::ChoosedObject(qint64 id, Scene::Scenes type) +{ Q_UNUSED(id); Q_UNUSED(type); } -void DialogTool::NamePointChanged(){ +void DialogTool::NamePointChanged() +{ Q_ASSERT(labelEditNamePoint != 0); QLineEdit* edit = qobject_cast(sender()); - if (edit){ + if (edit) + { QString name = edit->text(); - if(name.isEmpty() || name.contains(" ")){ + if (name.isEmpty() || name.contains(" ")) + { flagName = false; QPalette palette = labelEditNamePoint->palette(); palette.setColor(labelEditNamePoint->foregroundRole(), Qt::red); labelEditNamePoint->setPalette(palette); - } else { + } + else + { flagName = true; QPalette palette = labelEditNamePoint->palette(); - palette.setColor(labelEditNamePoint->foregroundRole(), QColor(76,76,76)); + palette.setColor(labelEditNamePoint->foregroundRole(), QColor(76, 76, 76)); labelEditNamePoint->setPalette(palette); } } CheckState(); } -void DialogTool::DialogAccepted(){ +void DialogTool::DialogAccepted() +{ emit DialogClosed(QDialog::Accepted); } -void DialogTool::DialogRejected(){ +void DialogTool::DialogRejected() +{ emit DialogClosed(QDialog::Rejected); } -void DialogTool::FormulaChanged(){ +void DialogTool::FormulaChanged() +{ QLineEdit* edit = qobject_cast(sender()); - if(edit){ + if (edit) + { ValFormulaChanged(flagFormula, edit, timerFormula); } } -void DialogTool::ArrowUp(){ +void DialogTool::ArrowUp() +{ Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(90); } -void DialogTool::ArrowDown(){ +void DialogTool::ArrowDown() +{ Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(270); } -void DialogTool::ArrowLeft(){ +void DialogTool::ArrowLeft() +{ Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(180); } -void DialogTool::ArrowRight(){ +void DialogTool::ArrowRight() +{ Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(0); } -void DialogTool::ArrowLeftUp(){ +void DialogTool::ArrowLeftUp() +{ Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(135); } -void DialogTool::ArrowLeftDown(){ +void DialogTool::ArrowLeftDown() +{ Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(225); } -void DialogTool::ArrowRightUp(){ +void DialogTool::ArrowRightUp() +{ Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(45); } -void DialogTool::ArrowRightDown(){ +void DialogTool::ArrowRightDown() +{ Q_ASSERT(spinBoxAngle != 0); spinBoxAngle->setValue(315); } -void DialogTool::EvalFormula(){ +void DialogTool::EvalFormula() +{ Q_ASSERT(lineEditFormula != 0); Q_ASSERT(labelResultCalculation != 0); Eval(lineEditFormula, flagFormula, timerFormula, labelResultCalculation); } -void DialogTool::SizeGrowth(){ +void DialogTool::SizeGrowth() +{ ShowVariable(data->DataBase()); } -void DialogTool::StandartTable(){ +void DialogTool::StandartTable() +{ ShowVariable(data->DataStandartTable()); } -void DialogTool::LengthLines(){ +void DialogTool::LengthLines() +{ ShowVariable(data->DataLengthLines()); } -void DialogTool::LengthArcs(){ +void DialogTool::LengthArcs() +{ ShowVariable(data->DataLengthArcs()); } -void DialogTool::LengthCurves(){ +void DialogTool::LengthCurves() +{ ShowVariable(data->DataLengthSplines()); } -void DialogTool::Increments(){ +void DialogTool::Increments() +{ ShowVariable(data->DataIncrementTable()); } -void DialogTool::PutHere(){ +void DialogTool::PutHere() +{ PutValHere(lineEditFormula, listWidget); } -void DialogTool::PutVal(QListWidgetItem *item){ +void DialogTool::PutVal(QListWidgetItem *item) +{ Q_ASSERT(lineEditFormula != 0); Q_ASSERT(item != 0); int pos = lineEditFormula->cursorPosition(); @@ -331,7 +405,8 @@ void DialogTool::PutVal(QListWidgetItem *item){ lineEditFormula->setCursorPosition(pos + item->text().size()); } -void DialogTool::ValChenged(int row){ +void DialogTool::ValChenged(int row) +{ Q_ASSERT(listWidget != 0); Q_ASSERT(labelDescription != 0); Q_ASSERT(radioButtonSizeGrowth != 0); @@ -340,48 +415,57 @@ void DialogTool::ValChenged(int row){ Q_ASSERT(radioButtonLengthLine != 0); Q_ASSERT(radioButtonLengthArc != 0); Q_ASSERT(radioButtonLengthCurve != 0); - if(listWidget->count() == 0){ + if (listWidget->count() == 0) + { return; } QListWidgetItem *item = listWidget->item( row ); - if(radioButtonSizeGrowth->isChecked()){ - if(item->text()=="Р"){ + if (radioButtonSizeGrowth->isChecked()) + { + if (item->text()=="Р") + { QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->growth()).arg(tr("Growth")); labelDescription->setText(desc); } - if(item->text()=="Сг"){ + if (item->text()=="Сг") + { QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->size()).arg(tr("Size")); labelDescription->setText(desc); } return; } - if(radioButtonStandartTable->isChecked()){ + if (radioButtonStandartTable->isChecked()) + { VStandartTableCell stable = data->GetStandartTableCell(item->text()); QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetValueStandartTableCell(item->text())) .arg(stable.GetDescription()); labelDescription->setText(desc); return; } - if(radioButtonIncrements->isChecked()){ + if (radioButtonIncrements->isChecked()) + { VIncrementTableRow itable = data->GetIncrementTableRow(item->text()); QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetValueIncrementTableRow(item->text())) .arg(itable.getDescription()); labelDescription->setText(desc); return; } - if(radioButtonLengthLine->isChecked()){ + if (radioButtonLengthLine->isChecked()) + { QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLine(item->text())) .arg(tr("Line length")); labelDescription->setText(desc); return; } - if(radioButtonLengthArc->isChecked()){ + if (radioButtonLengthArc->isChecked()) + { QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLengthArc(item->text())) .arg(tr("Arc length")); labelDescription->setText(desc); return; } - if(radioButtonLengthCurve->isChecked()){ + if (radioButtonLengthCurve->isChecked()) + { QString desc = QString("%1(%2) - %3").arg(item->text()).arg(data->GetLengthSpline(item->text())) .arg(tr("Curve length")); labelDescription->setText(desc); @@ -389,7 +473,8 @@ void DialogTool::ValChenged(int row){ } } -void DialogTool::UpdateList(){ +void DialogTool::UpdateList() +{ Q_ASSERT(radioButtonSizeGrowth != 0); Q_ASSERT(radioButtonStandartTable != 0); Q_ASSERT(radioButtonIncrements != 0); @@ -397,28 +482,36 @@ void DialogTool::UpdateList(){ Q_ASSERT(radioButtonLengthArc != 0); Q_ASSERT(radioButtonLengthCurve != 0); - if(radioButtonSizeGrowth->isChecked()){ + if (radioButtonSizeGrowth->isChecked()) + { ShowVariable(data->DataBase()); } - if(radioButtonStandartTable->isChecked()){ + if (radioButtonStandartTable->isChecked()) + { ShowVariable(data->DataStandartTable()); } - if(radioButtonIncrements->isChecked()){ + if (radioButtonIncrements->isChecked()) + { ShowVariable(data->DataIncrementTable()); } - if(radioButtonLengthLine->isChecked()){ + if (radioButtonLengthLine->isChecked()) + { ShowVariable(data->DataLengthLines()); } - if(radioButtonLengthArc->isChecked()){ + if (radioButtonLengthArc->isChecked()) + { ShowVariable(data->DataLengthArcs()); } - if(radioButtonLengthCurve->isChecked()){ + if (radioButtonLengthCurve->isChecked()) + { ShowVariable(data->DataLengthSplines()); } } -bool DialogTool::CheckObject(const qint64 &id){ - if(mode == Draw::Calculation || idDetail == 0){ +bool DialogTool::CheckObject(const qint64 &id) +{ + if (mode == Draw::Calculation || idDetail == 0) + { return false; } VDetail det = data->GetDetail(idDetail); @@ -426,20 +519,23 @@ bool DialogTool::CheckObject(const qint64 &id){ } template -void DialogTool::ShowVariable(const QHash *var){ +void DialogTool::ShowVariable(const QHash *var) +{ Q_ASSERT(listWidget != 0); disconnect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); listWidget->clear(); QHashIterator i(*var); QMap map; - while (i.hasNext()) { + while (i.hasNext()) + { i.next(); map.insert(i.key(), i.value()); } QMapIterator iMap(map); - while (iMap.hasNext()) { + while (iMap.hasNext()) + { iMap.next(); QListWidgetItem *item = new QListWidgetItem(iMap.key()); item->setFont(QFont("Times", 12, QFont::Bold)); diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index 02b3d56f6..02eea1fad 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -25,11 +25,11 @@ #include #include -class DialogTool : public QDialog{ +class DialogTool : public QDialog +{ Q_OBJECT public: - DialogTool(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); + DialogTool(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); virtual ~DialogTool() {} inline qint64 getIdDetail() const {return idDetail;} inline void setIdDetail(const qint64 &value) {idDetail = value;} diff --git a/dialogs/dialogtriangle.cpp b/dialogs/dialogtriangle.cpp index c86e3c008..336ddd7cc 100644 --- a/dialogs/dialogtriangle.cpp +++ b/dialogs/dialogtriangle.cpp @@ -1,9 +1,10 @@ #include "dialogtriangle.h" #include "ui_dialogtriangle.h" -DialogTriangle::DialogTriangle(const VContainer *data, Draw::Draws mode, QWidget *parent) : - DialogTool(data, mode, parent), ui(new Ui::DialogTriangle), number(0), pointName(QString()), axisP1Id(0), - axisP2Id(0), firstPointId(0), secondPointId(0){ +DialogTriangle::DialogTriangle(const VContainer *data, Draw::Draws mode, QWidget *parent) + :DialogTool(data, mode, parent), ui(new Ui::DialogTriangle), number(0), pointName(QString()), axisP1Id(0), + axisP2Id(0), firstPointId(0), secondPointId(0) +{ ui->setupUi(this); labelEditNamePoint = ui->labelEditNamePoint; bOk = ui->buttonBox->button(QDialogButtonBox::Ok); @@ -19,58 +20,71 @@ DialogTriangle::DialogTriangle(const VContainer *data, Draw::Draws mode, QWidget connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogTriangle::NamePointChanged); } -DialogTriangle::~DialogTriangle(){ +DialogTriangle::~DialogTriangle() +{ delete ui; } -void DialogTriangle::ChoosedObject(qint64 id, Scene::Scenes type){ - if(idDetail == 0 && mode == Draw::Modeling){ - if(type == Scene::Detail){ +void DialogTriangle::ChoosedObject(qint64 id, Scene::Scenes type) +{ + if (idDetail == 0 && mode == Draw::Modeling) + { + if (type == Scene::Detail) + { idDetail = id; return; } } - if(mode == Draw::Modeling){ - if(!CheckObject(id)){ + if (mode == Draw::Modeling) + { + if (CheckObject(id) == false) + { return; } } - if(type == Scene::Point){ + if (type == Scene::Point) + { VPointF point; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { point = data->GetPoint(id); - } else { + } + else + { point = data->GetModelingPoint(id); } - switch(number){ - case(0): - ChangeCurrentText(ui->comboBoxAxisP1, point.name()); - number++; - emit ToolTip(tr("Select second point of axis")); - break; - case(1): - ChangeCurrentText(ui->comboBoxAxisP2, point.name()); - number++; - emit ToolTip(tr("Select first point")); - break; - case(2): - ChangeCurrentText(ui->comboBoxFirstPoint, point.name()); - number++; - emit ToolTip(tr("Select second point")); - break; - case(3): - ChangeCurrentText(ui->comboBoxSecondPoint, point.name()); - number = 0; - emit ToolTip(tr("")); - if(!isInitialized){ - this->show(); - } - break; + switch (number) + { + case (0): + ChangeCurrentText(ui->comboBoxAxisP1, point.name()); + number++; + emit ToolTip(tr("Select second point of axis")); + break; + case (1): + ChangeCurrentText(ui->comboBoxAxisP2, point.name()); + number++; + emit ToolTip(tr("Select first point")); + break; + case (2): + ChangeCurrentText(ui->comboBoxFirstPoint, point.name()); + number++; + emit ToolTip(tr("Select second point")); + break; + case (3): + ChangeCurrentText(ui->comboBoxSecondPoint, point.name()); + number = 0; + emit ToolTip(tr("")); + if (isInitialized == false) + { + this->show(); + } + break; } } } -void DialogTriangle::DialogAccepted(){ +void DialogTriangle::DialogAccepted() +{ pointName = ui->lineEditNamePoint->text(); firstPointId = getCurrentPointId(ui->comboBoxFirstPoint); secondPointId = getCurrentPointId(ui->comboBoxSecondPoint); @@ -79,28 +93,32 @@ void DialogTriangle::DialogAccepted(){ emit DialogClosed(QDialog::Accepted); } -void DialogTriangle::setPointName(const QString &value){ +void DialogTriangle::setPointName(const QString &value) +{ pointName = value; ui->lineEditNamePoint->setText(pointName); } -void DialogTriangle::setSecondPointId(const qint64 &value, const qint64 &id){ +void DialogTriangle::setSecondPointId(const qint64 &value, const qint64 &id) +{ secondPointId = value; setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -void DialogTriangle::setFirstPointId(const qint64 &value, const qint64 &id){ +void DialogTriangle::setFirstPointId(const qint64 &value, const qint64 &id) +{ firstPointId = value; setCurrentPointId(ui->comboBoxFirstPoint, firstPointId, value, id); } -void DialogTriangle::setAxisP2Id(const qint64 &value, const qint64 &id){ +void DialogTriangle::setAxisP2Id(const qint64 &value, const qint64 &id) +{ axisP2Id = value; setCurrentPointId(ui->comboBoxAxisP2, axisP2Id, value, id); } -void DialogTriangle::setAxisP1Id(const qint64 &value, const qint64 &id){ +void DialogTriangle::setAxisP1Id(const qint64 &value, const qint64 &id) +{ axisP1Id = value; setCurrentPointId(ui->comboBoxAxisP1, axisP1Id, value, id); } - diff --git a/dialogs/dialogtriangle.h b/dialogs/dialogtriangle.h index 13b7c0c9d..3c43fc89f 100644 --- a/dialogs/dialogtriangle.h +++ b/dialogs/dialogtriangle.h @@ -24,15 +24,16 @@ #include "dialogtool.h" -namespace Ui { -class DialogTriangle; +namespace Ui +{ + class DialogTriangle; } -class DialogTriangle : public DialogTool{ +class DialogTriangle : public DialogTool +{ Q_OBJECT public: - DialogTriangle(const VContainer *data, Draw::Draws mode = Draw::Calculation, - QWidget *parent = 0); + DialogTriangle(const VContainer *data, Draw::Draws mode = Draw::Calculation, QWidget *parent = 0); ~DialogTriangle(); inline qint64 getAxisP1Id() const {return axisP1Id;} void setAxisP1Id(const qint64 &value, const qint64 &id); diff --git a/exception/vexception.cpp b/exception/vexception.cpp index a32b8ebde..07aaa4795 100644 --- a/exception/vexception.cpp +++ b/exception/vexception.cpp @@ -21,11 +21,13 @@ #include "vexception.h" -VException::VException(const QString &what):QException(), what(what){ - Q_ASSERT_X(!what.isEmpty(), Q_FUNC_INFO, "Error message is empty"); +VException::VException(const QString &what):QException(), what(what) +{ + Q_ASSERT_X(what.isEmpty() == false, Q_FUNC_INFO, "Error message is empty"); } -QString VException::ErrorMessage() const{ +QString VException::ErrorMessage() const +{ QString error = QString("Exception: %1").arg(what); return error; } diff --git a/exception/vexception.h b/exception/vexception.h index 28fa4c037..87b34cfc0 100644 --- a/exception/vexception.h +++ b/exception/vexception.h @@ -25,7 +25,8 @@ #include -class VException : public QException{ +class VException : public QException +{ public: VException(const QString &what); VException(const VException &e):what(e.What()){} diff --git a/exception/vexceptionbadid.cpp b/exception/vexceptionbadid.cpp index 02bf10a76..f11841124 100644 --- a/exception/vexceptionbadid.cpp +++ b/exception/vexceptionbadid.cpp @@ -21,13 +21,16 @@ #include "vexceptionbadid.h" -QString VExceptionBadId::ErrorMessage() const{ +QString VExceptionBadId::ErrorMessage() const +{ QString error; - if(key.isEmpty()){ + if (key.isEmpty()) + { error = QString("ExceptionBadId: %1, id = %2").arg(what).arg(id); - } else { + } + else + { error = QString("ExceptionBadId: %1, id = %2").arg(what).arg(key); } return error; } - diff --git a/exception/vexceptionbadid.h b/exception/vexceptionbadid.h index 89959d5d8..6ddf034c5 100644 --- a/exception/vexceptionbadid.h +++ b/exception/vexceptionbadid.h @@ -24,12 +24,15 @@ #include "vexception.h" -class VExceptionBadId : public VException{ +class VExceptionBadId : public VException +{ public: - VExceptionBadId(const QString &what, const qint64 &id):VException(what), id(id), - key(QString()){} - VExceptionBadId(const QString &what, const QString &key):VException(what), id(0), key(key){} - VExceptionBadId(const VExceptionBadId &e):VException(e), id(e.BadId()), key(e.BadKey()){} + VExceptionBadId(const QString &what, const qint64 &id) + :VException(what), id(id), key(QString()){} + VExceptionBadId(const QString &what, const QString &key) + :VException(what), id(0), key(key){} + VExceptionBadId(const VExceptionBadId &e) + :VException(e), id(e.BadId()), key(e.BadKey()){} virtual ~VExceptionBadId() noexcept(true){} virtual QString ErrorMessage() const; inline qint64 BadId() const {return id; } diff --git a/exception/vexceptionconversionerror.cpp b/exception/vexceptionconversionerror.cpp index 487d7ad3b..9e53d1a54 100644 --- a/exception/vexceptionconversionerror.cpp +++ b/exception/vexceptionconversionerror.cpp @@ -22,11 +22,13 @@ #include "vexceptionconversionerror.h" VExceptionConversionError::VExceptionConversionError(const QString &what, const QString &str) - :VException(what), str(str){ - Q_ASSERT_X(!str.isEmpty(), Q_FUNC_INFO, "Error converting string is empty"); + :VException(what), str(str) +{ + Q_ASSERT_X(str.isEmpty() == false, Q_FUNC_INFO, "Error converting string is empty"); } -QString VExceptionConversionError::ErrorMessage() const{ +QString VExceptionConversionError::ErrorMessage() const +{ QString error = QString("ExceptionConversionError: %1 %2").arg(what, str); return error; } diff --git a/exception/vexceptionconversionerror.h b/exception/vexceptionconversionerror.h index 904093e63..bd8313b3d 100644 --- a/exception/vexceptionconversionerror.h +++ b/exception/vexceptionconversionerror.h @@ -24,10 +24,12 @@ #include "vexception.h" -class VExceptionConversionError : public VException{ +class VExceptionConversionError : public VException +{ public: VExceptionConversionError(const QString &what, const QString &str); - VExceptionConversionError(const VExceptionConversionError &e):VException(e), str(e.String()){} + VExceptionConversionError(const VExceptionConversionError &e) + :VException(e), str(e.String()){} virtual ~VExceptionConversionError() noexcept(true) {} virtual QString ErrorMessage() const; inline QString String() const {return str;} diff --git a/exception/vexceptionemptyparameter.cpp b/exception/vexceptionemptyparameter.cpp index 31dc1550f..038f98f1d 100644 --- a/exception/vexceptionemptyparameter.cpp +++ b/exception/vexceptionemptyparameter.cpp @@ -22,22 +22,25 @@ #include "vexceptionemptyparameter.h" VExceptionEmptyParameter::VExceptionEmptyParameter(const QString &what, const QString &name, - const QDomElement &domElement): VException(what), - name(name), tagText(QString()), tagName(QString()), lineNumber(-1){ - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); - Q_ASSERT_X(!name.isEmpty(), Q_FUNC_INFO, "Parameter name is empty"); + const QDomElement &domElement) + : VException(what), name(name), tagText(QString()), tagName(QString()), lineNumber(-1) +{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); + Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "Parameter name is empty"); QTextStream stream(&tagText); domElement.save(stream, 4); tagName = domElement.tagName(); lineNumber = domElement.lineNumber(); } -QString VExceptionEmptyParameter::ErrorMessage() const{ +QString VExceptionEmptyParameter::ErrorMessage() const +{ QString error = QString("ExceptionEmptyParameter: %1 %2").arg(what, name); return error; } -QString VExceptionEmptyParameter::DetailedInformation() const{ +QString VExceptionEmptyParameter::DetailedInformation() const +{ QString detail = QString("tag: %1 in line %2\nFull tag:\n%3").arg(tagName).arg(lineNumber).arg(tagText); return detail; } diff --git a/exception/vexceptionemptyparameter.h b/exception/vexceptionemptyparameter.h index f03be1cec..c7fbae985 100644 --- a/exception/vexceptionemptyparameter.h +++ b/exception/vexceptionemptyparameter.h @@ -24,12 +24,13 @@ #include "vexception.h" -class VExceptionEmptyParameter : public VException{ +class VExceptionEmptyParameter : public VException +{ public: - VExceptionEmptyParameter(const QString &what, const QString &name, - const QDomElement &domElement); - VExceptionEmptyParameter(const VExceptionEmptyParameter &e):VException(e), name(e.Name()), - tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} + VExceptionEmptyParameter(const QString &what, const QString &name, const QDomElement &domElement); + VExceptionEmptyParameter(const VExceptionEmptyParameter &e) + :VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()), + lineNumber(e.LineNumber()){} virtual ~VExceptionEmptyParameter() noexcept(true) {} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; diff --git a/exception/vexceptionobjecterror.cpp b/exception/vexceptionobjecterror.cpp index 11d5be2b6..b1dcbfd5c 100644 --- a/exception/vexceptionobjecterror.cpp +++ b/exception/vexceptionobjecterror.cpp @@ -22,33 +22,41 @@ #include "vexceptionobjecterror.h" #include -VExceptionObjectError::VExceptionObjectError(const QString &what, const QDomElement &domElement): - VException(what), tagText(QString()), tagName(QString()), lineNumber(-1), moreInfo(QString()){ - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); +VExceptionObjectError::VExceptionObjectError(const QString &what, const QDomElement &domElement) + :VException(what), tagText(QString()), tagName(QString()), lineNumber(-1), moreInfo(QString()) +{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); QTextStream stream(&tagText); domElement.save(stream, 4); tagName = domElement.tagName(); lineNumber = domElement.lineNumber(); } -QString VExceptionObjectError::ErrorMessage() const{ +QString VExceptionObjectError::ErrorMessage() const +{ QString error = QString("ExceptionObjectError: %1").arg(what); return error; } -QString VExceptionObjectError::DetailedInformation() const{ +QString VExceptionObjectError::DetailedInformation() const +{ QString detail; - if(!moreInfo.isEmpty()){ + if (moreInfo.isEmpty() == false) + { QString i = QString("tag: %1 in line %2\n%3").arg(tagName).arg(lineNumber).arg(tagText); detail = QString("%1\n%2").arg(moreInfo, i); - } else { + } + else + { detail = QString("tag: %1 in line %2\n%3").arg(tagName).arg(lineNumber).arg(tagText); } return detail; } -void VExceptionObjectError::AddMoreInformation(const QString &info){ - if(info.isEmpty()){ +void VExceptionObjectError::AddMoreInformation(const QString &info) +{ + if (info.isEmpty()) + { qWarning()<<"Error additional information is empty."<moreInfo.append(info); diff --git a/exception/vexceptionobjecterror.h b/exception/vexceptionobjecterror.h index db12bb943..f564347b8 100644 --- a/exception/vexceptionobjecterror.h +++ b/exception/vexceptionobjecterror.h @@ -24,11 +24,13 @@ #include "vexception.h" -class VExceptionObjectError : public VException{ +class VExceptionObjectError : public VException +{ public: VExceptionObjectError(const QString &what, const QDomElement &domElement); - VExceptionObjectError(const VExceptionObjectError &e):VException(e), tagText(e.TagText()), - tagName(e.TagName()), lineNumber(e.LineNumber()), moreInfo(e.MoreInformation()){} + VExceptionObjectError(const VExceptionObjectError &e) + :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()), + moreInfo(e.MoreInformation()){} virtual ~VExceptionObjectError() noexcept(true) {} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; diff --git a/exception/vexceptionuniqueid.cpp b/exception/vexceptionuniqueid.cpp index c33fb592d..9f38b31a7 100644 --- a/exception/vexceptionuniqueid.cpp +++ b/exception/vexceptionuniqueid.cpp @@ -1,20 +1,23 @@ #include "vexceptionuniqueid.h" VExceptionUniqueId::VExceptionUniqueId(const QString &what, const QDomElement &domElement) - :VException(what), tagText(QString()), tagName(QString()), lineNumber(-1){ - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); + :VException(what), tagText(QString()), tagName(QString()), lineNumber(-1) +{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); QTextStream stream(&tagText); domElement.save(stream, 4); tagName = domElement.tagName(); lineNumber = domElement.lineNumber(); } -QString VExceptionUniqueId::ErrorMessage() const{ +QString VExceptionUniqueId::ErrorMessage() const +{ QString error = QString("ExceptionUniqueId: %1").arg(what); return error; } -QString VExceptionUniqueId::DetailedInformation() const{ +QString VExceptionUniqueId::DetailedInformation() const +{ QString detail = QString("tag: %1 in line %2\nFull tag:\n%3").arg(tagName).arg(lineNumber).arg(tagText); return detail; } diff --git a/exception/vexceptionuniqueid.h b/exception/vexceptionuniqueid.h index d2e9cb5bd..bd5b833d1 100644 --- a/exception/vexceptionuniqueid.h +++ b/exception/vexceptionuniqueid.h @@ -3,11 +3,12 @@ #include "vexception.h" -class VExceptionUniqueId : public VException{ +class VExceptionUniqueId : public VException +{ public: VExceptionUniqueId(const QString &what, const QDomElement &domElement); - VExceptionUniqueId(const VExceptionUniqueId &e):VException(e), tagText(e.TagText()), - tagName(e.TagName()), lineNumber(e.LineNumber()){} + VExceptionUniqueId(const VExceptionUniqueId &e) + :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} virtual ~VExceptionUniqueId() noexcept(true){} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; diff --git a/exception/vexceptionwrongparameterid.cpp b/exception/vexceptionwrongparameterid.cpp index 1ee8d090b..4e10560e3 100644 --- a/exception/vexceptionwrongparameterid.cpp +++ b/exception/vexceptionwrongparameterid.cpp @@ -22,21 +22,24 @@ #include "vexceptionwrongparameterid.h" #include -VExceptionWrongParameterId::VExceptionWrongParameterId(const QString &what, const QDomElement &domElement): - VException(what), tagText(QString()), tagName(QString()), lineNumber(-1){ - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); +VExceptionWrongParameterId::VExceptionWrongParameterId(const QString &what, const QDomElement &domElement) + :VException(what), tagText(QString()), tagName(QString()), lineNumber(-1) +{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); QTextStream stream(&tagText); domElement.save(stream, 4); tagName = domElement.tagName(); lineNumber = domElement.lineNumber(); } -QString VExceptionWrongParameterId::ErrorMessage() const{ +QString VExceptionWrongParameterId::ErrorMessage() const +{ QString error = QString("ExceptionWrongParameterId: %1").arg(what); return error; } -QString VExceptionWrongParameterId::DetailedInformation() const{ +QString VExceptionWrongParameterId::DetailedInformation() const +{ QString detail = QString("tag: %1 in line %2\n%3").arg(tagName).arg(lineNumber).arg(tagText); return detail; } diff --git a/exception/vexceptionwrongparameterid.h b/exception/vexceptionwrongparameterid.h index 6e81fcb43..905f32f11 100644 --- a/exception/vexceptionwrongparameterid.h +++ b/exception/vexceptionwrongparameterid.h @@ -24,11 +24,12 @@ #include "vexception.h" -class VExceptionWrongParameterId : public VException{ +class VExceptionWrongParameterId : public VException +{ public: VExceptionWrongParameterId(const QString &what, const QDomElement &domElement); - VExceptionWrongParameterId(const VExceptionWrongParameterId &e):VException(e),tagText(e.TagText()), - tagName(e.TagName()), lineNumber(e.LineNumber()){} + VExceptionWrongParameterId(const VExceptionWrongParameterId &e) + :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} virtual ~VExceptionWrongParameterId() noexcept(true){} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; diff --git a/geometry/varc.cpp b/geometry/varc.cpp index cff5c6119..14528dd22 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -22,23 +22,23 @@ #include "varc.h" #include -VArc::VArc () : f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), formulaRadius(QString()), - center(0), points(QHash()), mode(Draw::Calculation), idObject(0){ -} +VArc::VArc () + : f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), formulaRadius(QString()), + center(0), points(QHash()), mode(Draw::Calculation), idObject(0){} VArc::VArc (const QHash *points, qint64 center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1, qreal f2, QString formulaF2, Draw::Draws mode, qint64 idObject) : f1(f1), formulaF1(formulaF1), f2(f2), formulaF2(formulaF2), radius(radius), formulaRadius(formulaRadius), - center(center), points(*points), mode(mode), idObject(idObject){ -} + center(center), points(*points), mode(mode), idObject(idObject){} -VArc::VArc(const VArc &arc): f1(arc.GetF1()), formulaF1(arc.GetFormulaF1()), f2(arc.GetF2()), +VArc::VArc(const VArc &arc) + : f1(arc.GetF1()), formulaF1(arc.GetFormulaF1()), f2(arc.GetF2()), formulaF2(arc.GetFormulaF2()), radius(arc.GetRadius()), formulaRadius(arc.GetFormulaRadius()), center(arc.GetCenter()), points(arc.GetDataPoints()), mode(arc.getMode()), - idObject(arc.getIdObject()){ -} + idObject(arc.getIdObject()){} -VArc &VArc::operator =(const VArc &arc){ +VArc &VArc::operator =(const VArc &arc) +{ this->points = arc.GetDataPoints(); this->f1 = arc.GetF1(); this->formulaF1 = arc.GetFormulaF1(); @@ -52,35 +52,43 @@ VArc &VArc::operator =(const VArc &arc){ return *this; } -QPointF VArc::GetCenterPoint() const{ - if(points.contains(center)){ +QPointF VArc::GetCenterPoint() const +{ + if (points.contains(center)) + { return points.value(center).toQPointF(); - } else { + } + else + { QString error = QString(tr("Can't find id = %1 in table.")).arg(center); throw VException(error); } return QPointF(); } -QPointF VArc::GetP1() const{ +QPointF VArc::GetP1() const +{ QPointF p1 ( GetCenterPoint().x () + radius, GetCenterPoint().y () ); QLineF centerP1(GetCenterPoint(), p1); centerP1.setAngle(f1); return centerP1.p2(); } -QPointF VArc::GetP2 () const{ +QPointF VArc::GetP2 () const +{ QPointF p2 ( GetCenterPoint().x () + radius, GetCenterPoint().y () ); QLineF centerP2(GetCenterPoint(), p2); centerP2.setAngle(f2); return centerP2.p2(); } -const QHash VArc::GetDataPoints() const{ +const QHash VArc::GetDataPoints() const +{ return points; } -QPainterPath VArc::GetPath() const{ +QPainterPath VArc::GetPath() const +{ QPainterPath Path; QPointF center = GetCenterPoint(); QRectF rect(center.x()-radius, center.y()-radius, radius*2, radius*2); @@ -90,74 +98,96 @@ QPainterPath VArc::GetPath() const{ return Path; } -qreal VArc::AngleArc() const{ - QLineF l1(0,0, 100, 100); +qreal VArc::AngleArc() const +{ + QLineF l1(0, 0, 100, 100); l1.setAngle(f1); - QLineF l2(0,0, 100, 100); + QLineF l2(0, 0, 100, 100); l2.setAngle(f2); return l1.angleTo(l2); } -qint32 VArc::NumberSplOfArc() const{ +qint32 VArc::NumberSplOfArc() const +{ qint32 angArc = static_cast (AngleArc ()); - switch( angArc ){ - case 0:{ - QString error = QString(tr("Angle of arc can't be 0 degree.")); - throw VException(error); - } - case 90: - return 1; - case 180: - return 2; - case 270: - return 3; - case 360: - return 4; - default : - return static_cast (AngleArc ( ) / 90 + 1); + switch ( angArc ) + { + case 0: + { + QString error = QString(tr("Angle of arc can't be 0 degree.")); + throw VException(error); + } + case 90: + return 1; + case 180: + return 2; + case 270: + return 3; + case 360: + return 4; + default: + return static_cast (AngleArc ( ) / 90 + 1); } } -QVector VArc::GetPoints() const{ +QVector VArc::GetPoints() const +{ QVector points; qint32 numberSpl = NumberSplOfArc(); - for(qint32 i = 1; i <= numberSpl; ++i){ + for (qint32 i = 1; i <= numberSpl; ++i) + { points< VArc::SplOfArc(qint32 number) const{ +QVector VArc::SplOfArc(qint32 number) const +{ qint32 n = NumberSplOfArc (); - if( number > n ){ + if ( number > n ) + { QString error = QString(tr("Arc have not this number of part.")); throw VException(error); } qreal f1 = GetF1 (); qreal f2 = GetF2 (); qint32 i; - for ( i = 0; i < n; ++i ){ - if ( i == n - 1 ){ + for ( i = 0; i < n; ++i ) + { + if ( i == n - 1 ) + { f2 = GetF2 (); - } else { - if ( f1 + 90 > 360 ){ + } + else + { + if ( f1 + 90 > 360 ) + { f2 = f1 + 90 - 360; - } else { + } + else + { f2 = f1 + 90; } } qreal anglF1, anglF2; - if ( f1 + 90 > 360 ){ - anglF1 = f1 + 90 - 360 ; - } else { - anglF1 = f1 + 90 ; + if ( f1 + 90 > 360 ) + { + anglF1 = f1 + 90 - 360; } - if ( f2 - 90 < 0 ){ - anglF2 = 360 + f2 - 90 ; - } else { - anglF2 = f2 - 90 ; + else + { + anglF1 = f1 + 90; } - if ( i + 1 == number ){ + if ( f2 - 90 < 0 ) + { + anglF2 = 360 + f2 - 90; + } + else + { + anglF2 = f2 - 90; + } + if ( i + 1 == number ) + { f1 = f2; return VSpline::SplinePoints(GetP1 (), GetP2 (), anglF1, anglF2, 1., 1., 1.); } diff --git a/geometry/varc.h b/geometry/varc.h index 1de78e3fd..6f4b4771b 100644 --- a/geometry/varc.h +++ b/geometry/varc.h @@ -27,7 +27,8 @@ /** * @brief VArc клас, що реалізує дугу. Дуга розраховується за годиниковою стрілкою. */ -class VArc{ +class VArc +{ Q_DECLARE_TR_FUNCTIONS(VArc) public: /** @@ -42,7 +43,7 @@ public: * @param f2 кінцевий кут в градусах. */ VArc (const QHash *points, qint64 center, qreal radius, QString formulaRadius, - qreal f1, QString formulaF1, qreal f2 , QString formulaF2, + qreal f1, QString formulaF1, qreal f2, QString formulaF2, Draw::Draws mode = Draw::Calculation, qint64 idObject = 0); VArc(const VArc &arc); VArc& operator= (const VArc &arc); @@ -103,12 +104,12 @@ private: /** * @brief f1 початковий кут в градусах */ - qreal f1; // початковий кут нахилу дуги (градуси) + qreal f1; // початковий кут нахилу дуги (градуси) QString formulaF1; /** * @brief f2 кінцевий кут в градусах */ - qreal f2; // кінцевий кут нахилу дуги (градуси) + qreal f2; // кінцевий кут нахилу дуги (градуси) QString formulaF2; /** * @brief radius радіус дуги. diff --git a/geometry/vdetail.cpp b/geometry/vdetail.cpp index 2b4433444..6bfdf3add 100644 --- a/geometry/vdetail.cpp +++ b/geometry/vdetail.cpp @@ -21,20 +21,21 @@ #include "vdetail.h" -VDetail::VDetail():nodes(QVector()),name(QString()), mx(0), my(0), supplement(true), closed(true), - width(10){ -} +VDetail::VDetail() + :nodes(QVector()), name(QString()), mx(0), my(0), supplement(true), closed(true), width(10){} -VDetail::VDetail(const QString &name, const QVector &nodes):nodes(QVector()), - name(name), mx(0), my(0), supplement(true), closed(true), width(10){ +VDetail::VDetail(const QString &name, const QVector &nodes) + :nodes(QVector()), name(name), mx(0), my(0), supplement(true), closed(true), width(10) +{ this->nodes = nodes; } -VDetail::VDetail(const VDetail &detail):nodes(detail.getNodes()), name(detail.getName()), mx(detail.getMx()), - my(detail.getMy()), supplement(detail.getSupplement()), closed(detail.getClosed()), width(detail.getWidth()){ -} +VDetail::VDetail(const VDetail &detail) + :nodes(detail.getNodes()), name(detail.getName()), mx(detail.getMx()), my(detail.getMy()), + supplement(detail.getSupplement()), closed(detail.getClosed()), width(detail.getWidth()){} -VDetail &VDetail::operator =(const VDetail &detail){ +VDetail &VDetail::operator =(const VDetail &detail) +{ nodes = detail.getNodes(); name = detail.getName(); mx = detail.getMx(); @@ -45,7 +46,8 @@ VDetail &VDetail::operator =(const VDetail &detail){ return *this; } -void VDetail::Clear(){ +void VDetail::Clear() +{ nodes.clear(); name.clear(); mx = 0; @@ -55,17 +57,20 @@ void VDetail::Clear(){ width = 10; } -bool VDetail::Containes(const qint64 &id) const{ - for(qint32 i = 0; i < nodes.size(); ++i){ +bool VDetail::Containes(const qint64 &id) const +{ + for (qint32 i = 0; i < nodes.size(); ++i) + { VNodeDetail node = nodes[i]; - if(node.getId() == id){ + if (node.getId() == id) + { return true; } } return false; } -VNodeDetail &VDetail::operator [](int indx){ +VNodeDetail &VDetail::operator [](int indx) +{ return nodes[indx]; } - diff --git a/geometry/vdetail.h b/geometry/vdetail.h index f042f93a9..c715ea8da 100644 --- a/geometry/vdetail.h +++ b/geometry/vdetail.h @@ -24,7 +24,8 @@ #include "vnodedetail.h" -namespace Detail { +namespace Detail +{ enum Contour { OpenContour, CloseContour }; Q_DECLARE_FLAGS(Contours, Contour) @@ -34,7 +35,8 @@ namespace Detail { Q_DECLARE_OPERATORS_FOR_FLAGS(Detail::Contours) Q_DECLARE_OPERATORS_FOR_FLAGS(Detail::Equidistants) -class VDetail{ +class VDetail +{ public: VDetail(); VDetail(const QString &name, const QVector &nodes); diff --git a/geometry/vnodedetail.cpp b/geometry/vnodedetail.cpp index 33a5a1407..a3e62e51f 100644 --- a/geometry/vnodedetail.cpp +++ b/geometry/vnodedetail.cpp @@ -21,20 +21,19 @@ #include "vnodedetail.h" -VNodeDetail::VNodeDetail():id(0), typeTool(Tool::NodePoint), mode(Draw::Modeling), - typeNode(NodeDetail::Contour), mx(0), my(0){ -} +VNodeDetail::VNodeDetail() + :id(0), typeTool(Tool::NodePoint), mode(Draw::Modeling), typeNode(NodeDetail::Contour), mx(0), my(0){} VNodeDetail::VNodeDetail(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, - qreal mx, qreal my):id(id), typeTool(typeTool), mode(mode), typeNode(typeNode), - mx(mx), my(my){ -} + qreal mx, qreal my) + :id(id), typeTool(typeTool), mode(mode), typeNode(typeNode), mx(mx), my(my){} -VNodeDetail::VNodeDetail(const VNodeDetail &node):id(node.getId()), typeTool(node.getTypeTool()), - mode(node.getMode()), typeNode(node.getTypeNode()), mx(node.getMx()), my(node.getMy()){ -} +VNodeDetail::VNodeDetail(const VNodeDetail &node) + :id(node.getId()), typeTool(node.getTypeTool()), mode(node.getMode()), typeNode(node.getTypeNode()), + mx(node.getMx()), my(node.getMy()){} -VNodeDetail &VNodeDetail::operator =(const VNodeDetail &node){ +VNodeDetail &VNodeDetail::operator =(const VNodeDetail &node) +{ id = node.getId(); typeTool = node.getTypeTool(); mode = node.getMode(); diff --git a/geometry/vnodedetail.h b/geometry/vnodedetail.h index 1b433aaa9..9735445d4 100644 --- a/geometry/vnodedetail.h +++ b/geometry/vnodedetail.h @@ -25,13 +25,15 @@ #include #include "options.h" -namespace NodeDetail { +namespace NodeDetail +{ enum NodeDetail { Contour, Modeling }; Q_DECLARE_FLAGS(NodeDetails, NodeDetail) } Q_DECLARE_OPERATORS_FOR_FLAGS(NodeDetail::NodeDetails) -class VNodeDetail{ +class VNodeDetail +{ public: VNodeDetail(); VNodeDetail(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 1273a7f30..67ab29023 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -21,31 +21,34 @@ #include "vspline.h" -VSpline::VSpline():p1(0), p2(QPointF()), p3(QPointF()), p4(0), angle1(0), angle2(0), kAsm1(1), kAsm2(1), - kCurve(1), points(QHash()), mode(Draw::Calculation), idObject(0){ -} +VSpline::VSpline() + :p1(0), p2(QPointF()), p3(QPointF()), p4(0), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1), + points(QHash()), mode(Draw::Calculation), idObject(0){} -VSpline::VSpline ( const VSpline & spline ):p1(spline.GetP1 ()), p2(spline.GetP2 ()), p3(spline.GetP3 ()), - p4(spline.GetP4 ()), angle1(spline.GetAngle1 ()), angle2(spline.GetAngle2 ()), kAsm1(spline.GetKasm1()), - kAsm2(spline.GetKasm2()), kCurve(spline.GetKcurve()), points(spline.GetDataPoints()), - mode(spline.getMode()), idObject(spline.getIdObject()){ -} +VSpline::VSpline ( const VSpline & spline ) + :p1(spline.GetP1 ()), p2(spline.GetP2 ()), p3(spline.GetP3 ()), p4(spline.GetP4 ()), angle1(spline.GetAngle1 ()), + angle2(spline.GetAngle2 ()), kAsm1(spline.GetKasm1()), kAsm2(spline.GetKasm2()), kCurve(spline.GetKcurve()), + points(spline.GetDataPoints()), mode(spline.getMode()), idObject(spline.getIdObject()){} VSpline::VSpline (const QHash *points, qint64 p1, qint64 p4, qreal angle1, qreal angle2, - qreal kAsm1, qreal kAsm2 , qreal kCurve, Draw::Draws mode, qint64 idObject):p1(p1), p2(QPointF()), - p3(QPointF()), p4(p4), angle1(angle1), angle2(angle2), kAsm1(kAsm1), kAsm2(kAsm2), kCurve(kCurve), points(*points), - mode(mode), idObject(idObject){ + qreal kAsm1, qreal kAsm2, qreal kCurve, Draw::Draws mode, qint64 idObject) + :p1(p1), p2(QPointF()), p3(QPointF()), p4(p4), angle1(angle1), angle2(angle2), kAsm1(kAsm1), kAsm2(kAsm2), + kCurve(kCurve), points(*points), mode(mode), idObject(idObject) +{ ModifiSpl ( p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve ); } VSpline::VSpline (const QHash *points, qint64 p1, QPointF p2, QPointF p3, qint64 p4, - qreal kCurve, Draw::Draws mode, qint64 idObject):p1(p1), p2(p2), p3(p3), p4(p4), angle1(0), - angle2(0), kAsm1(1), kAsm2(1), kCurve(1), points(*points), mode(mode), idObject(idObject){ + qreal kCurve, Draw::Draws mode, qint64 idObject) + :p1(p1), p2(p2), p3(p3), p4(p4), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1), points(*points), mode(mode), + idObject(idObject) +{ ModifiSpl ( p1, p2, p3, p4, kCurve); } void VSpline::ModifiSpl ( qint64 p1, qint64 p4, qreal angle1, qreal angle2, - qreal kAsm1, qreal kAsm2, qreal kCurve){ + qreal kAsm1, qreal kAsm2, qreal kCurve) +{ this->p1 = p1; this->p4 = p4; this->angle1 = angle1; @@ -62,7 +65,7 @@ void VSpline::ModifiSpl ( qint64 p1, qint64 p4, qreal angle1, qreal angle2, // } QPointF point1 = GetPointP1().toQPointF(); QPointF point4 = GetPointP4().toQPointF(); - radius = QLineF(QPointF(point1.x(), point4.y()),point4).length(); + radius = QLineF(QPointF(point1.x(), point4.y()), point4).length(); // radius = QLineF(GetPointP1(), GetPointP4()).length() / 2 / sin( angle * M_PI / 180.0 ); L = kCurve * radius * 4 / 3 * tan( angle * M_PI / 180.0 / 4 ); QLineF p1p2(GetPointP1().x(), GetPointP1().y(), GetPointP1().x() + L * kAsm1, GetPointP1().y()); @@ -73,7 +76,8 @@ void VSpline::ModifiSpl ( qint64 p1, qint64 p4, qreal angle1, qreal angle2, this->p3 = p4p3.p2(); } -void VSpline::ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve){ +void VSpline::ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve) +{ this->p1 = p1; this->p2 = p2; this->p3 = p3; @@ -90,7 +94,7 @@ void VSpline::ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCu // } QPointF point1 = GetPointP1().toQPointF(); QPointF point4 = GetPointP4().toQPointF(); - radius = QLineF(QPointF(point1.x(), point4.y()),point4).length(); + radius = QLineF(QPointF(point1.x(), point4.y()), point4).length(); // radius = QLineF(GetPointP1(), GetPointP4()).length() / 2 / sin( angle * M_PI / 180.0 ); L = kCurve * radius * 4 / 3 * tan( angle * M_PI / 180.0 / 4 ); @@ -123,37 +127,48 @@ void VSpline::ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCu // p4 = QPointF(p4.x()+mx, p4.y()+my); //} -VPointF VSpline::GetPointP1() const{ - if(points.contains(p1)){ +VPointF VSpline::GetPointP1() const +{ + if (points.contains(p1)) + { return points.value(p1); - } else { + } + else + { qCritical()<<"Не можу знайти id = "<p2, this->p3, GetPointP4().toQPointF()); } -QString VSpline::GetName() const{ +QString VSpline::GetName() const +{ VPointF first = GetPointP1(); VPointF second = GetPointP4(); return QString("Spl_%1_%2").arg(first.name(), second.name()); } -QLineF::IntersectType VSpline::CrossingSplLine ( const QLineF &line, QPointF *intersectionPoint ) const{ +QLineF::IntersectType VSpline::CrossingSplLine ( const QLineF &line, QPointF *intersectionPoint ) const +{ QVector px; QVector py; px.append ( GetPointP1 ().x () ); @@ -168,10 +183,12 @@ QLineF::IntersectType VSpline::CrossingSplLine ( const QLineF &line, QPointF *in qint32 i = 0; QPointF crosPoint; QLineF::IntersectType type = QLineF::NoIntersection; - for ( i = 0; i < px.count()-1; ++i ){ + for ( i = 0; i < px.count()-1; ++i ) + { type = line.intersect(QLineF ( QPointF ( px[i], py[i] ), QPointF ( px[i+1], py[i+1] )), &crosPoint); - if ( type == QLineF::BoundedIntersection ){ + if ( type == QLineF::BoundedIntersection ) + { *intersectionPoint = crosPoint; return type; } @@ -236,7 +253,8 @@ QLineF::IntersectType VSpline::CrossingSplLine ( const QLineF &line, QPointF *in // } //} -QVector VSpline::GetPoints () const{ +QVector VSpline::GetPoints () const +{ return GetPoints(GetPointP1().toQPointF(), p2, p3, GetPointP4().toQPointF()); // QLineF line1(points.at(0).toPoint(), points.at(1).toPoint()); // line1.setLength(500); @@ -260,7 +278,8 @@ QVector VSpline::GetPoints () const{ // } } -QVector VSpline::GetPoints (QPointF p1, QPointF p2, QPointF p3, QPointF p4){ +QVector VSpline::GetPoints (QPointF p1, QPointF p2, QPointF p3, QPointF p4) +{ QVector pvector; QVector x; QVector y; @@ -272,17 +291,20 @@ QVector VSpline::GetPoints (QPointF p1, QPointF p2, QPointF p3, QPointF p3.x (), p3.y (), p4.x (), p4.y (), 0, wx, wy ); x.append ( p4.x () ); y.append ( p4.y () ); - for ( qint32 i = 0; i < x.count(); ++i ){ + for ( qint32 i = 0; i < x.count(); ++i ) + { pvector.append( QPointF ( x[i], y[i] ) ); } return pvector; } -qreal VSpline::LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const{ +qreal VSpline::LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const +{ QPainterPath splinePath; QVector points = GetPoints (p1, p2, p3, p4); splinePath.moveTo(points[0]); - for (qint32 i = 1; i < points.count(); ++i){ + for (qint32 i = 1; i < points.count(); ++i) + { splinePath.lineTo(points[i]); } return splinePath.length(); @@ -290,9 +312,10 @@ qreal VSpline::LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) c void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4, - qint16 level, QVector &px, QVector &py){ - const double curve_collinearity_epsilon = 1e-30; - const double curve_angle_tolerance_epsilon = 0.01; + qint16 level, QVector &px, QVector &py) +{ + const double curve_collinearity_epsilon = 1e-30; + const double curve_angle_tolerance_epsilon = 0.01; const double m_angle_tolerance = 0.0; enum curve_recursion_limit_e { curve_recursion_limit = 32 }; const double m_cusp_limit = 0.0; @@ -302,7 +325,7 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, m_distance_tolerance_square = 0.5 / m_approximation_scale; m_distance_tolerance_square *= m_distance_tolerance_square; - if(level > curve_recursion_limit) + if (level > curve_recursion_limit) { return; } @@ -332,217 +355,240 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, double d3 = fabs(((x3 - x4) * dy - (y3 - y4) * dx)); double da1, da2, k; - switch((static_cast(d2 > curve_collinearity_epsilon) << 1) + - static_cast(d3 > curve_collinearity_epsilon)) + switch ((static_cast(d2 > curve_collinearity_epsilon) << 1) + + static_cast(d3 > curve_collinearity_epsilon)) { - case 0: - // All collinear OR p1==p4 - //---------------------- - k = dx*dx + dy*dy; - if(k == 0) - { - d2 = CalcSqDistance(x1, y1, x2, y2); - d3 = CalcSqDistance(x4, y4, x3, y3); - } - else - { - k = 1 / k; - da1 = x2 - x1; - da2 = y2 - y1; - d2 = k * (da1*dx + da2*dy); - da1 = x3 - x1; - da2 = y3 - y1; - d3 = k * (da1*dx + da2*dy); - if(d2 > 0 && d2 < 1 && d3 > 0 && d3 < 1) - { - // Simple collinear case, 1---2---3---4 - // We can leave just two endpoints - return; - } - if(d2 <= 0) - d2 = CalcSqDistance(x2, y2, x1, y1); - else if(d2 >= 1) - d2 = CalcSqDistance(x2, y2, x4, y4); - else - d2 = CalcSqDistance(x2, y2, x1 + d2*dx, y1 + d2*dy); - - if(d3 <= 0) - d3 = CalcSqDistance(x3, y3, x1, y1); - else if(d3 >= 1) - d3 = CalcSqDistance(x3, y3, x4, y4); - else - d3 = CalcSqDistance(x3, y3, x1 + d3*dx, y1 + d3*dy); - } - if(d2 > d3) - { - if(d2 < m_distance_tolerance_square) - { - - px.append(x2); - py.append(y2); - //m_points.add(point_d(x2, y2)); - return; - } - } - else - { - if(d3 < m_distance_tolerance_square) - { - - px.append(x3); - py.append(y3); - //m_points.add(point_d(x3, y3)); - return; - } - } - break; - case 1: - // p1,p2,p4 are collinear, p3 is significant - //---------------------- - if(d3 * d3 <= m_distance_tolerance_square * (dx*dx + dy*dy)) - { - if(m_angle_tolerance < curve_angle_tolerance_epsilon) - { - - px.append(x23); - py.append(y23); - //m_points.add(point_d(x23, y23)); - return; - } - - // Angle Condition + case 0: + // All collinear OR p1==p4 //---------------------- - da1 = fabs(atan2(y4 - y3, x4 - x3) - atan2(y3 - y2, x3 - x2)); - if(da1 >= M_PI) - da1 = 2*M_PI - da1; - - if(da1 < m_angle_tolerance) + k = dx*dx + dy*dy; + if (k == 0) { - - px.append(x2); - py.append(y2); - - px.append(x3); - py.append(y3); - //m_points.add(point_d(x2, y2)); - //m_points.add(point_d(x3, y3)); - return; + d2 = CalcSqDistance(x1, y1, x2, y2); + d3 = CalcSqDistance(x4, y4, x3, y3); } - - if(m_cusp_limit != 0.0) + else { - if(da1 > m_cusp_limit) + k = 1 / k; + da1 = x2 - x1; + da2 = y2 - y1; + d2 = k * (da1*dx + da2*dy); + da1 = x3 - x1; + da2 = y3 - y1; + d3 = k * (da1*dx + da2*dy); + if (d2 > 0 && d2 < 1 && d3 > 0 && d3 < 1) { - + // Simple collinear case, 1---2---3---4 + // We can leave just two endpoints + return; + } + if (d2 <= 0) + { + d2 = CalcSqDistance(x2, y2, x1, y1); + } + else if (d2 >= 1) + { + d2 = CalcSqDistance(x2, y2, x4, y4); + } + else + { + d2 = CalcSqDistance(x2, y2, x1 + d2*dx, y1 + d2*dy); + } + + if (d3 <= 0) + { + d3 = CalcSqDistance(x3, y3, x1, y1); + } + else if (d3 >= 1) + { + d3 = CalcSqDistance(x3, y3, x4, y4); + } + else + { + d3 = CalcSqDistance(x3, y3, x1 + d3*dx, y1 + d3*dy); + } + } + if (d2 > d3) + { + if (d2 < m_distance_tolerance_square) + { + + px.append(x2); + py.append(y2); + //m_points.add(point_d(x2, y2)); + return; + } + } + else + { + if (d3 < m_distance_tolerance_square) + { + px.append(x3); py.append(y3); //m_points.add(point_d(x3, y3)); return; } } - } - break; - - case 2: - // p1,p3,p4 are collinear, p2 is significant - //---------------------- - if(d2 * d2 <= m_distance_tolerance_square * (dx*dx + dy*dy)) - { - if(m_angle_tolerance < curve_angle_tolerance_epsilon) - { - - px.append(x23); - py.append(y23); - //m_points.add(point_d(x23, y23)); - return; - } - - // Angle Condition + break; + case 1: + // p1,p2,p4 are collinear, p3 is significant //---------------------- - da1 = fabs(atan2(y3 - y2, x3 - x2) - atan2(y2 - y1, x2 - x1)); - if(da1 >= M_PI) da1 = 2*M_PI - da1; - - if(da1 < m_angle_tolerance) + if (d3 * d3 <= m_distance_tolerance_square * (dx*dx + dy*dy)) { - - px.append(x2); - py.append(y2); - - px.append(x3); - py.append(y3); - //m_points.add(point_d(x2, y2)); - //m_points.add(point_d(x3, y3)); - return; - } - - if(m_cusp_limit != 0.0) - { - if(da1 > m_cusp_limit) + if (m_angle_tolerance < curve_angle_tolerance_epsilon) { - px.append(x2); - py.append(y2); - - //m_points.add(point_d(x2, y2)); + + px.append(x23); + py.append(y23); + //m_points.add(point_d(x23, y23)); return; } - } - } - break; - - case 3: - // Regular case - //----------------- - if((d2 + d3)*(d2 + d3) <= m_distance_tolerance_square * (dx*dx + dy*dy)) - { - // If the curvature doesn't exceed the distance_tolerance value - // we tend to finish subdivisions. - //---------------------- - if(m_angle_tolerance < curve_angle_tolerance_epsilon) - { - - px.append(x23); - py.append(y23); - //m_points.add(point_d(x23, y23)); - return; - } - - // Angle & Cusp Condition - //---------------------- - k = atan2(y3 - y2, x3 - x2); - da1 = fabs(k - atan2(y2 - y1, x2 - x1)); - da2 = fabs(atan2(y4 - y3, x4 - x3) - k); - if(da1 >= M_PI) da1 = 2*M_PI - da1; - if(da2 >= M_PI) da2 = 2*M_PI - da2; - - if(da1 + da2 < m_angle_tolerance) - { - // Finally we can stop the recursion + + // Angle Condition //---------------------- - - px.append(x23); - py.append(y23); - //m_points.add(point_d(x23, y23)); - return; - } - - if(m_cusp_limit != 0.0) - { - if(da1 > m_cusp_limit) + da1 = fabs(atan2(y4 - y3, x4 - x3) - atan2(y3 - y2, x3 - x2)); + if (da1 >= M_PI) { + da1 = 2*M_PI - da1; + } + + if (da1 < m_angle_tolerance) + { + px.append(x2); py.append(y2); - return; - } - - if(da2 > m_cusp_limit) - { + px.append(x3); py.append(y3); + //m_points.add(point_d(x2, y2)); + //m_points.add(point_d(x3, y3)); return; } + + if (m_cusp_limit != 0.0) + { + if (da1 > m_cusp_limit) + { + + px.append(x3); + py.append(y3); + //m_points.add(point_d(x3, y3)); + return; + } + } } - } - break; + break; + + case 2: + // p1,p3,p4 are collinear, p2 is significant + //---------------------- + if (d2 * d2 <= m_distance_tolerance_square * (dx*dx + dy*dy)) + { + if (m_angle_tolerance < curve_angle_tolerance_epsilon) + { + + px.append(x23); + py.append(y23); + //m_points.add(point_d(x23, y23)); + return; + } + + // Angle Condition + //---------------------- + da1 = fabs(atan2(y3 - y2, x3 - x2) - atan2(y2 - y1, x2 - x1)); + if (da1 >= M_PI) + { + da1 = 2*M_PI - da1; + } + + if (da1 < m_angle_tolerance) + { + + px.append(x2); + py.append(y2); + + px.append(x3); + py.append(y3); + //m_points.add(point_d(x2, y2)); + //m_points.add(point_d(x3, y3)); + return; + } + + if (m_cusp_limit != 0.0) + { + if (da1 > m_cusp_limit) + { + px.append(x2); + py.append(y2); + + //m_points.add(point_d(x2, y2)); + return; + } + } + } + break; + + case 3: + // Regular case + //----------------- + if ((d2 + d3)*(d2 + d3) <= m_distance_tolerance_square * (dx*dx + dy*dy)) + { + // If the curvature doesn't exceed the distance_tolerance value + // we tend to finish subdivisions. + //---------------------- + if (m_angle_tolerance < curve_angle_tolerance_epsilon) + { + + px.append(x23); + py.append(y23); + //m_points.add(point_d(x23, y23)); + return; + } + + // Angle & Cusp Condition + //---------------------- + k = atan2(y3 - y2, x3 - x2); + da1 = fabs(k - atan2(y2 - y1, x2 - x1)); + da2 = fabs(atan2(y4 - y3, x4 - x3) - k); + if (da1 >= M_PI) + { + da1 = 2*M_PI - da1; + } + if (da2 >= M_PI) + { + da2 = 2*M_PI - da2; + } + + if (da1 + da2 < m_angle_tolerance) + { + // Finally we can stop the recursion + //---------------------- + + px.append(x23); + py.append(y23); + //m_points.add(point_d(x23, y23)); + return; + } + + if (m_cusp_limit != 0.0) + { + if (da1 > m_cusp_limit) + { + px.append(x2); + py.append(y2); + return; + } + + if (da2 > m_cusp_limit) + { + px.append(x3); + py.append(y3); + return; + } + } + } + break; } // Continue subdivision @@ -551,28 +597,33 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, PointBezier_r(x1234, y1234, x234, y234, x34, y34, x4, y4, static_cast(level + 1), px, py); } -qreal VSpline::CalcSqDistance (qreal x1, qreal y1, qreal x2, qreal y2){ +qreal VSpline::CalcSqDistance (qreal x1, qreal y1, qreal x2, qreal y2) +{ qreal dx = x2 - x1; qreal dy = y2 - y1; return dx * dx + dy * dy; } -QPainterPath VSpline::GetPath() const{ +QPainterPath VSpline::GetPath() const +{ QPainterPath splinePath; QVector points = GetPoints (); - if(points.count() >= 2){ - for (qint32 i = 0; i < points.count()-1; ++i){ + if (points.count() >= 2) + { + for (qint32 i = 0; i < points.count()-1; ++i) + { splinePath.moveTo(points[i]); splinePath.lineTo(points[i+1]); } - } else { + } + else + { qWarning()<<"points.count() < 2"<(malloc(3*sizeof(qreal))); // P1 = curve_coord1; // P2 = curve_coord2; // P3 = curve_coord3; // P4 = curve_coord4; // Bt = point_coord; - +// // a = -P1 + 3*P2 - 3*P3 + P4; // b = 3*P1 - 6*P2 + 3*P3; // c = -3*P1 + 3*P2; // d = -Bt + P1; - +// // if(Cubic(t, b/a, c/a, d/a) == 3){ // ret_t = t[2]; // } else { @@ -651,7 +702,7 @@ QPainterPath VSpline::GetPath() const{ // * Повертається три значення, але експереминтально знайдено що шукане // * значення знаходиться в третьому. // */ - +// // free(t); // if(ret_t<0 || ret_t>1){ // qDebug()<<"Неправильне значення параметра. фунція calc_t"; @@ -675,7 +726,7 @@ QPainterPath VSpline::GetPath() const{ // else // return t_y; //} - +// //void VSpline::Mirror(const QPointF Pmirror){ // QPointF P1 = p1; // P1 = QPointF(P1.x() - Pmirror.x(), P1.y() - Pmirror.y()); @@ -697,11 +748,12 @@ QPainterPath VSpline::GetPath() const{ //} QVector VSpline::SplinePoints(QPointF p1, QPointF p4, qreal angle1, qreal angle2, qreal kAsm1, - qreal kAsm2, qreal kCurve){ + qreal kAsm2, qreal kCurve) +{ QLineF p1pX(p1.x(), p1.y(), p1.x() + 100, p1.y()); p1pX.setAngle( angle1 ); qreal L = 0, radius = 0, angle = 90; - radius = QLineF(QPointF(p1.x(), p4.y()),p4).length(); + radius = QLineF(QPointF(p1.x(), p4.y()), p4).length(); L = kCurve * radius * 4 / 3 * tan( angle * M_PI / 180.0 / 4 ); QLineF p1p2(p1.x(), p1.y(), p1.x() + L * kAsm1, p1.y()); p1p2.setAngle(angle1); @@ -712,7 +764,8 @@ QVector VSpline::SplinePoints(QPointF p1, QPointF p4, qreal angle1, qre return GetPoints(p1, p2, p3, p4); } -VSpline &VSpline::operator =(const VSpline &spline){ +VSpline &VSpline::operator =(const VSpline &spline) +{ this->p1 = spline.GetP1 (); this->p2 = spline.GetP2 (); this->p3 = spline.GetP3 (); diff --git a/geometry/vspline.h b/geometry/vspline.h index 0b2b6dd40..cc85542c0 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -29,7 +29,8 @@ /** * @brief VSpline клас, що реалізує сплайн. */ -class VSpline{ +class VSpline +{ public: VSpline(); /** @@ -196,27 +197,27 @@ private: /** * @brief p1 початкова точка сплайну */ - qint64 p1; // перша точка + qint64 p1; // перша точка /** * @brief p2 перша контрольна точка сплайну. */ - QPointF p2; // друга точка + QPointF p2; // друга точка /** * @brief p3 друга контрольна точка сплайну. */ - QPointF p3; // третя точка + QPointF p3; // третя точка /** * @brief p4 кінцеві точка сплайну. */ - qint64 p4; // четверта точка + qint64 p4; // четверта точка /** * @brief angle1 кут в градусах першої напрямної. */ - qreal angle1; // кут нахилу дотичної в першій точці + qreal angle1; // кут нахилу дотичної в першій точці /** * @brief angle2 кут в градусах другої напрямної. */ - qreal angle2; // кут нахилу дотичної в другій точці + qreal angle2; // кут нахилу дотичної в другій точці qreal kAsm1; qreal kAsm2; qreal kCurve; diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index bfd448753..efbeacd20 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -22,36 +22,41 @@ #include "vsplinepath.h" #include -VSplinePath::VSplinePath(): path(QVector()), kCurve(1), mode(Draw::Calculation), - points(QHash()), idObject(0){ -} +VSplinePath::VSplinePath() + : path(QVector()), kCurve(1), mode(Draw::Calculation), points(QHash()), idObject(0){} -VSplinePath::VSplinePath(const QHash *points, qreal kCurve, Draw::Draws mode, qint64 idObject): path(QVector()), - kCurve(kCurve), mode(mode), points(*points), idObject(idObject){ -} +VSplinePath::VSplinePath(const QHash *points, qreal kCurve, Draw::Draws mode, qint64 idObject) + : path(QVector()), kCurve(kCurve), mode(mode), points(*points), idObject(idObject){} -VSplinePath::VSplinePath(const VSplinePath &splPath): path(*splPath.GetPoint()), - kCurve(splPath.getKCurve()), mode(splPath.getMode()), points(splPath.GetDataPoints()), - idObject(splPath.getIdObject()){ -} +VSplinePath::VSplinePath(const VSplinePath &splPath) + : path(*splPath.GetPoint()), kCurve(splPath.getKCurve()), mode(splPath.getMode()), points(splPath.GetDataPoints()), + idObject(splPath.getIdObject()){} -void VSplinePath::append(VSplinePoint point){ +void VSplinePath::append(VSplinePoint point) +{ path.append(point); } -qint32 VSplinePath::Count() const{ - if(path.size() == 0){ +qint32 VSplinePath::Count() const +{ + if (path.size() == 0) + { return 0; - } else { + } + else + { return path.size() - 1; } } -VSpline VSplinePath::GetSpline(qint32 index) const{ - if(Count()<1){ +VSpline VSplinePath::GetSpline(qint32 index) const +{ + if (Count()<1) + { throw VException(tr("Not enough points to create the spline.")); } - if(index < 1 || index > Count()){ + if (index < 1 || index > Count()) + { throw VException(tr("This spline is not exist.")); } VSpline spl(&points, path[index-1].P(), path[index].P(), path[index-1].Angle2(), path[index].Angle1(), @@ -59,9 +64,11 @@ VSpline VSplinePath::GetSpline(qint32 index) const{ return spl; } -QPainterPath VSplinePath::GetPath() const{ +QPainterPath VSplinePath::GetPath() const +{ QPainterPath painterPath; - for(qint32 i = 1; i <= Count(); ++i){ + for (qint32 i = 1; i <= Count(); ++i) + { VSpline spl(&points, path[i-1].P(), path[i].P(), path[i-1].Angle2(), path[i].Angle1(), path[i-1].KAsm2(), path[i].KAsm1(), this->kCurve); painterPath.addPath(spl.GetPath()); @@ -69,22 +76,27 @@ QPainterPath VSplinePath::GetPath() const{ return painterPath; } -QVector VSplinePath::GetPathPoints() const{ +QVector VSplinePath::GetPathPoints() const +{ QVector pathPoints; - for(qint32 i = 1; i <= Count(); ++i){ + for (qint32 i = 1; i <= Count(); ++i) + { VSpline spl(&points, path[i-1].P(), path[i].P(), path[i-1].Angle2(), path[i].Angle1(), path[i-1].KAsm2(), path[i].KAsm1(), this->kCurve); QVector splP = spl.GetPoints(); - for(qint32 j = 0; j < splP.size(); ++j){ + for (qint32 j = 0; j < splP.size(); ++j) + { pathPoints.append(splP[j]); } } return pathPoints; } -qreal VSplinePath::GetLength() const{ +qreal VSplinePath::GetLength() const +{ qreal length = 0; - for(qint32 i = 1; i <= Count(); ++i){ + for (qint32 i = 1; i <= Count(); ++i) + { VSpline spl(&points, path[i-1].P(), path[i].P(), path[i-1].Angle2(), path[i].Angle1(), path[i-1].KAsm2(), path[i].KAsm1(), kCurve); length += spl.GetLength(); @@ -92,29 +104,40 @@ qreal VSplinePath::GetLength() const{ return length; } -void VSplinePath::UpdatePoint(qint32 indexSpline, SplinePoint::Position pos, VSplinePoint point){ - if(indexSpline < 1 || indexSpline > Count()){ +void VSplinePath::UpdatePoint(qint32 indexSpline, SplinePoint::Position pos, VSplinePoint point) +{ + if (indexSpline < 1 || indexSpline > Count()) + { throw VException(tr("This spline is not exist.")); } - if(pos == SplinePoint::FirstPoint){ + if (pos == SplinePoint::FirstPoint) + { path[indexSpline-1] = point; - } else { + } + else + { path[indexSpline] = point; } } -VSplinePoint VSplinePath::GetSplinePoint(qint32 indexSpline, SplinePoint::Position pos) const{ - if(indexSpline < 1 || indexSpline > Count()){ +VSplinePoint VSplinePath::GetSplinePoint(qint32 indexSpline, SplinePoint::Position pos) const +{ + if (indexSpline < 1 || indexSpline > Count()) + { throw VException(tr("This spline is not exist.")); } - if(pos == SplinePoint::FirstPoint){ + if (pos == SplinePoint::FirstPoint) + { return path.at(indexSpline-1); - } else { + } + else + { return path.at(indexSpline); } } -VSplinePath &VSplinePath::operator =(const VSplinePath &path){ +VSplinePath &VSplinePath::operator =(const VSplinePath &path) +{ this->path = path.GetSplinePath(); this->kCurve = path.getKCurve(); this->mode = path.getMode(); @@ -123,6 +146,7 @@ VSplinePath &VSplinePath::operator =(const VSplinePath &path){ return *this; } -VSplinePoint & VSplinePath::operator[](int indx){ +VSplinePoint & VSplinePath::operator[](int indx) +{ return path[indx]; } diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index d8012b1ce..6ac235ec7 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -27,16 +27,18 @@ #include "vspline.h" #include -namespace SplinePoint{ -enum Position { FirstPoint, LastPoint }; -Q_DECLARE_FLAGS(Positions, Position) +namespace SplinePoint +{ + enum Position { FirstPoint, LastPoint }; + Q_DECLARE_FLAGS(Positions, Position) } Q_DECLARE_OPERATORS_FOR_FLAGS( SplinePoint::Positions ) /** * @brief The VSplinePath клас, що розраховує шлях сплайнів. */ -class VSplinePath{ +class VSplinePath +{ Q_DECLARE_TR_FUNCTIONS(VSplinePath) public: /** diff --git a/geometry/vsplinepoint.cpp b/geometry/vsplinepoint.cpp index 93ad612ab..7913d0fe9 100644 --- a/geometry/vsplinepoint.cpp +++ b/geometry/vsplinepoint.cpp @@ -21,19 +21,11 @@ #include "vsplinepoint.h" -VSplinePoint::VSplinePoint():pSpline(0), angle(0), kAsm1(1), kAsm2(1){ -} - -VSplinePoint::VSplinePoint(qint64 pSpline, qreal kAsm1, qreal angle , qreal kAsm2):pSpline(pSpline), - angle(angle), kAsm1(kAsm1), kAsm2(kAsm2){ -} - -VSplinePoint::VSplinePoint(const VSplinePoint &point):pSpline(point.P()), angle(point.Angle2()), - kAsm1(point.KAsm1()), kAsm2(point.KAsm2()){ -} - - - - +VSplinePoint::VSplinePoint() + :pSpline(0), angle(0), kAsm1(1), kAsm2(1){} +VSplinePoint::VSplinePoint(qint64 pSpline, qreal kAsm1, qreal angle, qreal kAsm2) + :pSpline(pSpline), angle(angle), kAsm1(kAsm1), kAsm2(kAsm2){} +VSplinePoint::VSplinePoint(const VSplinePoint &point) + :pSpline(point.P()), angle(point.Angle2()), kAsm1(point.KAsm1()), kAsm2(point.KAsm2()){} diff --git a/geometry/vsplinepoint.h b/geometry/vsplinepoint.h index 58fb845c8..41f2f9672 100644 --- a/geometry/vsplinepoint.h +++ b/geometry/vsplinepoint.h @@ -27,7 +27,8 @@ /** * @brief The VSplinePoint клас, що містить у собі інформацію про точки сплайну. */ -class VSplinePoint{ +class VSplinePoint +{ public: /** * @brief VSplinePoint конструктор по замповчуванню. diff --git a/main.cpp b/main.cpp index 0ff386dd9..bc8d1598c 100644 --- a/main.cpp +++ b/main.cpp @@ -24,29 +24,32 @@ #include #include "tablewindow.h" -void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg){ +void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) +{ QByteArray localMsg = msg.toLocal8Bit(); - switch (type) { - case QtDebugMsg: - fprintf(stderr, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, - context.function); - break; - case QtWarningMsg: - fprintf(stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, - context.function); - break; - case QtCriticalMsg: - fprintf(stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, - context.function); - break; - case QtFatalMsg: - fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, - context.function); - abort(); + switch (type) + { + case QtDebugMsg: + fprintf(stderr, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, + context.function); + break; + case QtWarningMsg: + fprintf(stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, + context.function); + break; + case QtCriticalMsg: + fprintf(stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, + context.function); + break; + case QtFatalMsg: + fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, + context.function); + abort(); } } -int main(int argc, char *argv[]){ +int main(int argc, char *argv[]) +{ qInstallMessageHandler(myMessageOutput); VApplication app(argc, argv); @@ -56,7 +59,7 @@ int main(int argc, char *argv[]){ app.installTranslator(&qtTranslator); QTranslator appTranslator; - appTranslator.load("valentina_" + QLocale::system().name(),"."); + appTranslator.load("valentina_" + QLocale::system().name(), "."); app.installTranslator(&appTranslator); MainWindow w; @@ -70,23 +73,31 @@ int main(int argc, char *argv[]){ QString fileName; QRegExp rxArgOpenFile("-o");//parameter open file - if(args.size()>1){ - for (int i = 1; i < args.size(); ++i) { - if (rxArgOpenFile.indexIn(args.at(i)) != -1 ) { - if(args.at(i+1).isEmpty() == false){ + if (args.size()>1) + { + for (int i = 1; i < args.size(); ++i) + { + if (rxArgOpenFile.indexIn(args.at(i)) != -1 ) + { + if (args.at(i+1).isEmpty() == false) + { fileName = args.at(i+1); qDebug() << args.at(i)<< ":" << fileName; w.OpenPattern(fileName); } w.show(); break; - } else { + } + else + { qDebug() << "Uknown arg:" << args.at(i); w.show(); break; } } - } else { + } + else + { w.show(); } return app.exec(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 536c86482..167d19f71 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -29,8 +29,8 @@ #include "exception/vexceptionuniqueid.h" #include "version.h" -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), ui(new Ui::MainWindow), tool(Tool::ArrowTool), currentScene(0), sceneDraw(0), +MainWindow::MainWindow(QWidget *parent) + :QMainWindow(parent), ui(new Ui::MainWindow), tool(Tool::ArrowTool), currentScene(0), sceneDraw(0), sceneDetails(0), mouseCoordinate(0), helpLabel(0), view(0), isInitialized(false), dialogTable(0), dialogEndLine(QSharedPointer()), dialogLine(QSharedPointer()), dialogAlongLine(QSharedPointer()), @@ -43,7 +43,8 @@ MainWindow::MainWindow(QWidget *parent) : dialogTriangle(QSharedPointer()), dialogPointOfIntersection(QSharedPointer()), dialogHistory(0), doc(0), data(0), comboBoxDraws(0), fileName(QString()), changeInFile(false), - mode(Draw::Calculation){ + mode(Draw::Calculation) +{ ui->setupUi(this); ToolBarOption(); ToolBarDraws(); @@ -111,7 +112,8 @@ MainWindow::MainWindow(QWidget *parent) : ui->toolBox->setCurrentIndex(0); } -void MainWindow::ActionNewDraw(){ +void MainWindow::ActionNewDraw() +{ QString nameDraw; bool bOk; qint32 index; @@ -121,25 +123,31 @@ void MainWindow::ActionNewDraw(){ dlg->setLabelText(tr("Drawing:")); dlg->setTextEchoMode(QLineEdit::Normal); dlg->setWindowTitle(tr("Enter a name for the drawing.")); - dlg->resize(300,100); + dlg->resize(300, 100); dlg->setTextValue(nDraw); - while(1){ + while (1) + { bOk = dlg->exec(); nameDraw = dlg->textValue(); - if(!bOk || nameDraw.isEmpty()){ + if (bOk == false || nameDraw.isEmpty()) + { delete dlg; return; } index = comboBoxDraws->findText(nameDraw); - if(index != -1){//we already have this name + if (index != -1) + {//we already have this name qCritical()<appendDraw(nameDraw); - if(bOk == false){ + if (bOk == false) + { qCritical()<addItem(nameDraw); index = comboBoxDraws->findText(nameDraw); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found comboBoxDraws->setCurrentIndex(index); currentDrawChanged( index ); } @@ -168,9 +177,9 @@ void MainWindow::ActionNewDraw(){ changeInFile = true; } -void MainWindow::OptionDraw(){ +void MainWindow::OptionDraw() +{ QString nameDraw; - bool bOk = false; qint32 index; QString nDraw = doc->GetNameActivDraw(); QInputDialog *dlg = new QInputDialog(this); @@ -178,27 +187,35 @@ void MainWindow::OptionDraw(){ dlg->setLabelText(tr("Drawing:")); dlg->setTextEchoMode(QLineEdit::Normal); dlg->setWindowTitle(tr("Enter a new name for the drawing.")); - dlg->resize(300,100); + dlg->resize(300, 100); dlg->setTextValue(nDraw); - while(1){ - bOk = dlg->exec(); + while (1) + { + bool bOk = dlg->exec(); nameDraw = dlg->textValue(); - if(!bOk || nameDraw.isEmpty()){ + if (bOk == false || nameDraw.isEmpty()) + { delete dlg; return; } index = comboBoxDraws->findText(nameDraw); - if(index != -1){//we already have this name + if (index != -1) + {//we already have this name qCritical()<findText(doc->GetNameActivDraw()); - if(doc->SetNameDraw(nameDraw)){ + if (doc->SetNameDraw(nameDraw)) + { comboBoxDraws->setItemText(index, nameDraw); - } else { + } + else + { QMessageBox::warning(this, tr("Error saving change!!!"), tr("Can't save new name of drawing")); } @@ -206,8 +223,10 @@ void MainWindow::OptionDraw(){ template void MainWindow::SetToolButton(bool checked, Tool::Tools t, const QString &cursor, const QString &toolTip, - QSharedPointer &dialog, Func closeDialogSlot){ - if(checked){ + QSharedPointer &dialog, Func closeDialogSlot) +{ + if (checked) + { CanselTool(); tool = t; QPixmap pixmap(cursor); @@ -219,8 +238,11 @@ void MainWindow::SetToolButton(bool checked, Tool::Tools t, const QString &curso connect(dialog.data(), &Dialog::DialogClosed, this, closeDialogSlot); connect(dialog.data(), &Dialog::ToolTip, this, &MainWindow::ShowToolTip); connect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &Dialog::UpdateList); - } else { - if(QToolButton *tButton = qobject_cast< QToolButton * >(this->sender())){ + } + else + { + if (QToolButton *tButton = qobject_cast< QToolButton * >(this->sender())) + { Q_ASSERT(tButton != 0); tButton->setChecked(true); } @@ -228,7 +250,8 @@ void MainWindow::SetToolButton(bool checked, Tool::Tools t, const QString &curso } template -void MainWindow::AddToolToDetail(T *tool, const qint64 &id, Tool::Tools typeTool, const qint64 &idDetail){ +void MainWindow::AddToolToDetail(T *tool, const qint64 &id, Tool::Tools typeTool, const qint64 &idDetail) +{ QHash* tools = doc->getTools(); VToolDetail *det = qobject_cast(tools->value(idDetail)); Q_ASSERT(det != 0); @@ -236,11 +259,16 @@ void MainWindow::AddToolToDetail(T *tool, const qint64 &id, Tool::Tools typeTool } template -void MainWindow::ClosedDialog(QSharedPointer &dialog, int result){ - if(result == QDialog::Accepted){ - if(mode == Draw::Calculation){ +void MainWindow::ClosedDialog(QSharedPointer &dialog, int result) +{ + if (result == QDialog::Accepted) + { + if (mode == Draw::Calculation) + { DrawTool::Create(dialog, currentScene, doc, data); - } else { + } + else + { ModelingTool *endLine = ModelingTool::Create(dialog, doc, data); AddToolToDetail(endLine, endLine->getId(), tool, dialog->getIdDetail()); } @@ -248,111 +276,135 @@ void MainWindow::ClosedDialog(QSharedPointer &dialog, int result){ ArrowTool(); } -void MainWindow::ToolEndLine(bool checked){ +void MainWindow::ToolEndLine(bool checked) +{ SetToolButton(checked, Tool::EndLineTool, ":/cursor/endline_cursor.png", tr("Select point"), dialogEndLine, &MainWindow::ClosedDialogEndLine); } -void MainWindow::ClosedDialogEndLine(int result){ +void MainWindow::ClosedDialogEndLine(int result) +{ ClosedDialog(dialogEndLine, result); } -void MainWindow::ToolLine(bool checked){ +void MainWindow::ToolLine(bool checked) +{ SetToolButton(checked, Tool::LineTool, ":/cursor/line_cursor.png", tr("Select first point"), dialogLine, &MainWindow::ClosedDialogLine); } -void MainWindow::ClosedDialogLine(int result){ +void MainWindow::ClosedDialogLine(int result) +{ ClosedDialog(dialogLine, result); } -void MainWindow::ToolAlongLine(bool checked){ +void MainWindow::ToolAlongLine(bool checked) +{ SetToolButton(checked, Tool::AlongLineTool, ":/cursor/alongline_cursor.png", tr("Select point"), dialogAlongLine, &MainWindow::ClosedDialogAlongLine); } -void MainWindow::ClosedDialogAlongLine(int result){ +void MainWindow::ClosedDialogAlongLine(int result) +{ ClosedDialog(dialogAlongLine, result); } -void MainWindow::ToolShoulderPoint(bool checked){ +void MainWindow::ToolShoulderPoint(bool checked) +{ SetToolButton(checked, Tool::ShoulderPointTool, ":/cursor/shoulder_cursor.png", tr("Select first point of line"), dialogShoulderPoint, &MainWindow::ClosedDialogShoulderPoint); } -void MainWindow::ClosedDialogShoulderPoint(int result){ +void MainWindow::ClosedDialogShoulderPoint(int result) +{ ClosedDialog(dialogShoulderPoint, result); } -void MainWindow::ToolNormal(bool checked){ +void MainWindow::ToolNormal(bool checked) +{ SetToolButton(checked, Tool::NormalTool, ":/cursor/normal_cursor.png", tr("Select first point of line"), dialogNormal, &MainWindow::ClosedDialogNormal); } -void MainWindow::ClosedDialogNormal(int result){ +void MainWindow::ClosedDialogNormal(int result) +{ ClosedDialog(dialogNormal, result); } -void MainWindow::ToolBisector(bool checked){ +void MainWindow::ToolBisector(bool checked) +{ SetToolButton(checked, Tool::BisectorTool, ":/cursor/bisector_cursor.png", tr("Select first point of angle"), dialogBisector, &MainWindow::ClosedDialogBisector); } -void MainWindow::ClosedDialogBisector(int result){ +void MainWindow::ClosedDialogBisector(int result) +{ ClosedDialog(dialogBisector, result); } -void MainWindow::ToolLineIntersect(bool checked){ +void MainWindow::ToolLineIntersect(bool checked) +{ SetToolButton(checked, Tool::LineIntersectTool, ":/cursor/intersect_cursor.png", tr("Select first point of first line"), dialogLineIntersect, &MainWindow::ClosedDialogLineIntersect); } -void MainWindow::ClosedDialogLineIntersect(int result){ +void MainWindow::ClosedDialogLineIntersect(int result) +{ ClosedDialog(dialogLineIntersect, result); } -void MainWindow::ToolSpline(bool checked){ +void MainWindow::ToolSpline(bool checked) +{ SetToolButton(checked, Tool::SplineTool, ":/cursor/spline_cursor.png", tr("Select first point curve"), dialogSpline, &MainWindow::ClosedDialogSpline); } -void MainWindow::ClosedDialogSpline(int result){ +void MainWindow::ClosedDialogSpline(int result) +{ ClosedDialog(dialogSpline, result); } -void MainWindow::ToolArc(bool checked){ +void MainWindow::ToolArc(bool checked) +{ SetToolButton(checked, Tool::ArcTool, ":/cursor/arc_cursor.png", tr("Select point of center of arc"), dialogArc, &MainWindow::ClosedDialogArc); } -void MainWindow::ClosedDialogArc(int result){ +void MainWindow::ClosedDialogArc(int result) +{ ClosedDialog(dialogArc, result); } -void MainWindow::ToolSplinePath(bool checked){ +void MainWindow::ToolSplinePath(bool checked) +{ SetToolButton(checked, Tool::SplinePathTool, ":/cursor/splinepath_cursor.png", tr("Select point of curve path"), dialogSplinePath, &MainWindow::ClosedDialogSplinePath); } -void MainWindow::ClosedDialogSplinePath(int result){ +void MainWindow::ClosedDialogSplinePath(int result) +{ ClosedDialog(dialogSplinePath, result); } -void MainWindow::ToolPointOfContact(bool checked){ +void MainWindow::ToolPointOfContact(bool checked) +{ SetToolButton(checked, Tool::PointOfContact, ":/cursor/pointcontact_cursor.png", tr("Select first point of line"), dialogPointOfContact, &MainWindow::ClosedDialogPointOfContact); } -void MainWindow::ClosedDialogPointOfContact(int result){ +void MainWindow::ClosedDialogPointOfContact(int result) +{ ClosedDialog(dialogPointOfContact, result); } -void MainWindow::ToolDetail(bool checked){ - if(checked){ +void MainWindow::ToolDetail(bool checked) +{ + if (checked) + { CanselTool(); tool = Tool::Detail; QPixmap pixmap("://cursor/new_detail_cursor.png"); @@ -364,76 +416,95 @@ void MainWindow::ToolDetail(bool checked){ &DialogDetail::ChoosedObject); connect(dialogDetail.data(), &DialogDetail::DialogClosed, this, &MainWindow::ClosedDialogDetail); connect(doc, &VDomDocument::FullUpdateFromFile, dialogDetail.data(), &DialogDetail::UpdateList); - } else { - if(QToolButton *tButton = qobject_cast< QToolButton * >(this->sender())){ + } + else + { + if (QToolButton *tButton = qobject_cast< QToolButton * >(this->sender())) + { tButton->setChecked(true); } } } -void MainWindow::ClosedDialogDetail(int result){ - if(result == QDialog::Accepted){ +void MainWindow::ClosedDialogDetail(int result) +{ + if (result == QDialog::Accepted) + { VToolDetail::Create(dialogDetail, sceneDetails, doc, data); } ArrowTool(); } -void MainWindow::ToolHeight(bool checked){ +void MainWindow::ToolHeight(bool checked) +{ SetToolButton(checked, Tool::Height, ":/cursor/height_cursor.png", tr("Select base point"), dialogHeight, &MainWindow::ClosedDialogHeight); } -void MainWindow::ClosedDialogHeight(int result){ +void MainWindow::ClosedDialogHeight(int result) +{ ClosedDialog(dialogHeight, result); } -void MainWindow::ToolTriangle(bool checked){ +void MainWindow::ToolTriangle(bool checked) +{ SetToolButton(checked, Tool::Triangle, ":/cursor/triangle_cursor.png", tr("Select first point of axis"), dialogTriangle, &MainWindow::ClosedDialogTriangle); } -void MainWindow::ClosedDialogTriangle(int result){ +void MainWindow::ClosedDialogTriangle(int result) +{ ClosedDialog(dialogTriangle, result); } -void MainWindow::ToolPointOfIntersection(bool checked){ +void MainWindow::ToolPointOfIntersection(bool checked) +{ SetToolButton(checked, Tool::PointOfIntersection, ":/cursor/pointofintersect_cursor.png", tr("Select point vertically"), dialogPointOfIntersection, &MainWindow::ClosedDialogPointOfIntersection); } -void MainWindow::ClosedDialogPointOfIntersection(int result){ +void MainWindow::ClosedDialogPointOfIntersection(int result) +{ ClosedDialog(dialogPointOfIntersection, result); } -void MainWindow::About(){ +void MainWindow::About() +{ QString fullName = QString("Valentina %1").arg(APP_VERSION); QString qtBase(tr("Based on Qt %2 (32 bit)").arg(QT_VERSION_STR)); QString buildOn(tr("Built on %3 at %4").arg(__DATE__).arg(__TIME__)); - QString about = QString(tr("

%1

%2

%3

%4")).arg(fullName).arg(qtBase).arg(buildOn).arg(WARRANTY); + QString about = QString(tr("

%1

%2

%3

%4")).arg(fullName).arg(qtBase).arg( + buildOn).arg(WARRANTY); QMessageBox::about(this, tr("About Valentina"), about); } -void MainWindow::AboutQt(){ +void MainWindow::AboutQt() +{ QMessageBox::aboutQt(this, tr("About Qt")); } -void MainWindow::ShowToolTip(const QString &toolTip){ +void MainWindow::ShowToolTip(const QString &toolTip) +{ helpLabel->setText(toolTip); } -void MainWindow::tableClosed(){ +void MainWindow::tableClosed() +{ show(); MinimumScrollBar(); } -void MainWindow::showEvent( QShowEvent *event ){ +void MainWindow::showEvent( QShowEvent *event ) +{ QMainWindow::showEvent( event ); - if( event->spontaneous() ){ + if ( event->spontaneous() ) + { return; } - if(isInitialized){ + if (isInitialized) + { return; } // do your init stuff here @@ -442,8 +513,10 @@ void MainWindow::showEvent( QShowEvent *event ){ isInitialized = true;//first show windows are held } -void MainWindow::closeEvent(QCloseEvent *event){ - if(changeInFile == true){ +void MainWindow::closeEvent(QCloseEvent *event) +{ + if (changeInFile == true) + { QMessageBox msgBox; msgBox.setText(tr("The pattern has been modified.")); msgBox.setInformativeText(tr("Do you want to save your changes?")); @@ -451,50 +524,58 @@ void MainWindow::closeEvent(QCloseEvent *event){ msgBox.setDefaultButton(QMessageBox::Save); msgBox.setIcon(QMessageBox::Question); int ret = msgBox.exec(); - switch (ret) { - case QMessageBox::Save: - // Save was clicked - if(fileName.isEmpty()){ - ActionSaveAs(); - } else { - ActionSave(); - } - if(changeInFile){ - // We did't save file - event->ignore(); - } else { - // We have successfully saved the file + switch (ret) + { + case QMessageBox::Save: + // Save was clicked + if (fileName.isEmpty()) + { + ActionSaveAs(); + } + else + { + ActionSave(); + } + if (changeInFile) + { + // We did't save file + event->ignore(); + } + else + { + // We have successfully saved the file + event->accept(); + } + break; + case QMessageBox::Discard: + // Don't Save was clicked event->accept(); - } - break; - case QMessageBox::Discard: - // Don't Save was clicked - event->accept(); - break; - case QMessageBox::Cancel: - // Cancel was clicked - event->ignore(); - break; - default: - // should never be reached - event->accept(); - break; + break; + case QMessageBox::Cancel: + // Cancel was clicked + event->ignore(); + break; + default: + // should never be reached + event->accept(); + break; } } } -void MainWindow::ToolBarOption(){ +void MainWindow::ToolBarOption() +{ QLabel * labelGrowth = new QLabel; labelGrowth->setText(tr("Growth: ")); ui->toolBarOption->addWidget(labelGrowth); QStringList list; - list << "104"<<"110"<<"116"<<"122"<<"128"<<"134"<<"140"<<"146"<<"152"<<"158"<<"164"<<"170"<<"176" - << "182" << "188"; + list <<"92"<<"98"<<"104"<<"110"<<"116"<<"122"<<"128"<<"134"<<"140"<<"146"<<"152"<<"158"<<"164"<<"170"<<"176" + <<"182"<<"188"; QComboBox *comboBoxGrow = new QComboBox; comboBoxGrow->clear(); comboBoxGrow->addItems(list); - comboBoxGrow->setCurrentIndex(12); + comboBoxGrow->setCurrentIndex(14); ui->toolBarOption->addWidget(comboBoxGrow); connect(comboBoxGrow, static_cast(&QComboBox::currentIndexChanged), @@ -505,11 +586,11 @@ void MainWindow::ToolBarOption(){ ui->toolBarOption->addWidget(labelSize); list.clear(); - list << "28"<<"30"<<"32"<<"34"<<"36"<<"38"<<"40"<<"42"<<"44"<<"46"<<"48"<<"50" << "52" << "54" << "56"; + list <<"22"<<"24"<<"26"<<"28"<<"30"<<"32"<<"34"<<"36"<<"38"<<"40"<<"42"<<"44"<<"46"<<"48"<<"50"<<"52"<<"54"<<"56"; QComboBox *comboBoxSize = new QComboBox; comboBoxSize->clear(); comboBoxSize->addItems(list); - comboBoxSize->setCurrentIndex(11); + comboBoxSize->setCurrentIndex(14); ui->toolBarOption->addWidget(comboBoxSize); connect(comboBoxSize, static_cast(&QComboBox::currentIndexChanged), @@ -523,7 +604,8 @@ void MainWindow::ToolBarOption(){ } -void MainWindow::ToolBarDraws(){ +void MainWindow::ToolBarDraws() +{ QLabel * labelNameDraw = new QLabel; labelNameDraw ->setText(tr("Drawing: ")); ui->toolBarDraws->addWidget(labelNameDraw); @@ -548,125 +630,131 @@ void MainWindow::ToolBarDraws(){ connect(ui->actionLayout, &QAction::triggered, this, &MainWindow::ActionLayout); } -void MainWindow::currentDrawChanged( int index ){ - if(index != -1) { +void MainWindow::currentDrawChanged( int index ) +{ + if (index != -1) + { doc->setCurrentData(); doc->ChangeActivDraw(comboBoxDraws->itemText(index)); } } -void MainWindow::mouseMove(QPointF scenePos){ +void MainWindow::mouseMove(QPointF scenePos) +{ QString string = QString("%1, %2") .arg(static_cast(toMM(scenePos.x()))) .arg(static_cast(toMM(scenePos.y()))); mouseCoordinate->setText(string); } -void MainWindow::CanselTool(){ - switch( tool ){ - case Tool::ArrowTool: - ui->actionArrowTool->setChecked(false); - helpLabel->setText(""); - break; - case Tool::SinglePointTool: - Q_UNREACHABLE(); - //Nothing to do here because we can't create this tool from main window. - break; - case Tool::EndLineTool: - dialogEndLine.clear(); - ui->toolButtonEndLine->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::LineTool: - dialogLine.clear(); - ui->toolButtonLine->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearFocus(); - break; - case Tool::AlongLineTool: - dialogAlongLine.clear(); - ui->toolButtonAlongLine->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::ShoulderPointTool: - dialogShoulderPoint.clear(); - ui->toolButtonShoulderPoint->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::NormalTool: - dialogNormal.clear(); - ui->toolButtonNormal->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::BisectorTool: - dialogBisector.clear(); - ui->toolButtonBisector->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::LineIntersectTool: - dialogLineIntersect.clear(); - ui->toolButtonLineIntersect->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::SplineTool: - dialogSpline.clear(); - ui->toolButtonSpline->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::ArcTool: - dialogArc.clear(); - ui->toolButtonArc->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::SplinePathTool: - dialogSplinePath.clear(); - ui->toolButtonSplinePath->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::PointOfContact: - dialogPointOfContact.clear(); - ui->toolButtonPointOfContact->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::Detail: - dialogDetail.clear(); - ui->toolButtonNewDetail->setChecked(false); - break; - case Tool::Height: - dialogHeight.clear(); - ui->toolButtonHeight->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::Triangle: - dialogTriangle.clear(); - ui->toolButtonTriangle->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - case Tool::PointOfIntersection: - dialogPointOfIntersection.clear(); - ui->toolButtonPointOfIntersection->setChecked(false); - currentScene->setFocus(Qt::OtherFocusReason); - currentScene->clearSelection(); - break; - default: - qWarning()<<"Get wrong tool type. Ignore."; - break; +void MainWindow::CanselTool() +{ + switch ( tool ) + { + case Tool::ArrowTool: + ui->actionArrowTool->setChecked(false); + helpLabel->setText(""); + break; + case Tool::SinglePointTool: + Q_UNREACHABLE(); + //Nothing to do here because we can't create this tool from main window. + break; + case Tool::EndLineTool: + dialogEndLine.clear(); + ui->toolButtonEndLine->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::LineTool: + dialogLine.clear(); + ui->toolButtonLine->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearFocus(); + break; + case Tool::AlongLineTool: + dialogAlongLine.clear(); + ui->toolButtonAlongLine->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::ShoulderPointTool: + dialogShoulderPoint.clear(); + ui->toolButtonShoulderPoint->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::NormalTool: + dialogNormal.clear(); + ui->toolButtonNormal->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::BisectorTool: + dialogBisector.clear(); + ui->toolButtonBisector->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::LineIntersectTool: + dialogLineIntersect.clear(); + ui->toolButtonLineIntersect->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::SplineTool: + dialogSpline.clear(); + ui->toolButtonSpline->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::ArcTool: + dialogArc.clear(); + ui->toolButtonArc->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::SplinePathTool: + dialogSplinePath.clear(); + ui->toolButtonSplinePath->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::PointOfContact: + dialogPointOfContact.clear(); + ui->toolButtonPointOfContact->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::Detail: + dialogDetail.clear(); + ui->toolButtonNewDetail->setChecked(false); + break; + case Tool::Height: + dialogHeight.clear(); + ui->toolButtonHeight->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::Triangle: + dialogTriangle.clear(); + ui->toolButtonTriangle->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + case Tool::PointOfIntersection: + dialogPointOfIntersection.clear(); + ui->toolButtonPointOfIntersection->setChecked(false); + currentScene->setFocus(Qt::OtherFocusReason); + currentScene->clearSelection(); + break; + default: + qWarning()<<"Get wrong tool type. Ignore."; + break; } } -void MainWindow::ArrowTool(){ +void MainWindow::ArrowTool() +{ CanselTool(); ui->actionArrowTool->setChecked(true); tool = Tool::ArrowTool; @@ -675,12 +763,15 @@ void MainWindow::ArrowTool(){ helpLabel->setText(""); } -void MainWindow::ActionAroowTool(){ +void MainWindow::ActionAroowTool() +{ ArrowTool(); } -void MainWindow::keyPressEvent ( QKeyEvent * event ){ - switch(event->key()){ +void MainWindow::keyPressEvent ( QKeyEvent * event ) +{ + switch (event->key()) + { case Qt::Key_Escape: ArrowTool(); break; @@ -688,8 +779,10 @@ void MainWindow::keyPressEvent ( QKeyEvent * event ){ QMainWindow::keyPressEvent ( event ); } -void MainWindow::ActionDraw(bool checked){ - if(checked){ +void MainWindow::ActionDraw(bool checked) +{ + if (checked) + { ui->actionDetails->setChecked(false); /*Save scroll bars value for previous scene.*/ QScrollBar *horScrollBar = view->horizontalScrollBar(); @@ -707,13 +800,17 @@ void MainWindow::ActionDraw(bool checked){ mode = Draw::Calculation; doc->setCurrentData(); - } else { + } + else + { ui->actionDraw->setChecked(true); } } -void MainWindow::ActionDetails(bool checked){ - if(checked){ +void MainWindow::ActionDetails(bool checked) +{ + if (checked) + { ui->actionDraw->setChecked(false); /*Save scroll bars value for previous scene.*/ QScrollBar *horScrollBar = view->horizontalScrollBar(); @@ -729,19 +826,25 @@ void MainWindow::ActionDetails(bool checked){ verScrollBar = view->verticalScrollBar(); verScrollBar->setValue(currentScene->getVerScrollBar()); mode = Draw::Modeling; - } else { + } + else + { ui->actionDetails->setChecked(true); } } -void MainWindow::ActionSaveAs(){ +void MainWindow::ActionSaveAs() +{ QString filters(tr("Lekalo files (*.xml);;All files (*.*)")); QString defaultFilter(tr("Lekalo files (*.xml)")); QString fName = QFileDialog::getSaveFileName(this, tr("Save as"), QDir::homePath(), filters, &defaultFilter); - if(fName.isEmpty()) + if (fName.isEmpty()) + { return; - if(fName.indexOf(".xml",fName.size()-4)<0){ + } + if (fName.indexOf(".xml", fName.size()-4)<0) + { fName.append(".xml"); } fileName = fName; @@ -749,17 +852,22 @@ void MainWindow::ActionSaveAs(){ ActionSave(); } -void MainWindow::ActionSave(){ - if(!fileName.isEmpty()){ +void MainWindow::ActionSave() +{ + if (fileName.isEmpty() == false) + { bool result = SafeSaveing(fileName); - if(result){ + if (result) + { ui->actionSave->setEnabled(false); changeInFile = false; QFileInfo info(fileName); QString title(info.fileName()); title.append("-Valentina"); setWindowTitle(title); - } else { + } + else + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error saving file. Can't save file.")); @@ -771,14 +879,20 @@ void MainWindow::ActionSave(){ } } -void MainWindow::ActionOpen(){ +void MainWindow::ActionOpen() +{ QString filter(tr("Lekalo files (*.xml)")); QString fName = QFileDialog::getOpenFileName(this, tr("Open file"), QDir::homePath(), filter); - if(fName.isEmpty()) + if (fName.isEmpty()) + { return; - if(fileName.isEmpty() && changeInFile == false){ + } + if (fileName.isEmpty() && changeInFile == false) + { OpenPattern(fName); - } else { + } + else + { /*Open new copy application*/ QProcess *v = new QProcess(this); QStringList arguments; @@ -788,7 +902,8 @@ void MainWindow::ActionOpen(){ } } -void MainWindow::Clear(){ +void MainWindow::Clear() +{ setWindowTitle("Valentina"); fileName.clear(); data->Clear(); @@ -803,14 +918,17 @@ void MainWindow::Clear(){ SetEnableTool(false); } -void MainWindow::ActionNew(){ +void MainWindow::ActionNew() +{ QProcess *v = new QProcess(this); v->startDetached(QCoreApplication::applicationFilePath ()); delete v; } -void MainWindow::haveChange(){ - if(!fileName.isEmpty()){ +void MainWindow::haveChange() +{ + if (fileName.isEmpty() == false) + { ui->actionSave->setEnabled(true); changeInFile = true; QFileInfo info(fileName); @@ -820,61 +938,75 @@ void MainWindow::haveChange(){ } } -void MainWindow::ChangedSize(const QString & text){ +void MainWindow::ChangedSize(const QString & text) +{ qint32 size = text.toInt(); data->SetSize(size*10); doc->FullUpdateTree(); } -void MainWindow::ChangedGrowth(const QString &text){ +void MainWindow::ChangedGrowth(const QString &text) +{ qint32 growth = text.toInt(); data->SetGrowth(growth*10); doc->FullUpdateTree(); } -void MainWindow::SetEnableWidgets(bool enable){ +void MainWindow::SetEnableWidgets(bool enable) +{ ui->actionSaveAs->setEnabled(enable); ui->actionDraw->setEnabled(enable); ui->actionDetails->setEnabled(enable); ui->actionOptionDraw->setEnabled(enable); - if(enable == true && !fileName.isEmpty()){ + if (enable == true && fileName.isEmpty() == false) + { ui->actionSave->setEnabled(enable); } ui->actionTable->setEnabled(enable); ui->actionHistory->setEnabled(enable); } -void MainWindow::ActionTable(bool checked){ - if(checked){ +void MainWindow::ActionTable(bool checked) +{ + if (checked) + { dialogTable = new DialogIncrements(data, doc, this); connect(dialogTable, &DialogIncrements::DialogClosed, this, &MainWindow::ClosedActionTable); dialogTable->show(); - } else { + } + else + { ui->actionTable->setChecked(true); dialogTable->activateWindow(); } } -void MainWindow::ClosedActionTable(){ +void MainWindow::ClosedActionTable() +{ ui->actionTable->setChecked(false); delete dialogTable; } -void MainWindow::ActionHistory(bool checked){ - if(checked){ +void MainWindow::ActionHistory(bool checked) +{ + if (checked) + { dialogHistory = new DialogHistory(data, doc, this); dialogHistory->setWindowFlags(Qt::Window); connect(dialogHistory, &DialogHistory::DialogClosed, this, &MainWindow::ClosedActionHistory); dialogHistory->show(); - } else { + } + else + { ui->actionHistory->setChecked(true); dialogHistory->activateWindow(); } } -void MainWindow::ActionLayout(bool checked){ +void MainWindow::ActionLayout(bool checked) +{ Q_UNUSED(checked); hide(); QVector listDetails; @@ -882,12 +1014,14 @@ void MainWindow::ActionLayout(bool checked){ emit ModelChosen(listDetails); } -void MainWindow::ClosedActionHistory(){ +void MainWindow::ClosedActionHistory() +{ ui->actionHistory->setChecked(false); delete dialogHistory; } -void MainWindow::SetEnableTool(bool enable){ +void MainWindow::SetEnableTool(bool enable) +{ ui->toolButtonEndLine->setEnabled(enable); ui->toolButtonLine->setEnabled(enable); ui->toolButtonAlongLine->setEnabled(enable); @@ -905,18 +1039,22 @@ void MainWindow::SetEnableTool(bool enable){ ui->toolButtonPointOfIntersection->setEnabled(enable); } -void MainWindow::MinimumScrollBar(){ +void MainWindow::MinimumScrollBar() +{ QScrollBar *horScrollBar = view->horizontalScrollBar(); horScrollBar->setValue(horScrollBar->minimum()); QScrollBar *verScrollBar = view->verticalScrollBar(); verScrollBar->setValue(verScrollBar->minimum()); } -bool MainWindow::SafeSaveing(const QString &fileName) const{ - try{ +bool MainWindow::SafeSaveing(const QString &fileName) const +{ + try + { doc->TestUniqueId(); } - catch(const VExceptionUniqueId &e){ + catch (const VExceptionUniqueId &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error don't unique id.")); @@ -928,7 +1066,8 @@ bool MainWindow::SafeSaveing(const QString &fileName) const{ msgBox.exec(); return false; } - if(fileName.isEmpty()){ + if (fileName.isEmpty()) + { qWarning()<save(out, Indent); @@ -948,31 +1088,42 @@ bool MainWindow::SafeSaveing(const QString &fileName) const{ QFile patternFile(fileName); // We need here temporary file because we need restore pattern after error of copying temp file. QTemporaryFile tempOfPattern; - if (tempOfPattern.open()) { + if (tempOfPattern.open()) + { patternFile.copy(tempOfPattern.fileName()); } - if ( !patternFile.exists() || patternFile.remove() ) { - if ( !tempFile.copy(patternFile.fileName()) ){ + if ( patternFile.exists() == false || patternFile.remove() ) + { + if ( tempFile.copy(patternFile.fileName()) == false ) + { qCritical()<actionSave->setEnabled(false); changeInFile = false; QFileInfo info(fileName); @@ -983,18 +1134,22 @@ void MainWindow::AutoSavePattern(){ } } -MainWindow::~MainWindow(){ +MainWindow::~MainWindow() +{ CanselTool(); delete ui; delete data; - if(!doc->isNull()){ + if (doc->isNull() == false) + { delete doc; } } -void MainWindow::OpenPattern(const QString &fileName){ - if(fileName.isEmpty()){ +void MainWindow::OpenPattern(const QString &fileName) +{ + if (fileName.isEmpty()) + { qWarning()<setContent(&file, &errorMsg, &errorLine, &errorColumn)){ + if (file.open(QIODevice::ReadOnly)) + { + if (doc->setContent(&file, &errorMsg, &errorLine, &errorColumn)) + { disconnect(comboBoxDraws, static_cast(&QComboBox::currentIndexChanged), this, &MainWindow::currentDrawChanged); - try{ - doc->Parse(Document::FullParse, sceneDraw, sceneDetails); + try + { + doc->Parse(Document::FullParse, sceneDraw, sceneDetails); } - catch(const VExceptionObjectError &e){ + catch (const VExceptionObjectError &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error parsing file.")); @@ -1023,7 +1182,8 @@ void MainWindow::OpenPattern(const QString &fileName){ Clear(); return; } - catch(const VExceptionConversionError &e){ + catch (const VExceptionConversionError &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error can't convert value.")); @@ -1036,7 +1196,8 @@ void MainWindow::OpenPattern(const QString &fileName){ Clear(); return; } - catch(const VExceptionEmptyParameter &e){ + catch (const VExceptionEmptyParameter &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error empty parameter.")); @@ -1050,7 +1211,8 @@ void MainWindow::OpenPattern(const QString &fileName){ Clear(); return; } - catch(const VExceptionWrongParameterId &e){ + catch (const VExceptionWrongParameterId &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error wrong id.")); @@ -1064,7 +1226,8 @@ void MainWindow::OpenPattern(const QString &fileName){ Clear(); return; } - catch(const VExceptionUniqueId &e){ + catch (const VExceptionUniqueId &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error don't unique id.")); @@ -1082,16 +1245,22 @@ void MainWindow::OpenPattern(const QString &fileName){ this, &MainWindow::currentDrawChanged); QString nameDraw = doc->GetNameActivDraw(); qint32 index = comboBoxDraws->findText(nameDraw); - if ( index != -1 ) { // -1 for not found + if ( index != -1 ) + { // -1 for not found comboBoxDraws->setCurrentIndex(index); } - if(comboBoxDraws->count() > 0){ + if (comboBoxDraws->count() > 0) + { SetEnableTool(true); - } else { + } + else + { SetEnableTool(false); } SetEnableWidgets(true); - } else { + } + else + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error parsing pattern file.")); diff --git a/mainwindow.h b/mainwindow.h index 76a331375..5d8027420 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -32,14 +32,16 @@ #include "tools/modelingTools/modelingtools.h" #include "xml/vdomdocument.h" -namespace Ui { -class MainWindow; +namespace Ui +{ + class MainWindow; } -class MainWindow : public QMainWindow{ - Q_OBJECT +class MainWindow : public QMainWindow +{ + Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent = 0); ~MainWindow(); void OpenPattern(const QString &fileName); public slots: @@ -152,9 +154,8 @@ private: void SetEnableWidgets(bool enable); void SetEnableTool(bool enable); template - void SetToolButton(bool checked, Tool::Tools t, const QString &cursor, - const QString &toolTip,QSharedPointer &dialog, - Func closeDialogSlot); + void SetToolButton(bool checked, Tool::Tools t, const QString &cursor, const QString &toolTip, + QSharedPointer &dialog, Func closeDialogSlot); void MinimumScrollBar(); template void AddToolToDetail(T *tool, const qint64 &id, Tool::Tools typeTool, diff --git a/options.h b/options.h index 06dcc5a69..bf2fbad48 100644 --- a/options.h +++ b/options.h @@ -31,44 +31,49 @@ #define widthMainLine toPixel(1.2) #define widthHairLine widthMainLine/3 -namespace Scene{ -enum Scene { Point, Line, Spline, Arc, SplinePath, Detail }; -Q_DECLARE_FLAGS(Scenes, Scene) +namespace Scene +{ + enum Scene { Point, Line, Spline, Arc, SplinePath, Detail }; + Q_DECLARE_FLAGS(Scenes, Scene) } Q_DECLARE_OPERATORS_FOR_FLAGS( Scene::Scenes ) -namespace Tool{ -enum Tool {ArrowTool, - SinglePointTool, - EndLineTool, - LineTool, - AlongLineTool, - ShoulderPointTool, - NormalTool, - BisectorTool, - LineIntersectTool, - SplineTool, - ArcTool, - SplinePathTool, - PointOfContact, - Detail, - NodePoint, - NodeArc, - NodeSpline, - NodeSplinePath, - Height, - Triangle, - PointOfIntersection -}; -Q_DECLARE_FLAGS(Tools, Tool) +namespace Tool +{ + enum Tool + { + ArrowTool, + SinglePointTool, + EndLineTool, + LineTool, + AlongLineTool, + ShoulderPointTool, + NormalTool, + BisectorTool, + LineIntersectTool, + SplineTool, + ArcTool, + SplinePathTool, + PointOfContact, + Detail, + NodePoint, + NodeArc, + NodeSpline, + NodeSplinePath, + Height, + Triangle, + PointOfIntersection + }; + Q_DECLARE_FLAGS(Tools, Tool) -enum Source { FromGui, FromFile }; -Q_DECLARE_FLAGS(Sources, Source) + enum Source { FromGui, FromFile }; + Q_DECLARE_FLAGS(Sources, Source) } Q_DECLARE_OPERATORS_FOR_FLAGS( Tool::Tools ) Q_DECLARE_OPERATORS_FOR_FLAGS( Tool::Sources ) -namespace Draw { +namespace Draw +{ enum Draw { Calculation, Modeling }; Q_DECLARE_FLAGS(Draws, Draw) } diff --git a/tablewindow.cpp b/tablewindow.cpp index c23c5c1f1..d597590ff 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -24,11 +24,12 @@ #include "widgets/vtablegraphicsview.h" #include "options.h" -TableWindow::TableWindow(QWidget *parent) : - QMainWindow(parent), numberDetal(0), colission(0), ui(new Ui::TableWindow), +TableWindow::TableWindow(QWidget *parent) + :QMainWindow(parent), numberDetal(0), colission(0), ui(new Ui::TableWindow), listDetails(QVector()), outItems(false), collidingItems(false), currentScene(0), paper(0), shadowPaper(0), listOutItems(0), listCollidingItems(QList()), - indexDetail(0), sceneRect(QRectF()){ + indexDetail(0), sceneRect(QRectF()) +{ ui->setupUi(this); numberDetal = new QLabel("Залишилось 0 деталей.", this); colission = new QLabel("Колізій не знайдено.", this); @@ -43,7 +44,7 @@ TableWindow::TableWindow(QWidget *parent) : brush->setColor( QColor( Qt::gray ) ); currentScene->setBackgroundBrush( *brush ); VTableGraphicsView* view = new VTableGraphicsView(currentScene); - view->fitInView(view->scene()->sceneRect(),Qt::KeepAspectRatio); + view->fitInView(view->scene()->sceneRect(), Qt::KeepAspectRatio); ui->horizontalLayout->addWidget(view); connect(ui->actionTurn, &QAction::triggered, view, &VTableGraphicsView::rotateItems); connect(ui->actionMirror, &QAction::triggered, view, &VTableGraphicsView::MirrorItem); @@ -57,30 +58,34 @@ TableWindow::TableWindow(QWidget *parent) : connect(view, &VTableGraphicsView::itemChect, this, &TableWindow::itemChect); } -TableWindow::~TableWindow(){ +TableWindow::~TableWindow() +{ delete ui; } -void TableWindow::AddPaper(){ +void TableWindow::AddPaper() +{ qreal x1, y1, x2, y2; sceneRect.getCoords(&x1, &y1, &x2, &y2); - shadowPaper = new QGraphicsRectItem(QRectF(x1+4,y1+4,x2+4, y2+4)); + shadowPaper = new QGraphicsRectItem(QRectF(x1+4, y1+4, x2+4, y2+4)); shadowPaper->setBrush(QBrush(Qt::black)); currentScene->addItem(shadowPaper); - paper = new QGraphicsRectItem(QRectF(x1,y1,x2, y2)); + paper = new QGraphicsRectItem(QRectF(x1, y1, x2, y2)); paper->setPen(QPen(Qt::black, toPixel(widthMainLine))); paper->setBrush(QBrush(Qt::white)); currentScene->addItem(paper); qDebug()<rect().size().toSize(); } -void TableWindow::AddDetail(){ - if(indexDetailclearSelection(); VItem* Detail = listDetails[indexDetail]; - QObject::connect(Detail, SIGNAL(itemOut(int,bool)), this, SLOT(itemOut(int,bool))); - QObject::connect(Detail, SIGNAL(itemColliding(QList,int)), this, - SLOT(itemColliding(QList,int))); + QObject::connect(Detail, SIGNAL(itemOut(int, bool)), this, SLOT(itemOut(int, bool))); + QObject::connect(Detail, SIGNAL(itemColliding(QList, int)), this, + SLOT(itemColliding(QList, int))); QObject::connect(this, SIGNAL(LengthChanged()), Detail, SLOT(LengthChanged())); Detail->setPen(QPen(Qt::black, toPixel(widthMainLine))); Detail->setBrush(QBrush(Qt::white)); @@ -91,7 +96,8 @@ void TableWindow::AddDetail(){ Detail->setParentItem(paper); Detail->setSelected(true); indexDetail++; - if(indexDetail==listDetails.count()){ + if (indexDetail==listDetails.count()) + { ui->actionSave->setEnabled(true); } } @@ -101,7 +107,8 @@ void TableWindow::AddDetail(){ /* * Отримуємо деталі розрахованої моделі для подальшого укладання. */ -void TableWindow::ModelChosen(QVector listDetails){ +void TableWindow::ModelChosen(QVector listDetails) +{ this->listDetails = listDetails; listOutItems = new QBitArray(this->listDetails.count()); AddPaper(); @@ -110,23 +117,27 @@ void TableWindow::ModelChosen(QVector listDetails){ show(); } -void TableWindow::closeEvent(QCloseEvent *event){ +void TableWindow::closeEvent(QCloseEvent *event) +{ event->ignore(); StopTable(); } -void TableWindow::moveToCenter(){ +void TableWindow::moveToCenter() +{ QRect rect = frameGeometry(); rect.moveCenter(QDesktopWidget().availableGeometry().center()); move(rect.topLeft()); } -void TableWindow::showEvent ( QShowEvent * event ){ +void TableWindow::showEvent ( QShowEvent * event ) +{ QMainWindow::showEvent(event); moveToCenter(); } -void TableWindow::StopTable(){ +void TableWindow::StopTable() +{ hide(); currentScene->clear(); delete listOutItems; @@ -136,9 +147,11 @@ void TableWindow::StopTable(){ emit closed(); } -void TableWindow::saveScene(){ +void TableWindow::saveScene() +{ QString name = QFileDialog::getSaveFileName(0, tr("Save layout"), "", "Images (*.png);;Svg files (*.svg)"); - if(name.isNull()){ + if (name.isNull()) + { return; } @@ -153,9 +166,12 @@ void TableWindow::saveScene(){ currentScene->setSceneRect(currentScene->itemsBoundingRect()); QFileInfo fi(name); - if(fi.suffix() == "svg"){ + if (fi.suffix() == "svg") + { SvgFile(name); - } else if(fi.suffix() == "png"){ + } + else if (fi.suffix() == "png") + { PngFile(name); } @@ -166,32 +182,43 @@ void TableWindow::saveScene(){ shadowPaper->setBrush(QBrush(Qt::black)); } -void TableWindow::itemChect(bool flag){ +void TableWindow::itemChect(bool flag) +{ ui->actionTurn->setDisabled(flag); ui->actionMirror->setDisabled(flag); } -void TableWindow::checkNext(){ - if(outItems == true && collidingItems == true){ +void TableWindow::checkNext() +{ + if (outItems == true && collidingItems == true) + { colission->setText("Колізій не знайдено."); - if(indexDetail==listDetails.count()){ + if (indexDetail==listDetails.count()) + { ui->actionSave->setEnabled(true); ui->actionNext->setDisabled(true); - } else { + } + else + { ui->actionNext->setDisabled(false); ui->actionSave->setEnabled(false); } - } else { + } + else + { colission->setText("Знайдено колізії."); ui->actionNext->setDisabled(true); ui->actionSave->setEnabled(false); } } -void TableWindow::itemOut(int number, bool flag){ - listOutItems->setBit(number,flag); - for( int i = 0; i < listOutItems->count(); ++i ){ - if(listOutItems->at(i)==true){ +void TableWindow::itemOut(int number, bool flag) +{ + listOutItems->setBit(number, flag); + for ( int i = 0; i < listOutItems->count(); ++i ) + { + if (listOutItems->at(i)==true) + { outItems=false; qDebug()<<"itemOut::outItems="< list, int number){ +void TableWindow::itemColliding(QList list, int number) +{ //qDebug()<<"number="<1){ - for( int i = 0; i < listCollidingItems.count(); ++i ){ - QList l = listCollidingItems.at(i)->collidingItems(); - if(l.size()-2 <= 0){ + if (listCollidingItems.size()>1) + { + for ( int i = 0; i < listCollidingItems.count(); ++i ) + { + QList lis = listCollidingItems.at(i)->collidingItems(); + if (lis.size()-2 <= 0) + { VItem * bitem = qgraphicsitem_cast ( listCollidingItems.at(i) ); - if (bitem == 0){ + if (bitem == 0) + { qDebug()<<"Не можу привести тип об'єкту"; - } else { + } + else + { bitem->setPen(QPen(Qt::black, toPixel(widthMainLine))); } listCollidingItems.removeAt(i); } } - } else if(listCollidingItems.size()==1){ + } + else if (listCollidingItems.size()==1) + { VItem * bitem = qgraphicsitem_cast ( listCollidingItems.at(0) ); - if (bitem == 0){ + if (bitem == 0) + { qDebug()<<"Не можу привести тип об'єкту"; - } else { + } + else + { bitem->setPen(QPen(Qt::black, toPixel(widthMainLine))); } listCollidingItems.clear(); collidingItems = true; } - } else { + } + else + { collidingItems = true; } - } else { + } + else + { collidingItems = true; } - } else if(number==1){ - if(list.contains(paper)==true){ + } + else if (number==1) + { + if (list.contains(paper)==true) + { list.removeAt(list.indexOf(paper)); } - if(list.contains(shadowPaper)==true){ + if (list.contains(shadowPaper)==true) + { list.removeAt(list.indexOf(shadowPaper)); } - for( int i = 0; i < list.count(); ++i ){ - if(listCollidingItems.contains(list.at(i))==false){ + for ( int i = 0; i < list.count(); ++i ) + { + if (listCollidingItems.contains(list.at(i))==false) + { listCollidingItems.append(list.at(i)); } } @@ -255,11 +307,13 @@ void TableWindow::itemColliding(QList list, int number){ checkNext(); } -void TableWindow::GetNextDetail(){ +void TableWindow::GetNextDetail() +{ AddDetail(); } -void TableWindow::AddLength(){ +void TableWindow::AddLength() +{ QRectF rect = currentScene->sceneRect(); rect.setHeight(rect.height()+toPixel(279)); currentScene->setSceneRect(rect); @@ -273,8 +327,10 @@ void TableWindow::AddLength(){ emit LengthChanged(); } -void TableWindow::RemoveLength(){ - if(sceneRect.height()<=currentScene->sceneRect().height()-100){ +void TableWindow::RemoveLength() +{ + if (sceneRect.height()<=currentScene->sceneRect().height()-100) + { QRectF rect = currentScene->sceneRect(); rect.setHeight(rect.height()-toPixel(279)); currentScene->setSceneRect(rect); @@ -284,18 +340,24 @@ void TableWindow::RemoveLength(){ rect = paper->rect(); rect.setHeight(rect.height()-toPixel(279)); paper->setRect(rect); - if(sceneRect.height()==currentScene->sceneRect().height()){ + if (sceneRect.height()==currentScene->sceneRect().height()) + { ui->actionRemove->setDisabled(true); } emit LengthChanged(); - } else { + } + else + { ui->actionRemove->setDisabled(true); } } -void TableWindow::keyPressEvent ( QKeyEvent * event ){ - if( event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return ){ - if(ui->actionNext->isEnabled() == true ){ +void TableWindow::keyPressEvent ( QKeyEvent * event ) +{ + if ( event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return ) + { + if (ui->actionNext->isEnabled() == true ) + { AddDetail(); qDebug()<<"Додали деталь."; } @@ -304,7 +366,8 @@ void TableWindow::keyPressEvent ( QKeyEvent * event ){ } -void TableWindow::SvgFile(const QString &name) const{ +void TableWindow::SvgFile(const QString &name) const +{ QSvgGenerator generator; generator.setFileName(name); generator.setSize(paper->rect().size().toSize()); @@ -322,11 +385,13 @@ void TableWindow::SvgFile(const QString &name) const{ painter.end(); } -void TableWindow::PngFile(const QString &name) const{ +void TableWindow::PngFile(const QString &name) const +{ QRectF r = paper->rect(); qreal x=0, y=0, w=0, h=0; - r.getRect(&x,&y,&w,&h);// Re-shrink the scene to it's bounding contents - QImage image(QSize(static_cast(w), static_cast(h)), QImage::Format_ARGB32); // Create the image with the exact size of the shrunk scene + r.getRect(&x, &y, &w, &h);// Re-shrink the scene to it's bounding contents + // Create the image with the exact size of the shrunk scene + QImage image(QSize(static_cast(w), static_cast(h)), QImage::Format_ARGB32); image.fill(Qt::transparent); // Start all pixels transparent QPainter painter(&image); painter.setFont( QFont( "Arial", 8, QFont::Normal ) ); diff --git a/tablewindow.h b/tablewindow.h index bda643db8..33facb88e 100644 --- a/tablewindow.h +++ b/tablewindow.h @@ -25,14 +25,16 @@ #include #include "widgets/vitem.h" -namespace Ui { +namespace Ui +{ class TableWindow; } /** * @brief TableWindow клас вікна створення розкладки. */ -class TableWindow : public QMainWindow{ +class TableWindow : public QMainWindow +{ Q_OBJECT public: /** @@ -47,7 +49,7 @@ public: * @brief TableWindow Конструктор класу вікна створення розкладки. * @param parent Батько об'єкту. За замовчуванням = 0. */ - explicit TableWindow(QWidget *parent = 0); + explicit TableWindow(QWidget *parent = 0); /** * @brief ~TableWindow Деструктор класу вікна. */ diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index b6290d45a..28e3a859b 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -23,24 +23,31 @@ qreal VDrawTool::factor = 1; -VDrawTool::VDrawTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent) : - VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false), ignoreFullUpdate(false), - nameActivDraw(doc->GetNameActivDraw()){ +VDrawTool::VDrawTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent) + :VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false), ignoreFullUpdate(false), + nameActivDraw(doc->GetNameActivDraw()) +{ connect(this->doc, &VDomDocument::ChangedActivDraw, this, &VDrawTool::ChangedActivDraw); connect(this->doc, &VDomDocument::ChangedNameDraw, this, &VDrawTool::ChangedNameDraw); connect(this->doc, &VDomDocument::ShowTool, this, &VDrawTool::ShowTool); } -void VDrawTool::AddRecord(const qint64 id, Tool::Tools toolType, VDomDocument *doc){ +void VDrawTool::AddRecord(const qint64 id, Tool::Tools toolType, VDomDocument *doc) +{ qint64 cursor = doc->getCursor(); QVector *history = doc->getHistory(); - if(cursor <= 0){ + if (cursor <= 0) + { history->append(VToolRecord(id, toolType, doc->GetNameActivDraw())); - } else { + } + else + { qint32 index = 0; - for(qint32 i = 0; isize(); ++i){ + for (qint32 i = 0; isize(); ++i) + { VToolRecord rec = history->at(i); - if(rec.getId() == cursor){ + if (rec.getId() == cursor) + { index = i; break; } @@ -49,49 +56,68 @@ void VDrawTool::AddRecord(const qint64 id, Tool::Tools toolType, VDomDocument *d } } -void VDrawTool::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ +void VDrawTool::ShowTool(qint64 id, Qt::GlobalColor color, bool enable) +{ Q_UNUSED(id); Q_UNUSED(color); Q_UNUSED(enable); } -void VDrawTool::ChangedActivDraw(const QString newName){ - if(nameActivDraw == newName){ +void VDrawTool::ChangedActivDraw(const QString newName) +{ + if (nameActivDraw == newName) + { ignoreContextMenuEvent = false; - } else { + } + else + { ignoreContextMenuEvent = true; } } -void VDrawTool::ChangedNameDraw(const QString oldName, const QString newName){ - if(nameActivDraw == oldName){ +void VDrawTool::ChangedNameDraw(const QString oldName, const QString newName) +{ + if (nameActivDraw == oldName) + { nameActivDraw = newName; } } -void VDrawTool::SetFactor(qreal factor){ - if(factor <= 2 && factor >= 0.5){ +void VDrawTool::SetFactor(qreal factor) +{ + if (factor <= 2 && factor >= 0.5) + { this->factor = factor; } } -void VDrawTool::AddToCalculation(const QDomElement &domElement){ +void VDrawTool::AddToCalculation(const QDomElement &domElement) +{ QDomElement calcElement; bool ok = doc->GetActivCalculationElement(calcElement); - if(ok){ + if (ok) + { qint64 id = doc->getCursor(); - if(id <= 0){ + if (id <= 0) + { calcElement.appendChild(domElement); - } else { + } + else + { QDomElement refElement = doc->elementById(QString().setNum(doc->getCursor())); - if(refElement.isElement()){ - calcElement.insertAfter(domElement,refElement); + if (refElement.isElement()) + { + calcElement.insertAfter(domElement, refElement); doc->setCursor(0); - } else { + } + else + { qCritical()< void ContextMenu(QSharedPointer &dialog, Tool *tool, QGraphicsSceneContextMenuEvent *event, - bool showRemove = true){ + bool showRemove = true) + { Q_ASSERT(tool != 0); Q_ASSERT(event != 0); - if(!ignoreContextMenuEvent){ + if (ignoreContextMenuEvent == false) + { QMenu menu; QAction *actionOption = menu.addAction(tr("Options")); QAction *actionRemove = 0; - if(showRemove){ + if (showRemove) + { actionRemove = menu.addAction(tr("Delete")); - if(_referens > 1){ + if (_referens > 1) + { actionRemove->setEnabled(false); - } else { + } + else + { actionRemove->setEnabled(true); } } QAction *selectedAction = menu.exec(event->screenPos()); - if(selectedAction == actionOption){ + if (selectedAction == actionOption) + { dialog = QSharedPointer(new Dialog(getData())); connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), &VMainGraphicsScene::ChoosedObject, dialog.data(), &Dialog::ChoosedObject); connect(dialog.data(), &Dialog::DialogClosed, tool, &Tool::FullUpdateFromGui); - if(!ignoreFullUpdate){ + if (ignoreFullUpdate == false) + { connect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &Dialog::UpdateList); } @@ -76,16 +85,20 @@ protected: dialog->show(); } - if(showRemove){ - if(selectedAction == actionRemove){ + if (showRemove) + { + if (selectedAction == actionRemove) + { //deincrement referens RemoveReferens(); //remove form xml file QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { QDomElement element; bool ok = doc->GetActivCalculationElement(element); - if(ok){ + if (ok) + { element.removeChild(domElement); //update xml file emit FullUpdateTree(); @@ -98,12 +111,17 @@ protected: } } template - void ShowItem(Item *item, qint64 id, Qt::GlobalColor color, bool enable){ + void ShowItem(Item *item, qint64 id, Qt::GlobalColor color, bool enable) + { Q_ASSERT(item != 0); - if(id == item->id){ - if(enable == false){ + if (id == item->id) + { + if (enable == false) + { currentColor = baseColor; - } else { + } + else + { currentColor = color; } item->setPen(QPen(currentColor, widthHairLine/factor)); diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index 3df25583e..e95cd586e 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -27,18 +27,22 @@ const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); VToolAlongLine::VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, Tool::Sources typeCreation, - QGraphicsItem *parent): - VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, 0, parent), secondPointId(secondPointId), - dialogAlongLine(QSharedPointer()){ + QGraphicsItem *parent) + :VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, 0, parent), secondPointId(secondPointId), + dialogAlongLine(QSharedPointer()) +{ - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolAlongLine::FullUpdateFromFile(){ +void VToolAlongLine::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); basePointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -47,10 +51,13 @@ void VToolAlongLine::FullUpdateFromFile(){ RefreshGeometry(); } -void VToolAlongLine::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolAlongLine::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogAlongLine->getPointName()); domElement.setAttribute(AttrTypeLine, dialogAlongLine->getTypeLine()); domElement.setAttribute(AttrLength, dialogAlongLine->getFormula()); @@ -62,16 +69,19 @@ void VToolAlongLine::FullUpdateFromGui(int result){ dialogAlongLine.clear(); } -void VToolAlongLine::SetFactor(qreal factor){ +void VToolAlongLine::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshGeometry(); } -void VToolAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogAlongLine, this, event); } -void VToolAlongLine::AddToFile(){ +void VToolAlongLine::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -89,25 +99,26 @@ void VToolAlongLine::AddToFile(){ AddToCalculation(domElement); } -void VToolAlongLine::RemoveReferens(){ +void VToolAlongLine::RemoveReferens() +{ doc->DecrementReferens(secondPointId); VToolLinePoint::RemoveReferens(); } -void VToolAlongLine::setDialog(){ - Q_ASSERT(!dialogAlongLine.isNull()); - if(!dialogAlongLine.isNull()){ - VPointF p = VAbstractTool::data.GetPoint(id); - dialogAlongLine->setTypeLine(typeLine); - dialogAlongLine->setFormula(formula); - dialogAlongLine->setFirstPointId(basePointId, id); - dialogAlongLine->setSecondPointId(secondPointId, id); - dialogAlongLine->setPointName(p.name()); - } +void VToolAlongLine::setDialog() +{ + Q_ASSERT(dialogAlongLine.isNull() == false); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogAlongLine->setTypeLine(typeLine); + dialogAlongLine->setFormula(formula); + dialogAlongLine->setFirstPointId(basePointId, id); + dialogAlongLine->setSecondPointId(secondPointId, id); + dialogAlongLine->setPointName(p.name()); } void VToolAlongLine::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ QString formula = dialog->getFormula(); qint64 firstPointId = dialog->getFirstPointId(); qint64 secondPointId = dialog->getSecondPointId(); @@ -120,30 +131,37 @@ void VToolAlongLine::Create(QSharedPointer &dialog, VMainGraphi void VToolAlongLine::Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) +{ VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); QLineF line = QLineF(firstPoint.toQPointF(), secondPoint.toQPointF()); Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { line.setLength(toPixel(result)); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); data->AddLine(firstPointId, id); data->AddLine(id, secondPointId); - } else { + } + else + { data->UpdatePoint(id, VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); data->AddLine(firstPointId, id); data->AddLine(id, secondPointId); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::AlongLineTool, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolAlongLine *point = new VToolAlongLine(doc, data, id, formula, firstPointId, secondPointId, typeLine, typeCreation); scene->addItem(point); diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index 35734aab9..22b0e7996 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -25,7 +25,8 @@ #include "vtoollinepoint.h" #include "dialogs/dialogalongline.h" -class VToolAlongLine : public VToolLinePoint{ +class VToolAlongLine : public VToolLinePoint +{ Q_OBJECT public: VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, @@ -49,7 +50,7 @@ protected: virtual void RemoveReferens(); private: qint64 secondPointId; - QSharedPointer dialogAlongLine; + QSharedPointer dialogAlongLine; }; #endif // VTOOLALONGLINE_H diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index 149560c3d..bda386b36 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -26,8 +26,9 @@ const QString VToolArc::TagName = QStringLiteral("arc"); const QString VToolArc::ToolType = QStringLiteral("simple"); VToolArc::VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, - QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsPathItem(parent), - dialogArc(QSharedPointer()){ + QGraphicsItem *parent) + :VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogArc(QSharedPointer()) +{ VArc arc = data->GetArc(id); QPainterPath path; path.addPath(arc.GetPath()); @@ -37,24 +38,25 @@ VToolArc::VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolArc::setDialog(){ - Q_ASSERT(!dialogArc.isNull()); - if(!dialogArc.isNull()){ - VArc arc = VAbstractTool::data.GetArc(id); - dialogArc->SetCenter(arc.GetCenter()); - dialogArc->SetF1(arc.GetFormulaF1()); - dialogArc->SetF2(arc.GetFormulaF2()); - dialogArc->SetRadius(arc.GetFormulaRadius()); - } +void VToolArc::setDialog() +{ + Q_ASSERT(dialogArc.isNull() == false); + VArc arc = VAbstractTool::data.GetArc(id); + dialogArc->SetCenter(arc.GetCenter()); + dialogArc->SetF1(arc.GetFormulaF1()); + dialogArc->SetF2(arc.GetFormulaF2()); + dialogArc->SetRadius(arc.GetFormulaRadius()); } void VToolArc::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data){ + VContainer *data) +{ qint64 center = dialog->GetCenter(); QString radius = dialog->GetRadius(); QString f1 = dialog->GetF1(); @@ -63,43 +65,52 @@ void VToolArc::Create(QSharedPointer &dialog, VMainGraphicsScene *sce } void VToolArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, - const QString &f2, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + const QString &f2, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation) +{ qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; Calculator cal(data); QString errorMsg; qreal result = cal.eval(radius, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { calcRadius = toPixel(result); } errorMsg.clear(); result = cal.eval(f1, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { calcF1 = result; } errorMsg.clear(); result = cal.eval(f2, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { calcF2 = result; } VArc arc = VArc(data->DataPoints(), center, calcRadius, radius, calcF1, f1, calcF2, f2 ); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddArc(arc); - data->AddLengthArc(data->GetNameArc(center,id), toMM(arc.GetLength())); - } else { + data->AddLengthArc(data->GetNameArc(center, id), toMM(arc.GetLength())); + } + else + { data->UpdateArc(id, arc); - data->AddLengthArc(data->GetNameArc(center,id), toMM(arc.GetLength())); - if(parse != Document::FullParse){ + data->AddLengthArc(data->GetNameArc(center, id), toMM(arc.GetLength())); + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::ArcTool, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolArc *toolArc = new VToolArc(doc, data, id, typeCreation); scene->addItem(toolArc); connect(toolArc, &VToolArc::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); @@ -109,14 +120,18 @@ void VToolArc::Create(const qint64 _id, const qint64 ¢er, const QString &rad } } -void VToolArc::FullUpdateFromFile(){ +void VToolArc::FullUpdateFromFile() +{ RefreshGeometry(); } -void VToolArc::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolArc::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrCenter, QString().setNum(dialogArc->GetCenter())); domElement.setAttribute(AttrRadius, dialogArc->GetRadius()); domElement.setAttribute(AttrAngle1, dialogArc->GetF1()); @@ -127,12 +142,16 @@ void VToolArc::FullUpdateFromGui(int result){ dialogArc.clear(); } -void VToolArc::ChangedActivDraw(const QString newName){ +void VToolArc::ChangedActivDraw(const QString newName) +{ bool selectable = false; - if(nameActivDraw == newName){ + if (nameActivDraw == newName) + { selectable = true; currentColor = Qt::black; - } else { + } + else + { selectable = false; currentColor = Qt::gray; } @@ -142,20 +161,24 @@ void VToolArc::ChangedActivDraw(const QString newName){ VDrawTool::ChangedActivDraw(newName); } -void VToolArc::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ +void VToolArc::ShowTool(qint64 id, Qt::GlobalColor color, bool enable) +{ ShowItem(this, id, color, enable); } -void VToolArc::SetFactor(qreal factor){ +void VToolArc::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshGeometry(); } -void VToolArc::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolArc::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogArc, this, event); } -void VToolArc::AddToFile(){ +void VToolArc::AddToFile() +{ VArc arc = VAbstractTool::data.GetArc(id); QDomElement domElement = doc->createElement(TagName); @@ -169,29 +192,35 @@ void VToolArc::AddToFile(){ AddToCalculation(domElement); } -void VToolArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VToolArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Arc); } QGraphicsItem::mouseReleaseEvent(event); } -void VToolArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VToolArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine/factor)); } -void VToolArc::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VToolArc::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine/factor)); } -void VToolArc::RemoveReferens(){ +void VToolArc::RemoveReferens() +{ VArc arc = VAbstractTool::data.GetArc(id); doc->DecrementReferens(arc.GetCenter()); } -void VToolArc::RefreshGeometry(){ +void VToolArc::RefreshGeometry() +{ this->setPen(QPen(currentColor, widthHairLine/factor)); VArc arc = VAbstractTool::data.GetArc(id); QPainterPath path; diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index a743b96e1..75ea37bfa 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -27,7 +27,8 @@ #include "dialogs/dialogarc.h" #include "widgets/vcontrolpointspline.h" -class VToolArc :public VDrawTool, public QGraphicsPathItem{ +class VToolArc :public VDrawTool, public QGraphicsPathItem +{ Q_OBJECT public: VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 9e21737ab..26af32886 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -27,47 +27,53 @@ const QString VToolBisector::ToolType = QStringLiteral("bisector"); VToolBisector::VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, - QGraphicsItem *parent): - VToolLinePoint(doc, data, id, typeLine, formula, secondPointId, 0, parent), firstPointId(0), - thirdPointId(0), dialogBisector(QSharedPointer()){ + QGraphicsItem *parent) + :VToolLinePoint(doc, data, id, typeLine, formula, secondPointId, 0, parent), firstPointId(0), + thirdPointId(0), dialogBisector(QSharedPointer()) +{ this->firstPointId = firstPointId; this->thirdPointId = thirdPointId; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } QPointF VToolBisector::FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, - const QPointF &thirdPoint, const qreal &length){ + const QPointF &thirdPoint, const qreal &length) +{ QLineF line1(secondPoint, firstPoint); QLineF line2(secondPoint, thirdPoint); qreal angle = line1.angleTo(line2); - if(angle>180){ + if (angle>180) + { angle = 360 - angle; line1.setAngle(line1.angle()-angle/2); - } else { + } + else + { line1.setAngle(line1.angle()+angle/2); } line1.setLength(length); return line1.p2(); } -void VToolBisector::setDialog(){ - Q_ASSERT(!dialogBisector.isNull()); - if(!dialogBisector.isNull()){ - VPointF p = VAbstractTool::data.GetPoint(id); - dialogBisector->setTypeLine(typeLine); - dialogBisector->setFormula(formula); - dialogBisector->setFirstPointId(firstPointId, id); - dialogBisector->setSecondPointId(basePointId, id); - dialogBisector->setThirdPointId(thirdPointId, id); - dialogBisector->setPointName(p.name()); - } +void VToolBisector::setDialog() +{ + Q_ASSERT(dialogBisector.isNull() == false); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogBisector->setTypeLine(typeLine); + dialogBisector->setFormula(formula); + dialogBisector->setFirstPointId(firstPointId, id); + dialogBisector->setSecondPointId(basePointId, id); + dialogBisector->setThirdPointId(thirdPointId, id); + dialogBisector->setPointName(p.name()); } -void VToolBisector::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ +void VToolBisector::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data) +{ QString formula = dialog->getFormula(); qint64 firstPointId = dialog->getFirstPointId(); qint64 secondPointId = dialog->getSecondPointId(); @@ -82,7 +88,8 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation) +{ VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); VPointF thirdPoint = data->GetPoint(thirdPointId); @@ -90,22 +97,28 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { QPointF fPoint = VToolBisector::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), thirdPoint.toQPointF(), toPixel(result)); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(firstPointId, id); - } else { + } + else + { data->UpdatePoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(firstPointId, id); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::BisectorTool, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolBisector *point = new VToolBisector(doc, data, id, typeLine, formula, firstPointId, secondPointId, thirdPointId, typeCreation); scene->addItem(point); @@ -120,9 +133,11 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 } } -void VToolBisector::FullUpdateFromFile(){ +void VToolBisector::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -132,10 +147,13 @@ void VToolBisector::FullUpdateFromFile(){ RefreshGeometry(); } -void VToolBisector::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolBisector::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogBisector->getPointName()); domElement.setAttribute(AttrTypeLine, dialogBisector->getTypeLine()); domElement.setAttribute(AttrLength, dialogBisector->getFormula()); @@ -148,16 +166,19 @@ void VToolBisector::FullUpdateFromGui(int result){ dialogBisector.clear(); } -void VToolBisector::SetFactor(qreal factor){ +void VToolBisector::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshGeometry(); } -void VToolBisector::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolBisector::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogBisector, this, event); } -void VToolBisector::AddToFile(){ +void VToolBisector::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -176,7 +197,8 @@ void VToolBisector::AddToFile(){ AddToCalculation(domElement); } -void VToolBisector::RemoveReferens(){ +void VToolBisector::RemoveReferens() +{ doc->DecrementReferens(firstPointId); doc->DecrementReferens(thirdPointId); VToolLinePoint::RemoveReferens(); diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 6e0603f01..9f7434538 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -25,7 +25,8 @@ #include "vtoollinepoint.h" #include "dialogs/dialogbisector.h" -class VToolBisector : public VToolLinePoint{ +class VToolBisector : public VToolLinePoint +{ public: VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index d2b58d931..cbd18add4 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -27,17 +27,20 @@ const QString VToolEndLine::ToolType = QStringLiteral("endLine"); VToolEndLine::VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, - Tool::Sources typeCreation, QGraphicsItem *parent): - VToolLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), - dialogEndLine(QSharedPointer()){ + Tool::Sources typeCreation, QGraphicsItem *parent) + :VToolLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), + dialogEndLine(QSharedPointer()) +{ - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolEndLine::setDialog(){ - Q_ASSERT(!dialogEndLine.isNull()); +void VToolEndLine::setDialog() +{ + Q_ASSERT(dialogEndLine.isNull() == false); VPointF p = VAbstractTool::data.GetPoint(id); dialogEndLine->setTypeLine(typeLine); dialogEndLine->setFormula(formula); @@ -46,8 +49,9 @@ void VToolEndLine::setDialog(){ dialogEndLine->setPointName(p.name()); } -void VToolEndLine::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ +void VToolEndLine::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data) +{ QString pointName = dialog->getPointName(); QString typeLine = dialog->getTypeLine(); QString formula = dialog->getFormula(); @@ -60,29 +64,35 @@ void VToolEndLine::Create(QSharedPointer &dialog, VMainGraphicsSc void VToolEndLine::Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ - + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) +{ VPointF basePoint = data->GetPoint(basePointId); QLineF line = QLineF(basePoint.toQPointF(), QPointF(basePoint.x()+100, basePoint.y())); Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { line.setLength(toPixel(result)); line.setAngle(angle); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); data->AddLine(basePointId, id); - } else { + } + else + { data->UpdatePoint(id, VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); data->AddLine(basePointId, id); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::EndLineTool, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolEndLine *point = new VToolEndLine(doc, data, id, typeLine, formula, angle, basePointId, typeCreation); scene->addItem(point); @@ -95,9 +105,11 @@ void VToolEndLine::Create(const qint64 _id, const QString &pointName, const QStr } } -void VToolEndLine::FullUpdateFromFile(){ +void VToolEndLine::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); basePointId = domElement.attribute(AttrBasePoint, "").toLongLong(); @@ -106,14 +118,18 @@ void VToolEndLine::FullUpdateFromFile(){ RefreshGeometry(); } -void VToolEndLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolEndLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogEndLine, this, event); } -void VToolEndLine::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolEndLine::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogEndLine->getPointName()); domElement.setAttribute(AttrTypeLine, dialogEndLine->getTypeLine()); domElement.setAttribute(AttrLength, dialogEndLine->getFormula()); @@ -125,7 +141,8 @@ void VToolEndLine::FullUpdateFromGui(int result){ dialogEndLine.clear(); } -void VToolEndLine::AddToFile(){ +void VToolEndLine::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -142,4 +159,3 @@ void VToolEndLine::AddToFile(){ AddToCalculation(domElement); } - diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index 75ce3cfeb..9e7171a7f 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -25,7 +25,8 @@ #include "vtoollinepoint.h" #include "dialogs/dialogendline.h" -class VToolEndLine : public VToolLinePoint{ +class VToolEndLine : public VToolLinePoint +{ Q_OBJECT public: VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, diff --git a/tools/drawTools/vtoolheight.cpp b/tools/drawTools/vtoolheight.cpp index 0ab9ff998..e8b4d502f 100644 --- a/tools/drawTools/vtoolheight.cpp +++ b/tools/drawTools/vtoolheight.cpp @@ -6,15 +6,18 @@ VToolHeight::VToolHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, Tool::Sources typeCreation, QGraphicsItem * parent) :VToolLinePoint(doc, data, id, typeLine, QString(), basePointId, 0, parent), - dialogHeight(QSharedPointer()), p1LineId(p1LineId), p2LineId(p2LineId){ + dialogHeight(QSharedPointer()), p1LineId(p1LineId), p2LineId(p2LineId) +{ ignoreFullUpdate = true; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolHeight::setDialog(){ - Q_ASSERT(!dialogHeight.isNull()); +void VToolHeight::setDialog() +{ + Q_ASSERT(dialogHeight.isNull() == false); VPointF p = VAbstractTool::data.GetPoint(id); dialogHeight->setTypeLine(typeLine); dialogHeight->setBasePointId(basePointId, id); @@ -24,7 +27,8 @@ void VToolHeight::setDialog(){ } void VToolHeight::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data){ + VContainer *data) +{ disconnect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &DialogHeight::UpdateList); QString pointName = dialog->getPointName(); QString typeLine = dialog->getTypeLine(); @@ -38,29 +42,35 @@ void VToolHeight::Create(QSharedPointer &dialog, VMainGraphicsScen void VToolHeight::Create(const qint64 _id, const QString &pointName, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) +{ VPointF basePoint = data->GetPoint(basePointId); VPointF p1Line = data->GetPoint(p1LineId); VPointF p2Line = data->GetPoint(p2LineId); QPointF pHeight = FindPoint(QLineF(p1Line.toQPointF(), p2Line.toQPointF()), basePoint.toQPointF()); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(pHeight.x(), pHeight.y(), pointName, mx, my)); data->AddLine(basePointId, id); data->AddLine(p1LineId, id); data->AddLine(p2LineId, id); - } else { + } + else + { data->UpdatePoint(id, VPointF(pHeight.x(), pHeight.y(), pointName, mx, my)); data->AddLine(basePointId, id); data->AddLine(p1LineId, id); data->AddLine(p2LineId, id); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::Height, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolHeight *point = new VToolHeight(doc, data, id, typeLine, basePointId, p1LineId, p2LineId, typeCreation); scene->addItem(point); @@ -74,24 +84,30 @@ void VToolHeight::Create(const qint64 _id, const QString &pointName, const QStri } } -QPointF VToolHeight::FindPoint(const QLineF &line, const QPointF &point){ +QPointF VToolHeight::FindPoint(const QLineF &line, const QPointF &point) +{ qreal a = 0, b = 0, c = 0; LineCoefficients(line, &a, &b, &c); qreal x = point.x() + a; qreal y = b + point.y(); - QLineF l (point, QPointF(x, y)); + QLineF lin (point, QPointF(x, y)); QPointF p; - QLineF::IntersectType intersect = line.intersect(l, &p); - if(intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection){ + QLineF::IntersectType intersect = line.intersect(lin, &p); + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) + { return p; - } else { + } + else + { return QPointF(); } } -void VToolHeight::FullUpdateFromFile(){ +void VToolHeight::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); basePointId = domElement.attribute(AttrBasePoint, "").toLongLong(); p1LineId = domElement.attribute(AttrP1Line, "").toLongLong(); @@ -101,10 +117,13 @@ void VToolHeight::FullUpdateFromFile(){ } -void VToolHeight::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolHeight::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogHeight->getPointName()); domElement.setAttribute(AttrTypeLine, dialogHeight->getTypeLine()); domElement.setAttribute(AttrBasePoint, QString().setNum(dialogHeight->getBasePointId())); @@ -116,11 +135,13 @@ void VToolHeight::FullUpdateFromGui(int result){ dialogHeight.clear(); } -void VToolHeight::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolHeight::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogHeight, this, event); } -void VToolHeight::AddToFile(){ +void VToolHeight::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h index 06158aca4..2dd0145e7 100644 --- a/tools/drawTools/vtoolheight.h +++ b/tools/drawTools/vtoolheight.h @@ -25,7 +25,8 @@ #include "vtoollinepoint.h" #include "dialogs/dialogheight.h" -class VToolHeight: public VToolLinePoint{ +class VToolHeight: public VToolLinePoint +{ Q_OBJECT public: VToolHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 98d24fb94..2dccf5b97 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -24,9 +24,10 @@ const QString VToolLine::TagName = QStringLiteral("line"); VToolLine::VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, qint64 secondPoint, - Tool::Sources typeCreation, QGraphicsItem *parent):VDrawTool(doc, data, id), - QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint), - dialogLine(QSharedPointer()){ + Tool::Sources typeCreation, QGraphicsItem *parent) + :VDrawTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint), + dialogLine(QSharedPointer()) +{ ignoreFullUpdate = true; //Лінія VPointF first = data->GetPoint(firstPoint); @@ -37,18 +38,21 @@ VToolLine::VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firs this->setAcceptHoverEvents(true); this->setPen(QPen(Qt::black, widthHairLine/factor)); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolLine::setDialog(){ +void VToolLine::setDialog() +{ dialogLine->setFirstPoint(firstPoint); dialogLine->setSecondPoint(secondPoint); } void VToolLine::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data){ + VContainer *data) +{ qint64 firstPoint = dialog->getFirstPoint(); qint64 secondPoint = dialog->getSecondPoint(); Create(0, firstPoint, secondPoint, scene, doc, data, Document::FullParse, Tool::FromGui); @@ -56,23 +60,29 @@ void VToolLine::Create(QSharedPointer &dialog, VMainGraphicsScene *s void VToolLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation) +{ Q_ASSERT(scene != 0); Q_ASSERT(doc != 0); Q_ASSERT(data != 0); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->getNextId(); data->AddLine(firstPoint, secondPoint); - } else { + } + else + { data->UpdateId(id); data->AddLine(firstPoint, secondPoint); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::LineTool, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolLine *line = new VToolLine(doc, data, id, firstPoint, secondPoint, typeCreation); Q_ASSERT(line != 0); scene->addItem(line); @@ -85,14 +95,18 @@ void VToolLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 } } -void VToolLine::FullUpdateFromFile(){ +void VToolLine::FullUpdateFromFile() +{ RefreshGeometry(); } -void VToolLine::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolLine::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogLine->getFirstPoint())); domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogLine->getSecondPoint())); emit FullUpdateTree(); @@ -101,21 +115,27 @@ void VToolLine::FullUpdateFromGui(int result){ dialogLine.clear(); } -void VToolLine::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ +void VToolLine::ShowTool(qint64 id, Qt::GlobalColor color, bool enable) +{ ShowItem(this, id, color, enable); } -void VToolLine::SetFactor(qreal factor){ +void VToolLine::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshGeometry(); } -void VToolLine::ChangedActivDraw(const QString newName){ +void VToolLine::ChangedActivDraw(const QString newName) +{ bool selectable = false; - if(nameActivDraw == newName){ + if (nameActivDraw == newName) + { selectable = true; currentColor = Qt::black; - } else { + } + else + { selectable = false; currentColor = Qt::gray; } @@ -124,11 +144,13 @@ void VToolLine::ChangedActivDraw(const QString newName){ VDrawTool::ChangedActivDraw(newName); } -void VToolLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogLine, this, event); } -void VToolLine::AddToFile(){ +void VToolLine::AddToFile() +{ QDomElement domElement = doc->createElement(TagName); AddAttribute(domElement, AttrId, id); AddAttribute(domElement, AttrFirstPoint, firstPoint); @@ -137,24 +159,29 @@ void VToolLine::AddToFile(){ AddToCalculation(domElement); } -void VToolLine::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VToolLine::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine/factor)); } -void VToolLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VToolLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine/factor)); } -void VToolLine::RemoveReferens(){ +void VToolLine::RemoveReferens() +{ doc->DecrementReferens(firstPoint); doc->DecrementReferens(secondPoint); } -void VToolLine::RefreshGeometry(){ +void VToolLine::RefreshGeometry() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { firstPoint = domElement.attribute(AttrFirstPoint, "").toLongLong(); secondPoint = domElement.attribute(AttrSecondPoint, "").toLongLong(); } @@ -163,4 +190,3 @@ void VToolLine::RefreshGeometry(){ this->setLine(QLineF(first.toQPointF(), second.toQPointF())); this->setPen(QPen(currentColor, widthHairLine/factor)); } - diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index c88e6fb21..43469b535 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -26,7 +26,8 @@ #include "QGraphicsLineItem" #include "dialogs/dialogline.h" -class VToolLine: public VDrawTool, public QGraphicsLineItem{ +class VToolLine: public VDrawTool, public QGraphicsLineItem +{ Q_OBJECT public: VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index b0eb6696a..f02c897cf 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -26,29 +26,31 @@ const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect"); VToolLineIntersect::VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2, Tool::Sources typeCreation, - QGraphicsItem *parent): - VToolPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), - p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()){ + QGraphicsItem *parent) + :VToolPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), + p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()) +{ ignoreFullUpdate = true; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolLineIntersect::setDialog(){ - Q_ASSERT(!dialogLineIntersect.isNull()); - if(!dialogLineIntersect.isNull()){ - VPointF p = VAbstractTool::data.GetPoint(id); - dialogLineIntersect->setP1Line1(p1Line1); - dialogLineIntersect->setP2Line1(p2Line1); - dialogLineIntersect->setP1Line2(p1Line2); - dialogLineIntersect->setP2Line2(p2Line2); - dialogLineIntersect->setPointName(p.name()); - } +void VToolLineIntersect::setDialog() +{ + Q_ASSERT(dialogLineIntersect.isNull() == false); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogLineIntersect->setP1Line1(p1Line1); + dialogLineIntersect->setP2Line1(p2Line1); + dialogLineIntersect->setP1Line2(p1Line2); + dialogLineIntersect->setP2Line2(p2Line2); + dialogLineIntersect->setPointName(p.name()); } void VToolLineIntersect::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ qint64 p1Line1Id = dialog->getP1Line1(); qint64 p2Line1Id = dialog->getP2Line1(); qint64 p1Line2Id = dialog->getP1Line2(); @@ -62,7 +64,8 @@ void VToolLineIntersect::Create(const qint64 _id, const qint64 &p1Line1Id, const const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ + Tool::Sources typeCreation) +{ VPointF p1Line1 = data->GetPoint(p1Line1Id); VPointF p2Line1 = data->GetPoint(p2Line1Id); VPointF p1Line2 = data->GetPoint(p1Line2Id); @@ -72,28 +75,33 @@ void VToolLineIntersect::Create(const qint64 _id, const qint64 &p1Line1Id, const QLineF line2(p1Line2.toQPointF(), p2Line2.toQPointF()); QPointF fPoint; QLineF::IntersectType intersect = line1.intersect(line2, &fPoint); - if(intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection){ + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) + { qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(p1Line1Id, id); data->AddLine(id, p2Line1Id); data->AddLine(p1Line2Id, id); data->AddLine(id, p2Line2Id); - } else { + } + else + { data->UpdatePoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(p1Line1Id, id); data->AddLine(id, p2Line1Id); data->AddLine(p1Line2Id, id); data->AddLine(id, p2Line2Id); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::LineIntersectTool, doc); - if(parse == Document::FullParse){ - VToolLineIntersect *point = new VToolLineIntersect(doc, data, id, p1Line1Id, - p2Line1Id, p1Line2Id, + if (parse == Document::FullParse) + { + VToolLineIntersect *point = new VToolLineIntersect(doc, data, id, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, typeCreation); scene->addItem(point); connect(point, &VToolLineIntersect::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); @@ -108,9 +116,11 @@ void VToolLineIntersect::Create(const qint64 _id, const qint64 &p1Line1Id, const } } -void VToolLineIntersect::FullUpdateFromFile(){ +void VToolLineIntersect::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { p1Line1 = domElement.attribute(AttrP1Line1, "").toLongLong(); p2Line1 = domElement.attribute(AttrP2Line1, "").toLongLong(); p1Line2 = domElement.attribute(AttrP1Line2, "").toLongLong(); @@ -119,10 +129,13 @@ void VToolLineIntersect::FullUpdateFromFile(){ RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } -void VToolLineIntersect::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolLineIntersect::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogLineIntersect->getPointName()); domElement.setAttribute(AttrP1Line1, QString().setNum(dialogLineIntersect->getP1Line1())); domElement.setAttribute(AttrP2Line1, QString().setNum(dialogLineIntersect->getP2Line1())); @@ -134,16 +147,19 @@ void VToolLineIntersect::FullUpdateFromGui(int result){ dialogLineIntersect.clear(); } -void VToolLineIntersect::SetFactor(qreal factor){ +void VToolLineIntersect::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } -void VToolLineIntersect::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolLineIntersect::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogLineIntersect, this, event); } -void VToolLineIntersect::AddToFile(){ +void VToolLineIntersect::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -161,7 +177,8 @@ void VToolLineIntersect::AddToFile(){ AddToCalculation(domElement); } -void VToolLineIntersect::RemoveReferens(){ +void VToolLineIntersect::RemoveReferens() +{ doc->DecrementReferens(p1Line1); doc->DecrementReferens(p2Line1); doc->DecrementReferens(p1Line2); diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index 2cea55c28..5d9058dbd 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -25,7 +25,8 @@ #include "vtoolpoint.h" #include "dialogs/dialoglineintersect.h" -class VToolLineIntersect:public VToolPoint{ +class VToolLineIntersect:public VToolPoint +{ Q_OBJECT public: VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index 3c5c11785..4ebfa443b 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -23,8 +23,10 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &basePointId, - const qreal &angle, QGraphicsItem *parent):VToolPoint(doc, data, id, parent), - typeLine(typeLine), formula(formula), angle(angle), basePointId(basePointId), mainLine(0){ + const qreal &angle, QGraphicsItem *parent) + :VToolPoint(doc, data, id, parent), typeLine(typeLine), formula(formula), angle(angle), basePointId(basePointId), + mainLine(0) +{ Q_ASSERT_X(basePointId > 0, Q_FUNC_INFO, "basePointId <= 0"); //Лінія, що з'єднує дві точки QPointF point1 = data->GetPoint(basePointId).toQPointF(); @@ -32,37 +34,49 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 mainLine = new QGraphicsLineItem(QLineF(point1 - point2, QPointF()), this); mainLine->setPen(QPen(Qt::black, widthHairLine/factor)); mainLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); - if(typeLine == TypeLineNone){ + if (typeLine == TypeLineNone) + { mainLine->setVisible(false); - } else { + } + else + { mainLine->setVisible(true); } } -void VToolLinePoint::ChangedActivDraw(const QString newName){ - if(nameActivDraw == newName){ +void VToolLinePoint::ChangedActivDraw(const QString newName) +{ + if (nameActivDraw == newName) + { currentColor = Qt::black; - } else { + } + else + { currentColor = Qt::gray; } mainLine->setPen(QPen(currentColor, widthHairLine/factor)); VToolPoint::ChangedActivDraw(newName); } -void VToolLinePoint::RefreshGeometry(){ +void VToolLinePoint::RefreshGeometry() +{ mainLine->setPen(QPen(currentColor, widthHairLine/factor)); VToolPoint::RefreshPointGeometry(VDrawTool::data.GetPoint(id)); QPointF point = VDrawTool::data.GetPoint(id).toQPointF(); QPointF basePoint = VDrawTool::data.GetPoint(basePointId).toQPointF(); mainLine->setLine(QLineF(basePoint - point, QPointF())); - if(typeLine == TypeLineNone){ + if (typeLine == TypeLineNone) + { mainLine->setVisible(false); - } else { + } + else + { mainLine->setVisible(true); } } -void VToolLinePoint::SetFactor(qreal factor){ +void VToolLinePoint::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshGeometry(); } diff --git a/tools/drawTools/vtoollinepoint.h b/tools/drawTools/vtoollinepoint.h index b349fac6c..3a0e0e9f0 100644 --- a/tools/drawTools/vtoollinepoint.h +++ b/tools/drawTools/vtoollinepoint.h @@ -24,14 +24,15 @@ #include "vtoolpoint.h" -class VToolLinePoint : public VToolPoint{ +class VToolLinePoint : public VToolPoint +{ Q_OBJECT public: VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &basePointId, const qreal &angle, QGraphicsItem * parent = 0); public slots: - virtual void ChangedActivDraw(const QString newName); + virtual void ChangedActivDraw(const QString newName); virtual void SetFactor(qreal factor); protected: QString typeLine; diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 0dd4fd809..967d7c2c6 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -26,31 +26,33 @@ const QString VToolNormal::ToolType = QStringLiteral("normal"); VToolNormal::VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent): - VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), - secondPointId(secondPointId), dialogNormal(QSharedPointer()){ + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) + :VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), + secondPointId(secondPointId), dialogNormal(QSharedPointer()) +{ - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolNormal::setDialog(){ - Q_ASSERT(!dialogNormal.isNull()); - if(!dialogNormal.isNull()){ - VPointF p = VAbstractTool::data.GetPoint(id); - dialogNormal->setTypeLine(typeLine); - dialogNormal->setFormula(formula); - dialogNormal->setAngle(angle); - dialogNormal->setFirstPointId(basePointId, id); - dialogNormal->setSecondPointId(secondPointId, id); - dialogNormal->setPointName(p.name()); - } +void VToolNormal::setDialog() +{ + Q_ASSERT(dialogNormal.isNull() == false); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogNormal->setTypeLine(typeLine); + dialogNormal->setFormula(formula); + dialogNormal->setAngle(angle); + dialogNormal->setFirstPointId(basePointId, id); + dialogNormal->setSecondPointId(secondPointId, id); + dialogNormal->setPointName(p.name()); } void VToolNormal::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data){ + VContainer *data) +{ QString formula = dialog->getFormula(); qint64 firstPointId = dialog->getFirstPointId(); qint64 secondPointId = dialog->getSecondPointId(); @@ -65,28 +67,35 @@ void VToolNormal::Create(const qint64 _id, const QString &formula, const qint64 const qint64 &secondPointId, const QString typeLine, const QString pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ + Tool::Sources typeCreation) +{ VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { QPointF fPoint = VToolNormal::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), toPixel(result), angle); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(firstPointId, id); - } else { + } + else + { data->UpdatePoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(firstPointId, id); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::NormalTool, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolNormal *point = new VToolNormal(doc, data, id, typeLine, formula, angle, firstPointId, secondPointId, typeCreation); scene->addItem(point); @@ -101,7 +110,8 @@ void VToolNormal::Create(const qint64 _id, const QString &formula, const qint64 } QPointF VToolNormal::FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const qreal &length, - const qreal &angle){ + const qreal &angle) +{ QLineF line(firstPoint, secondPoint); QLineF normal = line.normalVector(); normal.setAngle(normal.angle()+angle); @@ -109,9 +119,11 @@ QPointF VToolNormal::FindPoint(const QPointF &firstPoint, const QPointF &secondP return normal.p2(); } -void VToolNormal::FullUpdateFromFile(){ +void VToolNormal::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); basePointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -121,10 +133,13 @@ void VToolNormal::FullUpdateFromFile(){ RefreshGeometry(); } -void VToolNormal::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolNormal::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogNormal->getPointName()); domElement.setAttribute(AttrTypeLine, dialogNormal->getTypeLine()); domElement.setAttribute(AttrLength, dialogNormal->getFormula()); @@ -137,16 +152,19 @@ void VToolNormal::FullUpdateFromGui(int result){ dialogNormal.clear(); } -void VToolNormal::SetFactor(qreal factor){ +void VToolNormal::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshGeometry(); } -void VToolNormal::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolNormal::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogNormal, this, event); } -void VToolNormal::AddToFile(){ +void VToolNormal::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -165,7 +183,8 @@ void VToolNormal::AddToFile(){ AddToCalculation(domElement); } -void VToolNormal::RemoveReferens(){ +void VToolNormal::RemoveReferens() +{ doc->DecrementReferens(secondPointId); VToolLinePoint::RemoveReferens(); } diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 3370d2c90..2ce571cd7 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -25,7 +25,8 @@ #include "vtoollinepoint.h" #include "dialogs/dialognormal.h" -class VToolNormal : public VToolLinePoint{ +class VToolNormal : public VToolLinePoint +{ Q_OBJECT public: VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index fc94cd91a..cc12a21c6 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -23,9 +23,9 @@ const QString VToolPoint::TagName = QStringLiteral("point"); -VToolPoint::VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, - QGraphicsItem *parent):VDrawTool(doc, data, id), - QGraphicsEllipseItem(parent), radius(toPixel(2)), namePoint(0), lineName(0){ +VToolPoint::VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem *parent):VDrawTool(doc, data, id), + QGraphicsEllipseItem(parent), radius(toPixel(2)), namePoint(0), lineName(0) +{ namePoint = new VGraphicsSimpleTextItem(this); lineName = new QGraphicsLineItem(this); connect(namePoint, &VGraphicsSimpleTextItem::NameChangePosition, this, @@ -36,7 +36,8 @@ VToolPoint::VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } -void VToolPoint::NameChangePosition(const QPointF pos){ +void VToolPoint::NameChangePosition(const QPointF pos) +{ VPointF point = VAbstractTool::data.GetPoint(id); QPointF p = pos - this->pos(); point.setMx(p.x()); @@ -46,21 +47,27 @@ void VToolPoint::NameChangePosition(const QPointF pos){ VAbstractTool::data.UpdatePoint(id, point); } -void VToolPoint::UpdateNamePosition(qreal mx, qreal my){ +void VToolPoint::UpdateNamePosition(qreal mx, qreal my) +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrMx, QString().setNum(toMM(mx))); domElement.setAttribute(AttrMy, QString().setNum(toMM(my))); emit toolhaveChange(); } } -void VToolPoint::ChangedActivDraw(const QString newName){ +void VToolPoint::ChangedActivDraw(const QString newName) +{ bool selectable = false; - if(nameActivDraw == newName){ + if (nameActivDraw == newName) + { selectable = true; currentColor = Qt::black; - } else { + } + else + { selectable = false; currentColor = Qt::gray; } @@ -76,33 +83,40 @@ void VToolPoint::ChangedActivDraw(const QString newName){ VDrawTool::ChangedActivDraw(newName); } -void VToolPoint::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ +void VToolPoint::ShowTool(qint64 id, Qt::GlobalColor color, bool enable) +{ ShowItem(this, id, color, enable); } -void VToolPoint::SetFactor(qreal factor){ +void VToolPoint::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } -void VToolPoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VToolPoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Point); } QGraphicsItem::mouseReleaseEvent(event); } -void VToolPoint::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VToolPoint::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine/factor)); } -void VToolPoint::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VToolPoint::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine/factor)); } -void VToolPoint::RefreshPointGeometry(const VPointF &point){ +void VToolPoint::RefreshPointGeometry(const VPointF &point) +{ this->setPen(QPen(currentColor, widthHairLine/factor)); QRectF rec = QRectF(0, 0, radius*2/factor, radius*2/factor); rec.translate(-rec.center().x(), -rec.center().y()); @@ -120,16 +134,20 @@ void VToolPoint::RefreshPointGeometry(const VPointF &point){ RefreshLine(); } -void VToolPoint::RefreshLine(){ +void VToolPoint::RefreshLine() +{ QRectF nameRec = namePoint->sceneBoundingRect(); QPointF p1, p2; LineIntersectCircle(QPointF(), radius/factor, QLineF(QPointF(), nameRec.center()- scenePos()), p1, p2); QPointF pRec = LineIntersectRect(nameRec, QLineF(scenePos(), nameRec.center())); lineName->setLine(QLineF(p1, pRec - scenePos())); lineName->setPen(QPen(currentColor, widthHairLine/factor)); - if(QLineF(p1, pRec - scenePos()).length() <= toPixel(4)){ + if (QLineF(p1, pRec - scenePos()).length() <= toPixel(4)) + { lineName->setVisible(false); - } else { + } + else + { lineName->setVisible(true); } } diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index 924f5c593..ae04e6fb7 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -25,7 +25,8 @@ #include "vdrawtool.h" #include "widgets/vgraphicssimpletextitem.h" -class VToolPoint: public VDrawTool, public QGraphicsEllipseItem{ +class VToolPoint: public VDrawTool, public QGraphicsEllipseItem +{ Q_OBJECT public: VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem * parent = 0); diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index f068aecb2..35ee84e7c 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -29,39 +29,43 @@ VToolPointOfContact::VToolPointOfContact(VDomDocument *doc, VContainer *data, co const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) : VToolPoint(doc, data, id, parent), radius(radius), center(center), firstPointId(firstPointId), - secondPointId(secondPointId), dialogPointOfContact(QSharedPointer()){ - - if(typeCreation == Tool::FromGui){ + secondPointId(secondPointId), dialogPointOfContact(QSharedPointer()) +{ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolPointOfContact::setDialog(){ - Q_ASSERT(!dialogPointOfContact.isNull()); - if(!dialogPointOfContact.isNull()){ - VPointF p = VAbstractTool::data.GetPoint(id); - dialogPointOfContact->setRadius(radius); - dialogPointOfContact->setCenter(center, id); - dialogPointOfContact->setFirstPoint(firstPointId, id); - dialogPointOfContact->setSecondPoint(secondPointId, id); - dialogPointOfContact->setPointName(p.name()); - } +void VToolPointOfContact::setDialog() +{ + Q_ASSERT(dialogPointOfContact.isNull() == false); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogPointOfContact->setRadius(radius); + dialogPointOfContact->setCenter(center, id); + dialogPointOfContact->setFirstPoint(firstPointId, id); + dialogPointOfContact->setSecondPoint(secondPointId, id); + dialogPointOfContact->setPointName(p.name()); } QPointF VToolPointOfContact::FindPoint(const qreal &radius, const QPointF ¢er, const QPointF &firstPoint, - const QPointF &secondPoint){ + const QPointF &secondPoint) +{ QPointF pArc; qreal s = 0.0, s_x, s_y, step = 0.01, distans; - while( s < 1){ + while ( s < 1) + { s_x = secondPoint.x()-(qAbs(secondPoint.x()-firstPoint.x()))*s; s_y = secondPoint.y()-(qAbs(secondPoint.y()-firstPoint.y()))*s; distans = QLineF(center.x(), center.y(), s_x, s_y).length(); - if(ceil(distans*10) == ceil(radius*10)){ + if (ceil(distans*10) == ceil(radius*10)) + { pArc.rx() = s_x; pArc.ry() = s_y; break; } - if(distans &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ QString radius = dialog->getRadius(); qint64 center = dialog->getCenter(); qint64 firstPointId = dialog->getFirstPoint(); @@ -85,7 +90,8 @@ void VToolPointOfContact::Create(const qint64 _id, const QString &radius, const const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation) +{ VPointF centerP = data->GetPoint(center); VPointF firstP = data->GetPoint(firstPointId); VPointF secondP = data->GetPoint(secondPointId); @@ -93,26 +99,32 @@ void VToolPointOfContact::Create(const qint64 _id, const QString &radius, const Calculator cal(data); QString errorMsg; qreal result = cal.eval(radius, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { QPointF fPoint = VToolPointOfContact::FindPoint(toPixel(result), centerP.toQPointF(), firstP.toQPointF(), secondP.toQPointF()); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(firstPointId, id); data->AddLine(secondPointId, id); data->AddLine(center, id); - } else { - data->UpdatePoint(id,VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + } + else + { + data->UpdatePoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(firstPointId, id); data->AddLine(secondPointId, id); data->AddLine(center, id); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::PointOfContact, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolPointOfContact *point = new VToolPointOfContact(doc, data, id, radius, center, firstPointId, secondPointId, typeCreation); scene->addItem(point); @@ -127,9 +139,11 @@ void VToolPointOfContact::Create(const qint64 _id, const QString &radius, const } } -void VToolPointOfContact::FullUpdateFromFile(){ +void VToolPointOfContact::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { radius = domElement.attribute(AttrRadius, ""); center = domElement.attribute(AttrCenter, "").toLongLong(); firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -138,10 +152,13 @@ void VToolPointOfContact::FullUpdateFromFile(){ RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } -void VToolPointOfContact::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolPointOfContact::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogPointOfContact->getPointName()); domElement.setAttribute(AttrRadius, dialogPointOfContact->getRadius()); domElement.setAttribute(AttrCenter, QString().setNum(dialogPointOfContact->getCenter())); @@ -153,16 +170,19 @@ void VToolPointOfContact::FullUpdateFromGui(int result){ dialogPointOfContact.clear(); } -void VToolPointOfContact::SetFactor(qreal factor){ +void VToolPointOfContact::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } -void VToolPointOfContact::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolPointOfContact::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogPointOfContact, this, event); } -void VToolPointOfContact::AddToFile(){ +void VToolPointOfContact::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -180,7 +200,8 @@ void VToolPointOfContact::AddToFile(){ AddToCalculation(domElement); } -void VToolPointOfContact::RemoveReferens(){ +void VToolPointOfContact::RemoveReferens() +{ doc->DecrementReferens(center); doc->DecrementReferens(firstPointId); doc->DecrementReferens(secondPointId); diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index 852329aa5..a5f76f046 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -25,7 +25,8 @@ #include "vtoolpoint.h" #include "dialogs/dialogpointofcontact.h" -class VToolPointOfContact : public VToolPoint{ +class VToolPointOfContact : public VToolPoint +{ public: VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, diff --git a/tools/drawTools/vtoolpointofintersection.cpp b/tools/drawTools/vtoolpointofintersection.cpp index ceff574c3..8c23281aa 100644 --- a/tools/drawTools/vtoolpointofintersection.cpp +++ b/tools/drawTools/vtoolpointofintersection.cpp @@ -6,15 +6,18 @@ VToolPointOfIntersection::VToolPointOfIntersection(VDomDocument *doc, VContainer const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), firstPointId(firstPointId), secondPointId(secondPointId), - dialogPointOfIntersection(QSharedPointer()) { + dialogPointOfIntersection(QSharedPointer()) +{ ignoreFullUpdate = true; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolPointOfIntersection::setDialog(){ - Q_ASSERT(!dialogPointOfIntersection.isNull()); +void VToolPointOfIntersection::setDialog() +{ + Q_ASSERT(dialogPointOfIntersection.isNull() == false); VPointF p = VAbstractTool::data.GetPoint(id); dialogPointOfIntersection->setFirstPointId(firstPointId, id); dialogPointOfIntersection->setSecondPointId(secondPointId, id); @@ -22,7 +25,8 @@ void VToolPointOfIntersection::setDialog(){ } void VToolPointOfIntersection::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ qint64 firstPointId = dialog->getFirstPointId(); qint64 secondPointId = dialog->getSecondPointId(); QString pointName = dialog->getPointName(); @@ -32,22 +36,28 @@ void VToolPointOfIntersection::Create(QSharedPointer void VToolPointOfIntersection::Create(const qint64 _id, const QString &pointName, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation) +{ VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); QPointF point(firstPoint.x(), secondPoint.y()); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(point.x(), point.y(), pointName, mx, my)); - } else { + } + else + { data->UpdatePoint(id, VPointF(point.x(), point.y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::Triangle, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolPointOfIntersection *point = new VToolPointOfIntersection(doc, data, id, firstPointId, secondPointId, typeCreation); scene->addItem(point); @@ -60,19 +70,24 @@ void VToolPointOfIntersection::Create(const qint64 _id, const QString &pointName } } -void VToolPointOfIntersection::FullUpdateFromFile(){ +void VToolPointOfIntersection::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } VToolPoint::RefreshPointGeometry(VDrawTool::data.GetPoint(id)); } -void VToolPointOfIntersection::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolPointOfIntersection::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogPointOfIntersection->getPointName()); domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogPointOfIntersection->getFirstPointId())); domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogPointOfIntersection->getSecondPointId())); @@ -82,16 +97,19 @@ void VToolPointOfIntersection::FullUpdateFromGui(int result){ dialogPointOfIntersection.clear(); } -void VToolPointOfIntersection::RemoveReferens(){ +void VToolPointOfIntersection::RemoveReferens() +{ doc->DecrementReferens(firstPointId); doc->DecrementReferens(secondPointId); } -void VToolPointOfIntersection::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolPointOfIntersection::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogPointOfIntersection, this, event); } -void VToolPointOfIntersection::AddToFile(){ +void VToolPointOfIntersection::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h index 6aa69cd3c..d65f31ad6 100644 --- a/tools/drawTools/vtoolpointofintersection.h +++ b/tools/drawTools/vtoolpointofintersection.h @@ -4,7 +4,8 @@ #include "vtoolpoint.h" #include "dialogs/dialogpointofintersection.h" -class VToolPointOfIntersection : public VToolPoint{ +class VToolPointOfIntersection : public VToolPoint +{ Q_OBJECT public: VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index 77b2510e9..894a448f1 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -27,51 +27,57 @@ const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); VToolShoulderPoint::VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, - QGraphicsItem * parent): - VToolLinePoint(doc, data, id, typeLine, formula, p1Line, 0, parent), p2Line(p2Line), pShoulder(pShoulder), - dialogShoulderPoint(QSharedPointer()){ - - if(typeCreation == Tool::FromGui){ + QGraphicsItem * parent) + :VToolLinePoint(doc, data, id, typeLine, formula, p1Line, 0, parent), p2Line(p2Line), pShoulder(pShoulder), + dialogShoulderPoint(QSharedPointer()) +{ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolShoulderPoint::setDialog(){ - Q_ASSERT(!dialogShoulderPoint.isNull()); - if(!dialogShoulderPoint.isNull()){ - VPointF p = VAbstractTool::data.GetPoint(id); - dialogShoulderPoint->setTypeLine(typeLine); - dialogShoulderPoint->setFormula(formula); - dialogShoulderPoint->setP1Line(basePointId, id); - dialogShoulderPoint->setP2Line(p2Line, id); - dialogShoulderPoint->setPShoulder(pShoulder, id); - dialogShoulderPoint->setPointName(p.name()); - } +void VToolShoulderPoint::setDialog() +{ + Q_ASSERT(dialogShoulderPoint.isNull() == false); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogShoulderPoint->setTypeLine(typeLine); + dialogShoulderPoint->setFormula(formula); + dialogShoulderPoint->setP1Line(basePointId, id); + dialogShoulderPoint->setP2Line(p2Line, id); + dialogShoulderPoint->setPShoulder(pShoulder, id); + dialogShoulderPoint->setPointName(p.name()); } QPointF VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, - const qreal &length){ + const qreal &length) +{ QLineF line = QLineF(p1Line, p2Line); qreal dist = line.length(); - if(dist>length){ + if (dist>length) + { qDebug()<<"A3П2="<=length){ + if (line2.length()>=length) + { return line.p2(); } } } void VToolShoulderPoint::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ QString formula = dialog->getFormula(); qint64 p1Line = dialog->getP1Line(); qint64 p2Line = dialog->getP2Line(); @@ -86,7 +92,8 @@ void VToolShoulderPoint::Create(const qint64 _id, const QString &formula, const const qint64 &p2Line, const qint64 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation) +{ VPointF firstPoint = data->GetPoint(p1Line); VPointF secondPoint = data->GetPoint(p2Line); VPointF shoulderPoint = data->GetPoint(pShoulder); @@ -94,24 +101,30 @@ void VToolShoulderPoint::Create(const qint64 _id, const QString &formula, const Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { QPointF fPoint = VToolShoulderPoint::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), shoulderPoint.toQPointF(), toPixel(result)); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(p1Line, id); data->AddLine(p2Line, id); - } else { - data->UpdatePoint(id,VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + } + else + { + data->UpdatePoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(p1Line, id); data->AddLine(p2Line, id); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::ShoulderPointTool, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolShoulderPoint *point = new VToolShoulderPoint(doc, data, id, typeLine, formula, p1Line, p2Line, pShoulder, typeCreation); @@ -127,9 +140,11 @@ void VToolShoulderPoint::Create(const qint64 _id, const QString &formula, const } } -void VToolShoulderPoint::FullUpdateFromFile(){ +void VToolShoulderPoint::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); basePointId = domElement.attribute(AttrP1Line, "").toLongLong(); @@ -139,10 +154,13 @@ void VToolShoulderPoint::FullUpdateFromFile(){ RefreshGeometry(); } -void VToolShoulderPoint::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolShoulderPoint::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogShoulderPoint->getPointName()); domElement.setAttribute(AttrTypeLine, dialogShoulderPoint->getTypeLine()); domElement.setAttribute(AttrLength, dialogShoulderPoint->getFormula()); @@ -155,16 +173,19 @@ void VToolShoulderPoint::FullUpdateFromGui(int result){ dialogShoulderPoint.clear(); } -void VToolShoulderPoint::SetFactor(qreal factor){ +void VToolShoulderPoint::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshGeometry(); } -void VToolShoulderPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolShoulderPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogShoulderPoint, this, event); } -void VToolShoulderPoint::AddToFile(){ +void VToolShoulderPoint::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -183,7 +204,8 @@ void VToolShoulderPoint::AddToFile(){ AddToCalculation(domElement); } -void VToolShoulderPoint::RemoveReferens(){ +void VToolShoulderPoint::RemoveReferens() +{ doc->DecrementReferens(p2Line); doc->DecrementReferens(pShoulder); VToolLinePoint::RemoveReferens(); diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index c56277620..e557fdbb2 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -25,7 +25,8 @@ #include "vtoollinepoint.h" #include "dialogs/dialogshoulderpoint.h" -class VToolShoulderPoint : public VToolLinePoint{ +class VToolShoulderPoint : public VToolLinePoint +{ public: VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index 79f39759e..043c80a69 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -24,25 +24,27 @@ const QString VToolSinglePoint::ToolType = QStringLiteral("single"); VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, - QGraphicsItem * parent ):VToolPoint(doc, data, id, parent), - dialogSinglePoint(QSharedPointer()){ + QGraphicsItem * parent ) + :VToolPoint(doc, data, id, parent), dialogSinglePoint(QSharedPointer()) +{ ignoreFullUpdate = true; this->setFlag(QGraphicsItem::ItemIsMovable, true); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolSinglePoint::setDialog(){ - Q_ASSERT(!dialogSinglePoint.isNull()); - if(!dialogSinglePoint.isNull()){ - VPointF p = VAbstractTool::data.GetPoint(id); - dialogSinglePoint->setData(p.name(), p.toQPointF()); - } +void VToolSinglePoint::setDialog() +{ + Q_ASSERT(dialogSinglePoint.isNull() == false); + VPointF p = VAbstractTool::data.GetPoint(id); + dialogSinglePoint->setData(p.name(), p.toQPointF()); } -void VToolSinglePoint::AddToFile(){ +void VToolSinglePoint::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -57,23 +59,28 @@ void VToolSinglePoint::AddToFile(){ AddToCalculation(domElement); } -QVariant VToolSinglePoint::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value){ - if (change == ItemPositionChange && scene()) { +QVariant VToolSinglePoint::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) +{ + if (change == ItemPositionChange && scene()) + { // value - это новое положение. QPointF newPos = value.toPointF(); QRectF rect = scene()->sceneRect(); - if (!rect.contains(newPos)) { + if (rect.contains(newPos) == false) + { // Сохраняем элемент внутри прямоугольника сцены. newPos.setX(qMin(rect.right(), qMax(newPos.x(), rect.left()))); newPos.setY(qMin(rect.bottom(), qMax(newPos.y(), rect.top()))); return newPos; } } - if (change == ItemPositionHasChanged && scene()) { + if (change == ItemPositionHasChanged && scene()) + { // value - это новое положение. QPointF newPos = value.toPointF(); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrX, QString().setNum(toMM(newPos.x()))); domElement.setAttribute(AttrY, QString().setNum(toMM(newPos.y()))); //I don't now why but signal does not work. @@ -83,26 +90,33 @@ QVariant VToolSinglePoint::itemChange(QGraphicsItem::GraphicsItemChange change, return QGraphicsItem::itemChange(change, value); } -void VToolSinglePoint::decrementReferens(){ - if(_referens > 1){ +void VToolSinglePoint::decrementReferens() +{ + if (_referens > 1) + { --_referens; } } -void VToolSinglePoint::contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ){ +void VToolSinglePoint::contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) +{ ContextMenu(dialogSinglePoint, this, event, false); } -void VToolSinglePoint::FullUpdateFromFile(){ +void VToolSinglePoint::FullUpdateFromFile() +{ RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } -void VToolSinglePoint::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolSinglePoint::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QPointF p = dialogSinglePoint->getPoint(); QString name = dialogSinglePoint->getName(); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, name); domElement.setAttribute(AttrX, QString().setNum(toMM(p.x()))); domElement.setAttribute(AttrY, QString().setNum(toMM(p.y()))); @@ -113,17 +127,22 @@ void VToolSinglePoint::FullUpdateFromGui(int result){ dialogSinglePoint.clear(); } -void VToolSinglePoint::ChangedActivDraw(const QString newName){ - if(nameActivDraw == newName){ +void VToolSinglePoint::ChangedActivDraw(const QString newName) +{ + if (nameActivDraw == newName) + { this->setFlag(QGraphicsItem::ItemIsSelectable, true); VToolPoint::ChangedActivDraw(newName); - } else { + } + else + { this->setFlag(QGraphicsItem::ItemIsSelectable, false); VToolPoint::ChangedActivDraw(newName); } } -void VToolSinglePoint::SetFactor(qreal factor){ +void VToolSinglePoint::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index 65b9365cc..4265f8f83 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -25,7 +25,8 @@ #include "dialogs/dialogsinglepoint.h" #include "vtoolpoint.h" -class VToolSinglePoint : public VToolPoint{ +class VToolSinglePoint : public VToolPoint +{ Q_OBJECT public: VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 60ed17a35..0c058806b 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -25,10 +25,11 @@ const QString VToolSpline::TagName = QStringLiteral("spline"); const QString VToolSpline::ToolType = QStringLiteral("simple"); -VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, - QGraphicsItem *parent):VDrawTool(doc, data, id), QGraphicsPathItem(parent), - dialogSpline(QSharedPointer()), controlPoints(QVector()){ +VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem *parent) + :VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogSpline(QSharedPointer()), + controlPoints(QVector()) +{ ignoreFullUpdate = true; VSpline spl = data->GetSpline(id); @@ -56,27 +57,28 @@ VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, connect(this, &VToolSpline::setEnabledPoint, controlPoint2, &VControlPointSpline::setEnabledPoint); controlPoints.append(controlPoint2); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolSpline::setDialog(){ - Q_ASSERT(!dialogSpline.isNull()); - if(!dialogSpline.isNull()){ - VSpline spl = VAbstractTool::data.GetSpline(id); - dialogSpline->setP1(spl.GetP1()); - dialogSpline->setP4(spl.GetP4()); - dialogSpline->setAngle1(spl.GetAngle1()); - dialogSpline->setAngle2(spl.GetAngle2()); - dialogSpline->setKAsm1(spl.GetKasm1()); - dialogSpline->setKAsm2(spl.GetKasm2()); - dialogSpline->setKCurve(spl.GetKcurve()); - } +void VToolSpline::setDialog() +{ + Q_ASSERT(dialogSpline.isNull() == false); + VSpline spl = VAbstractTool::data.GetSpline(id); + dialogSpline->setP1(spl.GetP1()); + dialogSpline->setP4(spl.GetP4()); + dialogSpline->setAngle1(spl.GetAngle1()); + dialogSpline->setAngle2(spl.GetAngle2()); + dialogSpline->setKAsm1(spl.GetKasm1()); + dialogSpline->setKAsm2(spl.GetKasm2()); + dialogSpline->setKCurve(spl.GetKcurve()); } void VToolSpline::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data){ + VContainer *data) +{ qint64 p1 = dialog->getP1(); qint64 p4 = dialog->getP4(); qreal kAsm1 = dialog->getKAsm1(); @@ -90,22 +92,28 @@ void VToolSpline::Create(QSharedPointer &dialog, VMainGraphicsScen void VToolSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, - VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ + VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, Tool::Sources typeCreation) +{ VSpline spline = VSpline(data->DataPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddSpline(spline); data->AddLengthSpline(data->GetNameSpline(p1, p4), toMM(spline.GetLength())); - } else { + } + else + { data->UpdateSpline(id, spline); data->AddLengthSpline(data->GetNameSpline(p1, p4), toMM(spline.GetLength())); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::SplineTool, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolSpline *spl = new VToolSpline(doc, data, id, typeCreation); scene->addItem(spl); connect(spl, &VToolSpline::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); @@ -117,12 +125,15 @@ void VToolSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, c } } -void VToolSpline::FullUpdateFromFile(){ +void VToolSpline::FullUpdateFromFile() +{ RefreshGeometry(); } -void VToolSpline::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolSpline::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { VSpline spl = VSpline (VAbstractTool::data.DataPoints(), dialogSpline->getP1(), dialogSpline->getP4(), dialogSpline->getAngle1(), dialogSpline->getAngle2(), dialogSpline->getKAsm1(), dialogSpline->getKAsm2(), dialogSpline->getKCurve()); @@ -141,7 +152,8 @@ void VToolSpline::FullUpdateFromGui(int result){ spl = VSpline (VAbstractTool::data.DataPoints(), dialogSpline->getP1(), controlPoints[0]->pos(), controlPoints[1]->pos(), dialogSpline->getP4(), dialogSpline->getKCurve()); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrPoint1, QString().setNum(spl.GetP1())); domElement.setAttribute(AttrPoint4, QString().setNum(spl.GetP4())); domElement.setAttribute(AttrAngle1, QString().setNum(spl.GetAngle1())); @@ -156,16 +168,21 @@ void VToolSpline::FullUpdateFromGui(int result){ } void VToolSpline::ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos){ + const QPointF pos) +{ Q_UNUSED(indexSpline); VSpline spl = VAbstractTool::data.GetSpline(id); - if(position == SplinePoint::FirstPoint){ + if (position == SplinePoint::FirstPoint) + { spl.ModifiSpl (spl.GetP1(), pos, spl.GetP3(), spl.GetP4(), spl.GetKcurve()); - } else { + } + else + { spl.ModifiSpl (spl.GetP1(), spl.GetP2(), pos, spl.GetP4(), spl.GetKcurve()); } QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrAngle1, QString().setNum(spl.GetAngle1())); domElement.setAttribute(AttrAngle2, QString().setNum(spl.GetAngle2())); domElement.setAttribute(AttrKAsm1, QString().setNum(spl.GetKasm1())); @@ -175,11 +192,13 @@ void VToolSpline::ControlPointChangePosition(const qint32 &indexSpline, SplinePo } } -void VToolSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogSpline, this, event); } -void VToolSpline::AddToFile(){ +void VToolSpline::AddToFile() +{ VSpline spl = VAbstractTool::data.GetSpline(id); QDomElement domElement = doc->createElement(TagName); @@ -196,30 +215,36 @@ void VToolSpline::AddToFile(){ AddToCalculation(domElement); } -void VToolSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VToolSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Spline); } QGraphicsItem::mouseReleaseEvent(event); } -void VToolSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VToolSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine/factor)); } -void VToolSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VToolSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine/factor)); } -void VToolSpline::RemoveReferens(){ +void VToolSpline::RemoveReferens() +{ VSpline spl = VAbstractTool::data.GetSpline(id); doc->DecrementReferens(spl.GetP1()); doc->DecrementReferens(spl.GetP4()); } -void VToolSpline::RefreshGeometry(){ +void VToolSpline::RefreshGeometry() +{ this->setPen(QPen(currentColor, widthHairLine/factor)); VSpline spl = VAbstractTool::data.GetSpline(id); QPainterPath path; @@ -246,12 +271,16 @@ void VToolSpline::RefreshGeometry(){ } -void VToolSpline::ChangedActivDraw(const QString newName){ +void VToolSpline::ChangedActivDraw(const QString newName) +{ bool selectable = false; - if(nameActivDraw == newName){ + if (nameActivDraw == newName) + { selectable = true; currentColor = Qt::black; - } else { + } + else + { selectable = false; currentColor = Qt::gray; } @@ -262,11 +291,13 @@ void VToolSpline::ChangedActivDraw(const QString newName){ VDrawTool::ChangedActivDraw(newName); } -void VToolSpline::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ +void VToolSpline::ShowTool(qint64 id, Qt::GlobalColor color, bool enable) +{ ShowItem(this, id, color, enable); } -void VToolSpline::SetFactor(qreal factor){ +void VToolSpline::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshGeometry(); } diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index a298b7ae4..bc5ccb9fa 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -28,7 +28,8 @@ #include "widgets/vcontrolpointspline.h" #include "geometry/vsplinepath.h" -class VToolSpline:public VDrawTool, public QGraphicsPathItem{ +class VToolSpline:public VDrawTool, public QGraphicsPathItem +{ Q_OBJECT public: VToolSpline (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index 3e8cb0bee..fe793e24c 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -24,11 +24,11 @@ const QString VToolSplinePath::TagName = QStringLiteral("spline"); const QString VToolSplinePath::ToolType = QStringLiteral("path"); -VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, - QGraphicsItem *parent):VDrawTool(doc, data, id), - QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), - controlPoints(QVector()){ +VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem *parent) + :VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), + controlPoints(QVector()) +{ ignoreFullUpdate = true; VSplinePath splPath = data->GetSplinePath(id); QPainterPath path; @@ -39,7 +39,8 @@ VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); - for(qint32 i = 1; i<=splPath.Count(); ++i){ + for (qint32 i = 1; i<=splPath.Count(); ++i) + { VSpline spl = splPath.GetSpline(i); VControlPointSpline *controlPoint = new VControlPointSpline(i, SplinePoint::FirstPoint, spl.GetP2(), spl.GetPointP1().toQPointF(), this); @@ -57,23 +58,25 @@ VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, connect(this, &VToolSplinePath::setEnabledPoint, controlPoint, &VControlPointSpline::setEnabledPoint); controlPoints.append(controlPoint); } - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolSplinePath::setDialog(){ - Q_ASSERT(!dialogSplinePath.isNull()); - if(!dialogSplinePath.isNull()){ - VSplinePath splPath = VAbstractTool::data.GetSplinePath(id); - dialogSplinePath->SetPath(splPath); - } +void VToolSplinePath::setDialog() +{ + Q_ASSERT(dialogSplinePath.isNull() == false); + VSplinePath splPath = VAbstractTool::data.GetSplinePath(id); + dialogSplinePath->SetPath(splPath); } void VToolSplinePath::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ VSplinePath path = dialog->GetPath(); - for(qint32 i = 0; i < path.CountPoint(); ++i){ + for (qint32 i = 0; i < path.CountPoint(); ++i) + { doc->IncrementReferens(path[i].P()); } Create(0, path, scene, doc, data, Document::FullParse, Tool::FromGui); @@ -81,20 +84,26 @@ void VToolSplinePath::Create(QSharedPointer &dialog, VMainGrap void VToolSplinePath::Create(const qint64 _id, const VSplinePath &path, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ + Tool::Sources typeCreation) +{ qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddSplinePath(path); data->AddLengthSpline(data->GetNameSplinePath(path), toMM(path.GetLength())); - } else { + } + else + { data->UpdateSplinePath(id, path); data->AddLengthSpline(data->GetNameSplinePath(path), toMM(path.GetLength())); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::SplinePathTool, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolSplinePath *spl = new VToolSplinePath(doc, data, id, typeCreation); scene->addItem(spl); connect(spl, &VToolSplinePath::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); @@ -104,14 +113,18 @@ void VToolSplinePath::Create(const qint64 _id, const VSplinePath &path, VMainGra } } -void VToolSplinePath::FullUpdateFromFile(){ +void VToolSplinePath::FullUpdateFromFile() +{ RefreshGeometry(); } -void VToolSplinePath::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolSplinePath::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { VSplinePath splPath = dialogSplinePath->GetPath(); - for(qint32 i = 1; i<=splPath.Count(); ++i){ + for (qint32 i = 1; i<=splPath.Count(); ++i) + { VSpline spl = splPath.GetSpline(i); qint32 j = i*2; disconnect(controlPoints[j-2], &VControlPointSpline::ControlPointChangePosition, this, @@ -131,7 +144,8 @@ void VToolSplinePath::FullUpdateFromGui(int result){ CorectControlPoints(spl, splPath, i); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrKCurve, QString().setNum(splPath.getKCurve())); UpdatePathPoint(domElement, splPath); emit FullUpdateTree(); @@ -143,26 +157,31 @@ void VToolSplinePath::FullUpdateFromGui(int result){ } void VToolSplinePath::ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos){ + const QPointF pos) +{ VSplinePath splPath = VAbstractTool::data.GetSplinePath(id); VSpline spl = splPath.GetSpline(indexSpline); - if(position == SplinePoint::FirstPoint){ + if (position == SplinePoint::FirstPoint) + { spl.ModifiSpl (spl.GetP1(), pos, spl.GetP3(), spl.GetP4(), spl.GetKcurve()); - } else { + } + else + { spl.ModifiSpl (spl.GetP1(), spl.GetP2(), pos, spl.GetP4(), spl.GetKcurve()); } CorectControlPoints(spl, splPath, indexSpline); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrKCurve, QString().setNum(splPath.getKCurve())); UpdatePathPoint(domElement, splPath); emit FullUpdateTree(); } } -void VToolSplinePath::CorectControlPoints(const VSpline &spl, VSplinePath &splPath, - const qint32 &indexSpline){ +void VToolSplinePath::CorectControlPoints(const VSpline &spl, VSplinePath &splPath, const qint32 &indexSpline) +{ VSplinePoint p = splPath.GetSplinePoint(indexSpline, SplinePoint::FirstPoint); p.SetAngle(spl.GetAngle1()); p.SetKAsm2(spl.GetKasm1()); @@ -174,12 +193,15 @@ void VToolSplinePath::CorectControlPoints(const VSpline &spl, VSplinePath &splPa splPath.UpdatePoint(indexSpline, SplinePoint::LastPoint, p); } -void VToolSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path){ +void VToolSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path) +{ QDomNodeList nodeList = node.childNodes(); qint32 num = nodeList.size(); - for(qint32 i = 0; i < num; ++i){ + for (qint32 i = 0; i < num; ++i) + { QDomElement domElement = nodeList.at(i).toElement(); - if(!domElement.isNull()){ + if (domElement.isNull() == false) + { VSplinePoint p = path[i]; domElement.setAttribute(AttrPSpline, QString().setNum(p.P())); domElement.setAttribute(AttrKAsm1, QString().setNum(p.KAsm1())); @@ -189,12 +211,16 @@ void VToolSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path){ } } -void VToolSplinePath::ChangedActivDraw(const QString newName){ +void VToolSplinePath::ChangedActivDraw(const QString newName) +{ bool selectable = false; - if(nameActivDraw == newName){ + if (nameActivDraw == newName) + { selectable = true; currentColor = Qt::black; - } else { + } + else + { selectable = false; currentColor = Qt::gray; } @@ -205,20 +231,24 @@ void VToolSplinePath::ChangedActivDraw(const QString newName){ VDrawTool::ChangedActivDraw(newName); } -void VToolSplinePath::ShowTool(qint64 id, Qt::GlobalColor color, bool enable){ +void VToolSplinePath::ShowTool(qint64 id, Qt::GlobalColor color, bool enable) +{ ShowItem(this, id, color, enable); } -void VToolSplinePath::SetFactor(qreal factor){ +void VToolSplinePath::SetFactor(qreal factor) +{ VDrawTool::SetFactor(factor); RefreshGeometry(); } -void VToolSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogSplinePath, this, event); } -void VToolSplinePath::AddToFile(){ +void VToolSplinePath::AddToFile() +{ VSplinePath splPath = VAbstractTool::data.GetSplinePath(id); QDomElement domElement = doc->createElement(TagName); @@ -226,14 +256,16 @@ void VToolSplinePath::AddToFile(){ AddAttribute(domElement, AttrType, ToolType); AddAttribute(domElement, AttrKCurve, splPath.getKCurve()); - for(qint32 i = 0; i < splPath.CountPoint(); ++i){ + for (qint32 i = 0; i < splPath.CountPoint(); ++i) + { AddPathPoint(domElement, splPath[i]); } AddToCalculation(domElement); } -void VToolSplinePath::AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint){ +void VToolSplinePath::AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint) +{ QDomElement pathPoint = doc->createElement(AttrPathPoint); AddAttribute(pathPoint, AttrPSpline, splPoint.P()); @@ -244,38 +276,46 @@ void VToolSplinePath::AddPathPoint(QDomElement &domElement, const VSplinePoint & domElement.appendChild(pathPoint); } -void VToolSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VToolSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::SplinePath); } QGraphicsItem::mouseReleaseEvent(event); } -void VToolSplinePath::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VToolSplinePath::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine/factor)); } -void VToolSplinePath::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VToolSplinePath::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine/factor)); } -void VToolSplinePath::RemoveReferens(){ +void VToolSplinePath::RemoveReferens() +{ VSplinePath splPath = VAbstractTool::data.GetSplinePath(id); - for(qint32 i = 0; i < splPath.Count(); ++i){ + for (qint32 i = 0; i < splPath.Count(); ++i) + { doc->DecrementReferens(splPath[i].P()); } } -void VToolSplinePath::RefreshGeometry(){ +void VToolSplinePath::RefreshGeometry() +{ this->setPen(QPen(currentColor, widthHairLine/factor)); VSplinePath splPath = VAbstractTool::data.GetSplinePath(id); QPainterPath path; path.addPath(splPath.GetPath()); path.setFillRule( Qt::WindingFill ); this->setPath(path); - for(qint32 i = 1; i<=splPath.Count(); ++i){ + for (qint32 i = 1; i<=splPath.Count(); ++i) + { VSpline spl = splPath.GetSpline(i); QPointF splinePoint = spl.GetPointP1().toQPointF(); QPointF controlPoint = spl.GetP2(); @@ -296,5 +336,4 @@ void VToolSplinePath::RefreshGeometry(){ connect(controlPoints[j-1], &VControlPointSpline::ControlPointChangePosition, this, &VToolSplinePath::ControlPointChangePosition); } - } diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index 3bc9974e5..a1c3c51be 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -27,7 +27,8 @@ #include "dialogs/dialogsplinepath.h" #include "widgets/vcontrolpointspline.h" -class VToolSplinePath:public VDrawTool, public QGraphicsPathItem{ +class VToolSplinePath:public VDrawTool, public QGraphicsPathItem +{ Q_OBJECT public: VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index 6c9c74b3b..57ea24d23 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -6,15 +6,18 @@ VToolTriangle::VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 & const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), firstPointId(firstPointId), - secondPointId(secondPointId), dialogTriangle(QSharedPointer()) { + secondPointId(secondPointId), dialogTriangle(QSharedPointer()) +{ ignoreFullUpdate = true; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolTriangle::setDialog(){ - Q_ASSERT(!dialogTriangle.isNull()); +void VToolTriangle::setDialog() +{ + Q_ASSERT(dialogTriangle.isNull() == false); VPointF p = VAbstractTool::data.GetPoint(id); dialogTriangle->setAxisP1Id(axisP1Id, id); dialogTriangle->setAxisP2Id(axisP2Id, id); @@ -24,7 +27,8 @@ void VToolTriangle::setDialog(){ } void VToolTriangle::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ qint64 axisP1Id = dialog->getAxisP1Id(); qint64 axisP2Id = dialog->getAxisP2Id(); qint64 firstPointId = dialog->getFirstPointId(); @@ -37,7 +41,8 @@ void VToolTriangle::Create(QSharedPointer &dialog, VMainGraphics void VToolTriangle::Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) +{ VPointF axisP1 = data->GetPoint(axisP1Id); VPointF axisP2 = data->GetPoint(axisP2Id); VPointF firstPoint = data->GetPoint(firstPointId); @@ -46,16 +51,21 @@ void VToolTriangle::Create(const qint64 _id, const QString &pointName, const qin QPointF point = FindPoint(axisP1.toQPointF(), axisP2.toQPointF(), firstPoint.toQPointF(), secondPoint.toQPointF()); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(point.x(), point.y(), pointName, mx, my)); - } else { + } + else + { data->UpdatePoint(id, VPointF(point.x(), point.y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } VDrawTool::AddRecord(id, Tool::Triangle, doc); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolTriangle *point = new VToolTriangle(doc, data, id, axisP1Id, axisP2Id, firstPointId, secondPointId, typeCreation); scene->addItem(point); @@ -71,41 +81,50 @@ void VToolTriangle::Create(const qint64 _id, const QString &pointName, const qin } QPointF VToolTriangle::FindPoint(const QPointF axisP1, const QPointF axisP2, const QPointF firstPoint, - const QPointF secondPoint){ + const QPointF secondPoint) +{ qreal c = QLineF(firstPoint, secondPoint).length(); qreal a = QLineF(axisP2, firstPoint).length(); qreal b = QLineF(axisP2, secondPoint).length(); - if(c*c == a*a + b*b){ + if (c*c == a*a + b*b) + { QLineF l1(axisP2, firstPoint); QLineF l2(axisP2, secondPoint); - if(l1.angleTo(l2) == 90 || l2.angleTo(l1) == 90){ + if (l1.angleTo(l2) == 90 || l2.angleTo(l1) == 90) + { return axisP2; } } QLineF line = QLineF(axisP1, axisP2); qreal step = 0.01; - while(1){ + while (1) + { line.setLength(line.length()+step); a = QLineF(line.p2(), firstPoint).length(); b = QLineF(line.p2(), secondPoint).length(); - if(static_cast(c*c) == static_cast(a*a + b*b)){ + if (static_cast(c*c) == static_cast(a*a + b*b)) + { QLineF l1(axisP2, firstPoint); QLineF l2(axisP2, secondPoint); - if(l1.angleTo(l2) == 90 || l2.angleTo(l1) == 90){ + if (l1.angleTo(l2) == 90 || l2.angleTo(l1) == 90) + { return line.p2(); } } - if(c*c < a*a + b*b){ + if (c*c < a*a + b*b) + { qWarning()<elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { axisP1Id = domElement.attribute(AttrAxisP1, "").toLongLong(); axisP2Id = domElement.attribute(AttrAxisP2, "").toLongLong(); firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -114,10 +133,13 @@ void VToolTriangle::FullUpdateFromFile(){ VToolPoint::RefreshPointGeometry(VDrawTool::data.GetPoint(id)); } -void VToolTriangle::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolTriangle::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogTriangle->getPointName()); domElement.setAttribute(AttrAxisP1, QString().setNum(dialogTriangle->getAxisP1Id())); domElement.setAttribute(AttrAxisP2, QString().setNum(dialogTriangle->getAxisP2Id())); @@ -130,18 +152,21 @@ void VToolTriangle::FullUpdateFromGui(int result){ dialogTriangle.clear(); } -void VToolTriangle::RemoveReferens(){ +void VToolTriangle::RemoveReferens() +{ doc->DecrementReferens(axisP1Id); doc->DecrementReferens(axisP2Id); doc->DecrementReferens(firstPointId); doc->DecrementReferens(secondPointId); } -void VToolTriangle::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolTriangle::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogTriangle, this, event); } -void VToolTriangle::AddToFile(){ +void VToolTriangle::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index 63b07c06a..349ced7fd 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -25,7 +25,8 @@ #include "vtoolpoint.h" #include "dialogs/dialogtriangle.h" -class VToolTriangle : public VToolPoint{ +class VToolTriangle : public VToolPoint +{ Q_OBJECT public: VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index 30da7536d..eda3d393d 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -27,18 +27,21 @@ const QString VModelingAlongLine::ToolType = QStringLiteral("alongLine"); VModelingAlongLine::VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, - Tool::Sources typeCreation, QGraphicsItem *parent): - VModelingLinePoint(doc, data, id, typeLine, formula, firstPointId, 0, parent), - secondPointId(secondPointId), dialogAlongLine(QSharedPointer()){ - - if(typeCreation == Tool::FromGui){ + Tool::Sources typeCreation, QGraphicsItem *parent) + :VModelingLinePoint(doc, data, id, typeLine, formula, firstPointId, 0, parent), secondPointId(secondPointId), + dialogAlongLine(QSharedPointer()) +{ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingAlongLine::FullUpdateFromFile(){ +void VModelingAlongLine::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); basePointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -47,10 +50,13 @@ void VModelingAlongLine::FullUpdateFromFile(){ RefreshGeometry(); } -void VModelingAlongLine::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingAlongLine::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogAlongLine->getPointName()); domElement.setAttribute(AttrTypeLine, dialogAlongLine->getTypeLine()); domElement.setAttribute(AttrLength, dialogAlongLine->getFormula()); @@ -63,11 +69,13 @@ void VModelingAlongLine::FullUpdateFromGui(int result){ dialogAlongLine.clear(); } -void VModelingAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingAlongLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogAlongLine, this, event); } -void VModelingAlongLine::AddToFile(){ +void VModelingAlongLine::AddToFile() +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -85,25 +93,26 @@ void VModelingAlongLine::AddToFile(){ AddToModeling(domElement); } -void VModelingAlongLine::RemoveReferens(){ +void VModelingAlongLine::RemoveReferens() +{ doc->DecrementReferens(secondPointId); VModelingLinePoint::RemoveReferens(); } -void VModelingAlongLine::setDialog(){ - Q_ASSERT(!dialogAlongLine.isNull()); - if(!dialogAlongLine.isNull()){ - VPointF p = VAbstractTool::data.GetModelingPoint(id); - dialogAlongLine->setTypeLine(typeLine); - dialogAlongLine->setFormula(formula); - dialogAlongLine->setFirstPointId(basePointId, id); - dialogAlongLine->setSecondPointId(secondPointId, id); - dialogAlongLine->setPointName(p.name()); - } +void VModelingAlongLine::setDialog() +{ + Q_ASSERT(dialogAlongLine.isNull() == false); + VPointF p = VAbstractTool::data.GetModelingPoint(id); + dialogAlongLine->setTypeLine(typeLine); + dialogAlongLine->setFormula(formula); + dialogAlongLine->setFirstPointId(basePointId, id); + dialogAlongLine->setSecondPointId(secondPointId, id); + dialogAlongLine->setPointName(p.name()); } -VModelingAlongLine *VModelingAlongLine::Create(QSharedPointer &dialog, - VDomDocument *doc, VContainer *data){ +VModelingAlongLine *VModelingAlongLine::Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data) +{ QString formula = dialog->getFormula(); qint64 firstPointId = dialog->getFirstPointId(); qint64 secondPointId = dialog->getSecondPointId(); @@ -113,12 +122,12 @@ VModelingAlongLine *VModelingAlongLine::Create(QSharedPointer & Document::FullParse, Tool::FromGui); } -VModelingAlongLine *VModelingAlongLine::Create(const qint64 _id, const QString &pointName, - const QString &typeLine, const QString &formula, - const qint64 &firstPointId, const qint64 &secondPointId, - const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ +VModelingAlongLine *VModelingAlongLine::Create(const qint64 _id, const QString &pointName, const QString &typeLine, + const QString &formula, const qint64 &firstPointId, + const qint64 &secondPointId, const qreal &mx, const qreal &my, + VDomDocument *doc, VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation) +{ VModelingAlongLine *point = 0; VPointF firstPoint = data->GetModelingPoint(firstPointId); VPointF secondPoint = data->GetModelingPoint(secondPointId); @@ -126,21 +135,27 @@ VModelingAlongLine *VModelingAlongLine::Create(const qint64 _id, const QString & Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { line.setLength(toPixel(result)); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingPoint(VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); - } else { + } + else + { data->UpdateModelingPoint(id, VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } data->AddLine(firstPointId, id); data->AddLine(id, secondPointId); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { point = new VModelingAlongLine(doc, data, id, formula, firstPointId, secondPointId, typeLine, typeCreation); doc->AddTool(id, point); diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index eceb805b3..10806c529 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -25,7 +25,8 @@ #include "vmodelinglinepoint.h" #include "dialogs/dialogalongline.h" -class VModelingAlongLine : public VModelingLinePoint{ +class VModelingAlongLine : public VModelingLinePoint +{ Q_OBJECT public: VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index 6181db5c7..79cd93d05 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -26,30 +26,32 @@ const QString VModelingArc::TagName = QStringLiteral("arc"); const QString VModelingArc::ToolType = QStringLiteral("simple"); VModelingArc::VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, - QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), - dialogArc(QSharedPointer()){ + QGraphicsItem *parent) + :VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogArc(QSharedPointer()) +{ this->setPen(QPen(baseColor, widthHairLine)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); RefreshGeometry(); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingArc::setDialog(){ - Q_ASSERT(!dialogArc.isNull()); - if(!dialogArc.isNull()){ - VArc arc = VAbstractTool::data.GetModelingArc(id); - dialogArc->SetCenter(arc.GetCenter()); - dialogArc->SetRadius(arc.GetFormulaRadius()); - dialogArc->SetF1(arc.GetFormulaF1()); - dialogArc->SetF2(arc.GetFormulaF2()); - } +void VModelingArc::setDialog() +{ + Q_ASSERT(dialogArc.isNull() == false); + VArc arc = VAbstractTool::data.GetModelingArc(id); + dialogArc->SetCenter(arc.GetCenter()); + dialogArc->SetRadius(arc.GetFormulaRadius()); + dialogArc->SetF1(arc.GetFormulaF1()); + dialogArc->SetF2(arc.GetFormulaF2()); } -VModelingArc* VModelingArc::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data){ +VModelingArc* VModelingArc::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data) +{ qint64 center = dialog->GetCenter(); QString radius = dialog->GetRadius(); QString f1 = dialog->GetF1(); @@ -59,41 +61,50 @@ VModelingArc* VModelingArc::Create(QSharedPointer &dialog, VDomDocume VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) +{ VModelingArc *toolArc = 0; qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; Calculator cal(data); QString errorMsg; qreal result = cal.eval(radius, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { calcRadius = toPixel(result); } errorMsg.clear(); result = cal.eval(f1, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { calcF1 = result; } errorMsg.clear(); result = cal.eval(f2, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { calcF2 = result; } VArc arc = VArc(data->DataModelingPoints(), center, calcRadius, radius, calcF1, f1, calcF2, f2 ); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingArc(arc); - } else { + } + else + { data->UpdateModelingArc(id, arc); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } - data->AddLengthArc(data->GetNameArc(center,id, Draw::Modeling), toMM(arc.GetLength())); - if(parse == Document::FullParse){ + data->AddLengthArc(data->GetNameArc(center, id, Draw::Modeling), toMM(arc.GetLength())); + if (parse == Document::FullParse) + { toolArc = new VModelingArc(doc, data, id, typeCreation); doc->AddTool(id, toolArc); doc->IncrementReferens(center); @@ -101,14 +112,18 @@ VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const return toolArc; } -void VModelingArc::FullUpdateFromFile(){ +void VModelingArc::FullUpdateFromFile() +{ RefreshGeometry(); } -void VModelingArc::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingArc::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrCenter, QString().setNum(dialogArc->GetCenter())); domElement.setAttribute(AttrRadius, dialogArc->GetRadius()); domElement.setAttribute(AttrAngle1, dialogArc->GetF1()); @@ -119,11 +134,13 @@ void VModelingArc::FullUpdateFromGui(int result){ dialogArc.clear(); } -void VModelingArc::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingArc::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogArc, this, event); } -void VModelingArc::AddToFile(){ +void VModelingArc::AddToFile() +{ VArc arc = VAbstractTool::data.GetModelingArc(id); QDomElement domElement = doc->createElement(TagName); @@ -137,29 +154,35 @@ void VModelingArc::AddToFile(){ AddToModeling(domElement); } -void VModelingArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VModelingArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Arc); } QGraphicsItem::mouseReleaseEvent(event); } -void VModelingArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine)); } -void VModelingArc::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingArc::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine)); } -void VModelingArc::RemoveReferens(){ +void VModelingArc::RemoveReferens() +{ VArc arc = VAbstractTool::data.GetModelingArc(id); doc->DecrementReferens(arc.GetCenter()); } -void VModelingArc::RefreshGeometry(){ +void VModelingArc::RefreshGeometry() +{ VArc arc = VAbstractTool::data.GetModelingArc(id); QPainterPath path; path.addPath(arc.GetPath()); diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index 18c20f897..5604adf1b 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -27,7 +27,8 @@ #include "dialogs/dialogarc.h" #include "widgets/vcontrolpointspline.h" -class VModelingArc :public VModelingTool, public QGraphicsPathItem{ +class VModelingArc :public VModelingTool, public QGraphicsPathItem +{ Q_OBJECT public: VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index fa84f937b..34870255b 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -28,32 +28,34 @@ const QString VModelingBisector::ToolType = QStringLiteral("bisector"); VModelingBisector::VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, - QGraphicsItem *parent): - VModelingLinePoint(doc, data, id, typeLine, formula, secondPointId, 0, parent), firstPointId(0), - thirdPointId(0), dialogBisector(QSharedPointer()){ + QGraphicsItem *parent) + :VModelingLinePoint(doc, data, id, typeLine, formula, secondPointId, 0, parent), firstPointId(0), + thirdPointId(0), dialogBisector(QSharedPointer()) +{ this->firstPointId = firstPointId; this->thirdPointId = thirdPointId; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingBisector::setDialog(){ - Q_ASSERT(!dialogBisector.isNull()); - if(!dialogBisector.isNull()){ - VPointF p = VAbstractTool::data.GetModelingPoint(id); - dialogBisector->setTypeLine(typeLine); - dialogBisector->setFormula(formula); - dialogBisector->setFirstPointId(firstPointId, id); - dialogBisector->setSecondPointId(basePointId, id); - dialogBisector->setThirdPointId(thirdPointId, id); - dialogBisector->setPointName(p.name()); - } +void VModelingBisector::setDialog() +{ + Q_ASSERT(dialogBisector.isNull() == false); + VPointF p = VAbstractTool::data.GetModelingPoint(id); + dialogBisector->setTypeLine(typeLine); + dialogBisector->setFormula(formula); + dialogBisector->setFirstPointId(firstPointId, id); + dialogBisector->setSecondPointId(basePointId, id); + dialogBisector->setThirdPointId(thirdPointId, id); + dialogBisector->setPointName(p.name()); } VModelingBisector *VModelingBisector::Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data){ + VContainer *data) +{ QString formula = dialog->getFormula(); qint64 firstPointId = dialog->getFirstPointId(); qint64 secondPointId = dialog->getSecondPointId(); @@ -69,7 +71,8 @@ VModelingBisector *VModelingBisector::Create(const qint64 _id, const QString &fo const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ + Tool::Sources typeCreation) +{ VModelingBisector *point = 0; VPointF firstPoint = data->GetModelingPoint(firstPointId); VPointF secondPoint = data->GetModelingPoint(secondPointId); @@ -78,20 +81,26 @@ VModelingBisector *VModelingBisector::Create(const qint64 _id, const QString &fo Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { QPointF fPoint = VToolBisector::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), thirdPoint.toQPointF(), toPixel(result)); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - } else { + } + else + { data->UpdateModelingPoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } data->AddLine(firstPointId, id, Draw::Modeling); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { point = new VModelingBisector(doc, data, id, typeLine, formula, firstPointId, secondPointId, thirdPointId, typeCreation); doc->AddTool(id, point); @@ -103,9 +112,11 @@ VModelingBisector *VModelingBisector::Create(const qint64 _id, const QString &fo return point; } -void VModelingBisector::FullUpdateFromFile(){ +void VModelingBisector::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -115,10 +126,13 @@ void VModelingBisector::FullUpdateFromFile(){ RefreshGeometry(); } -void VModelingBisector::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingBisector::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogBisector->getPointName()); domElement.setAttribute(AttrTypeLine, dialogBisector->getTypeLine()); domElement.setAttribute(AttrLength, dialogBisector->getFormula()); @@ -131,11 +145,13 @@ void VModelingBisector::FullUpdateFromGui(int result){ dialogBisector.clear(); } -void VModelingBisector::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingBisector::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogBisector, this, event); } -void VModelingBisector::AddToFile(){ +void VModelingBisector::AddToFile() +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -154,7 +170,8 @@ void VModelingBisector::AddToFile(){ AddToModeling(domElement); } -void VModelingBisector::RemoveReferens(){ +void VModelingBisector::RemoveReferens() +{ doc->DecrementReferens(firstPointId); doc->DecrementReferens(thirdPointId); VModelingLinePoint::RemoveReferens(); diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index 2a84ac1fc..a80bfdb20 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -25,7 +25,8 @@ #include "vmodelinglinepoint.h" #include "dialogs/dialogbisector.h" -class VModelingBisector : public VModelingLinePoint{ +class VModelingBisector : public VModelingLinePoint +{ Q_OBJECT public: VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index fa4b51f5f..d5d2349d8 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -26,18 +26,19 @@ const QString VModelingEndLine::ToolType = QStringLiteral("endLine"); VModelingEndLine::VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, - const qint64 &basePointId, Tool::Sources typeCreation, - QGraphicsItem *parent): - VModelingLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), - dialogEndLine(QSharedPointer()){ - - if(typeCreation == Tool::FromGui){ + const qint64 &basePointId, Tool::Sources typeCreation, QGraphicsItem *parent) + :VModelingLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), + dialogEndLine(QSharedPointer()) +{ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingEndLine::setDialog(){ - Q_ASSERT(!dialogEndLine.isNull()); +void VModelingEndLine::setDialog() +{ + Q_ASSERT(dialogEndLine.isNull() == false); VPointF p = VAbstractTool::data.GetModelingPoint(id); dialogEndLine->setTypeLine(typeLine); dialogEndLine->setFormula(formula); @@ -46,8 +47,8 @@ void VModelingEndLine::setDialog(){ dialogEndLine->setPointName(p.name()); } -VModelingEndLine *VModelingEndLine::Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data){ +VModelingEndLine *VModelingEndLine::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data) +{ QString pointName = dialog->getPointName(); QString typeLine = dialog->getTypeLine(); QString formula = dialog->getFormula(); @@ -61,27 +62,34 @@ VModelingEndLine *VModelingEndLine::Create(const qint64 _id, const QString &poin const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation) +{ VModelingEndLine *point = 0; VPointF basePoint = data->GetModelingPoint(basePointId); QLineF line = QLineF(basePoint.toQPointF(), QPointF(basePoint.x()+100, basePoint.y())); Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { line.setLength(toPixel(result)); line.setAngle(angle); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingPoint(VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); - } else { + } + else + { data->UpdateModelingPoint(id, VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } data->AddLine(basePointId, id, Draw::Modeling); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { point = new VModelingEndLine(doc, data, id, typeLine, formula, angle, basePointId, typeCreation); doc->AddTool(id, point); doc->IncrementReferens(basePointId); @@ -90,9 +98,11 @@ VModelingEndLine *VModelingEndLine::Create(const qint64 _id, const QString &poin return point; } -void VModelingEndLine::FullUpdateFromFile(){ +void VModelingEndLine::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); basePointId = domElement.attribute(AttrBasePoint, "").toLongLong(); @@ -101,14 +111,18 @@ void VModelingEndLine::FullUpdateFromFile(){ RefreshGeometry(); } -void VModelingEndLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingEndLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogEndLine, this, event); } -void VModelingEndLine::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingEndLine::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogEndLine->getPointName()); domElement.setAttribute(AttrTypeLine, dialogEndLine->getTypeLine()); domElement.setAttribute(AttrLength, dialogEndLine->getFormula()); @@ -120,7 +134,8 @@ void VModelingEndLine::FullUpdateFromGui(int result){ dialogEndLine.clear(); } -void VModelingEndLine::AddToFile(){ +void VModelingEndLine::AddToFile() +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QDomElement domElement = doc->createElement(TagName); diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index edf57b266..7142d2b6c 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -25,7 +25,8 @@ #include "vmodelinglinepoint.h" #include "dialogs/dialogendline.h" -class VModelingEndLine : public VModelingLinePoint{ +class VModelingEndLine : public VModelingLinePoint +{ Q_OBJECT public: VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, diff --git a/tools/modelingTools/vmodelingheight.cpp b/tools/modelingTools/vmodelingheight.cpp index b71a69276..50024d09e 100644 --- a/tools/modelingTools/vmodelingheight.cpp +++ b/tools/modelingTools/vmodelingheight.cpp @@ -29,15 +29,18 @@ VModelingHeight::VModelingHeight(VDomDocument *doc, VContainer *data, const qint const qint64 &p2LineId, Tool::Sources typeCreation, QGraphicsItem * parent) :VModelingLinePoint(doc, data, id, typeLine, QString(), basePointId, 0, parent), - dialogHeight(QSharedPointer()), p1LineId(p1LineId), p2LineId(p2LineId){ + dialogHeight(QSharedPointer()), p1LineId(p1LineId), p2LineId(p2LineId) +{ ignoreFullUpdate = true; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingHeight::setDialog(){ - Q_ASSERT(!dialogHeight.isNull()); +void VModelingHeight::setDialog() +{ + Q_ASSERT(dialogHeight.isNull() == false); VPointF p = VAbstractTool::data.GetModelingPoint(id); dialogHeight->setTypeLine(typeLine); dialogHeight->setBasePointId(basePointId, id); @@ -46,8 +49,8 @@ void VModelingHeight::setDialog(){ dialogHeight->setPointName(p.name()); } -VModelingHeight *VModelingHeight::Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data){ +VModelingHeight *VModelingHeight::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data) +{ disconnect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &DialogHeight::UpdateList); QString pointName = dialog->getPointName(); QString typeLine = dialog->getTypeLine(); @@ -62,7 +65,8 @@ VModelingHeight *VModelingHeight::Create(const qint64 _id, const QString &pointN const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation){ + const Document::Documents &parse, Tool::Sources typeCreation) +{ VModelingHeight *point = 0; VPointF basePoint = data->GetModelingPoint(basePointId); VPointF p1Line = data->GetModelingPoint(p1LineId); @@ -72,16 +76,21 @@ VModelingHeight *VModelingHeight::Create(const qint64 _id, const QString &pointN basePoint.toQPointF()); QLineF line = QLineF(basePoint.toQPointF(), pHeight); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingPoint(VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); - } else { + } + else + { data->UpdateModelingPoint(id, VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } data->AddLine(basePointId, id, Draw::Modeling); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { point = new VModelingHeight(doc, data, id, typeLine, basePointId, p1LineId, p2LineId, typeCreation); doc->AddTool(id, point); doc->IncrementReferens(basePointId); @@ -91,9 +100,11 @@ VModelingHeight *VModelingHeight::Create(const qint64 _id, const QString &pointN return point; } -void VModelingHeight::FullUpdateFromFile(){ +void VModelingHeight::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); basePointId = domElement.attribute(AttrBasePoint, "").toLongLong(); p1LineId = domElement.attribute(AttrP1Line, "").toLongLong(); @@ -102,10 +113,13 @@ void VModelingHeight::FullUpdateFromFile(){ RefreshGeometry(); } -void VModelingHeight::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingHeight::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogHeight->getPointName()); domElement.setAttribute(AttrTypeLine, dialogHeight->getTypeLine()); domElement.setAttribute(AttrBasePoint, QString().setNum(dialogHeight->getBasePointId())); @@ -117,11 +131,13 @@ void VModelingHeight::FullUpdateFromGui(int result){ dialogHeight.clear(); } -void VModelingHeight::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingHeight::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogHeight, this, event); } -void VModelingHeight::AddToFile(){ +void VModelingHeight::AddToFile() +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QDomElement domElement = doc->createElement(TagName); diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index 7ad09f6e3..073b7bfae 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -25,7 +25,8 @@ #include "vmodelinglinepoint.h" #include "dialogs/dialogheight.h" -class VModelingHeight : public VModelingLinePoint{ +class VModelingHeight : public VModelingLinePoint +{ Q_OBJECT public: VModelingHeight(VDomDocument *doc, VContainer *data, const qint64 &id, diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index 6acd7cdd7..7f077bca1 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -26,7 +26,8 @@ const QString VModelingLine::TagName = QStringLiteral("line"); VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem *parent): VModelingTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), - secondPoint(secondPoint), dialogLine(QSharedPointer()){ + secondPoint(secondPoint), dialogLine(QSharedPointer()) +{ ignoreFullUpdate = true; //Лінія VPointF first = data->GetModelingPoint(firstPoint); @@ -36,18 +37,20 @@ VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qin this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingLine::setDialog(){ +void VModelingLine::setDialog() +{ dialogLine->setFirstPoint(firstPoint); dialogLine->setSecondPoint(secondPoint); } -VModelingLine *VModelingLine::Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data){ +VModelingLine *VModelingLine::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data) +{ qint64 firstPoint = dialog->getFirstPoint(); qint64 secondPoint = dialog->getSecondPoint(); return Create(0, firstPoint, secondPoint, doc, data, Document::FullParse, Tool::FromGui); @@ -55,21 +58,27 @@ VModelingLine *VModelingLine::Create(QSharedPointer &dialog, VDomDoc VModelingLine *VModelingLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ + Tool::Sources typeCreation) +{ VModelingLine *line = 0; Q_ASSERT(doc != 0); Q_ASSERT(data != 0); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->getNextId(); - } else { - if(parse != Document::FullParse){ + } + else + { + if (parse != Document::FullParse) + { data->UpdateId(id); doc->UpdateToolData(id, data); } } data->AddLine(firstPoint, secondPoint, Draw::Modeling); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { line = new VModelingLine(doc, data, id, firstPoint, secondPoint, typeCreation); doc->AddTool(id, line); doc->IncrementReferens(firstPoint); @@ -78,9 +87,11 @@ VModelingLine *VModelingLine::Create(const qint64 &_id, const qint64 &firstPoint return line; } -void VModelingLine::FullUpdateFromFile(){ +void VModelingLine::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { firstPoint = domElement.attribute(AttrFirstPoint, "").toLongLong(); secondPoint = domElement.attribute(AttrSecondPoint, "").toLongLong(); } @@ -89,10 +100,13 @@ void VModelingLine::FullUpdateFromFile(){ this->setLine(QLineF(first.toQPointF(), second.toQPointF())); } -void VModelingLine::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingLine::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogLine->getFirstPoint())); domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogLine->getSecondPoint())); emit FullUpdateTree(); @@ -101,11 +115,13 @@ void VModelingLine::FullUpdateFromGui(int result){ dialogLine.clear(); } -void VModelingLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingLine::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogLine, this, event); } -void VModelingLine::AddToFile(){ +void VModelingLine::AddToFile() +{ QDomElement domElement = doc->createElement(TagName); AddAttribute(domElement, AttrId, id); AddAttribute(domElement, AttrFirstPoint, firstPoint); @@ -114,17 +130,20 @@ void VModelingLine::AddToFile(){ AddToModeling(domElement); } -void VModelingLine::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingLine::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine)); } -void VModelingLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingLine::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine)); } -void VModelingLine::RemoveReferens(){ +void VModelingLine::RemoveReferens() +{ doc->DecrementReferens(firstPoint); doc->DecrementReferens(secondPoint); } diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index 8bee26207..f91380eaa 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -26,7 +26,8 @@ #include "QGraphicsLineItem" #include "dialogs/dialogline.h" -class VModelingLine: public VModelingTool, public QGraphicsLineItem{ +class VModelingLine: public VModelingTool, public QGraphicsLineItem +{ Q_OBJECT public: VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp index af78014b6..f73afb5be 100644 --- a/tools/modelingTools/vmodelinglineintersect.cpp +++ b/tools/modelingTools/vmodelinglineintersect.cpp @@ -25,29 +25,31 @@ const QString VModelingLineIntersect::ToolType = QStringLiteral("lineIntersect") VModelingLineIntersect::VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem *parent): - VModelingPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), - p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()){ + const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem *parent) + :VModelingPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), + p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()) +{ ignoreFullUpdate = true; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingLineIntersect::setDialog(){ - Q_ASSERT(!dialogLineIntersect.isNull()); - if(!dialogLineIntersect.isNull()){ - VPointF p = VAbstractTool::data.GetModelingPoint(id); - dialogLineIntersect->setP1Line1(p1Line1); - dialogLineIntersect->setP2Line1(p2Line1); - dialogLineIntersect->setP1Line2(p1Line2); - dialogLineIntersect->setP2Line2(p2Line2); - dialogLineIntersect->setPointName(p.name()); - } +void VModelingLineIntersect::setDialog() +{ + Q_ASSERT(dialogLineIntersect.isNull() == false); + VPointF p = VAbstractTool::data.GetModelingPoint(id); + dialogLineIntersect->setP1Line1(p1Line1); + dialogLineIntersect->setP2Line1(p2Line1); + dialogLineIntersect->setP1Line2(p1Line2); + dialogLineIntersect->setP2Line2(p2Line2); + dialogLineIntersect->setPointName(p.name()); } VModelingLineIntersect *VModelingLineIntersect::Create(QSharedPointer &dialog, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ qint64 p1Line1Id = dialog->getP1Line1(); qint64 p2Line1Id = dialog->getP2Line1(); qint64 p1Line2Id = dialog->getP1Line2(); @@ -62,7 +64,8 @@ VModelingLineIntersect *VModelingLineIntersect::Create(const qint64 _id, const q const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ + Tool::Sources typeCreation) +{ VModelingLineIntersect *point = 0; VPointF p1Line1 = data->GetModelingPoint(p1Line1Id); VPointF p2Line1 = data->GetModelingPoint(p2Line1Id); @@ -73,13 +76,18 @@ VModelingLineIntersect *VModelingLineIntersect::Create(const qint64 _id, const q QLineF line2(p1Line2.toQPointF(), p2Line2.toQPointF()); QPointF fPoint; QLineF::IntersectType intersect = line1.intersect(line2, &fPoint); - if(intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection){ + if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) + { qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - } else { + } + else + { data->UpdateModelingPoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } @@ -87,7 +95,8 @@ VModelingLineIntersect *VModelingLineIntersect::Create(const qint64 _id, const q data->AddLine(id, p2Line1Id, Draw::Modeling); data->AddLine(p1Line2Id, id, Draw::Modeling); data->AddLine(id, p2Line2Id, Draw::Modeling); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { point = new VModelingLineIntersect(doc, data, id, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, typeCreation); doc->AddTool(id, point); @@ -100,9 +109,11 @@ VModelingLineIntersect *VModelingLineIntersect::Create(const qint64 _id, const q return point; } -void VModelingLineIntersect::FullUpdateFromFile(){ +void VModelingLineIntersect::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { p1Line1 = domElement.attribute(AttrP1Line1, "").toLongLong(); p2Line1 = domElement.attribute(AttrP2Line1, "").toLongLong(); p1Line2 = domElement.attribute(AttrP1Line2, "").toLongLong(); @@ -111,10 +122,13 @@ void VModelingLineIntersect::FullUpdateFromFile(){ RefreshPointGeometry(VAbstractTool::data.GetModelingPoint(id)); } -void VModelingLineIntersect::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingLineIntersect::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogLineIntersect->getPointName()); domElement.setAttribute(AttrP1Line1, QString().setNum(dialogLineIntersect->getP1Line1())); domElement.setAttribute(AttrP2Line1, QString().setNum(dialogLineIntersect->getP2Line1())); @@ -126,11 +140,13 @@ void VModelingLineIntersect::FullUpdateFromGui(int result){ dialogLineIntersect.clear(); } -void VModelingLineIntersect::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingLineIntersect::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogLineIntersect, this, event); } -void VModelingLineIntersect::AddToFile(){ +void VModelingLineIntersect::AddToFile() +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -148,7 +164,8 @@ void VModelingLineIntersect::AddToFile(){ AddToModeling(domElement); } -void VModelingLineIntersect::RemoveReferens(){ +void VModelingLineIntersect::RemoveReferens() +{ doc->DecrementReferens(p1Line1); doc->DecrementReferens(p2Line1); doc->DecrementReferens(p1Line2); diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index 7051104d1..f6b1cc3e0 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -25,7 +25,8 @@ #include "vmodelingpoint.h" #include "dialogs/dialoglineintersect.h" -class VModelingLineIntersect:public VModelingPoint{ +class VModelingLineIntersect:public VModelingPoint +{ Q_OBJECT public: VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, diff --git a/tools/modelingTools/vmodelinglinepoint.cpp b/tools/modelingTools/vmodelinglinepoint.cpp index e8c05adb2..55802477a 100644 --- a/tools/modelingTools/vmodelinglinepoint.cpp +++ b/tools/modelingTools/vmodelinglinepoint.cpp @@ -23,30 +23,38 @@ VModelingLinePoint::VModelingLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &basePointId, - const qreal &angle, QGraphicsItem *parent): - VModelingPoint(doc, data, id, parent), typeLine(typeLine), formula(formula), angle(angle), - basePointId(basePointId), mainLine(0){ + const qreal &angle, QGraphicsItem *parent) + :VModelingPoint(doc, data, id, parent), typeLine(typeLine), formula(formula), angle(angle), + basePointId(basePointId), mainLine(0) +{ //Лінія, що з'єднує дві точки QPointF point1 = data->GetModelingPoint(basePointId).toQPointF(); QPointF point2 = data->GetModelingPoint(id).toQPointF(); mainLine = new QGraphicsLineItem(QLineF(point1 - point2, QPointF()), this); mainLine->setPen(QPen(Qt::black, widthHairLine)); mainLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); - if(typeLine == TypeLineNone){ + if (typeLine == TypeLineNone) + { mainLine->setVisible(false); - } else { + } + else + { mainLine->setVisible(true); } } -void VModelingLinePoint::RefreshGeometry(){ +void VModelingLinePoint::RefreshGeometry() +{ VModelingPoint::RefreshPointGeometry(VModelingTool::data.GetModelingPoint(id)); QPointF point = VModelingTool::data.GetModelingPoint(id).toQPointF(); QPointF basePoint = VModelingTool::data.GetModelingPoint(basePointId).toQPointF(); mainLine->setLine(QLineF(basePoint - point, QPointF())); - if(typeLine == TypeLineNone){ + if (typeLine == TypeLineNone) + { mainLine->setVisible(false); - } else { + } + else + { mainLine->setVisible(true); } } diff --git a/tools/modelingTools/vmodelinglinepoint.h b/tools/modelingTools/vmodelinglinepoint.h index 2fc252b99..be3afec2e 100644 --- a/tools/modelingTools/vmodelinglinepoint.h +++ b/tools/modelingTools/vmodelinglinepoint.h @@ -24,7 +24,8 @@ #include "vmodelingpoint.h" -class VModelingLinePoint : public VModelingPoint{ +class VModelingLinePoint : public VModelingPoint +{ Q_OBJECT public: VModelingLinePoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index c9a9c2cad..57e0da070 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -25,33 +25,32 @@ const QString VModelingNormal::ToolType = QStringLiteral("normal"); -VModelingNormal::VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &typeLine, +VModelingNormal::VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent): - VModelingLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), - secondPointId(secondPointId), dialogNormal(QSharedPointer()){ - - if(typeCreation == Tool::FromGui){ + const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) + :VModelingLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), + secondPointId(secondPointId), dialogNormal(QSharedPointer()) +{ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingNormal::setDialog(){ - Q_ASSERT(!dialogNormal.isNull()); - if(!dialogNormal.isNull()){ - VPointF p = VAbstractTool::data.GetModelingPoint(id); - dialogNormal->setTypeLine(typeLine); - dialogNormal->setFormula(formula); - dialogNormal->setAngle(angle); - dialogNormal->setFirstPointId(basePointId, id); - dialogNormal->setSecondPointId(secondPointId, id); - dialogNormal->setPointName(p.name()); - } +void VModelingNormal::setDialog() +{ + Q_ASSERT(dialogNormal.isNull() == false); + VPointF p = VAbstractTool::data.GetModelingPoint(id); + dialogNormal->setTypeLine(typeLine); + dialogNormal->setFormula(formula); + dialogNormal->setAngle(angle); + dialogNormal->setFirstPointId(basePointId, id); + dialogNormal->setSecondPointId(secondPointId, id); + dialogNormal->setPointName(p.name()); } -VModelingNormal* VModelingNormal::Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data){ +VModelingNormal* VModelingNormal::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data) +{ QString formula = dialog->getFormula(); qint64 firstPointId = dialog->getFirstPointId(); qint64 secondPointId = dialog->getSecondPointId(); @@ -62,32 +61,37 @@ VModelingNormal* VModelingNormal::Create(QSharedPointer &dialog, V Document::FullParse, Tool::FromGui); } -VModelingNormal *VModelingNormal::Create(const qint64 _id, const QString &formula, - const qint64 &firstPointId, const qint64 &secondPointId, - const QString typeLine, const QString pointName, - const qreal angle, const qreal &mx, const qreal &my, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ +VModelingNormal *VModelingNormal::Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, + const qint64 &secondPointId, const QString typeLine, const QString pointName, + const qreal angle, const qreal &mx, const qreal &my, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) +{ VModelingNormal *point = 0; VPointF firstPoint = data->GetModelingPoint(firstPointId); VPointF secondPoint = data->GetModelingPoint(secondPointId); Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { QPointF fPoint = VToolNormal::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), toPixel(result), angle); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - } else { + } + else + { data->UpdateModelingPoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } data->AddLine(firstPointId, id, Draw::Modeling); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { point = new VModelingNormal(doc, data, id, typeLine, formula, angle, firstPointId, secondPointId, typeCreation); doc->AddTool(id, point); @@ -98,9 +102,11 @@ VModelingNormal *VModelingNormal::Create(const qint64 _id, const QString &formul return point; } -void VModelingNormal::FullUpdateFromFile(){ +void VModelingNormal::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); basePointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -110,10 +116,13 @@ void VModelingNormal::FullUpdateFromFile(){ RefreshGeometry(); } -void VModelingNormal::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingNormal::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogNormal->getPointName()); domElement.setAttribute(AttrTypeLine, dialogNormal->getTypeLine()); domElement.setAttribute(AttrLength, dialogNormal->getFormula()); @@ -126,11 +135,13 @@ void VModelingNormal::FullUpdateFromGui(int result){ dialogNormal.clear(); } -void VModelingNormal::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingNormal::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogNormal, this, event); } -void VModelingNormal::AddToFile(){ +void VModelingNormal::AddToFile() +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -149,7 +160,8 @@ void VModelingNormal::AddToFile(){ AddToModeling(domElement); } -void VModelingNormal::RemoveReferens(){ +void VModelingNormal::RemoveReferens() +{ doc->DecrementReferens(secondPointId); VModelingLinePoint::RemoveReferens(); } diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index c1ef9c146..91dcaef62 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -25,7 +25,8 @@ #include "vmodelinglinepoint.h" #include "dialogs/dialognormal.h" -class VModelingNormal : public VModelingLinePoint{ +class VModelingNormal : public VModelingLinePoint +{ Q_OBJECT public: VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, diff --git a/tools/modelingTools/vmodelingpoint.cpp b/tools/modelingTools/vmodelingpoint.cpp index 4bb1741fa..50bb89a03 100644 --- a/tools/modelingTools/vmodelingpoint.cpp +++ b/tools/modelingTools/vmodelingpoint.cpp @@ -24,9 +24,9 @@ const QString VModelingPoint::TagName = QStringLiteral("point"); -VModelingPoint::VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, - QGraphicsItem *parent):VModelingTool(doc, data, id), - QGraphicsEllipseItem(parent), radius(toPixel(1.5)), namePoint(0), lineName(0){ +VModelingPoint::VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem *parent) + :VModelingTool(doc, data, id), QGraphicsEllipseItem(parent), radius(toPixel(1.5)), namePoint(0), lineName(0) +{ namePoint = new VGraphicsSimpleTextItem(this); lineName = new QGraphicsLineItem(this); connect(namePoint, &VGraphicsSimpleTextItem::NameChangePosition, this, @@ -38,7 +38,8 @@ VModelingPoint::VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, RefreshPointGeometry(VAbstractTool::data.GetModelingPoint(id)); } -void VModelingPoint::NameChangePosition(const QPointF pos){ +void VModelingPoint::NameChangePosition(const QPointF pos) +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QPointF p = pos - this->pos(); point.setMx(p.x()); @@ -48,33 +49,40 @@ void VModelingPoint::NameChangePosition(const QPointF pos){ VAbstractTool::data.UpdatePoint(id, point); } -void VModelingPoint::UpdateNamePosition(qreal mx, qreal my){ +void VModelingPoint::UpdateNamePosition(qreal mx, qreal my) +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrMx, QString().setNum(toMM(mx))); domElement.setAttribute(AttrMy, QString().setNum(toMM(my))); emit toolhaveChange(); } } -void VModelingPoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VModelingPoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Point); } QGraphicsItem::mouseReleaseEvent(event); } -void VModelingPoint::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingPoint::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine)); } -void VModelingPoint::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingPoint::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine)); } -void VModelingPoint::RefreshPointGeometry(const VPointF &point){ +void VModelingPoint::RefreshPointGeometry(const VPointF &point) +{ QRectF rec = QRectF(0, 0, radius*2, radius*2); rec.translate(-rec.center().x(), -rec.center().y()); this->setRect(rec); @@ -88,15 +96,19 @@ void VModelingPoint::RefreshPointGeometry(const VPointF &point){ RefreshLine(); } -void VModelingPoint::RefreshLine(){ +void VModelingPoint::RefreshLine() +{ QRectF nameRec = namePoint->sceneBoundingRect(); QPointF p1, p2; LineIntersectCircle(QPointF(), radius, QLineF(QPointF(), nameRec.center()- scenePos()), p1, p2); QPointF pRec = LineIntersectRect(nameRec, QLineF(scenePos(), nameRec.center())); lineName->setLine(QLineF(p1, pRec - scenePos())); - if(QLineF(p1, pRec - scenePos()).length() <= toPixel(4)){ + if (QLineF(p1, pRec - scenePos()).length() <= toPixel(4)) + { lineName->setVisible(false); - } else { + } + else + { lineName->setVisible(true); } } diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h index 03a8abe6c..ff5558185 100644 --- a/tools/modelingTools/vmodelingpoint.h +++ b/tools/modelingTools/vmodelingpoint.h @@ -25,7 +25,8 @@ #include "vmodelingtool.h" #include "widgets/vgraphicssimpletextitem.h" -class VModelingPoint: public VModelingTool, public QGraphicsEllipseItem{ +class VModelingPoint: public VModelingTool, public QGraphicsEllipseItem +{ Q_OBJECT public: VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphicsItem * parent = 0); diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index 11e9bd5ac..f87a094ad 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -26,31 +26,32 @@ const QString VModelingPointOfContact::ToolType = QStringLiteral("pointOfContact"); VModelingPointOfContact::VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, - const QString &radius, const qint64 ¢er, - const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem *parent) + const QString &radius, const qint64 ¢er, + const qint64 &firstPointId, const qint64 &secondPointId, + Tool::Sources typeCreation, QGraphicsItem *parent) : VModelingPoint(doc, data, id, parent), radius(radius), center(center), firstPointId(firstPointId), - secondPointId(secondPointId), dialogPointOfContact(QSharedPointer()){ - - if(typeCreation == Tool::FromGui){ + secondPointId(secondPointId), dialogPointOfContact(QSharedPointer()) +{ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingPointOfContact::setDialog(){ - Q_ASSERT(!dialogPointOfContact.isNull()); - if(!dialogPointOfContact.isNull()){ - VPointF p = VAbstractTool::data.GetModelingPoint(id); - dialogPointOfContact->setRadius(radius); - dialogPointOfContact->setCenter(center, id); - dialogPointOfContact->setFirstPoint(firstPointId, id); - dialogPointOfContact->setSecondPoint(secondPointId, id); - dialogPointOfContact->setPointName(p.name()); - } +void VModelingPointOfContact::setDialog() +{ + Q_ASSERT(dialogPointOfContact.isNull() == false); + VPointF p = VAbstractTool::data.GetModelingPoint(id); + dialogPointOfContact->setRadius(radius); + dialogPointOfContact->setCenter(center, id); + dialogPointOfContact->setFirstPoint(firstPointId, id); + dialogPointOfContact->setSecondPoint(secondPointId, id); + dialogPointOfContact->setPointName(p.name()); } VModelingPointOfContact *VModelingPointOfContact::Create(QSharedPointer &dialog, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ QString radius = dialog->getRadius(); qint64 center = dialog->getCenter(); qint64 firstPointId = dialog->getFirstPoint(); @@ -66,7 +67,8 @@ VModelingPointOfContact *VModelingPointOfContact::Create(const qint64 _id, const const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ + Tool::Sources typeCreation) +{ VModelingPointOfContact *point = 0; VPointF centerP = data->GetModelingPoint(center); VPointF firstP = data->GetModelingPoint(firstPointId); @@ -75,19 +77,25 @@ VModelingPointOfContact *VModelingPointOfContact::Create(const qint64 _id, const Calculator cal(data); QString errorMsg; qreal result = cal.eval(radius, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { QPointF fPoint = VToolPointOfContact::FindPoint(toPixel(result), centerP.toQPointF(), firstP.toQPointF(), secondP.toQPointF()); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - } else { + } + else + { data->UpdateModelingPoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { point = new VModelingPointOfContact(doc, data, id, radius, center, firstPointId, secondPointId, typeCreation); doc->AddTool(id, point); @@ -99,9 +107,11 @@ VModelingPointOfContact *VModelingPointOfContact::Create(const qint64 _id, const return point; } -void VModelingPointOfContact::FullUpdateFromFile(){ +void VModelingPointOfContact::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { radius = domElement.attribute(AttrRadius, ""); center = domElement.attribute(AttrCenter, "").toLongLong(); firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -110,10 +120,13 @@ void VModelingPointOfContact::FullUpdateFromFile(){ RefreshPointGeometry(VAbstractTool::data.GetModelingPoint(id)); } -void VModelingPointOfContact::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingPointOfContact::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogPointOfContact->getPointName()); domElement.setAttribute(AttrRadius, dialogPointOfContact->getRadius()); domElement.setAttribute(AttrCenter, QString().setNum(dialogPointOfContact->getCenter())); @@ -125,11 +138,13 @@ void VModelingPointOfContact::FullUpdateFromGui(int result){ dialogPointOfContact.clear(); } -void VModelingPointOfContact::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingPointOfContact::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogPointOfContact, this, event); } -void VModelingPointOfContact::AddToFile(){ +void VModelingPointOfContact::AddToFile() +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -147,7 +162,8 @@ void VModelingPointOfContact::AddToFile(){ AddToModeling(domElement); } -void VModelingPointOfContact::RemoveReferens(){ +void VModelingPointOfContact::RemoveReferens() +{ doc->DecrementReferens(center); doc->DecrementReferens(firstPointId); doc->DecrementReferens(secondPointId); diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index 6eebac9ec..64418b636 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -25,7 +25,8 @@ #include "vmodelingpoint.h" #include "dialogs/dialogpointofcontact.h" -class VModelingPointOfContact : public VModelingPoint{ +class VModelingPointOfContact : public VModelingPoint +{ Q_OBJECT public: VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, diff --git a/tools/modelingTools/vmodelingpointofintersection.cpp b/tools/modelingTools/vmodelingpointofintersection.cpp index e22e97c7b..15fb326fa 100644 --- a/tools/modelingTools/vmodelingpointofintersection.cpp +++ b/tools/modelingTools/vmodelingpointofintersection.cpp @@ -6,15 +6,18 @@ VModelingPointOfIntersection::VModelingPointOfIntersection(VDomDocument *doc, VC const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) :VModelingPoint(doc, data, id, parent), firstPointId(firstPointId), secondPointId(secondPointId), - dialogPointOfIntersection(QSharedPointer()) { + dialogPointOfIntersection(QSharedPointer()) +{ ignoreFullUpdate = true; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingPointOfIntersection::setDialog(){ - Q_ASSERT(!dialogPointOfIntersection.isNull()); +void VModelingPointOfIntersection::setDialog() +{ + Q_ASSERT(dialogPointOfIntersection.isNull() == false); VPointF p = VAbstractTool::data.GetPoint(id); dialogPointOfIntersection->setFirstPointId(firstPointId, id); dialogPointOfIntersection->setSecondPointId(secondPointId, id); @@ -22,7 +25,8 @@ void VModelingPointOfIntersection::setDialog(){ } VModelingPointOfIntersection *VModelingPointOfIntersection::Create(QSharedPointer &dialog, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ qint64 firstPointId = dialog->getFirstPointId(); qint64 secondPointId = dialog->getSecondPointId(); QString pointName = dialog->getPointName(); @@ -33,24 +37,29 @@ VModelingPointOfIntersection *VModelingPointOfIntersection::Create(const qint64 const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, - const Document::Documents &parse, - Tool::Sources typeCreation){ + VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation) +{ VModelingPointOfIntersection *tool = 0; VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); QPointF point(firstPoint.x(), secondPoint.y()); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(point.x(), point.y(), pointName, mx, my)); - } else { + } + else + { data->UpdatePoint(id, VPointF(point.x(), point.y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { tool = new VModelingPointOfIntersection(doc, data, id, firstPointId, secondPointId, typeCreation); doc->AddTool(id, tool); doc->IncrementReferens(firstPointId); @@ -59,19 +68,24 @@ VModelingPointOfIntersection *VModelingPointOfIntersection::Create(const qint64 return tool; } -void VModelingPointOfIntersection::FullUpdateFromFile(){ +void VModelingPointOfIntersection::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); secondPointId = domElement.attribute(AttrSecondPoint, "").toLongLong(); } VModelingPoint::RefreshPointGeometry(VModelingTool::data.GetPoint(id)); } -void VModelingPointOfIntersection::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingPointOfIntersection::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogPointOfIntersection->getPointName()); domElement.setAttribute(AttrFirstPoint, QString().setNum(dialogPointOfIntersection->getFirstPointId())); domElement.setAttribute(AttrSecondPoint, QString().setNum(dialogPointOfIntersection->getSecondPointId())); @@ -81,16 +95,19 @@ void VModelingPointOfIntersection::FullUpdateFromGui(int result){ dialogPointOfIntersection.clear(); } -void VModelingPointOfIntersection::RemoveReferens(){ +void VModelingPointOfIntersection::RemoveReferens() +{ doc->DecrementReferens(firstPointId); doc->DecrementReferens(secondPointId); } -void VModelingPointOfIntersection::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingPointOfIntersection::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogPointOfIntersection, this, event); } -void VModelingPointOfIntersection::AddToFile(){ +void VModelingPointOfIntersection::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); diff --git a/tools/modelingTools/vmodelingpointofintersection.h b/tools/modelingTools/vmodelingpointofintersection.h index b2c00f4f2..1f11f0b6a 100644 --- a/tools/modelingTools/vmodelingpointofintersection.h +++ b/tools/modelingTools/vmodelingpointofintersection.h @@ -4,7 +4,8 @@ #include "vmodelingpoint.h" #include "dialogs/dialogpointofintersection.h" -class VModelingPointOfIntersection : public VModelingPoint{ +class VModelingPointOfIntersection : public VModelingPoint +{ Q_OBJECT public: VModelingPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index d0f32ebfb..ac27b5392 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -28,30 +28,31 @@ const QString VModelingShoulderPoint::ToolType = QStringLiteral("shoulder"); VModelingShoulderPoint::VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, - QGraphicsItem * parent): - VModelingLinePoint(doc, data, id, typeLine, formula, p1Line, 0, parent), p2Line(p2Line), - pShoulder(pShoulder), dialogShoulderPoint(QSharedPointer()){ - - if(typeCreation == Tool::FromGui){ + QGraphicsItem * parent) + :VModelingLinePoint(doc, data, id, typeLine, formula, p1Line, 0, parent), p2Line(p2Line), + pShoulder(pShoulder), dialogShoulderPoint(QSharedPointer()) +{ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingShoulderPoint::setDialog(){ - Q_ASSERT(!dialogShoulderPoint.isNull()); - if(!dialogShoulderPoint.isNull()){ - VPointF p = VAbstractTool::data.GetModelingPoint(id); - dialogShoulderPoint->setTypeLine(typeLine); - dialogShoulderPoint->setFormula(formula); - dialogShoulderPoint->setP1Line(basePointId, id); - dialogShoulderPoint->setP2Line(p2Line, id); - dialogShoulderPoint->setPShoulder(pShoulder, id); - dialogShoulderPoint->setPointName(p.name()); - } +void VModelingShoulderPoint::setDialog() +{ + Q_ASSERT(dialogShoulderPoint.isNull() == false); + VPointF p = VAbstractTool::data.GetModelingPoint(id); + dialogShoulderPoint->setTypeLine(typeLine); + dialogShoulderPoint->setFormula(formula); + dialogShoulderPoint->setP1Line(basePointId, id); + dialogShoulderPoint->setP2Line(p2Line, id); + dialogShoulderPoint->setPShoulder(pShoulder, id); + dialogShoulderPoint->setPointName(p.name()); } VModelingShoulderPoint *VModelingShoulderPoint::Create(QSharedPointer &dialog, - VDomDocument *doc, VContainer *data){ + VDomDocument *doc, VContainer *data) +{ QString formula = dialog->getFormula(); qint64 p1Line = dialog->getP1Line(); qint64 p2Line = dialog->getP2Line(); @@ -68,7 +69,8 @@ VModelingShoulderPoint *VModelingShoulderPoint::Create(const qint64 _id, const Q const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - const Tool::Sources &typeCreation){ + const Tool::Sources &typeCreation) +{ VModelingShoulderPoint *point = 0; VPointF firstPoint = data->GetModelingPoint(p1Line); VPointF secondPoint = data->GetModelingPoint(p2Line); @@ -77,21 +79,27 @@ VModelingShoulderPoint *VModelingShoulderPoint::Create(const qint64 _id, const Q Calculator cal(data); QString errorMsg; qreal result = cal.eval(formula, &errorMsg); - if(errorMsg.isEmpty()){ + if (errorMsg.isEmpty()) + { QPointF fPoint = VToolShoulderPoint::FindPoint(firstPoint.toQPointF(), secondPoint.toQPointF(), shoulderPoint.toQPointF(), toPixel(result)); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingPoint(VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - } else { - data->UpdateModelingPoint(id,VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); - if(parse != Document::FullParse){ + } + else + { + data->UpdateModelingPoint(id, VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } data->AddLine(p1Line, id, Draw::Modeling); data->AddLine(p2Line, id, Draw::Modeling); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { point = new VModelingShoulderPoint(doc, data, id, typeLine, formula, p1Line, p2Line, pShoulder, typeCreation); doc->AddTool(id, point); @@ -103,9 +111,11 @@ VModelingShoulderPoint *VModelingShoulderPoint::Create(const qint64 _id, const Q return point; } -void VModelingShoulderPoint::FullUpdateFromFile(){ +void VModelingShoulderPoint::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { typeLine = domElement.attribute(AttrTypeLine, ""); formula = domElement.attribute(AttrLength, ""); basePointId = domElement.attribute(AttrP1Line, "").toLongLong(); @@ -115,10 +125,13 @@ void VModelingShoulderPoint::FullUpdateFromFile(){ RefreshGeometry(); } -void VModelingShoulderPoint::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingShoulderPoint::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogShoulderPoint->getPointName()); domElement.setAttribute(AttrTypeLine, dialogShoulderPoint->getTypeLine()); domElement.setAttribute(AttrLength, dialogShoulderPoint->getFormula()); @@ -131,11 +144,13 @@ void VModelingShoulderPoint::FullUpdateFromGui(int result){ dialogShoulderPoint.clear(); } -void VModelingShoulderPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingShoulderPoint::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogShoulderPoint, this, event); } -void VModelingShoulderPoint::AddToFile(){ +void VModelingShoulderPoint::AddToFile() +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QDomElement domElement = doc->createElement(TagName); @@ -154,7 +169,8 @@ void VModelingShoulderPoint::AddToFile(){ AddToModeling(domElement); } -void VModelingShoulderPoint::RemoveReferens(){ +void VModelingShoulderPoint::RemoveReferens() +{ doc->DecrementReferens(p2Line); doc->DecrementReferens(pShoulder); VModelingLinePoint::RemoveReferens(); diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index a9cee71cd..e1d86995e 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -25,7 +25,8 @@ #include "vmodelinglinepoint.h" #include "dialogs/dialogshoulderpoint.h" -class VModelingShoulderPoint : public VModelingLinePoint{ +class VModelingShoulderPoint : public VModelingLinePoint +{ Q_OBJECT public: VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index 4cd48e3c8..7d3a39e69 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -26,8 +26,10 @@ const QString VModelingSpline::TagName = QStringLiteral("spline"); const QString VModelingSpline::ToolType = QStringLiteral("simple"); VModelingSpline::VModelingSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, - QGraphicsItem *parent):VModelingTool(doc, data, id), QGraphicsPathItem(parent), - dialogSpline(QSharedPointer()), controlPoints(QVector()){ + QGraphicsItem *parent) + :VModelingTool(doc, data, id), QGraphicsPathItem(parent), + dialogSpline(QSharedPointer()), controlPoints(QVector()) +{ ignoreFullUpdate = true; VSpline spl = data->GetModelingSpline(id); QPainterPath path; @@ -54,27 +56,27 @@ VModelingSpline::VModelingSpline(VDomDocument *doc, VContainer *data, qint64 id, connect(this, &VModelingSpline::setEnabledPoint, controlPoint2, &VControlPointSpline::setEnabledPoint); controlPoints.append(controlPoint2); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingSpline::setDialog(){ - Q_ASSERT(!dialogSpline.isNull()); - if(!dialogSpline.isNull()){ - VSpline spl = VAbstractTool::data.GetModelingSpline(id); - dialogSpline->setP1(spl.GetP1()); - dialogSpline->setP4(spl.GetP4()); - dialogSpline->setAngle1(spl.GetAngle1()); - dialogSpline->setAngle2(spl.GetAngle2()); - dialogSpline->setKAsm1(spl.GetKasm1()); - dialogSpline->setKAsm2(spl.GetKasm2()); - dialogSpline->setKCurve(spl.GetKcurve()); - } +void VModelingSpline::setDialog() +{ + Q_ASSERT(dialogSpline.isNull() == false); + VSpline spl = VAbstractTool::data.GetModelingSpline(id); + dialogSpline->setP1(spl.GetP1()); + dialogSpline->setP4(spl.GetP4()); + dialogSpline->setAngle1(spl.GetAngle1()); + dialogSpline->setAngle2(spl.GetAngle2()); + dialogSpline->setKAsm1(spl.GetKasm1()); + dialogSpline->setKAsm2(spl.GetKasm2()); + dialogSpline->setKCurve(spl.GetKcurve()); } -VModelingSpline *VModelingSpline::Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data){ +VModelingSpline *VModelingSpline::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data) +{ qint64 p1 = dialog->getP1(); qint64 p4 = dialog->getP4(); qreal kAsm1 = dialog->getKAsm1(); @@ -89,20 +91,26 @@ VModelingSpline *VModelingSpline::Create(QSharedPointer &dialog, V VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) +{ VModelingSpline *spl = 0; VSpline spline = VSpline(data->DataModelingPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingSpline(spline); - } else { + } + else + { data->UpdateModelingSpline(id, spline); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } data->AddLengthSpline(data->GetNameSpline(p1, p4, Draw::Modeling), toMM(spline.GetLength())); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { spl = new VModelingSpline(doc, data, id, typeCreation); doc->AddTool(id, spl); doc->IncrementReferens(p1); @@ -111,12 +119,15 @@ VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, con return spl; } -void VModelingSpline::FullUpdateFromFile(){ +void VModelingSpline::FullUpdateFromFile() +{ RefreshGeometry(); } -void VModelingSpline::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingSpline::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { VSpline spl = VSpline (VAbstractTool::data.DataModelingPoints(), dialogSpline->getP1(), dialogSpline->getP4(), dialogSpline->getAngle1(), dialogSpline->getAngle2(), dialogSpline->getKAsm1(), dialogSpline->getKAsm2(), dialogSpline->getKCurve()); @@ -136,7 +147,8 @@ void VModelingSpline::FullUpdateFromGui(int result){ controlPoints[0]->pos(), controlPoints[1]->pos(), dialogSpline->getP4(), dialogSpline->getKCurve()); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrPoint1, QString().setNum(spl.GetP1())); domElement.setAttribute(AttrPoint4, QString().setNum(spl.GetP4())); domElement.setAttribute(AttrAngle1, QString().setNum(spl.GetAngle1())); @@ -151,16 +163,21 @@ void VModelingSpline::FullUpdateFromGui(int result){ } void VModelingSpline::ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos){ + const QPointF pos) +{ Q_UNUSED(indexSpline); VSpline spl = VAbstractTool::data.GetModelingSpline(id); - if(position == SplinePoint::FirstPoint){ + if (position == SplinePoint::FirstPoint) + { spl.ModifiSpl (spl.GetP1(), pos, spl.GetP3(), spl.GetP4(), spl.GetKcurve()); - } else { + } + else + { spl.ModifiSpl (spl.GetP1(), spl.GetP2(), pos, spl.GetP4(), spl.GetKcurve()); } QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrAngle1, QString().setNum(spl.GetAngle1())); domElement.setAttribute(AttrAngle2, QString().setNum(spl.GetAngle2())); domElement.setAttribute(AttrKAsm1, QString().setNum(spl.GetKasm1())); @@ -170,11 +187,13 @@ void VModelingSpline::ControlPointChangePosition(const qint32 &indexSpline, Spli } } -void VModelingSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingSpline::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogSpline, this, event); } -void VModelingSpline::AddToFile(){ +void VModelingSpline::AddToFile() +{ VSpline spl = VAbstractTool::data.GetModelingSpline(id); QDomElement domElement = doc->createElement(TagName); @@ -191,30 +210,36 @@ void VModelingSpline::AddToFile(){ AddToModeling(domElement); } -void VModelingSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VModelingSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Spline); } QGraphicsItem::mouseReleaseEvent(event); } -void VModelingSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine)); } -void VModelingSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine)); } -void VModelingSpline::RemoveReferens(){ +void VModelingSpline::RemoveReferens() +{ VSpline spl = VAbstractTool::data.GetModelingSpline(id); doc->DecrementReferens(spl.GetP1()); doc->DecrementReferens(spl.GetP4()); } -void VModelingSpline::RefreshGeometry(){ +void VModelingSpline::RefreshGeometry() +{ VSpline spl = VAbstractTool::data.GetModelingSpline(id); QPainterPath path; path.addPath(spl.GetPath()); diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index b4417fb66..66d1bbd1c 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -28,7 +28,8 @@ #include "widgets/vcontrolpointspline.h" #include "geometry/vsplinepath.h" -class VModelingSpline:public VModelingTool, public QGraphicsPathItem{ +class VModelingSpline:public VModelingTool, public QGraphicsPathItem +{ Q_OBJECT public: VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 04e1d5c01..3022c060c 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -24,11 +24,11 @@ const QString VModelingSplinePath::TagName = QStringLiteral("spline"); const QString VModelingSplinePath::ToolType = QStringLiteral("path"); -VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, - QGraphicsItem *parent):VModelingTool(doc, data, id), - QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), - controlPoints(QVector()){ +VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + QGraphicsItem *parent) + :VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), + controlPoints(QVector()) +{ ignoreFullUpdate = true; VSplinePath splPath = data->GetModelingSplinePath(id); QPainterPath path; @@ -39,7 +39,8 @@ VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qi this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); - for(qint32 i = 1; i<=splPath.Count(); ++i){ + for (qint32 i = 1; i<=splPath.Count(); ++i) + { VSpline spl = splPath.GetSpline(i); VControlPointSpline *controlPoint = new VControlPointSpline(i, SplinePoint::FirstPoint, spl.GetP2(), spl.GetPointP1().toQPointF(), this); @@ -57,57 +58,69 @@ VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qi connect(this, &VModelingSplinePath::setEnabledPoint, controlPoint, &VControlPointSpline::setEnabledPoint); controlPoints.append(controlPoint); } - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingSplinePath::setDialog(){ - Q_ASSERT(!dialogSplinePath.isNull()); - if(!dialogSplinePath.isNull()){ - VSplinePath splPath = VAbstractTool::data.GetModelingSplinePath(id); - dialogSplinePath->SetPath(splPath); - } +void VModelingSplinePath::setDialog() +{ + Q_ASSERT(dialogSplinePath.isNull() == false); + VSplinePath splPath = VAbstractTool::data.GetModelingSplinePath(id); + dialogSplinePath->SetPath(splPath); } -VModelingSplinePath *VModelingSplinePath::Create(QSharedPointer &dialog, - VDomDocument *doc, VContainer *data){ +VModelingSplinePath *VModelingSplinePath::Create(QSharedPointer &dialog, VDomDocument *doc, + VContainer *data) +{ VSplinePath path = dialog->GetPath(); - for(qint32 i = 0; i < path.CountPoint(); ++i){ + for (qint32 i = 0; i < path.CountPoint(); ++i) + { doc->IncrementReferens(path[i].P()); } return Create(0, path, doc, data, Document::FullParse, Tool::FromGui); } -VModelingSplinePath * VModelingSplinePath::Create(const qint64 _id, const VSplinePath &path, - VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ +VModelingSplinePath * VModelingSplinePath::Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, + VContainer *data, const Document::Documents &parse, + Tool::Sources typeCreation) +{ VModelingSplinePath *spl = 0; qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddModelingSplinePath(path); - } else { + } + else + { data->UpdateModelingSplinePath(id, path); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } data->AddLengthSpline(data->GetNameSplinePath(path), toMM(path.GetLength())); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { spl = new VModelingSplinePath(doc, data, id, typeCreation); doc->AddTool(id, spl); } return spl; } -void VModelingSplinePath::FullUpdateFromFile(){ +void VModelingSplinePath::FullUpdateFromFile() +{ RefreshGeometry(); } -void VModelingSplinePath::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingSplinePath::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { VSplinePath splPath = dialogSplinePath->GetPath(); - for(qint32 i = 1; i<=splPath.Count(); ++i){ + for (qint32 i = 1; i<=splPath.Count(); ++i) + { VSpline spl = splPath.GetSpline(i); qint32 j = i*2; disconnect(controlPoints[j-2], &VControlPointSpline::ControlPointChangePosition, this, @@ -127,7 +140,8 @@ void VModelingSplinePath::FullUpdateFromGui(int result){ CorectControlPoints(spl, splPath, i); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrKCurve, QString().setNum(splPath.getKCurve())); UpdatePathPoint(domElement, splPath); emit FullUpdateTree(); @@ -139,26 +153,31 @@ void VModelingSplinePath::FullUpdateFromGui(int result){ } void VModelingSplinePath::ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos){ + const QPointF pos) +{ VSplinePath splPath = VAbstractTool::data.GetModelingSplinePath(id); VSpline spl = splPath.GetSpline(indexSpline); - if(position == SplinePoint::FirstPoint){ + if (position == SplinePoint::FirstPoint) + { spl.ModifiSpl (spl.GetP1(), pos, spl.GetP3(), spl.GetP4(), spl.GetKcurve()); - } else { + } + else + { spl.ModifiSpl (spl.GetP1(), spl.GetP2(), pos, spl.GetP4(), spl.GetKcurve()); } CorectControlPoints(spl, splPath, indexSpline); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrKCurve, QString().setNum(splPath.getKCurve())); UpdatePathPoint(domElement, splPath); emit FullUpdateTree(); } } -void VModelingSplinePath::CorectControlPoints(const VSpline &spl, VSplinePath &splPath, - const qint32 &indexSpline){ +void VModelingSplinePath::CorectControlPoints(const VSpline &spl, VSplinePath &splPath, const qint32 &indexSpline) +{ VSplinePoint p = splPath.GetSplinePoint(indexSpline, SplinePoint::FirstPoint); p.SetAngle(spl.GetAngle1()); p.SetKAsm2(spl.GetKasm1()); @@ -170,12 +189,15 @@ void VModelingSplinePath::CorectControlPoints(const VSpline &spl, VSplinePath &s splPath.UpdatePoint(indexSpline, SplinePoint::LastPoint, p); } -void VModelingSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path){ +void VModelingSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path) +{ QDomNodeList nodeList = node.childNodes(); qint32 num = nodeList.size(); - for(qint32 i = 0; i < num; ++i){ + for (qint32 i = 0; i < num; ++i) + { QDomElement domElement = nodeList.at(i).toElement(); - if(!domElement.isNull()){ + if (domElement.isNull() == false) + { VSplinePoint p = path[i]; domElement.setAttribute(AttrPSpline, QString().setNum(p.P())); domElement.setAttribute(AttrKAsm1, QString().setNum(p.KAsm1())); @@ -185,11 +207,13 @@ void VModelingSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path){ } } -void VModelingSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingSplinePath::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogSplinePath, this, event); } -void VModelingSplinePath::AddToFile(){ +void VModelingSplinePath::AddToFile() +{ VSplinePath splPath = VAbstractTool::data.GetModelingSplinePath(id); QDomElement domElement = doc->createElement(TagName); @@ -197,14 +221,16 @@ void VModelingSplinePath::AddToFile(){ AddAttribute(domElement, AttrType, ToolType); AddAttribute(domElement, AttrKCurve, splPath.getKCurve()); - for(qint32 i = 0; i < splPath.CountPoint(); ++i){ + for (qint32 i = 0; i < splPath.CountPoint(); ++i) + { AddPathPoint(domElement, splPath[i]); } AddToModeling(domElement); } -void VModelingSplinePath::AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint){ +void VModelingSplinePath::AddPathPoint(QDomElement &domElement, const VSplinePoint &splPoint) +{ QDomElement pathPoint = doc->createElement(AttrPathPoint); AddAttribute(pathPoint, AttrPSpline, splPoint.P()); @@ -215,37 +241,45 @@ void VModelingSplinePath::AddPathPoint(QDomElement &domElement, const VSplinePoi domElement.appendChild(pathPoint); } -void VModelingSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VModelingSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::SplinePath); } QGraphicsItem::mouseReleaseEvent(event); } -void VModelingSplinePath::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingSplinePath::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine)); } -void VModelingSplinePath::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VModelingSplinePath::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine)); } -void VModelingSplinePath::RemoveReferens(){ +void VModelingSplinePath::RemoveReferens() +{ VSplinePath splPath = VAbstractTool::data.GetModelingSplinePath(id); - for(qint32 i = 0; i < splPath.Count(); ++i){ + for (qint32 i = 0; i < splPath.Count(); ++i) + { doc->DecrementReferens(splPath[i].P()); } } -void VModelingSplinePath::RefreshGeometry(){ +void VModelingSplinePath::RefreshGeometry() +{ VSplinePath splPath = VAbstractTool::data.GetModelingSplinePath(id); QPainterPath path; path.addPath(splPath.GetPath()); path.setFillRule( Qt::WindingFill ); this->setPath(path); - for(qint32 i = 1; i<=splPath.Count(); ++i){ + for (qint32 i = 1; i<=splPath.Count(); ++i) + { VSpline spl = splPath.GetSpline(i); QPointF splinePoint = spl.GetPointP1().toQPointF(); QPointF controlPoint = spl.GetP2(); @@ -266,5 +300,4 @@ void VModelingSplinePath::RefreshGeometry(){ connect(controlPoints[j-1], &VControlPointSpline::ControlPointChangePosition, this, &VModelingSplinePath::ControlPointChangePosition); } - } diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index 19f44235f..4071c1c70 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -27,7 +27,8 @@ #include "dialogs/dialogsplinepath.h" #include "widgets/vcontrolpointspline.h" -class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem{ +class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem +{ Q_OBJECT public: VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, diff --git a/tools/modelingTools/vmodelingtool.cpp b/tools/modelingTools/vmodelingtool.cpp index fd38f2088..cc0d58cb9 100644 --- a/tools/modelingTools/vmodelingtool.cpp +++ b/tools/modelingTools/vmodelingtool.cpp @@ -22,32 +22,42 @@ #include "vmodelingtool.h" #include -VModelingTool::VModelingTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent): -VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false), ignoreFullUpdate(false) { +VModelingTool::VModelingTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent) + :VAbstractTool(doc, data, id, parent), ignoreContextMenuEvent(false), ignoreFullUpdate(false) +{ _referens = 0; } -void VModelingTool::AddToModeling(const QDomElement &domElement){ +void VModelingTool::AddToModeling(const QDomElement &domElement) +{ QDomElement modelingElement; bool ok = doc->GetActivModelingElement(modelingElement); - if(ok){ + if (ok) + { modelingElement.appendChild(domElement); - } else { + } + else + { qCritical()<<"Can't find tag Modeling"<< Q_FUNC_INFO; } emit toolhaveChange(); } -void VModelingTool::decrementReferens(){ - if(_referens > 0){ +void VModelingTool::decrementReferens() +{ + if (_referens > 0) + { --_referens; } - if(_referens <= 0){ + if (_referens <= 0) + { RemoveReferens(); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { QDomNode element = domElement.parentNode(); - if(!element.isNull()){ + if (element.isNull() == false) + { element.removeChild(domElement); } } diff --git a/tools/modelingTools/vmodelingtool.h b/tools/modelingTools/vmodelingtool.h index 014ff996d..e40edaacd 100644 --- a/tools/modelingTools/vmodelingtool.h +++ b/tools/modelingTools/vmodelingtool.h @@ -25,7 +25,8 @@ #include "../vabstracttool.h" #include -class VModelingTool: public VAbstractTool{ +class VModelingTool: public VAbstractTool +{ Q_OBJECT public: VModelingTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); @@ -41,27 +42,35 @@ protected: virtual void decrementReferens(); template void ContextMenu(QSharedPointer &dialog, Tool *tool, QGraphicsSceneContextMenuEvent *event, - bool showRemove = true){ - if(!ignoreContextMenuEvent){ + bool showRemove = true) + { + if (ignoreContextMenuEvent == false) + { QMenu menu; QAction *actionOption = menu.addAction(tr("Option")); QAction *actionRemove = 0; - if(showRemove){ + if (showRemove) + { actionRemove = menu.addAction(tr("Delete")); - if(_referens > 1){ + if (_referens > 1) + { actionRemove->setEnabled(false); - } else { + } + else + { actionRemove->setEnabled(true); } } QAction *selectedAction = menu.exec(event->screenPos()); - if(selectedAction == actionOption){ + if (selectedAction == actionOption) + { dialog = QSharedPointer(new Dialog(getData())); connect(qobject_cast< VMainGraphicsScene * >(tool->scene()), &VMainGraphicsScene::ChoosedObject, dialog.data(), &Dialog::ChoosedObject); connect(dialog.data(), &Dialog::DialogClosed, tool, &Tool::FullUpdateFromGui); - if(!ignoreFullUpdate){ + if (ignoreFullUpdate == false) + { connect(doc, &VDomDocument::FullUpdateFromFile, dialog.data(), &Dialog::UpdateList); } @@ -69,16 +78,20 @@ protected: dialog->show(); } - if(showRemove){ - if(selectedAction == actionRemove){ + if (showRemove) + { + if (selectedAction == actionRemove) + { //deincrement referens RemoveReferens(); //remove form xml file QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { QDomElement element; bool ok = doc->GetActivCalculationElement(element); - if(ok){ + if (ok) + { element.removeChild(domElement); //update xml file emit FullUpdateTree(); diff --git a/tools/modelingTools/vmodelingtriangle.cpp b/tools/modelingTools/vmodelingtriangle.cpp index 2e068ab85..d22de1f75 100644 --- a/tools/modelingTools/vmodelingtriangle.cpp +++ b/tools/modelingTools/vmodelingtriangle.cpp @@ -28,14 +28,17 @@ VModelingTriangle::VModelingTriangle(VDomDocument *doc, VContainer *data, const const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) :VModelingPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), firstPointId(firstPointId), - secondPointId(secondPointId), dialogTriangle(QSharedPointer()) { - if(typeCreation == Tool::FromGui){ + secondPointId(secondPointId), dialogTriangle(QSharedPointer()) +{ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VModelingTriangle::setDialog(){ - Q_ASSERT(!dialogTriangle.isNull()); +void VModelingTriangle::setDialog() +{ + Q_ASSERT(dialogTriangle.isNull() == false); VPointF p = VAbstractTool::data.GetPoint(id); dialogTriangle->setAxisP1Id(axisP1Id, id); dialogTriangle->setAxisP2Id(axisP2Id, id); @@ -45,7 +48,8 @@ void VModelingTriangle::setDialog(){ } VModelingTriangle *VModelingTriangle::Create(QSharedPointer &dialog, VDomDocument *doc, - VContainer *data){ + VContainer *data) +{ qint64 axisP1Id = dialog->getAxisP1Id(); qint64 axisP2Id = dialog->getAxisP2Id(); qint64 firstPointId = dialog->getFirstPointId(); @@ -59,7 +63,8 @@ VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &po const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation){ + Tool::Sources typeCreation) +{ VModelingTriangle *tool = 0; VPointF axisP1 = data->GetPoint(axisP1Id); VPointF axisP2 = data->GetPoint(axisP2Id); @@ -69,15 +74,20 @@ VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &po QPointF point = VToolTriangle::FindPoint(axisP1.toQPointF(), axisP2.toQPointF(), firstPoint.toQPointF(), secondPoint.toQPointF()); qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddPoint(VPointF(point.x(), point.y(), pointName, mx, my)); - } else { + } + else + { data->UpdatePoint(id, VPointF(point.x(), point.y(), pointName, mx, my)); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { tool = new VModelingTriangle(doc, data, id, axisP1Id, axisP2Id, firstPointId, secondPointId, typeCreation); doc->AddTool(id, tool); doc->IncrementReferens(axisP1Id); @@ -88,9 +98,11 @@ VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &po return tool; } -void VModelingTriangle::FullUpdateFromFile(){ +void VModelingTriangle::FullUpdateFromFile() +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { axisP1Id = domElement.attribute(AttrAxisP1, "").toLongLong(); axisP2Id = domElement.attribute(AttrAxisP2, "").toLongLong(); firstPointId = domElement.attribute(AttrFirstPoint, "").toLongLong(); @@ -99,10 +111,13 @@ void VModelingTriangle::FullUpdateFromFile(){ VModelingPoint::RefreshPointGeometry(VModelingTool::data.GetPoint(id)); } -void VModelingTriangle::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VModelingTriangle::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrName, dialogTriangle->getPointName()); domElement.setAttribute(AttrAxisP1, QString().setNum(dialogTriangle->getAxisP1Id())); domElement.setAttribute(AttrAxisP2, QString().setNum(dialogTriangle->getAxisP2Id())); @@ -115,18 +130,21 @@ void VModelingTriangle::FullUpdateFromGui(int result){ dialogTriangle.clear(); } -void VModelingTriangle::RemoveReferens(){ +void VModelingTriangle::RemoveReferens() +{ doc->DecrementReferens(axisP1Id); doc->DecrementReferens(axisP2Id); doc->DecrementReferens(firstPointId); doc->DecrementReferens(secondPointId); } -void VModelingTriangle::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VModelingTriangle::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ ContextMenu(dialogTriangle, this, event); } -void VModelingTriangle::AddToFile(){ +void VModelingTriangle::AddToFile() +{ VPointF point = VAbstractTool::data.GetPoint(id); QDomElement domElement = doc->createElement(TagName); diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index 069544bd7..cc1007291 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -26,7 +26,8 @@ #include "../drawTools/vtooltriangle.h" #include "dialogs/dialogtriangle.h" -class VModelingTriangle : public VModelingPoint{ +class VModelingTriangle : public VModelingPoint +{ Q_OBJECT public: VModelingTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, diff --git a/tools/nodeDetails/vabstractnode.cpp b/tools/nodeDetails/vabstractnode.cpp index 2e671ea9d..ab9c6473f 100644 --- a/tools/nodeDetails/vabstractnode.cpp +++ b/tools/nodeDetails/vabstractnode.cpp @@ -28,32 +28,42 @@ const QString VAbstractNode::TypeObjectCalculation = QStringLiteral("Calculation const QString VAbstractNode::TypeObjectModeling = QStringLiteral("Modeling"); VAbstractNode::VAbstractNode(VDomDocument *doc, VContainer *data, qint64 id, qint64 idNode, Draw::Draws typeobject, - QObject *parent) : VAbstractTool(doc, data, id, parent), idNode(idNode), - typeobject(typeobject){ + QObject *parent) + : VAbstractTool(doc, data, id, parent), idNode(idNode), typeobject(typeobject) +{ _referens = 0; } -void VAbstractNode::AddToModeling(const QDomElement &domElement){ +void VAbstractNode::AddToModeling(const QDomElement &domElement) +{ QDomElement modelingElement; bool ok = doc->GetActivModelingElement(modelingElement); - if(ok){ + if (ok) + { modelingElement.appendChild(domElement); - } else { + } + else + { qCritical()< 0){ +void VAbstractNode::decrementReferens() +{ + if (_referens > 0) + { --_referens; } - if(_referens <= 0){ + if (_referens <= 0) + { doc->DecrementReferens(idNode); QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { QDomNode element = domElement.parentNode(); - if(!element.isNull()){ + if (element.isNull() == false) + { element.removeChild(domElement); } } diff --git a/tools/nodeDetails/vabstractnode.h b/tools/nodeDetails/vabstractnode.h index 5a931f103..a7553b878 100644 --- a/tools/nodeDetails/vabstractnode.h +++ b/tools/nodeDetails/vabstractnode.h @@ -24,7 +24,8 @@ #include "../vabstracttool.h" -class VAbstractNode : public VAbstractTool{ +class VAbstractNode : public VAbstractTool +{ Q_OBJECT public: VAbstractNode(VDomDocument *doc, VContainer *data, qint64 id, qint64 idNode, diff --git a/tools/nodeDetails/vnodearc.cpp b/tools/nodeDetails/vnodearc.cpp index 1e4d3c5c1..7f8a1cdef 100644 --- a/tools/nodeDetails/vnodearc.cpp +++ b/tools/nodeDetails/vnodearc.cpp @@ -25,67 +25,83 @@ const QString VNodeArc::TagName = QStringLiteral("arc"); const QString VNodeArc::ToolType = QStringLiteral("modeling"); VNodeArc::VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, - Tool::Sources typeCreation, QGraphicsItem * parent) : - VAbstractNode(doc, data, id, idArc, typeobject), QGraphicsPathItem(parent){ + Tool::Sources typeCreation, QGraphicsItem * parent) + :VAbstractNode(doc, data, id, idArc, typeobject), QGraphicsPathItem(parent) +{ RefreshGeometry(); this->setPen(QPen(baseColor, widthHairLine)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VNodeArc::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation){ - if(parse == Document::FullParse){ +void VNodeArc::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, + const Document::Documents &parse, Tool::Sources typeCreation) +{ + if (parse == Document::FullParse) + { VNodeArc *arc = new VNodeArc(doc, data, id, idArc, typeobject, typeCreation); Q_ASSERT(arc != 0); doc->AddTool(id, arc); doc->IncrementReferens(idArc); - } else { + } + else + { doc->UpdateToolData(id, data); } } -void VNodeArc::FullUpdateFromFile(){ +void VNodeArc::FullUpdateFromFile() +{ RefreshGeometry(); } -void VNodeArc::AddToFile(){ +void VNodeArc::AddToFile() +{ QDomElement domElement = doc->createElement(TagName); AddAttribute(domElement, AttrId, id); AddAttribute(domElement, AttrType, ToolType); AddAttribute(domElement, AttrIdObject, idNode); - if(typeobject == Draw::Calculation){ + if (typeobject == Draw::Calculation) + { AddAttribute(domElement, AttrTypeObject, TypeObjectCalculation); - } else { + } + else + { AddAttribute(domElement, AttrTypeObject, ToolType ); } AddToModeling(domElement); } -void VNodeArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VNodeArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Arc); } QGraphicsItem::mouseReleaseEvent(event); } -void VNodeArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VNodeArc::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine)); } -void VNodeArc::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VNodeArc::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine)); } -void VNodeArc::RefreshGeometry(){ +void VNodeArc::RefreshGeometry() +{ VArc arc = VAbstractTool::data.GetModelingArc(id); QPainterPath path; path.addPath(arc.GetPath()); diff --git a/tools/nodeDetails/vnodearc.h b/tools/nodeDetails/vnodearc.h index e206e2c6a..9b07ffba9 100644 --- a/tools/nodeDetails/vnodearc.h +++ b/tools/nodeDetails/vnodearc.h @@ -25,7 +25,8 @@ #include "vabstractnode.h" #include -class VNodeArc :public VAbstractNode, public QGraphicsPathItem{ +class VNodeArc :public VAbstractNode, public QGraphicsPathItem +{ Q_OBJECT public: VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, diff --git a/tools/nodeDetails/vnodepoint.cpp b/tools/nodeDetails/vnodepoint.cpp index c5b1056f8..a42370749 100644 --- a/tools/nodeDetails/vnodepoint.cpp +++ b/tools/nodeDetails/vnodepoint.cpp @@ -24,10 +24,11 @@ const QString VNodePoint::TagName = QStringLiteral("point"); const QString VNodePoint::ToolType = QStringLiteral("modeling"); -VNodePoint::VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, - Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem *parent) - :VAbstractNode(doc, data, id, idPoint, typeobject), QGraphicsEllipseItem(parent), - radius(toPixel(1.5)), namePoint(0), lineName(0){ +VNodePoint::VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, + Tool::Sources typeCreation, QGraphicsItem *parent) + :VAbstractNode(doc, data, id, idPoint, typeobject), QGraphicsEllipseItem(parent), radius(toPixel(1.5)), + namePoint(0), lineName(0) +{ namePoint = new VGraphicsSimpleTextItem(this); lineName = new QGraphicsLineItem(this); connect(namePoint, &VGraphicsSimpleTextItem::NameChangePosition, this, @@ -37,37 +38,47 @@ VNodePoint::VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 id this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); RefreshPointGeometry(VAbstractTool::data.GetModelingPoint(id)); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VNodePoint::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation){ - if(parse == Document::FullParse){ +void VNodePoint::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, + const Document::Documents &parse, Tool::Sources typeCreation) +{ + if (parse == Document::FullParse) + { VNodePoint *point = new VNodePoint(doc, data, id, idPoint, typeobject, typeCreation); Q_ASSERT(point != 0); doc->AddTool(id, point); doc->IncrementReferens(idPoint); - } else { + } + else + { doc->UpdateToolData(id, data); } } -void VNodePoint::FullUpdateFromFile(){ +void VNodePoint::FullUpdateFromFile() +{ RefreshPointGeometry(VAbstractTool::data.GetModelingPoint(id)); } -void VNodePoint::AddToFile(){ +void VNodePoint::AddToFile() +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QDomElement domElement = doc->createElement(TagName); AddAttribute(domElement, AttrId, id); AddAttribute(domElement, AttrType, ToolType); AddAttribute(domElement, AttrIdObject, idNode); - if(typeobject == Draw::Calculation){ + if (typeobject == Draw::Calculation) + { AddAttribute(domElement, AttrTypeObject, TypeObjectCalculation); - } else { + } + else + { AddAttribute(domElement, AttrTypeObject, TypeObjectModeling); } AddAttribute(domElement, AttrMx, toMM(point.mx())); @@ -76,25 +87,30 @@ void VNodePoint::AddToFile(){ AddToModeling(domElement); } -void VNodePoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VNodePoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Point); } QGraphicsItem::mouseReleaseEvent(event); } -void VNodePoint::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VNodePoint::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine)); } -void VNodePoint::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VNodePoint::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine)); } -void VNodePoint::NameChangePosition(const QPointF pos){ +void VNodePoint::NameChangePosition(const QPointF pos) +{ VPointF point = VAbstractTool::data.GetModelingPoint(id); QPointF p = pos - this->pos(); point.setMx(p.x()); @@ -104,16 +120,19 @@ void VNodePoint::NameChangePosition(const QPointF pos){ VAbstractTool::data.UpdatePoint(id, point); } -void VNodePoint::UpdateNamePosition(qreal mx, qreal my){ +void VNodePoint::UpdateNamePosition(qreal mx, qreal my) +{ QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrMx, QString().setNum(toMM(mx))); domElement.setAttribute(AttrMy, QString().setNum(toMM(my))); emit toolhaveChange(); } } -void VNodePoint::RefreshPointGeometry(const VPointF &point){ +void VNodePoint::RefreshPointGeometry(const VPointF &point) +{ QRectF rec = QRectF(0, 0, radius*2, radius*2); rec.translate(-rec.center().x(), -rec.center().y()); this->setRect(rec); @@ -128,15 +147,19 @@ void VNodePoint::RefreshPointGeometry(const VPointF &point){ RefreshLine(); } -void VNodePoint::RefreshLine(){ +void VNodePoint::RefreshLine() +{ QRectF nameRec = namePoint->sceneBoundingRect(); QPointF p1, p2; LineIntersectCircle(QPointF(), radius, QLineF(QPointF(), nameRec.center()- scenePos()), p1, p2); QPointF pRec = LineIntersectRect(nameRec, QLineF(scenePos(), nameRec.center())); lineName->setLine(QLineF(p1, pRec - scenePos())); - if(QLineF(p1, pRec - scenePos()).length() <= toPixel(4)){ + if (QLineF(p1, pRec - scenePos()).length() <= toPixel(4)) + { lineName->setVisible(false); - } else { + } + else + { lineName->setVisible(true); } } diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index e1a6d75e0..e90393e7d 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -25,7 +25,8 @@ #include "vabstractnode.h" #include "widgets/vgraphicssimpletextitem.h" -class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem{ +class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem +{ Q_OBJECT public: VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, diff --git a/tools/nodeDetails/vnodespline.cpp b/tools/nodeDetails/vnodespline.cpp index cf6092c73..b315878ae 100644 --- a/tools/nodeDetails/vnodespline.cpp +++ b/tools/nodeDetails/vnodespline.cpp @@ -24,70 +24,86 @@ const QString VNodeSpline::TagName = QStringLiteral("spline"); const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline"); -VNodeSpline::VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent) : - VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent){ +VNodeSpline::VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, + Tool::Sources typeCreation, QGraphicsItem * parent) + :VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent) +{ RefreshGeometry(); this->setPen(QPen(baseColor, widthHairLine)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } VNodeSpline *VNodeSpline::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, const Document::Documents &parse, - Tool::Sources typeCreation){ + Tool::Sources typeCreation) +{ VNodeSpline *spl = 0; - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { spl = new VNodeSpline(doc, data, id, idSpline, typeobject, typeCreation); doc->AddTool(id, spl); doc->IncrementReferens(idSpline); - } else { + } + else + { doc->UpdateToolData(id, data); } return spl; } -void VNodeSpline::FullUpdateFromFile(){ +void VNodeSpline::FullUpdateFromFile() +{ RefreshGeometry(); } -void VNodeSpline::AddToFile(){ +void VNodeSpline::AddToFile() +{ QDomElement domElement = doc->createElement(TagName); AddAttribute(domElement, AttrId, id); AddAttribute(domElement, AttrType, ToolType); AddAttribute(domElement, AttrIdObject, idNode); - if(typeobject == Draw::Calculation){ + if (typeobject == Draw::Calculation) + { AddAttribute(domElement, AttrTypeObject, TypeObjectCalculation); - } else { + } + else + { AddAttribute(domElement, AttrTypeObject, TypeObjectModeling); } AddToModeling(domElement); } -void VNodeSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VNodeSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Spline); } QGraphicsItem::mouseReleaseEvent(event); } -void VNodeSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VNodeSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine)); } -void VNodeSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VNodeSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine)); } -void VNodeSpline::RefreshGeometry(){ +void VNodeSpline::RefreshGeometry() +{ VSpline spl = VAbstractTool::data.GetModelingSpline(id); QPainterPath path; path.addPath(spl.GetPath()); diff --git a/tools/nodeDetails/vnodespline.h b/tools/nodeDetails/vnodespline.h index 3e1d381bc..6af937ab7 100644 --- a/tools/nodeDetails/vnodespline.h +++ b/tools/nodeDetails/vnodespline.h @@ -25,7 +25,8 @@ #include "vabstractnode.h" #include -class VNodeSpline:public VAbstractNode, public QGraphicsPathItem{ +class VNodeSpline:public VAbstractNode, public QGraphicsPathItem +{ Q_OBJECT public: VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, diff --git a/tools/nodeDetails/vnodesplinepath.cpp b/tools/nodeDetails/vnodesplinepath.cpp index 07ac92b53..2f226afb3 100644 --- a/tools/nodeDetails/vnodesplinepath.cpp +++ b/tools/nodeDetails/vnodesplinepath.cpp @@ -25,73 +25,88 @@ const QString VNodeSplinePath::TagName = QStringLiteral("spline"); const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); VNodeSplinePath::VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, Tool::Sources typeCreation, - QGraphicsItem * parent) : - VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent){ + Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent) + :VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent) +{ RefreshGeometry(); this->setPen(QPen(baseColor, widthHairLine)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } void VNodeSplinePath::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Document::Documents &parse, - Tool::Sources typeCreation){ - if(parse == Document::FullParse){ + Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation) +{ + if (parse == Document::FullParse) + { VNodeSplinePath *splPath = new VNodeSplinePath(doc, data, id, idSpline, typeobject, typeCreation); Q_ASSERT(splPath != 0); doc->AddTool(id, splPath); VSplinePath path = data->GetModelingSplinePath(id); const QVector *points = path.GetPoint(); - for(qint32 i = 0; isize(); ++i){ + for (qint32 i = 0; isize(); ++i) + { doc->IncrementReferens(points->at(i).P()); } - } else { + } + else + { doc->UpdateToolData(id, data); } } -void VNodeSplinePath::FullUpdateFromFile(){ +void VNodeSplinePath::FullUpdateFromFile() +{ RefreshGeometry(); } -void VNodeSplinePath::AddToFile(){ +void VNodeSplinePath::AddToFile() +{ QDomElement domElement = doc->createElement(TagName); AddAttribute(domElement, AttrId, id); AddAttribute(domElement, AttrType, ToolType); AddAttribute(domElement, AttrIdObject, idNode); - if(typeobject == Draw::Calculation){ + if (typeobject == Draw::Calculation) + { AddAttribute(domElement, AttrTypeObject, TypeObjectCalculation); - } else { + } + else + { AddAttribute(domElement, AttrTypeObject, TypeObjectModeling); } AddToModeling(domElement); } -void VNodeSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VNodeSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::SplinePath); } QGraphicsItem::mouseReleaseEvent(event); } -void VNodeSplinePath::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VNodeSplinePath::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthMainLine)); } -void VNodeSplinePath::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VNodeSplinePath::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(currentColor, widthHairLine)); } -void VNodeSplinePath::RefreshGeometry(){ +void VNodeSplinePath::RefreshGeometry() +{ VSplinePath splPath = VAbstractTool::data.GetModelingSplinePath(id); QPainterPath path; path.addPath(splPath.GetPath()); diff --git a/tools/nodeDetails/vnodesplinepath.h b/tools/nodeDetails/vnodesplinepath.h index 5e623b65c..6ee6ee980 100644 --- a/tools/nodeDetails/vnodesplinepath.h +++ b/tools/nodeDetails/vnodesplinepath.h @@ -25,7 +25,8 @@ #include "vabstractnode.h" #include -class VNodeSplinePath : public VAbstractNode, public QGraphicsPathItem{ +class VNodeSplinePath : public VAbstractNode, public QGraphicsPathItem +{ Q_OBJECT public: VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index 634a3a73f..df6bcb14e 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -58,40 +58,45 @@ const QString VAbstractTool::AttrAxisP2 = QStringLiteral("axisP2"); const QString VAbstractTool::TypeLineNone = QStringLiteral("none"); const QString VAbstractTool::TypeLineLine = QStringLiteral("hair"); -VAbstractTool::VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent): - VDataTool(data, parent), doc(doc), id(id), baseColor(Qt::black), currentColor(Qt::black){ - +VAbstractTool::VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent) + :VDataTool(data, parent), doc(doc), id(id), baseColor(Qt::black), currentColor(Qt::black) +{ connect(this, &VAbstractTool::toolhaveChange, this->doc, &VDomDocument::haveLiteChange); connect(this->doc, &VDomDocument::FullUpdateFromFile, this, &VAbstractTool::FullUpdateFromFile); connect(this, &VAbstractTool::FullUpdateTree, this->doc, &VDomDocument::FullUpdateTree); } -QPointF VAbstractTool::LineIntersectRect(QRectF rec, QLineF line){ +QPointF VAbstractTool::LineIntersectRect(QRectF rec, QLineF line) +{ qreal x1, y1, x2, y2; rec.getCoords(&x1, &y1, &x2, &y2); QPointF point; - QLineF::IntersectType type = line.intersect(QLineF(QPointF(x1,y1), QPointF(x1,y2)),&point); - if ( type == QLineF::BoundedIntersection ){ + QLineF::IntersectType type = line.intersect(QLineF(QPointF(x1, y1), QPointF(x1, y2)), &point); + if ( type == QLineF::BoundedIntersection ) + { return point; } - type = line.intersect(QLineF(QPointF(x1,y1), QPointF(x2,y1)),&point); - if ( type == QLineF::BoundedIntersection ){ + type = line.intersect(QLineF(QPointF(x1, y1), QPointF(x2, y1)), &point); + if ( type == QLineF::BoundedIntersection ) + { return point; } - type = line.intersect(QLineF(QPointF(x1,y2), QPointF(x2,y2)),&point); - if ( type == QLineF::BoundedIntersection ){ + type = line.intersect(QLineF(QPointF(x1, y2), QPointF(x2, y2)), &point); + if ( type == QLineF::BoundedIntersection ) + { return point; } - type = line.intersect(QLineF(QPointF(x2,y1), QPointF(x2,y2)),&point); - if ( type == QLineF::BoundedIntersection ){ + type = line.intersect(QLineF(QPointF(x2, y1), QPointF(x2, y2)), &point); + if ( type == QLineF::BoundedIntersection ) + { return point; } Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "There is no point of intersection."); return point; } -qint32 VAbstractTool::LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, - QPointF &p2){ +qint32 VAbstractTool::LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, QPointF &p2) +{ const qreal eps = 1e-8; //коефіцієнти для рівняння відрізку qreal a = 0, b = 0, c = 0; @@ -101,12 +106,18 @@ qint32 VAbstractTool::LineIntersectCircle(QPointF center, qreal radius, QLineF l // сколько всего решений? qint32 flag = 0; qreal d = QLineF (center, p).length(); - if (qAbs (d - radius) <= eps){ + if (qAbs (d - radius) <= eps) + { flag = 1; - } else { - if (radius > d){ + } + else + { + if (radius > d) + { flag = 2; - } else { + } + else + { return 0; } } @@ -119,17 +130,22 @@ qint32 VAbstractTool::LineIntersectCircle(QPointF center, qreal radius, QLineF l return flag; } -QPointF VAbstractTool::ClosestPoint(QLineF line, QPointF p){ +QPointF VAbstractTool::ClosestPoint(QLineF line, QPointF p) +{ QLineF lineP2pointFrom = QLineF(line.p2(), p); qreal angle = 180-line.angleTo(lineP2pointFrom)-90; QLineF pointFromlineP2 = QLineF(p, line.p2()); pointFromlineP2.setAngle(pointFromlineP2.angle()+angle); QPointF point; - QLineF::IntersectType type = pointFromlineP2.intersect(line,&point); - if ( type == QLineF::BoundedIntersection ){ + QLineF::IntersectType type = pointFromlineP2.intersect(line, &point); + if ( type == QLineF::BoundedIntersection ) + { return point; - } else{ - if ( type == QLineF::NoIntersection || type == QLineF::UnboundedIntersection ){ + } + else + { + if ( type == QLineF::NoIntersection || type == QLineF::UnboundedIntersection ) + { Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "Немає точки перетину."); return point; } @@ -137,19 +153,24 @@ QPointF VAbstractTool::ClosestPoint(QLineF line, QPointF p){ return point; } -QPointF VAbstractTool::addVector(QPointF p, QPointF p1, QPointF p2, qreal k){ +QPointF VAbstractTool::addVector(QPointF p, QPointF p1, QPointF p2, qreal k) +{ return QPointF (p.x() + (p2.x() - p1.x()) * k, p.y() + (p2.y() - p1.y()) * k); } -void VAbstractTool::RemoveAllChild(QDomElement &domElement){ - if ( domElement.hasChildNodes() ){ - while ( domElement.childNodes().length() >= 1 ){ +void VAbstractTool::RemoveAllChild(QDomElement &domElement) +{ + if ( domElement.hasChildNodes() ) + { + while ( domElement.childNodes().length() >= 1 ) + { domElement.removeChild( domElement.firstChild() ); } } } -void VAbstractTool::LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c){ +void VAbstractTool::LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c) +{ //коефіцієнти для рівняння відрізку *a = line.p2().y() - line.p1().y(); *b = line.p1().x() - line.p2().x(); diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index 511e43f31..a5a398d56 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -25,7 +25,8 @@ #include "vdatatool.h" #include -class VAbstractTool: public VDataTool{ +class VAbstractTool: public VDataTool +{ Q_OBJECT public: VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); @@ -89,7 +90,8 @@ protected: virtual void RemoveReferens(){} void RemoveAllChild(QDomElement &domElement); template - void AddAttribute(QDomElement &domElement, const QString &name, const T &value){ + void AddAttribute(QDomElement &domElement, const QString &name, const T &value) + { QDomAttr domAttr = doc->createAttribute(name); domAttr.setValue(QString().setNum(value)); domElement.setAttributeNode(domAttr); @@ -99,7 +101,8 @@ private: }; template <> -inline void VAbstractTool::AddAttribute(QDomElement &domElement, const QString &name, const QString &value){ +inline void VAbstractTool::AddAttribute(QDomElement &domElement, const QString &name, const QString &value) +{ QDomAttr domAttr = doc->createAttribute(name); domAttr.setValue(value); domElement.setAttributeNode(domAttr); diff --git a/tools/vdatatool.cpp b/tools/vdatatool.cpp index 60dba8c40..d5f3ebefd 100644 --- a/tools/vdatatool.cpp +++ b/tools/vdatatool.cpp @@ -21,14 +21,17 @@ #include "vdatatool.h" -VDataTool &VDataTool::operator =(const VDataTool &tool){ +VDataTool &VDataTool::operator =(const VDataTool &tool) +{ data = tool.getData(); _referens = tool.referens(); return *this; } -void VDataTool::decrementReferens(){ - if(_referens > 0){ +void VDataTool::decrementReferens() +{ + if (_referens > 0) + { --_referens; } } diff --git a/tools/vdatatool.h b/tools/vdatatool.h index f0519762f..9b8dda925 100644 --- a/tools/vdatatool.h +++ b/tools/vdatatool.h @@ -25,10 +25,11 @@ #include //We need QObject class because we use qobject_cast. -class VDataTool : public QObject{ +class VDataTool : public QObject +{ Q_OBJECT public: - explicit VDataTool(VContainer *data, QObject *parent = 0): QObject(parent), data(*data), _referens(1){} + VDataTool(VContainer *data, QObject *parent = 0): QObject(parent), data(*data), _referens(1){} virtual ~VDataTool(){} VDataTool &operator= (const VDataTool &tool); inline VContainer getData() const { return data; } diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index de0d48269..d51e0fc57 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -35,68 +35,72 @@ const QString VToolDetail::NodeTypeContour = QStringLiteral("Contour"); const QString VToolDetail::NodeTypeModeling = QStringLiteral("Modeling"); VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, Tool::Sources typeCreation, - VMainGraphicsScene *scene, QGraphicsItem *parent) :VAbstractTool(doc, data, id), - QGraphicsPathItem(parent), dialogDetail(QSharedPointer()), sceneDetails(scene){ + VMainGraphicsScene *scene, QGraphicsItem *parent) + :VAbstractTool(doc, data, id), QGraphicsPathItem(parent), dialogDetail(QSharedPointer()), + sceneDetails(scene) +{ VDetail detail = data->GetDetail(id); - for(qint32 i = 0; i< detail.CountNode(); ++i){ - switch(detail[i].getTypeTool()){ - case(Tool::NodePoint): - InitTool(scene, detail[i]); - break; - case(Tool::NodeArc): - InitTool(scene, detail[i]); - break; - case(Tool::NodeSpline): - InitTool(scene, detail[i]); - break; - case(Tool::NodeSplinePath): - InitTool(scene, detail[i]); - break; - case(Tool::AlongLineTool): - InitTool(scene, detail[i]); - break; - case(Tool::ArcTool): - InitTool(scene, detail[i]); - break; - case(Tool::BisectorTool): - InitTool(scene, detail[i]); - break; - case(Tool::EndLineTool): - InitTool(scene, detail[i]); - break; - case(Tool::LineIntersectTool): - InitTool(scene, detail[i]); - break; - case(Tool::LineTool): - InitTool(scene, detail[i]); - break; - case(Tool::NormalTool): - InitTool(scene, detail[i]); - break; - case(Tool::PointOfContact): - InitTool(scene, detail[i]); - break; - case(Tool::ShoulderPointTool): - InitTool(scene, detail[i]); - break; - case(Tool::SplinePathTool): - InitTool(scene, detail[i]); - break; - case(Tool::SplineTool): - InitTool(scene, detail[i]); - break; - case(Tool::Height): - InitTool(scene, detail[i]); - break; - case(Tool::Triangle): - InitTool(scene, detail[i]); - break; - case(Tool::PointOfIntersection): - InitTool(scene, detail[i]); - break; - default: - qWarning()<<"Get wrong tool type. Ignore."; - break; + for (qint32 i = 0; i< detail.CountNode(); ++i) + { + switch (detail[i].getTypeTool()) + { + case (Tool::NodePoint): + InitTool(scene, detail[i]); + break; + case (Tool::NodeArc): + InitTool(scene, detail[i]); + break; + case (Tool::NodeSpline): + InitTool(scene, detail[i]); + break; + case (Tool::NodeSplinePath): + InitTool(scene, detail[i]); + break; + case (Tool::AlongLineTool): + InitTool(scene, detail[i]); + break; + case (Tool::ArcTool): + InitTool(scene, detail[i]); + break; + case (Tool::BisectorTool): + InitTool(scene, detail[i]); + break; + case (Tool::EndLineTool): + InitTool(scene, detail[i]); + break; + case (Tool::LineIntersectTool): + InitTool(scene, detail[i]); + break; + case (Tool::LineTool): + InitTool(scene, detail[i]); + break; + case (Tool::NormalTool): + InitTool(scene, detail[i]); + break; + case (Tool::PointOfContact): + InitTool(scene, detail[i]); + break; + case (Tool::ShoulderPointTool): + InitTool(scene, detail[i]); + break; + case (Tool::SplinePathTool): + InitTool(scene, detail[i]); + break; + case (Tool::SplineTool): + InitTool(scene, detail[i]); + break; + case (Tool::Height): + InitTool(scene, detail[i]); + break; + case (Tool::Triangle): + InitTool(scene, detail[i]); + break; + case (Tool::PointOfIntersection): + InitTool(scene, detail[i]); + break; + default: + qWarning()<<"Get wrong tool type. Ignore."; + break; } doc->IncrementReferens(detail[i].getId()); } @@ -105,75 +109,96 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, RefreshGeometry(); this->setPos(detail.getMx(), detail.getMy()); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { AddToFile(); } } -void VToolDetail::setDialog(){ - Q_ASSERT(!dialogDetail.isNull()); +void VToolDetail::setDialog() +{ + Q_ASSERT(dialogDetail.isNull() == false); VDetail detail = VAbstractTool::data.GetDetail(id); dialogDetail->setDetails(detail); } -void VToolDetail::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, - VDomDocument *doc, VContainer *data){ +void VToolDetail::Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, + VContainer *data) +{ VDetail detail = dialog->getDetails(); VDetail det; - for(qint32 i = 0; i< detail.CountNode(); ++i){ + for (qint32 i = 0; i< detail.CountNode(); ++i) + { qint64 id = 0; - switch(detail[i].getTypeTool()){ - case(Tool::NodePoint):{ - VPointF point; - if(detail[i].getMode() == Draw::Calculation){ - point = data->GetPoint(detail[i].getId()); - } else { - point = data->GetModelingPoint(detail[i].getId()); + switch (detail[i].getTypeTool()) + { + case (Tool::NodePoint): + { + VPointF point; + if (detail[i].getMode() == Draw::Calculation) + { + point = data->GetPoint(detail[i].getId()); + } + else + { + point = data->GetModelingPoint(detail[i].getId()); + } + id = data->AddModelingPoint(point); + VNodePoint::Create(doc, data, id, detail[i].getId(), detail[i].getMode(), + Document::FullParse, Tool::FromGui); } - id = data->AddModelingPoint(point); - VNodePoint::Create(doc, data, id, detail[i].getId(), detail[i].getMode(), - Document::FullParse, Tool::FromGui); - } break; - case(Tool::NodeArc):{ - VArc arc; - if(detail[i].getMode() == Draw::Calculation){ - arc = data->GetArc(detail[i].getId()); - } else { - arc = data->GetModelingArc(detail[i].getId()); + case (Tool::NodeArc): + { + VArc arc; + if (detail[i].getMode() == Draw::Calculation) + { + arc = data->GetArc(detail[i].getId()); + } + else + { + arc = data->GetModelingArc(detail[i].getId()); + } + id = data->AddModelingArc(arc); + VNodeArc::Create(doc, data, id, detail[i].getId(), detail[i].getMode(), + Document::FullParse, Tool::FromGui); } - id = data->AddModelingArc(arc); - VNodeArc::Create(doc, data, id, detail[i].getId(), detail[i].getMode(), - Document::FullParse, Tool::FromGui); - } break; - case(Tool::NodeSpline):{ - VSpline spline; - if(detail[i].getMode() == Draw::Calculation){ - spline = data->GetSpline(detail[i].getId()); - } else { - spline = data->GetModelingSpline(detail[i].getId()); - } - id = data->AddModelingSpline(spline); - VNodeSpline::Create(doc, data, id, detail[i].getId(), detail[i].getMode(), - Document::FullParse, Tool::FromGui); - } - break; - case(Tool::NodeSplinePath):{ - VSplinePath splinePath; - if(detail[i].getMode() == Draw::Calculation){ - splinePath = data->GetSplinePath(detail[i].getId()); - } else { - splinePath = data->GetModelingSplinePath(detail[i].getId()); - } - id = data->AddModelingSplinePath(splinePath); - VNodeSplinePath::Create(doc, data, id, detail[i].getId(), detail[i].getMode(), + case (Tool::NodeSpline): + { + VSpline spline; + if (detail[i].getMode() == Draw::Calculation) + { + spline = data->GetSpline(detail[i].getId()); + } + else + { + spline = data->GetModelingSpline(detail[i].getId()); + } + id = data->AddModelingSpline(spline); + VNodeSpline::Create(doc, data, id, detail[i].getId(), detail[i].getMode(), Document::FullParse, Tool::FromGui); - } + } break; - default: - qWarning()<<"May be wrong tool type!!! Ignoring."<GetSplinePath(detail[i].getId()); + } + else + { + splinePath = data->GetModelingSplinePath(detail[i].getId()); + } + id = data->AddModelingSplinePath(splinePath); + VNodeSplinePath::Create(doc, data, id, detail[i].getId(), detail[i].getMode(), + Document::FullParse, Tool::FromGui); + } break; + default: + qWarning()<<"May be wrong tool type!!! Ignoring."< &dialog, VMainGraphicsScen } void VToolDetail::Create(const qint64 _id, VDetail &newDetail, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation){ + VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) +{ qint64 id = _id; - if(typeCreation == Tool::FromGui){ + if (typeCreation == Tool::FromGui) + { id = data->AddDetail(newDetail); - } else { + } + else + { data->UpdateDetail(id, newDetail); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { doc->UpdateToolData(id, data); } } - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolDetail *detail = new VToolDetail(doc, data, id, typeCreation, scene); scene->addItem(detail); connect(detail, &VToolDetail::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); @@ -203,21 +234,26 @@ void VToolDetail::Create(const qint64 _id, VDetail &newDetail, VMainGraphicsScen } } -void VToolDetail::FullUpdateFromFile(){ +void VToolDetail::FullUpdateFromFile() +{ RefreshGeometry(); } -void VToolDetail::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ +void VToolDetail::FullUpdateFromGui(int result) +{ + if (result == QDialog::Accepted) + { QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { VDetail det = dialogDetail->getDetails(); domElement.setAttribute(AttrName, det.getName()); domElement.setAttribute(AttrSupplement, QString().setNum(det.getSupplement())); domElement.setAttribute(AttrClosed, QString().setNum(det.getClosed())); domElement.setAttribute(AttrWidth, QString().setNum(det.getWidth())); RemoveAllChild(domElement); - for(qint32 i = 0; i < det.CountNode(); ++i){ + for (qint32 i = 0; i < det.CountNode(); ++i) + { AddNode(domElement, det[i]); } emit FullUpdateTree(); @@ -226,7 +262,8 @@ void VToolDetail::FullUpdateFromGui(int result){ dialogDetail.clear(); } -void VToolDetail::AddToFile(){ +void VToolDetail::AddToFile() +{ VDetail detail = VAbstractTool::data.GetDetail(id); QDomElement domElement = doc->createElement(TagName); @@ -238,24 +275,29 @@ void VToolDetail::AddToFile(){ AddAttribute(domElement, AttrClosed, detail.getClosed()); AddAttribute(domElement, AttrWidth, detail.getWidth()); - for(qint32 i = 0; i < detail.CountNode(); ++i){ + for (qint32 i = 0; i < detail.CountNode(); ++i) + { AddNode(domElement, detail[i]); } QDomElement element; bool ok = doc->GetActivDetailsElement(element); - if(ok){ + if (ok) + { element.appendChild(domElement); } } -QVariant VToolDetail::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value){ - if (change == ItemPositionHasChanged && scene()) { +QVariant VToolDetail::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) +{ + if (change == ItemPositionHasChanged && scene()) + { // value - это новое положение. QPointF newPos = value.toPointF(); //qDebug()<elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { domElement.setAttribute(AttrMx, QString().setNum(toMM(newPos.x()))); domElement.setAttribute(AttrMy, QString().setNum(toMM(newPos.y()))); //I don't now why but signal does not work. @@ -265,24 +307,31 @@ QVariant VToolDetail::itemChange(QGraphicsItem::GraphicsItemChange change, const return QGraphicsItem::itemChange(change, value); } -void VToolDetail::mouseReleaseEvent(QGraphicsSceneMouseEvent *event){ - if(event->button() == Qt::LeftButton){ +void VToolDetail::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) +{ + if (event->button() == Qt::LeftButton) + { emit ChoosedTool(id, Scene::Detail); } QGraphicsItem::mouseReleaseEvent(event); } -void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ +void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) +{ QMenu menu; QAction *actionOption = menu.addAction(tr("Options")); QAction *actionRemove = menu.addAction(tr("Delete")); - if(_referens > 1){ + if (_referens > 1) + { actionRemove->setEnabled(false); - } else { + } + else + { actionRemove->setEnabled(true); } QAction *selectedAction = menu.exec(event->screenPos()); - if(selectedAction == actionOption){ + if (selectedAction == actionOption) + { dialogDetail = QSharedPointer(new DialogDetail(getData(), Draw::Modeling)); connect(qobject_cast< VMainGraphicsScene * >(this->scene()), &VMainGraphicsScene::ChoosedObject, dialogDetail.data(), &DialogDetail::ChoosedObject); @@ -290,12 +339,15 @@ void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ setDialog(); dialogDetail->show(); } - if(selectedAction == actionRemove){ + if (selectedAction == actionRemove) + { //remove form xml file QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { QDomNode element = domElement.parentNode(); - if(!element.isNull()){ + if (element.isNull() == false) + { //deincrement referens RemoveReferens(); element.removeChild(domElement); @@ -303,102 +355,115 @@ void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event){ emit FullUpdateTree(); //remove form scene emit RemoveTool(this); - } else { + } + else + { qWarning()<<"parentNode isNull"<setPath(path); } template -void VToolDetail::InitTool(VMainGraphicsScene *scene, const VNodeDetail &node){ +void VToolDetail::InitTool(VMainGraphicsScene *scene, const VNodeDetail &node) +{ QHash* tools = doc->getTools(); Q_ASSERT(tools != 0); Tool *tool = qobject_cast(tools->value(node.getId())); diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index 4a877e8e6..a5da79b37 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -26,7 +26,8 @@ #include #include "dialogs/dialogdetail.h" -class VToolDetail: public VAbstractTool, public QGraphicsPathItem{ +class VToolDetail: public VAbstractTool, public QGraphicsPathItem +{ Q_OBJECT public: VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, @@ -39,7 +40,8 @@ public: VDomDocument *doc, VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); template - void AddTool(T *tool, const qint64 &id, Tool::Tools typeTool){ + void AddTool(T *tool, const qint64 &id, Tool::Tools typeTool) + { tool->setParentItem(this); connect(tool, &T::ChoosedTool, sceneDetails, &VMainGraphicsScene::ChoosedItem); VNodeDetail node(id, typeTool, Draw::Modeling, NodeDetail::Modeling); @@ -47,7 +49,8 @@ public: det.append(node); VAbstractTool::data.UpdateDetail(this->id, det); QDomElement domElement = doc->elementById(QString().setNum(this->id)); - if(domElement.isElement()){ + if (domElement.isElement()) + { AddNode(domElement, node); } } diff --git a/version.h b/version.h index f988bb497..5a80c3c59 100644 --- a/version.h +++ b/version.h @@ -8,5 +8,6 @@ extern const int MINOR_VERSION = 2; extern const int DEBUG_VERSION = 0; extern const QString APP_VERSION(QStringLiteral("%1.%2.%3").arg(MAJOR_VERSION).arg(MINOR_VERSION).arg(DEBUG_VERSION)); -extern const QString WARRANTY(QT_TR_NOOP("The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.")); +extern const QString WARRANTY(QT_TR_NOOP("The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE " + "WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.")); #endif // VERSION_H diff --git a/widgets/doubledelegate.cpp b/widgets/doubledelegate.cpp index 612f38b5a..480e68f0e 100644 --- a/widgets/doubledelegate.cpp +++ b/widgets/doubledelegate.cpp @@ -48,7 +48,8 @@ #include "doubledelegate.h" QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index ) const{ + const QModelIndex &index ) const +{ Q_UNUSED(option); Q_UNUSED(index); QDoubleSpinBox *editor = new QDoubleSpinBox(parent); @@ -57,14 +58,16 @@ QWidget *DoubleSpinBoxDelegate::createEditor(QWidget *parent, const QStyleOption return editor; } -void DoubleSpinBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const{ +void DoubleSpinBoxDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const +{ qreal value = index.model()->data(index, Qt::EditRole).toDouble(); QDoubleSpinBox *spinBox = static_cast(editor); spinBox->setValue(value); } -void DoubleSpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const{ +void DoubleSpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const +{ QDoubleSpinBox *spinBox = static_cast(editor); spinBox->interpretText(); qreal value = spinBox->value(); @@ -73,7 +76,8 @@ void DoubleSpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *mo } void DoubleSpinBoxDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, - const QModelIndex &index) const{ + const QModelIndex &index) const +{ Q_UNUSED(index) editor->setGeometry(option.rect); - } +} diff --git a/widgets/doubledelegate.h b/widgets/doubledelegate.h index a4c7a536e..948b91851 100644 --- a/widgets/doubledelegate.h +++ b/widgets/doubledelegate.h @@ -43,7 +43,8 @@ #include -class DoubleSpinBoxDelegate : public QItemDelegate{ +class DoubleSpinBoxDelegate : public QItemDelegate +{ Q_OBJECT public: DoubleSpinBoxDelegate(QObject *parent = 0): QItemDelegate(parent){} diff --git a/widgets/vapplication.cpp b/widgets/vapplication.cpp index e53617b6f..efabe6acb 100644 --- a/widgets/vapplication.cpp +++ b/widgets/vapplication.cpp @@ -27,11 +27,14 @@ #include "exception/vexceptionwrongparameterid.h" // reimplemented from QApplication so we can throw exceptions in slots -bool VApplication::notify(QObject *receiver, QEvent *event){ - try { +bool VApplication::notify(QObject *receiver, QEvent *event) +{ + try + { return QApplication::notify(receiver, event); } - catch(const VExceptionObjectError &e){ + catch (const VExceptionObjectError &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error parsing file. Program will be terminated.")); @@ -43,7 +46,8 @@ bool VApplication::notify(QObject *receiver, QEvent *event){ msgBox.exec(); abort(); } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error bad id. Program will be terminated.")); @@ -54,7 +58,8 @@ bool VApplication::notify(QObject *receiver, QEvent *event){ msgBox.exec(); abort(); } - catch(const VExceptionConversionError &e){ + catch (const VExceptionConversionError &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error can't convert value. Program will be terminated.")); @@ -65,7 +70,8 @@ bool VApplication::notify(QObject *receiver, QEvent *event){ msgBox.exec(); abort(); } - catch(const VExceptionEmptyParameter &e){ + catch (const VExceptionEmptyParameter &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error empty parameter. Program will be terminated.")); @@ -77,7 +83,8 @@ bool VApplication::notify(QObject *receiver, QEvent *event){ msgBox.exec(); abort(); } - catch(const VExceptionWrongParameterId &e){ + catch (const VExceptionWrongParameterId &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Error wrong id. Program will be terminated.")); @@ -89,7 +96,8 @@ bool VApplication::notify(QObject *receiver, QEvent *event){ msgBox.exec(); abort(); } - catch(const VException &e){ + catch (const VException &e) + { QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); msgBox.setText(tr("Something wrong!!")); @@ -99,7 +107,8 @@ bool VApplication::notify(QObject *receiver, QEvent *event){ msgBox.setIcon(QMessageBox::Critical); msgBox.exec(); } - catch(std::exception& e) { + catch (std::exception& e) + { qCritical() << "Exception thrown:" << e.what(); } return false; diff --git a/widgets/vapplication.h b/widgets/vapplication.h index 3192cb658..145c5cac8 100644 --- a/widgets/vapplication.h +++ b/widgets/vapplication.h @@ -3,7 +3,8 @@ #include -class VApplication : public QApplication{ +class VApplication : public QApplication +{ Q_OBJECT public: VApplication(int &argc, char ** argv): QApplication(argc, argv){} diff --git a/widgets/vcontrolpointspline.cpp b/widgets/vcontrolpointspline.cpp index 4e3e378b9..5b25e4d86 100644 --- a/widgets/vcontrolpointspline.cpp +++ b/widgets/vcontrolpointspline.cpp @@ -23,8 +23,9 @@ VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position, const QPointF &controlPoint, const QPointF &splinePoint, - QGraphicsItem *parent):QGraphicsEllipseItem(parent), - radius(toPixel(1.5)), controlLine(0), indexSpline(indexSpline), position(position){ + QGraphicsItem *parent) + :QGraphicsEllipseItem(parent), radius(toPixel(1.5)), controlLine(0), indexSpline(indexSpline), position(position) +{ //create circle QRectF rec = QRectF(0, 0, radius*2, radius*2); rec.translate(-rec.center().x(), -rec.center().y()); @@ -45,18 +46,22 @@ VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePoint: controlLine->setFlag(QGraphicsItem::ItemStacksBehindParent, true); } -void VControlPointSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VControlPointSpline::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(Qt::black, widthMainLine)); } -void VControlPointSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VControlPointSpline::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setPen(QPen(Qt::black, widthHairLine)); } -QVariant VControlPointSpline::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value){ - if (change == ItemPositionChange && scene()) { +QVariant VControlPointSpline::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) +{ + if (change == ItemPositionChange && scene()) + { // value - new position. QPointF newPos = value.toPointF(); emit ControlPointChangePosition(indexSpline, position, newPos); @@ -65,7 +70,8 @@ QVariant VControlPointSpline::itemChange(QGraphicsItem::GraphicsItemChange chang } qint32 VControlPointSpline::LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, - QPointF &p2) const{ + QPointF &p2) const +{ const qreal eps = 1e-8; //коефіцієнти для рівняння відрізку qreal a = line.p2().y() - line.p1().y(); @@ -77,12 +83,18 @@ qint32 VControlPointSpline::LineIntersectCircle(QPointF center, qreal radius, QL // сколько всего решений? qint32 flag = 0; qreal d = QLineF (center, p).length(); - if (qAbs (d - radius) <= eps){ + if (qAbs (d - radius) <= eps) + { flag = 1; - } else { - if (radius > d){ + } + else + { + if (radius > d) + { flag = 2; - } else { + } + else + { return 0; } } @@ -95,17 +107,22 @@ qint32 VControlPointSpline::LineIntersectCircle(QPointF center, qreal radius, QL return flag; } -QPointF VControlPointSpline::ClosestPoint(QLineF line, QPointF p) const{ +QPointF VControlPointSpline::ClosestPoint(QLineF line, QPointF p) const +{ QLineF lineP2pointFrom = QLineF(line.p2(), p); qreal angle = 180-line.angleTo(lineP2pointFrom)-90; QLineF pointFromlineP2 = QLineF(p, line.p2()); pointFromlineP2.setAngle(pointFromlineP2.angle()+angle); QPointF point; - QLineF::IntersectType type = pointFromlineP2.intersect(line,&point); - if ( type == QLineF::BoundedIntersection ){ + QLineF::IntersectType type = pointFromlineP2.intersect(line, &point); + if ( type == QLineF::BoundedIntersection ) + { return point; - } else{ - if ( type == QLineF::NoIntersection || type == QLineF::UnboundedIntersection ){ + } + else + { + if ( type == QLineF::NoIntersection || type == QLineF::UnboundedIntersection ) + { Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "Немає точки перетину."); return point; } @@ -113,26 +130,33 @@ QPointF VControlPointSpline::ClosestPoint(QLineF line, QPointF p) const{ return point; } -QPointF VControlPointSpline::addVector(QPointF p, QPointF p1, QPointF p2, qreal k) const{ +QPointF VControlPointSpline::addVector(QPointF p, QPointF p1, QPointF p2, qreal k) const +{ return QPointF (p.x() + (p2.x() - p1.x()) * k, p.y() + (p2.y() - p1.y()) * k); } void VControlPointSpline::RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, - const QPointF &controlPoint, const QPointF &splinePoint){ - if(this->indexSpline == indexSpline && this->position == pos){ + const QPointF &controlPoint, const QPointF &splinePoint) +{ + if (this->indexSpline == indexSpline && this->position == pos) + { QPointF p1, p2; LineIntersectCircle(QPointF(), radius, QLineF( QPointF(), splinePoint-controlPoint), p1, p2); controlLine->setLine(QLineF(splinePoint-controlPoint, p1)); } } -void VControlPointSpline::setEnabledPoint(bool enable){ - if(enable == true){ +void VControlPointSpline::setEnabledPoint(bool enable) +{ + if (enable == true) + { this->setPen(QPen(Qt::black, widthHairLine)); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setFlag(QGraphicsItem::ItemIsMovable, true); this->setAcceptHoverEvents(true); - } else { + } + else + { this->setPen(QPen(Qt::gray, widthHairLine)); this->setFlag(QGraphicsItem::ItemIsSelectable, false); this->setFlag(QGraphicsItem::ItemIsMovable, false); diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h index 9ed7e1cbb..56f51ef93 100644 --- a/widgets/vcontrolpointspline.h +++ b/widgets/vcontrolpointspline.h @@ -26,7 +26,8 @@ #include #include "geometry/vsplinepath.h" -class VControlPointSpline : public QObject, public QGraphicsEllipseItem{ +class VControlPointSpline : public QObject, public QGraphicsEllipseItem +{ Q_OBJECT public: VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position, diff --git a/widgets/vgraphicssimpletextitem.cpp b/widgets/vgraphicssimpletextitem.cpp index 52a74973e..55fa10187 100644 --- a/widgets/vgraphicssimpletextitem.cpp +++ b/widgets/vgraphicssimpletextitem.cpp @@ -21,8 +21,9 @@ #include "vgraphicssimpletextitem.h" -VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent):QGraphicsSimpleTextItem(parent), - fontSize(0){ +VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent) + :QGraphicsSimpleTextItem(parent), fontSize(0) +{ this->setFlag(QGraphicsItem::ItemIsMovable, true); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); @@ -34,27 +35,32 @@ VGraphicsSimpleTextItem::VGraphicsSimpleTextItem(QGraphicsItem * parent):QGraphi } VGraphicsSimpleTextItem::VGraphicsSimpleTextItem( const QString & text, QGraphicsItem * parent ) - :QGraphicsSimpleTextItem(text, parent), fontSize(0){ + :QGraphicsSimpleTextItem(text, parent), fontSize(0) +{ this->setFlag(QGraphicsItem::ItemIsMovable, true); this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); this->setAcceptHoverEvents(true); } -QVariant VGraphicsSimpleTextItem::itemChange(GraphicsItemChange change, const QVariant &value){ - if (change == ItemPositionChange && scene()) { +QVariant VGraphicsSimpleTextItem::itemChange(GraphicsItemChange change, const QVariant &value) +{ + if (change == ItemPositionChange && scene()) + { QPointF newPos = value.toPointF() + this->parentItem()->pos(); emit NameChangePosition(newPos); } return QGraphicsItem::itemChange(change, value); } -void VGraphicsSimpleTextItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ +void VGraphicsSimpleTextItem::hoverMoveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setBrush(Qt::green); } -void VGraphicsSimpleTextItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ +void VGraphicsSimpleTextItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) +{ Q_UNUSED(event); this->setBrush(Qt::black); } diff --git a/widgets/vgraphicssimpletextitem.h b/widgets/vgraphicssimpletextitem.h index 61bcd9471..dacf920ce 100644 --- a/widgets/vgraphicssimpletextitem.h +++ b/widgets/vgraphicssimpletextitem.h @@ -24,7 +24,8 @@ #include -class VGraphicsSimpleTextItem : public QObject, public QGraphicsSimpleTextItem{ +class VGraphicsSimpleTextItem : public QObject, public QGraphicsSimpleTextItem +{ Q_OBJECT public: VGraphicsSimpleTextItem(QGraphicsItem * parent = 0); diff --git a/widgets/vitem.cpp b/widgets/vitem.cpp index d9b508003..963a693da 100644 --- a/widgets/vitem.cpp +++ b/widgets/vitem.cpp @@ -21,29 +21,37 @@ #include "vitem.h" -VItem::VItem (const QPainterPath & path, int numInList, QGraphicsItem * parent ): - QGraphicsPathItem ( path, parent ), numInOutList(numInList){ +VItem::VItem (const QPainterPath & path, int numInList, QGraphicsItem * parent ) + :QGraphicsPathItem ( path, parent ), numInOutList(numInList) +{ } -void VItem::checkItemChange(){ +void VItem::checkItemChange() +{ QRectF rect = parentItem()->sceneBoundingRect(); QRectF myrect = sceneBoundingRect(); - if( rect.contains( myrect )==true ){ + if ( rect.contains( myrect )==true ) + { qDebug()<<"Не виходить за рамки листа"; setPen(QPen(Qt::black, widthMainLine)); emit itemOut( numInOutList, false ); - } else { + } + else + { qDebug()<<"Виходить за рамки листа"; setPen(QPen(Qt::red, widthMainLine)); emit itemOut( numInOutList, true ); } QList list = QGraphicsItem::collidingItems (); - if( list.size() - 2 > 0 ){ + if ( list.size() - 2 > 0 ) + { list.append( this ); setPen(QPen(Qt::red, widthMainLine)); qDebug()<<"Деталь перетинається з іншими деталями "< itemList; itemList.append( this ); qDebug()<<"Деталь більше не перетинається з іншими деталями "<scenePos()); QGraphicsScene::mouseMoveEvent(event); } -void VMainGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *event){ +void VMainGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *event) +{ emit mousePress(event->scenePos()); QGraphicsScene::mousePressEvent(event); } -void VMainGraphicsScene::ChoosedItem(qint64 id, Scene::Scenes type){ +void VMainGraphicsScene::ChoosedItem(qint64 id, Scene::Scenes type) +{ emit ChoosedObject(id, type); } -void VMainGraphicsScene::SetFactor(qreal factor){ +void VMainGraphicsScene::SetFactor(qreal factor) +{ scaleFactor=scaleFactor*factor; emit NewFactor(scaleFactor); } diff --git a/widgets/vmaingraphicsscene.h b/widgets/vmaingraphicsscene.h index 63522396e..0f3cb116d 100644 --- a/widgets/vmaingraphicsscene.h +++ b/widgets/vmaingraphicsscene.h @@ -24,7 +24,8 @@ #include -class VMainGraphicsScene : public QGraphicsScene{ +class VMainGraphicsScene : public QGraphicsScene +{ Q_OBJECT public: VMainGraphicsScene(); diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index acfca1764..9aab81ce1 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -21,18 +21,21 @@ #include "vmaingraphicsview.h" -VMainGraphicsView::VMainGraphicsView(QWidget *parent) : - QGraphicsView(parent), _numScheduledScalings(0){ +VMainGraphicsView::VMainGraphicsView(QWidget *parent) + :QGraphicsView(parent), _numScheduledScalings(0) +{ this->setResizeAnchor(QGraphicsView::AnchorUnderMouse); this->setTransformationAnchor(QGraphicsView::AnchorUnderMouse); this->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform); } -void VMainGraphicsView::wheelEvent(QWheelEvent *event){ +void VMainGraphicsView::wheelEvent(QWheelEvent *event) +{ int numDegrees = event->delta() / 8; int numSteps = numDegrees / 15; // see QWheelEvent documentation _numScheduledScalings += numSteps; - if (_numScheduledScalings * numSteps < 0){ // if user moved the wheel in another direction, we reset + if (_numScheduledScalings * numSteps < 0) + { // if user moved the wheel in another direction, we reset _numScheduledScalings = numSteps; // previously scheduled scalings } @@ -44,49 +47,65 @@ void VMainGraphicsView::wheelEvent(QWheelEvent *event){ anim->start(); } -void VMainGraphicsView::scalingTime(qreal x){ +void VMainGraphicsView::scalingTime(qreal x) +{ Q_UNUSED(x); qreal factor = 1.0 + qreal(_numScheduledScalings) / 300.0; - if (QApplication::keyboardModifiers() == Qt::ControlModifier){// If you press CTRL this code will execute + if (QApplication::keyboardModifiers() == Qt::ControlModifier) + {// If you press CTRL this code will execute scale(factor, factor); emit NewFactor(factor); - } else { - if(_numScheduledScalings < 0){ + } + else + { + if (_numScheduledScalings < 0) + { verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() + factor*3.5)); emit NewFactor(factor); - } else { - if(verticalScrollBar()->value() > 0){ + } + else + { + if (verticalScrollBar()->value() > 0) + { verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() - factor*3.5)); emit NewFactor(factor); } } - } + } } -void VMainGraphicsView::animFinished(){ - if (_numScheduledScalings > 0){ +void VMainGraphicsView::animFinished() +{ + if (_numScheduledScalings > 0) + { _numScheduledScalings--; - } else { + } + else + { _numScheduledScalings++; } sender()->~QObject(); } -void VMainGraphicsView::mousePressEvent(QMouseEvent *mousePress){ - if(mousePress->button() & Qt::LeftButton){ - switch(QGuiApplication::keyboardModifiers()){ - case Qt::ControlModifier: - QGraphicsView::setDragMode(QGraphicsView::ScrollHandDrag); - QGraphicsView::mousePressEvent(mousePress); - break; - default: - QGraphicsView::mousePressEvent(mousePress); - break; +void VMainGraphicsView::mousePressEvent(QMouseEvent *mousePress) +{ + if (mousePress->button() & Qt::LeftButton) + { + switch (QGuiApplication::keyboardModifiers()) + { + case Qt::ControlModifier: + QGraphicsView::setDragMode(QGraphicsView::ScrollHandDrag); + QGraphicsView::mousePressEvent(mousePress); + break; + default: + QGraphicsView::mousePressEvent(mousePress); + break; } } } -void VMainGraphicsView::mouseReleaseEvent(QMouseEvent *event){ +void VMainGraphicsView::mouseReleaseEvent(QMouseEvent *event) +{ QGraphicsView::mouseReleaseEvent ( event ); QGraphicsView::setDragMode( QGraphicsView::RubberBandDrag ); } diff --git a/widgets/vmaingraphicsview.h b/widgets/vmaingraphicsview.h index d0035c7de..f4ad052ef 100644 --- a/widgets/vmaingraphicsview.h +++ b/widgets/vmaingraphicsview.h @@ -24,7 +24,8 @@ #include -class VMainGraphicsView : public QGraphicsView{ +class VMainGraphicsView : public QGraphicsView +{ Q_OBJECT public: explicit VMainGraphicsView(QWidget *parent = 0); diff --git a/widgets/vtablegraphicsview.cpp b/widgets/vtablegraphicsview.cpp index 609bb1ec3..c6716255e 100644 --- a/widgets/vtablegraphicsview.cpp +++ b/widgets/vtablegraphicsview.cpp @@ -21,27 +21,35 @@ #include "vtablegraphicsview.h" -VTableGraphicsView::VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent) : - QGraphicsView(pScene, parent){ +VTableGraphicsView::VTableGraphicsView(QGraphicsScene* pScene, QWidget *parent) + :QGraphicsView(pScene, parent) +{ QGraphicsView::setResizeAnchor(QGraphicsView::AnchorUnderMouse); connect(pScene, &QGraphicsScene::selectionChanged, this, &VTableGraphicsView::selectionChanged); } -void VTableGraphicsView::selectionChanged(){ +void VTableGraphicsView::selectionChanged() +{ QList listSelectedItems = scene()->selectedItems(); - if( listSelectedItems.isEmpty() == true ){ + if ( listSelectedItems.isEmpty() == true ) + { qDebug() << tr("detail don't find"); emit itemChect(true); - } else { + } + else + { qDebug() << tr("detail find"); emit itemChect(false); } } -void VTableGraphicsView::MirrorItem(){ +void VTableGraphicsView::MirrorItem() +{ QList list = scene()->selectedItems(); - if(list.size()>0){ - for( qint32 i = 0; i < list.count(); ++i ){ + if (list.size()>0) + { + for ( qint32 i = 0; i < list.count(); ++i ) + { QRectF itemRectOld = list.at(i)->sceneBoundingRect(); //Get the current transform QTransform transform(list.at(i)->transform()); @@ -73,92 +81,112 @@ void VTableGraphicsView::MirrorItem(){ } } -void VTableGraphicsView::wheelEvent(QWheelEvent *event){ - if (QGuiApplication::keyboardModifiers() == Qt::ControlModifier){ +void VTableGraphicsView::wheelEvent(QWheelEvent *event) +{ + if (QGuiApplication::keyboardModifiers() == Qt::ControlModifier) + { // Если нажата клавиша CTRL этот код выполнится - if ((event->delta())>0){ + if ((event->delta())>0) + { ZoomIn(); - } else if ((event->delta())<0){ + } + else if ((event->delta())<0) + { ZoomOut(); } - } else { + } + else + { verticalScrollBar()->setValue(verticalScrollBar()->value()-event->delta()); } } -void VTableGraphicsView::mousePressEvent(QMouseEvent *mousePress){ - if(mousePress->button() & Qt::LeftButton){ - switch(QGuiApplication::keyboardModifiers()){ - case Qt::ControlModifier: - QGraphicsView::setDragMode(QGraphicsView::ScrollHandDrag); - QGraphicsView::mousePressEvent(mousePress); - break; - default: - QGraphicsView::mousePressEvent(mousePress); - break; +void VTableGraphicsView::mousePressEvent(QMouseEvent *mousePress) +{ + if (mousePress->button() & Qt::LeftButton) + { + switch (QGuiApplication::keyboardModifiers()) + { + case Qt::ControlModifier: + QGraphicsView::setDragMode(QGraphicsView::ScrollHandDrag); + QGraphicsView::mousePressEvent(mousePress); + break; + default: + QGraphicsView::mousePressEvent(mousePress); + break; } } } -void VTableGraphicsView::mouseReleaseEvent(QMouseEvent *event){ +void VTableGraphicsView::mouseReleaseEvent(QMouseEvent *event) +{ QGraphicsView::mouseReleaseEvent ( event ); QGraphicsView::setDragMode( QGraphicsView::RubberBandDrag ); } -void VTableGraphicsView::keyPressEvent(QKeyEvent *event){ - switch(event->key()){ - case Qt::Key_Space: - rotateIt(); - break; - case Qt::Key_Left: - MoveItem(VTableGraphicsView::Left); - break; - case Qt::Key_Right: - MoveItem(VTableGraphicsView::Right); - break; - case Qt::Key_Up: - MoveItem(VTableGraphicsView::Up); - break; - case Qt::Key_Down: - MoveItem(VTableGraphicsView::Down); - break; +void VTableGraphicsView::keyPressEvent(QKeyEvent *event) +{ + switch (event->key()) + { + case Qt::Key_Space: + rotateIt(); + break; + case Qt::Key_Left: + MoveItem(VTableGraphicsView::Left); + break; + case Qt::Key_Right: + MoveItem(VTableGraphicsView::Right); + break; + case Qt::Key_Up: + MoveItem(VTableGraphicsView::Up); + break; + case Qt::Key_Down: + MoveItem(VTableGraphicsView::Down); + break; } QGraphicsView::keyPressEvent ( event ); } -void VTableGraphicsView::rotateIt(){ +void VTableGraphicsView::rotateIt() +{ QList list = scene()->selectedItems(); - if(list.size()>0){ - for( qint32 i = 0; i < list.count(); ++i ){ + if (list.size()>0) + { + for ( qint32 i = 0; i < list.count(); ++i ) + { list.at(i)->setTransformOriginPoint(list.at(i)->boundingRect().center()); list.at(i)->setRotation(list.at(i)->rotation() + 180); } } } -void VTableGraphicsView::MoveItem(VTableGraphicsView::typeMove_e move){ +void VTableGraphicsView::MoveItem(VTableGraphicsView::typeMove_e move) +{ qreal dx = 0, dy = 0; - switch(move){ - case VTableGraphicsView::Left: - dx = -3; - dy = 0; - break; - case VTableGraphicsView::Right: - dx = 3; - dy = 0; - break; - case VTableGraphicsView::Up: - dx = 0; - dy = -3; - break; - case VTableGraphicsView::Down: - dx = 0; - dy = 3; - break; + switch (move) + { + case VTableGraphicsView::Left: + dx = -3; + dy = 0; + break; + case VTableGraphicsView::Right: + dx = 3; + dy = 0; + break; + case VTableGraphicsView::Up: + dx = 0; + dy = -3; + break; + case VTableGraphicsView::Down: + dx = 0; + dy = 3; + break; } QList listSelectedItems = scene()->selectedItems(); - if(listSelectedItems.size()>0){ - for( qint32 i = 0; i < listSelectedItems.count(); ++i ){ + if (listSelectedItems.size()>0) + { + for ( qint32 i = 0; i < listSelectedItems.count(); ++i ) + { listSelectedItems.at(i)->moveBy(dx, dy); } } diff --git a/widgets/vtablegraphicsview.h b/widgets/vtablegraphicsview.h index 8b52ac2a7..3f78d7f4f 100644 --- a/widgets/vtablegraphicsview.h +++ b/widgets/vtablegraphicsview.h @@ -24,7 +24,8 @@ #include -class VTableGraphicsView : public QGraphicsView{ +class VTableGraphicsView : public QGraphicsView +{ Q_OBJECT public: enum typeMove_e { Left, Right, Up, Down }; @@ -51,11 +52,11 @@ public slots: /** * @brief ZoomIn збільшує масштаб листа. */ - inline void ZoomIn() {scale(1.1,1.1);} + inline void ZoomIn() {scale(1.1, 1.1);} /** * @brief ZoomOut зменшує масштаб листа. */ - inline void ZoomOut() {scale(1/1.1,1/1.1);} + inline void ZoomOut() {scale(1/1.1, 1/1.1);} protected: /** * @brief wheelEvent обробник повороту колеса мишки. diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 7dc3e5807..76c73c831 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -34,57 +34,64 @@ #include #include -VDomDocument::VDomDocument(VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode) : QDomDocument(), - map(QHash()), nameActivDraw(QString()), data(data), +VDomDocument::VDomDocument(VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode) + : QDomDocument(), map(QHash()), nameActivDraw(QString()), data(data), tools(QHash()), history(QVector()), cursor(0), - comboBoxDraws(comboBoxDraws), mode(mode){ -} + comboBoxDraws(comboBoxDraws), mode(mode){} VDomDocument::VDomDocument(const QString& name, VContainer *data, QComboBox *comboBoxDraws, - Draw::Draws *mode) : - QDomDocument(name), map(QHash()), nameActivDraw(QString()), data(data), + Draw::Draws *mode) + :QDomDocument(name), map(QHash()), nameActivDraw(QString()), data(data), tools(QHash()), history(QVector()), cursor(0), - comboBoxDraws(comboBoxDraws), mode(mode){ -} + comboBoxDraws(comboBoxDraws), mode(mode){} VDomDocument::VDomDocument(const QDomDocumentType& doctype, VContainer *data, QComboBox *comboBoxDraws, - Draw::Draws *mode) : - QDomDocument(doctype), map(QHash()), nameActivDraw(QString()), data(data), + Draw::Draws *mode) + :QDomDocument(doctype), map(QHash()), nameActivDraw(QString()), data(data), tools(QHash()), history(QVector()), cursor(0), - comboBoxDraws(comboBoxDraws), mode(mode){ -} + comboBoxDraws(comboBoxDraws), mode(mode){} -QDomElement VDomDocument::elementById(const QString& id){ - if (map.contains(id)) { +QDomElement VDomDocument::elementById(const QString& id) +{ + if (map.contains(id)) + { QDomElement e = map[id]; - if (e.parentNode().nodeType() != QDomNode::BaseNode) { + if (e.parentNode().nodeType() != QDomNode::BaseNode) + { return e; } map.remove(id); } bool res = this->find(this->documentElement(), id); - if (res) { + if (res) + { return map[id]; } return QDomElement(); } -bool VDomDocument::find(QDomElement node, const QString& id){ - if (node.hasAttribute("id")) { +bool VDomDocument::find(QDomElement node, const QString& id) +{ + if (node.hasAttribute("id")) + { QString value = node.attribute("id"); this->map[value] = node; - if (value == id) { + if (value == id) + { return true; } } - for (qint32 i=0; ifind(n.toElement(), id); - if (res) { + if (res) + { return true; } } @@ -93,7 +100,8 @@ bool VDomDocument::find(QDomElement node, const QString& id){ return false; } -void VDomDocument::CreateEmptyFile(){ +void VDomDocument::CreateEmptyFile() +{ QDomElement domElement = this->createElement("lekalo"); this->appendChild(domElement); QDomNode xmlNode = this->createProcessingInstruction("xml", "version=\"1.0\" encoding=\"UTF-8\""); @@ -102,17 +110,22 @@ void VDomDocument::CreateEmptyFile(){ domElement.appendChild(incrElement); } -bool VDomDocument::CheckNameDraw(const QString& name) const{ - Q_ASSERT_X(!name.isEmpty(), "CheckNameDraw", "name draw is empty"); +bool VDomDocument::CheckNameDraw(const QString& name) const +{ + Q_ASSERT_X(name.isEmpty() == false, "CheckNameDraw", "name draw is empty"); QDomNodeList elements = this->documentElement().elementsByTagName( "draw" ); - if(elements.size() == 0){ + if (elements.size() == 0) + { return false; } - for ( qint32 i = 0; i < elements.count(); i++ ){ + for ( qint32 i = 0; i < elements.count(); i++ ) + { QDomElement elem = elements.at( i ).toElement(); - if(!elem.isNull()){ + if (elem.isNull() == false) + { QString fieldName = elem.attribute( "name" ); - if ( fieldName == name ){ + if ( fieldName == name ) + { return true; } } @@ -120,12 +133,15 @@ bool VDomDocument::CheckNameDraw(const QString& name) const{ return false; } -bool VDomDocument::appendDraw(const QString& name){ - Q_ASSERT_X(!name.isEmpty(), "appendDraw", "name draw is empty"); - if(name.isEmpty()){ +bool VDomDocument::appendDraw(const QString& name) +{ + Q_ASSERT_X(name.isEmpty() == false, "appendDraw", "name draw is empty"); + if (name.isEmpty()) + { return false; } - if(CheckNameDraw(name)== false){ + if (CheckNameDraw(name)== false) + { QDomElement rootElement = this->documentElement(); QDomElement drawElement = this->createElement("draw"); @@ -142,60 +158,79 @@ bool VDomDocument::appendDraw(const QString& name){ rootElement.appendChild(drawElement); - if(nameActivDraw.isEmpty()){ + if (nameActivDraw.isEmpty()) + { SetActivDraw(name); - } else { + } + else + { ChangeActivDraw(name); } return true; - } else { + } + else + { return false; } return false; } -void VDomDocument::ChangeActivDraw(const QString& name, Document::Documents parse){ - Q_ASSERT_X(!name.isEmpty(), "ChangeActivDraw", "name draw is empty"); - if(CheckNameDraw(name) == true){ +void VDomDocument::ChangeActivDraw(const QString& name, Document::Documents parse) +{ + Q_ASSERT_X(name.isEmpty() == false, "ChangeActivDraw", "name draw is empty"); + if (CheckNameDraw(name) == true) + { this->nameActivDraw = name; - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { emit ChangedActivDraw(name); } } } -bool VDomDocument::SetNameDraw(const QString& name){ - Q_ASSERT_X(!name.isEmpty(), "SetNameDraw", "name draw is empty"); +bool VDomDocument::SetNameDraw(const QString& name) +{ + Q_ASSERT_X(name.isEmpty() == false, "SetNameDraw", "name draw is empty"); QString oldName = nameActivDraw; QDomElement element; - if(GetActivDrawElement(element)){ + if (GetActivDrawElement(element)) + { nameActivDraw = name; element.setAttribute("name", nameActivDraw); emit haveChange(); emit ChangedNameDraw(oldName, nameActivDraw); return true; - } else { + } + else + { qWarning()<<"Can't find activ draw"<nameActivDraw = name; } -bool VDomDocument::GetActivDrawElement(QDomElement &element){ - if(!nameActivDraw.isEmpty()){ +bool VDomDocument::GetActivDrawElement(QDomElement &element) +{ + if (nameActivDraw.isEmpty() == false) + { QDomNodeList elements = this->documentElement().elementsByTagName( "draw" ); - if(elements.size() == 0){ + if (elements.size() == 0) + { return false; } - for ( qint32 i = 0; i < elements.count(); i++ ){ + for ( qint32 i = 0; i < elements.count(); i++ ) + { element = elements.at( i ).toElement(); - if(!element.isNull()){ + if (element.isNull() == false) + { QString fieldName = element.attribute( "name" ); - if ( fieldName == nameActivDraw ){ + if ( fieldName == nameActivDraw ) + { return true; } } @@ -204,58 +239,79 @@ bool VDomDocument::GetActivDrawElement(QDomElement &element){ return false; } -bool VDomDocument::GetActivCalculationElement(QDomElement &element){ +bool VDomDocument::GetActivCalculationElement(QDomElement &element) +{ bool ok = GetActivNodeElement("calculation", element); - if(ok){ + if (ok) + { return true; - } else { + } + else + { return false; } } -bool VDomDocument::GetActivModelingElement(QDomElement &element){ +bool VDomDocument::GetActivModelingElement(QDomElement &element) +{ bool ok = GetActivNodeElement("modeling", element); - if(ok){ + if (ok) + { return true; - } else { + } + else + { return false; } } -bool VDomDocument::GetActivDetailsElement(QDomElement &element){ +bool VDomDocument::GetActivDetailsElement(QDomElement &element) +{ bool ok = GetActivNodeElement("details", element); - if(ok){ + if (ok) + { return true; - } else { + } + else + { return false; } } -bool VDomDocument::GetActivNodeElement(const QString& name, QDomElement &element){ - Q_ASSERT_X(!name.isEmpty(), "GetActivNodeElement", "name draw is empty"); +bool VDomDocument::GetActivNodeElement(const QString& name, QDomElement &element) +{ + Q_ASSERT_X(name.isEmpty() == false, "GetActivNodeElement", "name draw is empty"); QDomElement drawElement; bool drawOk = this->GetActivDrawElement(drawElement); - if(drawOk == true){ + if (drawOk == true) + { QDomNodeList listElement = drawElement.elementsByTagName(name); - if(listElement.size() == 0 || listElement.size() > 1){ + if (listElement.size() == 0 || listElement.size() > 1) + { return false; } element = listElement.at( 0 ).toElement(); - if(!element.isNull()){ + if (element.isNull() == false) + { return true; - } else { + } + else + { return false; } - } else { + } + else + { return false; } } -void VDomDocument::Parse(Document::Documents parse, VMainGraphicsScene *sceneDraw, - VMainGraphicsScene *sceneDetail){ +void VDomDocument::Parse(Document::Documents parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail) +{ Q_ASSERT(sceneDraw != 0); Q_ASSERT(sceneDetail != 0); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { TestUniqueId(); data->Clear(); nameActivDraw.clear(); @@ -272,24 +328,35 @@ void VDomDocument::Parse(Document::Documents parse, VMainGraphicsScene *sceneDra history.clear(); QDomElement rootElement = this->documentElement(); QDomNode domNode = rootElement.firstChild(); - while(!domNode.isNull()){ - if(domNode.isElement()){ + while (domNode.isNull() == false) + { + if (domNode.isElement()) + { QDomElement domElement = domNode.toElement(); - if(!domElement.isNull()){ - if(domElement.tagName()=="draw"){ - if(parse == Document::FullParse){ - if(nameActivDraw.isEmpty()){ + if (domElement.isNull() == false) + { + if (domElement.tagName()=="draw") + { + if (parse == Document::FullParse) + { + if (nameActivDraw.isEmpty()) + { SetActivDraw(domElement.attribute("name")); - } else { + } + else + { ChangeActivDraw(domElement.attribute("name")); } comboBoxDraws->addItem(domElement.attribute("name")); - } else { + } + else + { ChangeActivDraw(domElement.attribute("name"), Document::LiteParse); } ParseDrawElement(sceneDraw, sceneDetail, domElement, parse); } - if(domElement.tagName()=="increments"){ + if (domElement.tagName()=="increments") + { ParseIncrementsElement(domElement); } } @@ -298,13 +365,18 @@ void VDomDocument::Parse(Document::Documents parse, VMainGraphicsScene *sceneDra } } -void VDomDocument::ParseIncrementsElement(const QDomNode &node){ +void VDomDocument::ParseIncrementsElement(const QDomNode &node) +{ QDomNode domNode = node.firstChild(); - while(!domNode.isNull()){ - if(domNode.isElement()){ + while (domNode.isNull() == false) + { + if (domNode.isElement()) + { QDomElement domElement = domNode.toElement(); - if(!domElement.isNull()){ - if(domElement.tagName() == "increment"){ + if (domElement.isNull() == false) + { + if (domElement.tagName() == "increment") + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal base = GetParametrDouble(domElement, "base"); @@ -321,86 +393,107 @@ void VDomDocument::ParseIncrementsElement(const QDomNode &node){ } } -qint64 VDomDocument::GetParametrId(const QDomElement &domElement) const{ - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); +qint64 VDomDocument::GetParametrId(const QDomElement &domElement) const +{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); qint64 id = GetParametrLongLong(domElement, "id"); - if(id <= 0){ + if (id <= 0) + { throw VExceptionWrongParameterId(tr("Got wrong parameter id. Need only id > 0."), domElement); } return id; } -qint64 VDomDocument::GetParametrLongLong(const QDomElement &domElement, const QString &name) const{ - Q_ASSERT_X(!name.isEmpty(), Q_FUNC_INFO, "name of parametr is empty"); - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); +qint64 VDomDocument::GetParametrLongLong(const QDomElement &domElement, const QString &name) const +{ + Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "name of parametr is empty"); + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); bool ok = false; QString parametr = GetParametrString(domElement, name); qint64 id = parametr.toLongLong(&ok); - if(ok == false){ + if (ok == false) + { throw VExceptionConversionError(tr("Can't convert toLongLong parameter"), name); } return id; } -QString VDomDocument::GetParametrString(const QDomElement &domElement, const QString &name) const{ - Q_ASSERT_X(!name.isEmpty(), Q_FUNC_INFO, "name of parametr is empty"); - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); +QString VDomDocument::GetParametrString(const QDomElement &domElement, const QString &name) const +{ + Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "name of parametr is empty"); + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); QString parameter = domElement.attribute(name, ""); - if(parameter.isEmpty()){ + if (parameter.isEmpty()) + { throw VExceptionEmptyParameter(tr("Got empty parameter"), name, domElement); } return parameter; } -qreal VDomDocument::GetParametrDouble(const QDomElement &domElement, const QString &name) const{ - Q_ASSERT_X(!name.isEmpty(), Q_FUNC_INFO, "name of parametr is empty"); - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); +qreal VDomDocument::GetParametrDouble(const QDomElement &domElement, const QString &name) const +{ + Q_ASSERT_X(name.isEmpty() == false, Q_FUNC_INFO, "name of parametr is empty"); + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); bool ok = false; QString parametr = GetParametrString(domElement, name); qreal param = parametr.replace(",", ".").toDouble(&ok); - if(ok == false){ + if (ok == false) + { throw VExceptionConversionError(tr("Can't convert toDouble parameter"), name); } return param; } -void VDomDocument::TestUniqueId() const{ +void VDomDocument::TestUniqueId() const +{ QVector vector; CollectId(this->documentElement(), vector); } -void VDomDocument::CollectId(QDomElement node, QVector &vector) const{ - if (node.hasAttribute("id")) { +void VDomDocument::CollectId(QDomElement node, QVector &vector) const +{ + if (node.hasAttribute("id")) + { qint64 id = GetParametrId(node); - if(vector.contains(id)){ + if (vector.contains(id)) + { throw VExceptionUniqueId(tr("This id is not unique."), node); } vector.append(id); } - for (qint32 i=0; iClearObject(); ParseDrawMode(sceneDraw, sceneDetail, domElement, parse, Draw::Calculation); } - if(domElement.tagName() == "modeling"){ + if (domElement.tagName() == "modeling") + { ParseDrawMode(sceneDraw, sceneDetail, domElement, parse, Draw::Modeling); } - if(domElement.tagName() == "details"){ + if (domElement.tagName() == "details") + { ParseDetails(sceneDetail, domElement, parse); } } @@ -410,34 +503,43 @@ void VDomDocument::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphics } void VDomDocument::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, - const QDomNode& node, const Document::Documents &parse, - Draw::Draws mode){ + const QDomNode& node, const Document::Documents &parse, Draw::Draws mode) +{ Q_ASSERT(sceneDraw != 0); Q_ASSERT(sceneDetail != 0); VMainGraphicsScene *scene = 0; - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { scene = sceneDraw; - } else { + } + else + { scene = sceneDetail; } QDomNodeList nodeList = node.childNodes(); qint32 num = nodeList.size(); - for(qint32 i = 0; i < num; ++i){ + for (qint32 i = 0; i < num; ++i) + { QDomElement domElement = nodeList.at(i).toElement(); - if(!domElement.isNull()){ - if(domElement.tagName() == "point"){ + if (domElement.isNull() == false) + { + if (domElement.tagName() == "point") + { ParsePointElement(scene, domElement, parse, domElement.attribute("type", ""), mode); continue; } - if(domElement.tagName() == "line"){ + if (domElement.tagName() == "line") + { ParseLineElement(scene, domElement, parse, mode); continue; } - if(domElement.tagName() == "spline"){ + if (domElement.tagName() == "spline") + { ParseSplineElement(scene, domElement, parse, domElement.attribute("type", ""), mode); continue; } - if(domElement.tagName() == "arc"){ + if (domElement.tagName() == "arc") + { ParseArcElement(scene, domElement, parse, domElement.attribute("type", ""), mode); continue; } @@ -446,10 +548,12 @@ void VDomDocument::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsSce } void VDomDocument::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, - const Document::Documents &parse){ + const Document::Documents &parse) +{ Q_ASSERT(sceneDetail != 0); - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); - try{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); + try + { VDetail detail; VDetail oldDetail; qint64 id = GetParametrId(domElement); @@ -462,10 +566,13 @@ void VDomDocument::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDo QDomNodeList nodeList = domElement.childNodes(); qint32 num = nodeList.size(); - for(qint32 i = 0; i < num; ++i){ + for (qint32 i = 0; i < num; ++i) + { QDomElement element = nodeList.at(i).toElement(); - if(!element.isNull()){ - if(element.tagName() == "node"){ + if (element.isNull() == false) + { + if (element.tagName() == "node") + { qint64 id = GetParametrLongLong(element, "idObject"); qreal mx = toPixel(GetParametrDouble(element, "mx")); qreal my = toPixel(GetParametrDouble(element, "my")); @@ -473,53 +580,88 @@ void VDomDocument::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDo Draw::Draws mode; NodeDetail::NodeDetails nodeType = NodeDetail::Contour; QString t = GetParametrString(element, "type"); - if(t == "NodePoint"){ + if (t == "NodePoint") + { tool = Tool::NodePoint; VPointF point = data->GetModelingPoint(id); mode = point.getMode(); oldDetail.append(VNodeDetail(point.getIdObject(), tool, mode, NodeDetail::Contour)); - } else if(t == "NodeArc"){ + } + else if (t == "NodeArc") + { tool = Tool::NodeArc; VArc arc = data->GetModelingArc(id); mode = arc.getMode(); oldDetail.append(VNodeDetail(arc.getIdObject(), tool, mode, NodeDetail::Contour)); - } else if(t == "NodeSpline"){ + } + else if (t == "NodeSpline") + { tool = Tool::NodeSpline; VSpline spl = data->GetModelingSpline(id); mode = spl.getMode(); oldDetail.append(VNodeDetail(spl.getIdObject(), tool, mode, NodeDetail::Contour)); - } else if(t == "NodeSplinePath"){ + } + else if (t == "NodeSplinePath") + { tool = Tool::NodeSplinePath; VSplinePath splPath = data->GetModelingSplinePath(id); mode = splPath.getMode(); oldDetail.append(VNodeDetail(splPath.getIdObject(), tool, mode, NodeDetail::Contour)); - } else if(t == "AlongLineTool"){ + } + else if (t == "AlongLineTool") + { tool = Tool::AlongLineTool; - } else if(t == "ArcTool"){ + } + else if (t == "ArcTool") + { tool = Tool::ArcTool; - } else if(t == "BisectorTool"){ + } + else if (t == "BisectorTool") + { tool = Tool::BisectorTool; - } else if(t == "EndLineTool"){ + } + else if (t == "EndLineTool") + { tool = Tool::EndLineTool; - } else if(t == "LineIntersectTool"){ + } + else if (t == "LineIntersectTool") + { tool = Tool::LineIntersectTool; - } else if(t == "LineTool"){ + } + else if (t == "LineTool") + { tool = Tool::LineTool; - } else if(t == "NormalTool"){ + } + else if (t == "NormalTool") + { tool = Tool::NormalTool; - } else if(t == "PointOfContact"){ + } + else if (t == "PointOfContact") + { tool = Tool::PointOfContact; - } else if(t == "ShoulderPointTool"){ + } + else if (t == "ShoulderPointTool") + { tool = Tool::ShoulderPointTool; - } else if(t == "SplinePathTool"){ + } + else if (t == "SplinePathTool") + { tool = Tool::SplinePathTool; - } else if(t == "SplineTool"){ + } + else if (t == "SplineTool") + { tool = Tool::SplineTool; - } else if(t == "Height"){ + } + else if (t == "Height") + { tool = Tool::Height; - } else if(t == "Triangle"){ + } + else if (t == "Triangle") + { tool = Tool::Triangle; - } else if(t == "PointOfIntersection"){ + } + else if (t == "PointOfIntersection") + { tool = Tool::PointOfIntersection; } detail.append(VNodeDetail(id, tool, Draw::Modeling, nodeType, mx, my)); @@ -528,7 +670,8 @@ void VDomDocument::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDo } VToolDetail::Create(id, detail, sceneDetail, this, data, parse, Tool::FromFile); } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating detail"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; @@ -536,15 +679,20 @@ void VDomDocument::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDo } void VDomDocument::ParseDetails(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, - const Document::Documents &parse){ + const Document::Documents &parse) +{ Q_ASSERT(sceneDetail != 0); - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); QDomNode domNode = domElement.firstChild(); - while(!domNode.isNull()){ - if(domNode.isElement()){ + while (domNode.isNull() == false) + { + if (domNode.isElement()) + { QDomElement domElement = domNode.toElement(); - if(!domElement.isNull()){ - if(domElement.tagName() == "detail"){ + if (domElement.isNull() == false) + { + if (domElement.tagName() == "detail") + { ParseDetailElement(sceneDetail, domElement, parse); } } @@ -554,13 +702,15 @@ void VDomDocument::ParseDetails(VMainGraphicsScene *sceneDetail, const QDomEleme } void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, const QString& type, - Draw::Draws mode){ + const Document::Documents &parse, const QString& type, Draw::Draws mode) +{ Q_ASSERT(scene != 0); - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); - Q_ASSERT_X(!type.isEmpty(), Q_FUNC_INFO, "type of point is empty"); - if(type == "single"){ - try{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); + Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of point is empty"); + if (type == "single") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal x = toPixel(GetParametrDouble(domElement, "x")); @@ -570,10 +720,12 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen data->UpdatePoint(id, VPointF(x, y, name, mx, my)); VDrawTool::AddRecord(id, Tool::SinglePointTool, this); - if(parse != Document::FullParse){ + if (parse != Document::FullParse) + { UpdateToolData(id, data); } - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { VToolSinglePoint *spoint = new VToolSinglePoint(this, data, id, Tool::FromFile); Q_ASSERT(spoint != 0); scene->addItem(spoint); @@ -583,14 +735,17 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating single point"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "endLine"){ - try{ + if (type == "endLine") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -599,23 +754,29 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen QString formula = GetParametrString(domElement, "length"); qint64 basePointId = GetParametrLongLong(domElement, "basePoint"); qreal angle = GetParametrDouble(domElement, "angle"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolEndLine::Create(id, name, typeLine, formula, angle, basePointId, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingEndLine::Create(id, name, typeLine, formula, angle, basePointId, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating point of end line"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "alongLine"){ - try{ + if (type == "alongLine") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -625,23 +786,29 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolAlongLine::Create(id, name, typeLine, formula, firstPointId, secondPointId, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingAlongLine::Create(id, name, typeLine, formula, firstPointId, secondPointId, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating point along line"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "shoulder"){ - try{ + if (type == "shoulder") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -652,23 +819,29 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen qint64 p2Line = GetParametrLongLong(domElement, "p2Line"); qint64 pShoulder = GetParametrLongLong(domElement, "pShoulder"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolShoulderPoint::Create(id, formula, p1Line, p2Line, pShoulder, typeLine, name, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingShoulderPoint::Create(id, formula, p1Line, p2Line, pShoulder, typeLine, name, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating point of shoulder"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "normal"){ - try{ + if (type == "normal") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -679,23 +852,29 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); qreal angle = GetParametrDouble(domElement, "angle"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolNormal::Create(id, formula, firstPointId, secondPointId, typeLine, name, angle, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingNormal::Create(id, formula, firstPointId, secondPointId, typeLine, name, angle, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating point of normal"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "bisector"){ - try{ + if (type == "bisector") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -706,23 +885,29 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); qint64 thirdPointId = GetParametrLongLong(domElement, "thirdPoint"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolBisector::Create(id, formula, firstPointId, secondPointId, thirdPointId, typeLine, name, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingBisector::Create(id, formula, firstPointId, secondPointId, thirdPointId, typeLine, name, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating point of bisector"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "lineIntersect"){ - try{ + if (type == "lineIntersect") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -732,23 +917,29 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen qint64 p1Line2Id = GetParametrLongLong(domElement, "p1Line2"); qint64 p2Line2Id = GetParametrLongLong(domElement, "p2Line2"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolLineIntersect::Create(id, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, name, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingLineIntersect::Create(id, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, name, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating point of lineintersection"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "pointOfContact"){ - try{ + if (type == "pointOfContact") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -758,32 +949,41 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolPointOfContact::Create(id, radius, center, firstPointId, secondPointId, name, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingPointOfContact::Create(id, radius, center, firstPointId, secondPointId, name, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating point of contact"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "modeling"){ - try{ + if (type == "modeling") + { + try + { qint64 id = GetParametrId(domElement); qint64 idObject = GetParametrLongLong(domElement, "idObject"); QString tObject = GetParametrString(domElement, "typeObject"); VPointF point; Draw::Draws typeObject; - if(tObject == "Calculation"){ + if (tObject == "Calculation") + { typeObject = Draw::Calculation; point = data->GetPoint(idObject ); - } else { + } + else + { typeObject = Draw::Modeling; point = data->GetModelingPoint(idObject); } @@ -794,14 +994,17 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen VNodePoint::Create(this, data, id, idObject, mode, parse, Tool::FromFile); return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating modeling point"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "height"){ - try{ + if (type == "height") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -810,23 +1013,29 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen qint64 basePointId = GetParametrLongLong(domElement, "basePoint"); qint64 p1LineId = GetParametrLongLong(domElement, "p1Line"); qint64 p2LineId = GetParametrLongLong(domElement, "p2Line"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolHeight::Create(id, name, typeLine, basePointId, p1LineId, p2LineId, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingHeight::Create(id, name, typeLine, basePointId, p1LineId, p2LineId, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating height"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "triangle"){ - try{ + if (type == "triangle") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -836,23 +1045,29 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolTriangle::Create(id, name, axisP1Id, axisP2Id, firstPointId, secondPointId, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingTriangle::Create(id, name, axisP1Id, axisP2Id, firstPointId, secondPointId, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating triangle"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "pointOfIntersection"){ - try{ + if (type == "pointOfIntersection") + { + try + { qint64 id = GetParametrId(domElement); QString name = GetParametrString(domElement, "name"); qreal mx = toPixel(GetParametrDouble(domElement, "mx")); @@ -860,16 +1075,20 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen qint64 firstPointId = GetParametrLongLong(domElement, "firstPoint"); qint64 secondPointId = GetParametrLongLong(domElement, "secondPoint"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolPointOfIntersection::Create(id, name, firstPointId, secondPointId, mx, my, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingPointOfIntersection::Create(id, name, firstPointId, secondPointId, mx, my, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating point of intersection"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; @@ -878,22 +1097,28 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen } void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &domElement, - const Document::Documents &parse, Draw::Draws mode){ + const Document::Documents &parse, Draw::Draws mode) +{ Q_ASSERT(scene != 0); - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); - try{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); + try + { qint64 id = GetParametrId(domElement); qint64 firstPoint = GetParametrLongLong(domElement, "firstPoint"); qint64 secondPoint = GetParametrLongLong(domElement, "secondPoint"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolLine::Create(id, firstPoint, secondPoint, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingLine::Create(id, firstPoint, secondPoint, this, data, parse, Tool::FromFile); } } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating line"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; @@ -901,13 +1126,15 @@ void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement } void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement &domElement, - const Document::Documents &parse, const QString &type, - Draw::Draws mode){ + const Document::Documents &parse, const QString &type, Draw::Draws mode) +{ Q_ASSERT(scene != 0); - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); - Q_ASSERT_X(!type.isEmpty(), Q_FUNC_INFO, "type of spline is empty"); - if(type == "simple"){ - try{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); + Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty"); + if (type == "simple") + { + try + { qint64 id = GetParametrId(domElement); qint64 point1 = GetParametrLongLong(domElement, "point1"); qint64 point4 = GetParametrLongLong(domElement, "point4"); @@ -917,70 +1144,89 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme qreal kAsm2 = GetParametrDouble(domElement, "kAsm2"); qreal kCurve = GetParametrDouble(domElement, "kCurve"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolSpline::Create(id, point1, point4, kAsm1, kAsm2, angle1, angle2, kCurve, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingSpline::Create(id, point1, point4, kAsm1, kAsm2, angle1, angle2, kCurve, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating simple curve"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "path"){ - try{ + if (type == "path") + { + try + { qint64 id = GetParametrId(domElement); qreal kCurve = GetParametrDouble(domElement, "kCurve"); VSplinePath path(data->DataPoints(), kCurve); QDomNodeList nodeList = domElement.childNodes(); qint32 num = nodeList.size(); - for(qint32 i = 0; i < num; ++i){ + for (qint32 i = 0; i < num; ++i) + { QDomElement element = nodeList.at(i).toElement(); - if(!element.isNull()){ - if(element.tagName() == "pathPoint"){ + if (element.isNull() == false) + { + if (element.tagName() == "pathPoint") + { qreal kAsm1 = GetParametrDouble(element, "kAsm1"); qreal angle = GetParametrDouble(element, "angle"); qreal kAsm2 = GetParametrDouble(element, "kAsm2"); qint64 pSpline = GetParametrLongLong(element, "pSpline"); VSplinePoint splPoint(pSpline, kAsm1, angle, kAsm2); path.append(splPoint); - if(parse == Document::FullParse){ + if (parse == Document::FullParse) + { IncrementReferens(pSpline); } } } } - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolSplinePath::Create(id, path, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingSplinePath::Create(id, path, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating curve path"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "modelingSpline"){ - try{ + if (type == "modelingSpline") + { + try + { qint64 id = GetParametrId(domElement); qint64 idObject = GetParametrLongLong(domElement, "idObject"); QString tObject = GetParametrString(domElement, "typeObject"); VSpline spl; Draw::Draws typeObject; - if(tObject == "Calculation"){ + if (tObject == "Calculation") + { typeObject = Draw::Calculation; spl = data->GetSpline(idObject); - } else { + } + else + { typeObject = Draw::Modeling; spl = data->GetModelingSpline(idObject); } @@ -990,23 +1236,29 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme VNodeSpline::Create(this, data, id, idObject, mode, parse, Tool::FromFile); return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating modeling simple curve"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "modelingPath"){ - try{ + if (type == "modelingPath") + { + try + { qint64 id = GetParametrId(domElement); qint64 idObject = GetParametrLongLong(domElement, "idObject"); QString tObject = GetParametrString(domElement, "typeObject"); VSplinePath path; Draw::Draws typeObject; - if(tObject == "Calculation"){ + if (tObject == "Calculation") + { typeObject = Draw::Calculation; path = data->GetSplinePath(idObject); - } else { + } + else + { typeObject = Draw::Modeling; path = data->GetModelingSplinePath(idObject); } @@ -1016,7 +1268,8 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme VNodeSplinePath::Create(this, data, id, idObject, mode, parse, Tool::FromFile); return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating modeling curve path"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; @@ -1025,43 +1278,55 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme } void VDomDocument::ParseArcElement(VMainGraphicsScene *scene, const QDomElement &domElement, - const Document::Documents &parse, const QString &type, Draw::Draws mode){ + const Document::Documents &parse, const QString &type, Draw::Draws mode) +{ Q_ASSERT(scene != 0); - Q_ASSERT_X(!domElement.isNull(), Q_FUNC_INFO, "domElement is null"); - Q_ASSERT_X(!type.isEmpty(), Q_FUNC_INFO, "type of spline is empty"); - if(type == "simple"){ - try{ + Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); + Q_ASSERT_X(type.isEmpty() == false, Q_FUNC_INFO, "type of spline is empty"); + if (type == "simple") + { + try + { qint64 id = GetParametrId(domElement); qint64 center = GetParametrLongLong(domElement, "center"); QString radius = GetParametrString(domElement, "radius"); QString f1 = GetParametrString(domElement, "angle1"); QString f2 = GetParametrString(domElement, "angle2"); - if(mode == Draw::Calculation){ + if (mode == Draw::Calculation) + { VToolArc::Create(id, center, radius, f1, f2, scene, this, data, parse, Tool::FromFile); - } else { + } + else + { VModelingArc::Create(id, center, radius, f1, f2, this, data, parse, Tool::FromFile); } return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating simple arc"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; } } - if(type == "modeling"){ - try{ + if (type == "modeling") + { + try + { qint64 id = GetParametrId(domElement); qint64 idObject = GetParametrLongLong(domElement, "idObject"); QString tObject = GetParametrString(domElement, "typeObject"); VArc arc; Draw::Draws typeObject; - if(tObject == "Calculation"){ + if (tObject == "Calculation") + { typeObject = Draw::Calculation; arc = data->GetArc(idObject); - } else { + } + else + { typeObject = Draw::Modeling; arc = data->GetModelingArc(idObject); } @@ -1071,7 +1336,8 @@ void VDomDocument::ParseArcElement(VMainGraphicsScene *scene, const QDomElement VNodeArc::Create(this, data, id, idObject, mode, parse, Tool::FromFile); return; } - catch(const VExceptionBadId &e){ + catch (const VExceptionBadId &e) + { VExceptionObjectError excep(tr("Error creating or updating modeling arc"), domElement); excep.AddMoreInformation(e.ErrorMessage()); throw excep; @@ -1079,14 +1345,17 @@ void VDomDocument::ParseArcElement(VMainGraphicsScene *scene, const QDomElement } } -void VDomDocument::FullUpdateTree(){ +void VDomDocument::FullUpdateTree() +{ VMainGraphicsScene *scene = new VMainGraphicsScene(); Q_ASSERT(scene != 0); - try{ + try + { data->ClearObject(); Parse(Document::LiteParse, scene, scene); } - catch (const std::bad_alloc &) { + catch (const std::bad_alloc &) + { delete scene; QMessageBox msgBox; msgBox.setWindowTitle(tr("Error!")); @@ -1098,7 +1367,8 @@ void VDomDocument::FullUpdateTree(){ msgBox.exec(); return; } - catch(...){ + catch (...) + { delete scene; throw; } @@ -1109,42 +1379,54 @@ void VDomDocument::FullUpdateTree(){ emit haveChange(); } -void VDomDocument::haveLiteChange(){ +void VDomDocument::haveLiteChange() +{ emit haveChange(); } -void VDomDocument::ShowHistoryTool(qint64 id, Qt::GlobalColor color, bool enable){ +void VDomDocument::ShowHistoryTool(qint64 id, Qt::GlobalColor color, bool enable) +{ emit ShowTool(id, color, enable); } -void VDomDocument::setCursor(const qint64 &value){ +void VDomDocument::setCursor(const qint64 &value) +{ cursor = value; emit ChangedCursor(cursor); } -void VDomDocument::setCurrentData(){ - if(*mode == Draw::Calculation){ +void VDomDocument::setCurrentData() +{ + if (*mode == Draw::Calculation) + { QString nameDraw = comboBoxDraws->itemText(comboBoxDraws->currentIndex()); - if(nameActivDraw != nameDraw){ + if (nameActivDraw != nameDraw) + { nameActivDraw = nameDraw; qint64 id = 0; - if(history.size() == 0){ + if (history.size() == 0) + { return; } - for(qint32 i = 0; i < history.size(); ++i){ + for (qint32 i = 0; i < history.size(); ++i) + { VToolRecord tool = history.at(i); - if(tool.getNameDraw() == nameDraw){ + if (tool.getNameDraw() == nameDraw) + { id = tool.getId(); } } - if(id == 0){ + if (id == 0) + { VToolRecord tool = history.at(history.size()-1); id = tool.getId(); - if(id == 0){ + if (id == 0) + { return; } } - if(tools.size() > 0){ + if (tools.size() > 0) + { VDataTool *vTool = tools.value(id); data->setData(vTool->getData()); } @@ -1152,13 +1434,15 @@ void VDomDocument::setCurrentData(){ } } -void VDomDocument::AddTool(const qint64 &id, VDataTool *tool){ +void VDomDocument::AddTool(const qint64 &id, VDataTool *tool) +{ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); Q_ASSERT(tool != 0); tools.insert(id, tool); } -void VDomDocument::UpdateToolData(const qint64 &id, VContainer *data){ +void VDomDocument::UpdateToolData(const qint64 &id, VContainer *data) +{ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); Q_ASSERT(data != 0); VDataTool *tool = tools.value(id); @@ -1166,14 +1450,16 @@ void VDomDocument::UpdateToolData(const qint64 &id, VContainer *data){ tool->VDataTool::setData(data); } -void VDomDocument::IncrementReferens(qint64 id) const{ +void VDomDocument::IncrementReferens(qint64 id) const +{ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); VDataTool *tool = tools.value(id); Q_ASSERT(tool != 0); tool->incrementReferens(); } -void VDomDocument::DecrementReferens(qint64 id) const{ +void VDomDocument::DecrementReferens(qint64 id) const +{ Q_ASSERT_X(id > 0, Q_FUNC_INFO, "id <= 0"); VDataTool *tool = tools.value(id); Q_ASSERT(tool != 0); diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index 8f9f5709d..fbd67550b 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -28,7 +28,8 @@ #include #include "vtoolrecord.h" -namespace Document { +namespace Document +{ enum Document { LiteParse, FullParse}; Q_DECLARE_FLAGS(Documents, Document) } @@ -36,12 +37,12 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Document::Documents) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Weffc++" -class VDomDocument : public QObject, public QDomDocument{ +class VDomDocument : public QObject, public QDomDocument +{ Q_OBJECT public: - VDomDocument(VContainer *data,QComboBox *comboBoxDraws, Draw::Draws *mode); - VDomDocument(const QString& name, VContainer *data, QComboBox *comboBoxDraws, - Draw::Draws *mode); + VDomDocument(VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode); + VDomDocument(const QString& name, VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode); VDomDocument(const QDomDocumentType& doctype, VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode); ~VDomDocument(){} diff --git a/xml/vtoolrecord.cpp b/xml/vtoolrecord.cpp index 881a484d9..1df97da1f 100644 --- a/xml/vtoolrecord.cpp +++ b/xml/vtoolrecord.cpp @@ -21,9 +21,8 @@ #include "vtoolrecord.h" -VToolRecord::VToolRecord():id(0), typeTool(Tool::ArrowTool), nameDraw(QString()){ -} +VToolRecord::VToolRecord() + :id(0), typeTool(Tool::ArrowTool), nameDraw(QString()){} -VToolRecord::VToolRecord(const qint64 &id, const Tool::Tools &typeTool, const QString &nameDraw):id(id), - typeTool(typeTool), nameDraw(nameDraw){ -} +VToolRecord::VToolRecord(const qint64 &id, const Tool::Tools &typeTool, const QString &nameDraw) + :id(id), typeTool(typeTool), nameDraw(nameDraw){} diff --git a/xml/vtoolrecord.h b/xml/vtoolrecord.h index ce598c1e0..3a4184e63 100644 --- a/xml/vtoolrecord.h +++ b/xml/vtoolrecord.h @@ -22,7 +22,8 @@ #ifndef VTOOLRECORD_H #define VTOOLRECORD_H -class VToolRecord{ +class VToolRecord +{ public: VToolRecord(); VToolRecord(const qint64 &id, const Tool::Tools &typeTool, const QString &nameDraw); From f9a0baa77c1e7b33f24a1118e4b957b2dbf1b9b6 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 4 Nov 2013 22:38:54 +0200 Subject: [PATCH 58/83] Missed license in files. --HG-- branch : develop --- dialogs/dialogheight.cpp | 21 +++++++++++++++++++ dialogs/dialogpointofintersection.cpp | 21 +++++++++++++++++++ dialogs/dialogpointofintersection.h | 21 +++++++++++++++++++ dialogs/dialogtriangle.cpp | 21 +++++++++++++++++++ exception/vexceptionuniqueid.cpp | 21 +++++++++++++++++++ exception/vexceptionuniqueid.h | 21 +++++++++++++++++++ tools/drawTools/vtoolheight.cpp | 21 +++++++++++++++++++ tools/drawTools/vtoolpointofintersection.cpp | 21 +++++++++++++++++++ tools/drawTools/vtoolpointofintersection.h | 21 +++++++++++++++++++ tools/drawTools/vtooltriangle.cpp | 21 +++++++++++++++++++ .../vmodelingpointofintersection.cpp | 21 +++++++++++++++++++ .../vmodelingpointofintersection.h | 21 +++++++++++++++++++ version.h | 21 +++++++++++++++++++ widgets/vapplication.h | 21 +++++++++++++++++++ 14 files changed, 294 insertions(+) diff --git a/dialogs/dialogheight.cpp b/dialogs/dialogheight.cpp index 4fdaa9761..db2039bce 100644 --- a/dialogs/dialogheight.cpp +++ b/dialogs/dialogheight.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "dialogheight.h" #include "ui_dialogheight.h" diff --git a/dialogs/dialogpointofintersection.cpp b/dialogs/dialogpointofintersection.cpp index bf6fff658..299eaadee 100644 --- a/dialogs/dialogpointofintersection.cpp +++ b/dialogs/dialogpointofintersection.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "dialogpointofintersection.h" #include "ui_dialogpointofintersection.h" diff --git a/dialogs/dialogpointofintersection.h b/dialogs/dialogpointofintersection.h index 52a3ff7a2..556b9b3ea 100644 --- a/dialogs/dialogpointofintersection.h +++ b/dialogs/dialogpointofintersection.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef DIALOGPOINTOFINTERSECTION_H #define DIALOGPOINTOFINTERSECTION_H diff --git a/dialogs/dialogtriangle.cpp b/dialogs/dialogtriangle.cpp index 336ddd7cc..96b136c2c 100644 --- a/dialogs/dialogtriangle.cpp +++ b/dialogs/dialogtriangle.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "dialogtriangle.h" #include "ui_dialogtriangle.h" diff --git a/exception/vexceptionuniqueid.cpp b/exception/vexceptionuniqueid.cpp index 9f38b31a7..df7c506ae 100644 --- a/exception/vexceptionuniqueid.cpp +++ b/exception/vexceptionuniqueid.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "vexceptionuniqueid.h" VExceptionUniqueId::VExceptionUniqueId(const QString &what, const QDomElement &domElement) diff --git a/exception/vexceptionuniqueid.h b/exception/vexceptionuniqueid.h index bd5b833d1..d3d618598 100644 --- a/exception/vexceptionuniqueid.h +++ b/exception/vexceptionuniqueid.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef VEXCEPTIONUNIQUEID_H #define VEXCEPTIONUNIQUEID_H diff --git a/tools/drawTools/vtoolheight.cpp b/tools/drawTools/vtoolheight.cpp index e8b4d502f..0165e6481 100644 --- a/tools/drawTools/vtoolheight.cpp +++ b/tools/drawTools/vtoolheight.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "vtoolheight.h" const QString VToolHeight::ToolType = QStringLiteral("height"); diff --git a/tools/drawTools/vtoolpointofintersection.cpp b/tools/drawTools/vtoolpointofintersection.cpp index 8c23281aa..87984ca44 100644 --- a/tools/drawTools/vtoolpointofintersection.cpp +++ b/tools/drawTools/vtoolpointofintersection.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "vtoolpointofintersection.h" const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection"); diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h index d65f31ad6..45ea6ea70 100644 --- a/tools/drawTools/vtoolpointofintersection.h +++ b/tools/drawTools/vtoolpointofintersection.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef VTOOLPOINTOFINTERSECTION_H #define VTOOLPOINTOFINTERSECTION_H diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index 57ea24d23..bd36becc9 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "vtooltriangle.h" const QString VToolTriangle::ToolType = QStringLiteral("triangle"); diff --git a/tools/modelingTools/vmodelingpointofintersection.cpp b/tools/modelingTools/vmodelingpointofintersection.cpp index 15fb326fa..a56e3b4d7 100644 --- a/tools/modelingTools/vmodelingpointofintersection.cpp +++ b/tools/modelingTools/vmodelingpointofintersection.cpp @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #include "vmodelingpointofintersection.h" const QString VModelingPointOfIntersection::ToolType = QStringLiteral("pointOfIntersection"); diff --git a/tools/modelingTools/vmodelingpointofintersection.h b/tools/modelingTools/vmodelingpointofintersection.h index 1f11f0b6a..6890998d5 100644 --- a/tools/modelingTools/vmodelingpointofintersection.h +++ b/tools/modelingTools/vmodelingpointofintersection.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef VMODELINGPOINTOFINTERSECTION_H #define VMODELINGPOINTOFINTERSECTION_H diff --git a/version.h b/version.h index 5a80c3c59..a7ac52cdc 100644 --- a/version.h +++ b/version.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef VERSION_H #define VERSION_H diff --git a/widgets/vapplication.h b/widgets/vapplication.h index 145c5cac8..1e04c118b 100644 --- a/widgets/vapplication.h +++ b/widgets/vapplication.h @@ -1,3 +1,24 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + #ifndef VAPPLICATION_H #define VAPPLICATION_H From d7becda4eb4268c2fe6502876eaab91b7e014236 Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 15:34:54 +0200 Subject: [PATCH 59/83] Change in structure of project file. --HG-- branch : develop --- Valentina.pro | 260 +++---------------- container/container.pri | 13 + dialogs/dialogs.pri | 62 +++++ exception/exception.pri | 17 ++ geometry/geometry.pri | 15 ++ tools/drawTools/drawTools.pri | 40 +++ tools/modelingTools/modelingTools.pri | 38 +++ tools/modelingTools/modelingtools.h | 1 - tools/modelingTools/vmodelingsinglepoint.cpp | 93 ------- tools/modelingTools/vmodelingsinglepoint.h | 29 --- tools/nodeDetails/nodeDetails.pri | 14 + tools/tools.pri | 14 + tools/vgraphicspoint.cpp | 39 --- tools/vgraphicspoint.h | 35 --- widgets/delegate.cpp | 90 ------- widgets/widgets.pri | 19 ++ xml/xml.pri | 7 + 17 files changed, 277 insertions(+), 509 deletions(-) create mode 100644 container/container.pri create mode 100644 dialogs/dialogs.pri create mode 100644 exception/exception.pri create mode 100644 geometry/geometry.pri create mode 100644 tools/drawTools/drawTools.pri create mode 100644 tools/modelingTools/modelingTools.pri delete mode 100644 tools/modelingTools/vmodelingsinglepoint.cpp delete mode 100644 tools/modelingTools/vmodelingsinglepoint.h create mode 100644 tools/nodeDetails/nodeDetails.pri create mode 100644 tools/tools.pri delete mode 100644 tools/vgraphicspoint.cpp delete mode 100644 tools/vgraphicspoint.h delete mode 100644 widgets/delegate.cpp create mode 100644 widgets/widgets.pri create mode 100644 xml/xml.pri diff --git a/Valentina.pro b/Valentina.pro index b523128a3..1de130512 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -8,231 +8,19 @@ QT += core gui widgets xml svg -TARGET = Valentina TEMPLATE = app + +DEBUG_TARGET = Valentinad +RELEASE_TARGET = Valentina + CONFIG -= debug_and_release debug_and_release_target CONFIG += c++11 precompile_header + QMAKE_CXX = ccache g++ +#DEFINES += ... -SOURCES += main.cpp\ - mainwindow.cpp \ - dialogs/dialogsinglepoint.cpp \ - widgets/vgraphicssimpletextitem.cpp \ - xml/vdomdocument.cpp \ - container/vpointf.cpp \ - container/vcontainer.cpp \ - tools/drawTools/vtoolpoint.cpp \ - container/calculator.cpp \ - dialogs/dialogincrements.cpp \ - container/vstandarttablecell.cpp \ - container/vincrementtablerow.cpp \ - widgets/doubledelegate.cpp \ - dialogs/dialogendline.cpp \ - tools/drawTools/vtoolendline.cpp \ - tools/drawTools/vtoolline.cpp \ - tools/vabstracttool.cpp \ - dialogs/dialogline.cpp \ - tools/drawTools/vtoolalongline.cpp \ - dialogs/dialogtool.cpp \ - dialogs/dialogalongline.cpp \ - tools/drawTools/vtoolshoulderpoint.cpp \ - dialogs/dialogshoulderpoint.cpp \ - tools/drawTools/vtoolnormal.cpp \ - dialogs/dialognormal.cpp \ - tools/drawTools/vtoolbisector.cpp \ - dialogs/dialogbisector.cpp \ - tools/drawTools/vtoollinepoint.cpp \ - tools/drawTools/vtoollineintersect.cpp \ - dialogs/dialoglineintersect.cpp \ - geometry/vspline.cpp \ - tools/drawTools/vtoolsinglepoint.cpp \ - geometry/varc.cpp \ - widgets/vcontrolpointspline.cpp \ - tools/drawTools/vtoolspline.cpp \ - dialogs/dialogspline.cpp \ - tools/drawTools/vtoolarc.cpp \ - dialogs/dialogarc.cpp \ - geometry/vsplinepoint.cpp \ - geometry/vsplinepath.cpp \ - tools/drawTools/vtoolsplinepath.cpp \ - dialogs/dialogsplinepath.cpp \ - widgets/vmaingraphicsscene.cpp \ - widgets/vmaingraphicsview.cpp \ - tools/vdatatool.cpp \ - xml/vtoolrecord.cpp \ - dialogs/dialoghistory.cpp \ - tools/drawTools/vtoolpointofcontact.cpp \ - dialogs/dialogpointofcontact.cpp \ - geometry/vnodedetail.cpp \ - geometry/vdetail.cpp \ - dialogs/dialogdetail.cpp \ - tools/vtooldetail.cpp \ - widgets/vtablegraphicsview.cpp \ - widgets/vitem.cpp \ - tablewindow.cpp \ - tools/nodeDetails/vnodearc.cpp \ - tools/nodeDetails/vnodepoint.cpp \ - tools/nodeDetails/vnodespline.cpp \ - tools/nodeDetails/vnodesplinepath.cpp \ - tools/drawTools/vdrawtool.cpp \ - tools/nodeDetails/vabstractnode.cpp \ - tools/modelingTools/vmodelingtool.cpp \ - tools/modelingTools/vmodelingalongline.cpp \ - tools/modelingTools/vmodelingarc.cpp \ - tools/modelingTools/vmodelingbisector.cpp \ - tools/modelingTools/vmodelingendline.cpp \ - tools/modelingTools/vmodelingline.cpp \ - tools/modelingTools/vmodelinglineintersect.cpp \ - tools/modelingTools/vmodelinglinepoint.cpp \ - tools/modelingTools/vmodelingnormal.cpp \ - tools/modelingTools/vmodelingpoint.cpp \ - tools/modelingTools/vmodelingpointofcontact.cpp \ - tools/modelingTools/vmodelingshoulderpoint.cpp \ - tools/modelingTools/vmodelingspline.cpp \ - tools/modelingTools/vmodelingsplinepath.cpp \ - exception/vexception.cpp \ - exception/vexceptionbadid.cpp \ - exception/vexceptionwrongparameterid.cpp \ - exception/vexceptionconversionerror.cpp \ - exception/vexceptionemptyparameter.cpp \ - exception/vexceptionobjecterror.cpp \ - widgets/vapplication.cpp \ - exception/vexceptionuniqueid.cpp \ - tools/drawTools/vtoolheight.cpp \ - tools/modelingTools/vmodelingheight.cpp \ - dialogs/dialogheight.cpp \ - tools/drawTools/vtooltriangle.cpp \ - tools/modelingTools/vmodelingtriangle.cpp \ - dialogs/dialogtriangle.cpp \ - dialogs/dialogpointofintersection.cpp \ - tools/drawTools/vtoolpointofintersection.cpp \ - tools/modelingTools/vmodelingpointofintersection.cpp - -HEADERS += mainwindow.h \ - widgets/vmaingraphicsscene.h \ - dialogs/dialogsinglepoint.h \ - options.h \ - widgets/vgraphicssimpletextitem.h \ - xml/vdomdocument.h \ - container/vpointf.h \ - container/vcontainer.h \ - tools/drawTools/vtoolpoint.h \ - container/calculator.h \ - dialogs/dialogincrements.h \ - container/vstandarttablecell.h \ - container/vincrementtablerow.h \ - widgets/doubledelegate.h \ - dialogs/dialogendline.h \ - tools/drawTools/vtoolendline.h \ - tools/drawTools/vtoolline.h \ - tools/vabstracttool.h \ - dialogs/dialogline.h \ - tools/drawTools/vtoolalongline.h \ - dialogs/dialogtool.h \ - dialogs/dialogalongline.h \ - tools/drawTools/vtoolshoulderpoint.h \ - dialogs/dialogshoulderpoint.h \ - tools/drawTools/vtoolnormal.h \ - dialogs/dialognormal.h \ - tools/drawTools/vtoolbisector.h \ - dialogs/dialogbisector.h \ - tools/drawTools/vtoollinepoint.h \ - tools/drawTools/vtoollineintersect.h \ - dialogs/dialoglineintersect.h \ - geometry/vspline.h \ - tools/drawTools/vtoolsinglepoint.h \ - geometry/varc.h \ - widgets/vcontrolpointspline.h \ - tools/drawTools/vtoolspline.h \ - dialogs/dialogspline.h \ - tools/drawTools/vtoolarc.h \ - dialogs/dialogarc.h \ - geometry/vsplinepoint.h \ - geometry/vsplinepath.h \ - tools/drawTools/vtoolsplinepath.h \ - dialogs/dialogsplinepath.h \ - widgets/vmaingraphicsview.h \ - tools/vdatatool.h \ - xml/vtoolrecord.h \ - dialogs/dialoghistory.h \ - tools/drawTools/vtoolpointofcontact.h \ - dialogs/dialogpointofcontact.h \ - geometry/vnodedetail.h \ - geometry/vdetail.h \ - dialogs/dialogdetail.h \ - tools/vtooldetail.h \ - widgets/vtablegraphicsview.h \ - widgets/vitem.h \ - tablewindow.h \ - tools/tools.h \ - tools/drawTools/drawtools.h \ - tools/nodeDetails/nodedetails.h \ - tools/nodeDetails/vnodearc.h \ - tools/nodeDetails/vnodepoint.h \ - tools/nodeDetails/vnodespline.h \ - tools/nodeDetails/vnodesplinepath.h \ - stable.h \ - tools/drawTools/vdrawtool.h \ - tools/nodeDetails/vabstractnode.h \ - dialogs/dialogs.h \ - tools/modelingTools/modelingtools.h \ - tools/modelingTools/vmodelingtool.h \ - tools/modelingTools/vmodelingalongline.h \ - tools/modelingTools/vmodelingarc.h \ - tools/modelingTools/vmodelingbisector.h \ - tools/modelingTools/vmodelingendline.h \ - tools/modelingTools/vmodelingline.h \ - tools/modelingTools/vmodelinglineintersect.h \ - tools/modelingTools/vmodelinglinepoint.h \ - tools/modelingTools/vmodelingnormal.h \ - tools/modelingTools/vmodelingpoint.h \ - tools/modelingTools/vmodelingpointofcontact.h \ - tools/modelingTools/vmodelingshoulderpoint.h \ - tools/modelingTools/vmodelingspline.h \ - tools/modelingTools/vmodelingsplinepath.h \ - exception/vexception.h \ - exception/vexceptionbadid.h \ - exception/vexceptionwrongparameterid.h \ - exception/vexceptionconversionerror.h \ - exception/vexceptionemptyparameter.h \ - exception/vexceptionobjecterror.h \ - widgets/vapplication.h \ - exception/vexceptionuniqueid.h \ - tools/drawTools/vtoolheight.h \ - tools/modelingTools/vmodelingheight.h \ - dialogs/dialogheight.h \ - tools/drawTools/vtooltriangle.h \ - tools/modelingTools/vmodelingtriangle.h \ - dialogs/dialogtriangle.h \ - dialogs/dialogpointofintersection.h \ - tools/drawTools/vtoolpointofintersection.h \ - tools/modelingTools/vmodelingpointofintersection.h \ - version.h - -FORMS += mainwindow.ui \ - dialogs/dialogsinglepoint.ui \ - dialogs/dialogincrements.ui \ - dialogs/dialogendline.ui \ - dialogs/dialogline.ui \ - dialogs/dialogalongline.ui \ - dialogs/dialogshoulderpoint.ui \ - dialogs/dialognormal.ui \ - dialogs/dialogbisector.ui \ - dialogs/dialoglineintersect.ui \ - dialogs/dialogspline.ui \ - dialogs/dialogarc.ui \ - dialogs/dialogsplinepath.ui \ - dialogs/dialoghistory.ui \ - dialogs/dialogpointofcontact.ui \ - dialogs/dialogdetail.ui \ - tablewindow.ui \ - dialogs/dialogheight.ui \ - dialogs/dialogtriangle.ui \ - dialogs/dialogpointofintersection.ui - -RESOURCES += \ - icon.qrc \ - cursor.qrc +# Precompiled headers (PCH) +PRECOMPILED_HEADER = stable.h # directory for executable file DESTDIR = bin @@ -249,14 +37,38 @@ RCC_DIR = rcc # files created uic UI_DIR = uic -# Use Precompiled headers (PCH) -PRECOMPILED_HEADER = stable.h +include(container/container.pri) +include(dialogs/dialogs.pri) +include(exception/exception.pri) +include(geometry/geometry.pri) +include(tools/tools.pri) +include(widgets/widgets.pri) +include(xml/xml.pri) + +SOURCES += main.cpp\ + mainwindow.cpp \ + tablewindow.cpp \ + +HEADERS += mainwindow.h \ + options.h \ + tablewindow.h \ + stable.h \ + version.h + +FORMS += mainwindow.ui \ + tablewindow.ui + +RESOURCES += \ + icon.qrc \ + cursor.qrc TRANSLATIONS += translations/valentina_ru.ts \ translations/valentina_uk.ts CONFIG(debug, debug|release){ # Debug + TARGET = $$DEBUG_TARGET + QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \ -isystem "/usr/include/qt5/QtCore" -isystem "$$OUT_PWD/uic" -isystem "$$OUT_PWD/moc/" \ @@ -265,8 +77,12 @@ CONFIG(debug, debug|release){ -Wunreachable-code }else{ # Release + TARGET = $$RELEASE_TARGET + QMAKE_CXXFLAGS += -O1 + DEFINES += QT_NO_DEBUG_OUTPUT + QMAKE_EXTRA_COMPILERS += lrelease lrelease.input = TRANSLATIONS lrelease.output = ${QMAKE_FILE_BASE}.qm diff --git a/container/container.pri b/container/container.pri new file mode 100644 index 000000000..a6461484b --- /dev/null +++ b/container/container.pri @@ -0,0 +1,13 @@ +SOURCES += \ + container/vpointf.cpp \ + container/vincrementtablerow.cpp \ + container/vcontainer.cpp \ + container/calculator.cpp \ + container/vstandarttablecell.cpp + +HEADERS += \ + container/vstandarttablecell.h \ + container/vpointf.h \ + container/vincrementtablerow.h \ + container/vcontainer.h \ + container/calculator.h diff --git a/dialogs/dialogs.pri b/dialogs/dialogs.pri new file mode 100644 index 000000000..86876c1d2 --- /dev/null +++ b/dialogs/dialogs.pri @@ -0,0 +1,62 @@ +HEADERS += \ + dialogs/dialogtriangle.h \ + dialogs/dialogtool.h \ + dialogs/dialogsplinepath.h \ + dialogs/dialogspline.h \ + dialogs/dialogsinglepoint.h \ + dialogs/dialogshoulderpoint.h \ + dialogs/dialogs.h \ + dialogs/dialogpointofintersection.h \ + dialogs/dialogpointofcontact.h \ + dialogs/dialognormal.h \ + dialogs/dialoglineintersect.h \ + dialogs/dialogline.h \ + dialogs/dialogincrements.h \ + dialogs/dialoghistory.h \ + dialogs/dialogheight.h \ + dialogs/dialogendline.h \ + dialogs/dialogdetail.h \ + dialogs/dialogbisector.h \ + dialogs/dialogarc.h \ + dialogs/dialogalongline.h + +SOURCES += \ + dialogs/dialogtriangle.cpp \ + dialogs/dialogtool.cpp \ + dialogs/dialogsplinepath.cpp \ + dialogs/dialogspline.cpp \ + dialogs/dialogsinglepoint.cpp \ + dialogs/dialogshoulderpoint.cpp \ + dialogs/dialogpointofintersection.cpp \ + dialogs/dialogpointofcontact.cpp \ + dialogs/dialognormal.cpp \ + dialogs/dialoglineintersect.cpp \ + dialogs/dialogline.cpp \ + dialogs/dialogincrements.cpp \ + dialogs/dialoghistory.cpp \ + dialogs/dialogheight.cpp \ + dialogs/dialogendline.cpp \ + dialogs/dialogdetail.cpp \ + dialogs/dialogbisector.cpp \ + dialogs/dialogarc.cpp \ + dialogs/dialogalongline.cpp + +FORMS += \ + dialogs/dialogtriangle.ui \ + dialogs/dialogsplinepath.ui \ + dialogs/dialogspline.ui \ + dialogs/dialogsinglepoint.ui \ + dialogs/dialogshoulderpoint.ui \ + dialogs/dialogpointofintersection.ui \ + dialogs/dialogpointofcontact.ui \ + dialogs/dialognormal.ui \ + dialogs/dialoglineintersect.ui \ + dialogs/dialogline.ui \ + dialogs/dialogincrements.ui \ + dialogs/dialoghistory.ui \ + dialogs/dialogheight.ui \ + dialogs/dialogendline.ui \ + dialogs/dialogdetail.ui \ + dialogs/dialogbisector.ui \ + dialogs/dialogarc.ui \ + dialogs/dialogalongline.ui diff --git a/exception/exception.pri b/exception/exception.pri new file mode 100644 index 000000000..4293f086b --- /dev/null +++ b/exception/exception.pri @@ -0,0 +1,17 @@ +HEADERS += \ + exception/vexceptionwrongparameterid.h \ + exception/vexceptionuniqueid.h \ + exception/vexceptionobjecterror.h \ + exception/vexceptionemptyparameter.h \ + exception/vexceptionconversionerror.h \ + exception/vexceptionbadid.h \ + exception/vexception.h + +SOURCES += \ + exception/vexceptionwrongparameterid.cpp \ + exception/vexceptionuniqueid.cpp \ + exception/vexceptionobjecterror.cpp \ + exception/vexceptionemptyparameter.cpp \ + exception/vexceptionconversionerror.cpp \ + exception/vexceptionbadid.cpp \ + exception/vexception.cpp diff --git a/geometry/geometry.pri b/geometry/geometry.pri new file mode 100644 index 000000000..37d5100cc --- /dev/null +++ b/geometry/geometry.pri @@ -0,0 +1,15 @@ +HEADERS += \ + geometry/vsplinepoint.h \ + geometry/vsplinepath.h \ + geometry/vspline.h \ + geometry/vnodedetail.h \ + geometry/vdetail.h \ + geometry/varc.h + +SOURCES += \ + geometry/vsplinepoint.cpp \ + geometry/vsplinepath.cpp \ + geometry/vspline.cpp \ + geometry/vnodedetail.cpp \ + geometry/vdetail.cpp \ + geometry/varc.cpp diff --git a/tools/drawTools/drawTools.pri b/tools/drawTools/drawTools.pri new file mode 100644 index 000000000..54cf0341c --- /dev/null +++ b/tools/drawTools/drawTools.pri @@ -0,0 +1,40 @@ +HEADERS += \ + tools/drawTools/vtooltriangle.h \ + tools/drawTools/vtoolsplinepath.h \ + tools/drawTools/vtoolspline.h \ + tools/drawTools/vtoolshoulderpoint.h \ + tools/drawTools/vtoolpointofintersection.h \ + tools/drawTools/vtoolpointofcontact.h \ + tools/drawTools/vtoolpoint.h \ + tools/drawTools/vtoolnormal.h \ + tools/drawTools/vtoollinepoint.h \ + tools/drawTools/vtoollineintersect.h \ + tools/drawTools/vtoolline.h \ + tools/drawTools/vtoolheight.h \ + tools/drawTools/vtoolendline.h \ + tools/drawTools/vtoolbisector.h \ + tools/drawTools/vtoolarc.h \ + tools/drawTools/vtoolalongline.h \ + tools/drawTools/vdrawtool.h \ + tools/drawTools/drawtools.h \ + tools/drawTools/vtoolsinglepoint.h + +SOURCES += \ + tools/drawTools/vtooltriangle.cpp \ + tools/drawTools/vtoolsplinepath.cpp \ + tools/drawTools/vtoolspline.cpp \ + tools/drawTools/vtoolshoulderpoint.cpp \ + tools/drawTools/vtoolpointofintersection.cpp \ + tools/drawTools/vtoolpointofcontact.cpp \ + tools/drawTools/vtoolpoint.cpp \ + tools/drawTools/vtoolnormal.cpp \ + tools/drawTools/vtoollinepoint.cpp \ + tools/drawTools/vtoollineintersect.cpp \ + tools/drawTools/vtoolline.cpp \ + tools/drawTools/vtoolheight.cpp \ + tools/drawTools/vtoolendline.cpp \ + tools/drawTools/vtoolbisector.cpp \ + tools/drawTools/vtoolarc.cpp \ + tools/drawTools/vtoolalongline.cpp \ + tools/drawTools/vdrawtool.cpp \ + tools/drawTools/vtoolsinglepoint.cpp diff --git a/tools/modelingTools/modelingTools.pri b/tools/modelingTools/modelingTools.pri new file mode 100644 index 000000000..165b67fe5 --- /dev/null +++ b/tools/modelingTools/modelingTools.pri @@ -0,0 +1,38 @@ +HEADERS += \ + tools/modelingTools/vmodelingtriangle.h \ + tools/modelingTools/vmodelingtool.h \ + tools/modelingTools/vmodelingsplinepath.h \ + tools/modelingTools/vmodelingspline.h \ + tools/modelingTools/vmodelingshoulderpoint.h \ + tools/modelingTools/vmodelingpointofintersection.h \ + tools/modelingTools/vmodelingpointofcontact.h \ + tools/modelingTools/vmodelingpoint.h \ + tools/modelingTools/vmodelingnormal.h \ + tools/modelingTools/vmodelinglinepoint.h \ + tools/modelingTools/vmodelinglineintersect.h \ + tools/modelingTools/vmodelingline.h \ + tools/modelingTools/vmodelingheight.h \ + tools/modelingTools/vmodelingendline.h \ + tools/modelingTools/vmodelingbisector.h \ + tools/modelingTools/vmodelingarc.h \ + tools/modelingTools/vmodelingalongline.h \ + tools/modelingTools/modelingtools.h + +SOURCES += \ + tools/modelingTools/vmodelingtriangle.cpp \ + tools/modelingTools/vmodelingtool.cpp \ + tools/modelingTools/vmodelingsplinepath.cpp \ + tools/modelingTools/vmodelingspline.cpp \ + tools/modelingTools/vmodelingshoulderpoint.cpp \ + tools/modelingTools/vmodelingpointofintersection.cpp \ + tools/modelingTools/vmodelingpointofcontact.cpp \ + tools/modelingTools/vmodelingpoint.cpp \ + tools/modelingTools/vmodelingnormal.cpp \ + tools/modelingTools/vmodelinglinepoint.cpp \ + tools/modelingTools/vmodelinglineintersect.cpp \ + tools/modelingTools/vmodelingline.cpp \ + tools/modelingTools/vmodelingheight.cpp \ + tools/modelingTools/vmodelingendline.cpp \ + tools/modelingTools/vmodelingbisector.cpp \ + tools/modelingTools/vmodelingarc.cpp \ + tools/modelingTools/vmodelingalongline.cpp diff --git a/tools/modelingTools/modelingtools.h b/tools/modelingTools/modelingtools.h index b7c755edc..7a336be62 100644 --- a/tools/modelingTools/modelingtools.h +++ b/tools/modelingTools/modelingtools.h @@ -31,7 +31,6 @@ #include "vmodelingnormal.h" #include "vmodelingpointofcontact.h" #include "vmodelingshoulderpoint.h" -#include "vmodelingsinglepoint.h" #include "vmodelingspline.h" #include "vmodelingsplinepath.h" #include "vmodelingheight.h" diff --git a/tools/modelingTools/vmodelingsinglepoint.cpp b/tools/modelingTools/vmodelingsinglepoint.cpp deleted file mode 100644 index df9b1f0f5..000000000 --- a/tools/modelingTools/vmodelingsinglepoint.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include "vmodelingsinglepoint.h" -#include -#include -#include -#include -#include -#include -#include -#include "options.h" -#include "container/vpointf.h" - -VModelingSinglePoint::VModelingSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, - QGraphicsItem * parent ):VModelingPoint(doc, data, id, parent), - dialogSinglePoint(QSharedPointer()){ - this->setFlag(QGraphicsItem::ItemIsMovable, true); - this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); - if(typeCreation == Tool::FromGui){ - AddToFile(); - } -} - -void VModelingSinglePoint::setDialog(){ - Q_ASSERT(!dialogSinglePoint.isNull()); - if(!dialogSinglePoint.isNull()){ - VPointF p = VAbstractTool::data.GetPoint(id); - dialogSinglePoint->setData(p.name(), p.toQPointF()); - } -} - -void VModelingSinglePoint::AddToFile(){ - VPointF point = VAbstractTool::data.GetPoint(id); - QDomElement domElement = doc->createElement("point"); - - AddAttribute(domElement, "id", id); - AddAttribute(domElement, "type", "single"); - AddAttribute(domElement, "name", point.name()); - AddAttribute(domElement, "x", toMM(point.x())); - AddAttribute(domElement, "y", toMM(point.y())); - AddAttribute(domElement, "mx", toMM(point.mx())); - AddAttribute(domElement, "my", toMM(point.my())); - - AddToModeling(domElement); -} - -QVariant VModelingSinglePoint::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value){ - if (change == ItemPositionChange && scene()) { - // value - это новое положение. - QPointF newPos = value.toPointF(); - QRectF rect = scene()->sceneRect(); - if (!rect.contains(newPos)) { - // Сохраняем элемент внутри прямоугольника сцены. - newPos.setX(qMin(rect.right(), qMax(newPos.x(), rect.left()))); - newPos.setY(qMin(rect.bottom(), qMax(newPos.y(), rect.top()))); - return newPos; - } - } - if (change == ItemPositionHasChanged && scene()) { - // value - это новое положение. - QPointF newPos = value.toPointF(); - QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ - domElement.setAttribute("x", QString().setNum(toMM(newPos.x()))); - domElement.setAttribute("y", QString().setNum(toMM(newPos.y()))); - //I don't now why but signal does not work. - doc->FullUpdateTree(); - } - } - return QGraphicsItem::itemChange(change, value); -} - -void VModelingSinglePoint::contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ){ - ContextMenu(dialogSinglePoint, this, event, false); -} - -void VModelingSinglePoint::FullUpdateFromFile(){ - RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); -} - -void VModelingSinglePoint::FullUpdateFromGui(int result){ - if(result == QDialog::Accepted){ - QPointF p = dialogSinglePoint->getPoint(); - QString name = dialogSinglePoint->getName(); - QDomElement domElement = doc->elementById(QString().setNum(id)); - if(domElement.isElement()){ - domElement.setAttribute("name", name); - domElement.setAttribute("x", QString().setNum(toMM(p.x()))); - domElement.setAttribute("y", QString().setNum(toMM(p.y()))); - //I don't now why but signal does not work. - doc->FullUpdateTree(); - } - } - dialogSinglePoint.clear(); -} diff --git a/tools/modelingTools/vmodelingsinglepoint.h b/tools/modelingTools/vmodelingsinglepoint.h deleted file mode 100644 index 0695becb3..000000000 --- a/tools/modelingTools/vmodelingsinglepoint.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef VMODELINGSINGLEPOINT_H -#define VMODELINGSINGLEPOINT_H - -#include "container/vcontainer.h" -#include "xml/vdomdocument.h" -#include "dialogs/dialogsinglepoint.h" -#include "vmodelingpoint.h" - -class VModelingSinglePoint : public VModelingPoint -{ - Q_OBJECT -public: - VModelingSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, - Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); - virtual void setDialog(); -public slots: - virtual void FullUpdateFromFile(); - virtual void FullUpdateFromGui(int result); -signals: - void FullUpdateTree(); -protected: - virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); - virtual void AddToFile(); - QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); -private: - QSharedPointer dialogSinglePoint; -}; - -#endif // VMODELINGSINGLEPOINT_H diff --git a/tools/nodeDetails/nodeDetails.pri b/tools/nodeDetails/nodeDetails.pri new file mode 100644 index 000000000..c79444f12 --- /dev/null +++ b/tools/nodeDetails/nodeDetails.pri @@ -0,0 +1,14 @@ +HEADERS += \ + tools/nodeDetails/vnodesplinepath.h \ + tools/nodeDetails/vnodespline.h \ + tools/nodeDetails/vnodepoint.h \ + tools/nodeDetails/vnodearc.h \ + tools/nodeDetails/vabstractnode.h \ + tools/nodeDetails/nodedetails.h + +SOURCES += \ + tools/nodeDetails/vnodesplinepath.cpp \ + tools/nodeDetails/vnodespline.cpp \ + tools/nodeDetails/vnodepoint.cpp \ + tools/nodeDetails/vnodearc.cpp \ + tools/nodeDetails/vabstractnode.cpp diff --git a/tools/tools.pri b/tools/tools.pri new file mode 100644 index 000000000..a53c97ba6 --- /dev/null +++ b/tools/tools.pri @@ -0,0 +1,14 @@ +HEADERS += \ + tools/vtooldetail.h \ + tools/vdatatool.h \ + tools/vabstracttool.h \ + tools/tools.h + +SOURCES += \ + tools/vtooldetail.cpp \ + tools/vdatatool.cpp \ + tools/vabstracttool.cpp + +include(drawTools/drawTools.pri) +include(modelingTools/modelingTools.pri) +include(nodeDetails/nodeDetails.pri) diff --git a/tools/vgraphicspoint.cpp b/tools/vgraphicspoint.cpp deleted file mode 100644 index df82f6f1e..000000000 --- a/tools/vgraphicspoint.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include "vgraphicspoint.h" -#include "options.h" - -VGraphicsPoint::VGraphicsPoint(QGraphicsItem *parent): QGraphicsEllipseItem(parent), - radius(toPixel(1.5)), namePoint(0), lineName(0){ - //namePoint = new VGraphicsSimpleTextItem(this); - lineName = new QGraphicsLineItem(this); - this->setPen(QPen(Qt::black, widthHairLine)); - this->setBrush(QBrush(Qt::NoBrush)); - this->setFlag(QGraphicsItem::ItemIsSelectable, true); - this->setAcceptHoverEvents(true); -} - -VGraphicsPoint::~VGraphicsPoint(){ -} - - -void VGraphicsPoint::RefreshLine(){ - QRectF nameRec = namePoint->sceneBoundingRect(); - QPointF p1, p2; - LineIntersectCircle(QPointF(), radius, QLineF(QPointF(), nameRec.center()- scenePos()), p1, p2); - QPointF pRec = LineIntersectRect(nameRec, QLineF(scenePos(), nameRec.center())); - lineName->setLine(QLineF(p1, pRec - scenePos())); - if(QLineF(p1, pRec - scenePos()).length() <= toPixel(4)){ - lineName->setVisible(false); - } else { - lineName->setVisible(true); - } -} - -void VGraphicsPoint::hoverMoveEvent(QGraphicsSceneHoverEvent *event){ - Q_UNUSED(event); - this->setPen(QPen(Qt::black, widthMainLine)); -} - -void VGraphicsPoint::hoverLeaveEvent(QGraphicsSceneHoverEvent *event){ - Q_UNUSED(event); - this->setPen(QPen(Qt::black, widthHairLine)); -} diff --git a/tools/vgraphicspoint.h b/tools/vgraphicspoint.h deleted file mode 100644 index 4bd108524..000000000 --- a/tools/vgraphicspoint.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifndef VGRAPHICSPOINT_H -#define VGRAPHICSPOINT_H - -#include -#include -#include "widgets/vgraphicssimpletextitem.h" -#include "../container/vpointf.h" - -class VGraphicsPoint: public QGraphicsEllipseItem -{ -public: - VGraphicsPoint(QGraphicsItem *parent); - virtual ~VGraphicsPoint(); -public slots: - virtual void NameChangePosition(const QPointF pos)=0; -protected: - qreal radius; - VGraphicsSimpleTextItem *namePoint; - QGraphicsLineItem *lineName; - virtual void UpdateNamePosition(qreal mx, qreal my)=0; - void RefreshLine(); - virtual void hoverMoveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent * event ); - virtual void RefreshPointGeometry(const VPointF &point)=0; -private: - VGraphicsPoint(const VGraphicsPoint &point); - const VGraphicsPoint &operator=(const VGraphicsPoint &point); - QPointF LineIntersectRect(QRectF rec, QLineF line) const; - qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, - QPointF &p2) const; - QPointF ClosestPoint(QLineF line, QPointF p) const; - QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k) const; -}; - -#endif // VGRAPHICSPOINT_H diff --git a/widgets/delegate.cpp b/widgets/delegate.cpp deleted file mode 100644 index f3b2d0de5..000000000 --- a/widgets/delegate.cpp +++ /dev/null @@ -1,90 +0,0 @@ - /**************************************************************************** - ** - ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/legal - ** - ** This file is part of the examples of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:BSD$ - ** You may use this file under the terms of the BSD license as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names - ** of its contributors may be used to endorse or promote products derived - ** from this software without specific prior written permission. - ** - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ - - /* - delegate.cpp - - A delegate that allows the user to change integer values from the model - using a spin box widget. - */ - -#include -#include "delegate.h" - - SpinBoxDelegate::SpinBoxDelegate(QObject *parent) - : QItemDelegate(parent) - { - } - - QWidget *SpinBoxDelegate::createEditor(QWidget *parent, - const QStyleOptionViewItem &/* option */, - const QModelIndex &/* index */) const - { - QSpinBox *editor = new QSpinBox(parent); - editor->setMinimum(0); - editor->setMaximum(1000); - - return editor; - } - - void SpinBoxDelegate::setEditorData(QWidget *editor, - const QModelIndex &index) const - { - int value = index.model()->data(index, Qt::EditRole).toInt(); - - QSpinBox *spinBox = static_cast(editor); - spinBox->setValue(value); - } - - void SpinBoxDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const - { - QSpinBox *spinBox = static_cast(editor); - spinBox->interpretText(); - int value = spinBox->value(); - - model->setData(index, value, Qt::EditRole); - } - - void SpinBoxDelegate::updateEditorGeometry(QWidget *editor, - const QStyleOptionViewItem &option, const QModelIndex &/* index */) const - { - editor->setGeometry(option.rect); - } diff --git a/widgets/widgets.pri b/widgets/widgets.pri new file mode 100644 index 000000000..4b908b906 --- /dev/null +++ b/widgets/widgets.pri @@ -0,0 +1,19 @@ +HEADERS += \ + widgets/vtablegraphicsview.h \ + widgets/vmaingraphicsview.h \ + widgets/vmaingraphicsscene.h \ + widgets/vitem.h \ + widgets/vgraphicssimpletextitem.h \ + widgets/vcontrolpointspline.h \ + widgets/vapplication.h \ + widgets/doubledelegate.h + +SOURCES += \ + widgets/vtablegraphicsview.cpp \ + widgets/vmaingraphicsview.cpp \ + widgets/vmaingraphicsscene.cpp \ + widgets/vitem.cpp \ + widgets/vgraphicssimpletextitem.cpp \ + widgets/vcontrolpointspline.cpp \ + widgets/vapplication.cpp \ + widgets/doubledelegate.cpp diff --git a/xml/xml.pri b/xml/xml.pri new file mode 100644 index 000000000..71489d606 --- /dev/null +++ b/xml/xml.pri @@ -0,0 +1,7 @@ +HEADERS += \ + xml/vtoolrecord.h \ + xml/vdomdocument.h + +SOURCES += \ + xml/vtoolrecord.cpp \ + xml/vdomdocument.cpp From 497e4633ff39614f03fd0e5e0e0bd61b9d053ac1 Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 17:35:57 +0200 Subject: [PATCH 60/83] Change in structure of project file. --HG-- branch : develop --- tools/tools.pri | 91 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 6 deletions(-) diff --git a/tools/tools.pri b/tools/tools.pri index a53c97ba6..818066245 100644 --- a/tools/tools.pri +++ b/tools/tools.pri @@ -2,13 +2,92 @@ HEADERS += \ tools/vtooldetail.h \ tools/vdatatool.h \ tools/vabstracttool.h \ - tools/tools.h + tools/tools.h \ + tools/drawTools/vtooltriangle.h \ + tools/drawTools/vtoolsplinepath.h \ + tools/drawTools/vtoolspline.h \ + tools/drawTools/vtoolsinglepoint.h \ + tools/drawTools/vtoolshoulderpoint.h \ + tools/drawTools/vtoolpointofintersection.h \ + tools/drawTools/vtoolpointofcontact.h \ + tools/drawTools/vtoolpoint.h \ + tools/drawTools/vtoolnormal.h \ + tools/drawTools/vtoollinepoint.h \ + tools/drawTools/vtoollineintersect.h \ + tools/drawTools/vtoolline.h \ + tools/drawTools/vtoolheight.h \ + tools/drawTools/vtoolendline.h \ + tools/drawTools/vtoolbisector.h \ + tools/drawTools/vtoolarc.h \ + tools/drawTools/vtoolalongline.h \ + tools/drawTools/vdrawtool.h \ + tools/drawTools/drawtools.h \ + tools/modelingTools/vmodelingtriangle.h \ + tools/modelingTools/vmodelingtool.h \ + tools/modelingTools/vmodelingsplinepath.h \ + tools/modelingTools/vmodelingspline.h \ + tools/modelingTools/vmodelingshoulderpoint.h \ + tools/modelingTools/vmodelingpointofintersection.h \ + tools/modelingTools/vmodelingpointofcontact.h \ + tools/modelingTools/vmodelingpoint.h \ + tools/modelingTools/vmodelingnormal.h \ + tools/modelingTools/vmodelinglinepoint.h \ + tools/modelingTools/vmodelinglineintersect.h \ + tools/modelingTools/vmodelingline.h \ + tools/modelingTools/vmodelingheight.h \ + tools/modelingTools/vmodelingendline.h \ + tools/modelingTools/vmodelingbisector.h \ + tools/modelingTools/vmodelingarc.h \ + tools/modelingTools/vmodelingalongline.h \ + tools/modelingTools/modelingtools.h \ + tools/nodeDetails/vnodesplinepath.h \ + tools/nodeDetails/vnodespline.h \ + tools/nodeDetails/vnodepoint.h \ + tools/nodeDetails/vnodearc.h \ + tools/nodeDetails/vabstractnode.h \ + tools/nodeDetails/nodedetails.h SOURCES += \ tools/vtooldetail.cpp \ tools/vdatatool.cpp \ - tools/vabstracttool.cpp - -include(drawTools/drawTools.pri) -include(modelingTools/modelingTools.pri) -include(nodeDetails/nodeDetails.pri) + tools/vabstracttool.cpp \ + tools/drawTools/vtooltriangle.cpp \ + tools/drawTools/vtoolsplinepath.cpp \ + tools/drawTools/vtoolspline.cpp \ + tools/drawTools/vtoolsinglepoint.cpp \ + tools/drawTools/vtoolshoulderpoint.cpp \ + tools/drawTools/vtoolpointofintersection.cpp \ + tools/drawTools/vtoolpointofcontact.cpp \ + tools/drawTools/vtoolpoint.cpp \ + tools/drawTools/vtoolnormal.cpp \ + tools/drawTools/vtoollinepoint.cpp \ + tools/drawTools/vtoollineintersect.cpp \ + tools/drawTools/vtoolline.cpp \ + tools/drawTools/vtoolheight.cpp \ + tools/drawTools/vtoolendline.cpp \ + tools/drawTools/vtoolbisector.cpp \ + tools/drawTools/vtoolarc.cpp \ + tools/drawTools/vtoolalongline.cpp \ + tools/drawTools/vdrawtool.cpp \ + tools/modelingTools/vmodelingtriangle.cpp \ + tools/modelingTools/vmodelingtool.cpp \ + tools/modelingTools/vmodelingsplinepath.cpp \ + tools/modelingTools/vmodelingspline.cpp \ + tools/modelingTools/vmodelingshoulderpoint.cpp \ + tools/modelingTools/vmodelingpointofintersection.cpp \ + tools/modelingTools/vmodelingpointofcontact.cpp \ + tools/modelingTools/vmodelingpoint.cpp \ + tools/modelingTools/vmodelingnormal.cpp \ + tools/modelingTools/vmodelinglinepoint.cpp \ + tools/modelingTools/vmodelinglineintersect.cpp \ + tools/modelingTools/vmodelingline.cpp \ + tools/modelingTools/vmodelingheight.cpp \ + tools/modelingTools/vmodelingendline.cpp \ + tools/modelingTools/vmodelingbisector.cpp \ + tools/modelingTools/vmodelingarc.cpp \ + tools/modelingTools/vmodelingalongline.cpp \ + tools/nodeDetails/vnodesplinepath.cpp \ + tools/nodeDetails/vnodespline.cpp \ + tools/nodeDetails/vnodepoint.cpp \ + tools/nodeDetails/vnodearc.cpp \ + tools/nodeDetails/vabstractnode.cpp From bc3bc3f99477c3e7d2bbce1f47445ea13b3925ac Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 17:49:07 +0200 Subject: [PATCH 61/83] Refactoring include for Visual Studio. --HG-- branch : develop --- container/vcontainer.cpp | 2 +- dialogs/dialogincrements.cpp | 4 +- dialogs/dialogtool.cpp | 2 +- dialogs/dialogtool.h | 2 +- geometry/varc.cpp | 2 +- geometry/vspline.h | 2 +- geometry/vsplinepath.cpp | 2 +- geometry/vsplinepath.h | 2 +- tools/drawTools/drawTools.pri | 40 ------------------- tools/drawTools/vtoolbisector.cpp | 2 +- tools/drawTools/vtoolendline.cpp | 2 +- tools/drawTools/vtoolnormal.cpp | 2 +- tools/drawTools/vtoolpointofcontact.cpp | 2 +- tools/drawTools/vtoolshoulderpoint.cpp | 2 +- tools/modelingTools/modelingTools.pri | 38 ------------------ tools/modelingTools/vmodelingbisector.cpp | 2 +- tools/modelingTools/vmodelingendline.cpp | 2 +- tools/modelingTools/vmodelingnormal.cpp | 2 +- .../modelingTools/vmodelingpointofcontact.cpp | 2 +- .../modelingTools/vmodelingshoulderpoint.cpp | 2 +- tools/nodeDetails/nodeDetails.pri | 14 ------- tools/vabstracttool.h | 2 +- tools/vdatatool.h | 2 +- xml/vdomdocument.cpp | 26 ++++++------ xml/vdomdocument.h | 6 +-- 25 files changed, 37 insertions(+), 129 deletions(-) delete mode 100644 tools/drawTools/drawTools.pri delete mode 100644 tools/modelingTools/modelingTools.pri delete mode 100644 tools/nodeDetails/nodeDetails.pri diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 2a6daca3d..b99b862b8 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vcontainer.h" -#include +#include "../exception/vexceptionbadid.h" qint64 VContainer::_id = 0; diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 0dd5e7298..3a499d8f3 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -21,8 +21,8 @@ #include "dialogincrements.h" #include "ui_dialogincrements.h" -#include -#include +#include "../widgets/doubledelegate.h" +#include "../exception/vexception.h" DialogIncrements::DialogIncrements(VContainer *data, VDomDocument *doc, QWidget *parent) :DialogTool(data, Draw::Calculation, parent), ui(new Ui::DialogIncrements), data(data), doc(doc), row(0), column(0) diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index 3f3e0133a..beaa36183 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "dialogtool.h" -#include +#include "../container/calculator.h" DialogTool::DialogTool(const VContainer *data, Draw::Draws mode, QWidget *parent) :QDialog(parent), data(data), isInitialized(false), flagName(true), flagFormula(true), timerFormula(0), bOk(0), diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index 02eea1fad..119eba2e9 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -23,7 +23,7 @@ #define DIALOGTOOL_H #include -#include +#include "../container/vcontainer.h" class DialogTool : public QDialog { diff --git a/geometry/varc.cpp b/geometry/varc.cpp index 14528dd22..d7f5ef860 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "varc.h" -#include +#include "../exception/vexception.h" VArc::VArc () : f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), formulaRadius(QString()), diff --git a/geometry/vspline.h b/geometry/vspline.h index cc85542c0..abbc90121 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -22,7 +22,7 @@ #ifndef VSPLINE_H #define VSPLINE_H -#include +#include "../container/vpointf.h" #define M_2PI 6.28318530717958647692528676655900576 diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index efbeacd20..23c5d45b0 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vsplinepath.h" -#include +#include "../exception/vexception.h" VSplinePath::VSplinePath() : path(QVector()), kCurve(1), mode(Draw::Calculation), points(QHash()), idObject(0){} diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index 6ac235ec7..94279c109 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -23,7 +23,7 @@ #define VSPLINEPATH_H #include "vsplinepoint.h" -#include +#include "../container/vpointf.h" #include "vspline.h" #include diff --git a/tools/drawTools/drawTools.pri b/tools/drawTools/drawTools.pri deleted file mode 100644 index 54cf0341c..000000000 --- a/tools/drawTools/drawTools.pri +++ /dev/null @@ -1,40 +0,0 @@ -HEADERS += \ - tools/drawTools/vtooltriangle.h \ - tools/drawTools/vtoolsplinepath.h \ - tools/drawTools/vtoolspline.h \ - tools/drawTools/vtoolshoulderpoint.h \ - tools/drawTools/vtoolpointofintersection.h \ - tools/drawTools/vtoolpointofcontact.h \ - tools/drawTools/vtoolpoint.h \ - tools/drawTools/vtoolnormal.h \ - tools/drawTools/vtoollinepoint.h \ - tools/drawTools/vtoollineintersect.h \ - tools/drawTools/vtoolline.h \ - tools/drawTools/vtoolheight.h \ - tools/drawTools/vtoolendline.h \ - tools/drawTools/vtoolbisector.h \ - tools/drawTools/vtoolarc.h \ - tools/drawTools/vtoolalongline.h \ - tools/drawTools/vdrawtool.h \ - tools/drawTools/drawtools.h \ - tools/drawTools/vtoolsinglepoint.h - -SOURCES += \ - tools/drawTools/vtooltriangle.cpp \ - tools/drawTools/vtoolsplinepath.cpp \ - tools/drawTools/vtoolspline.cpp \ - tools/drawTools/vtoolshoulderpoint.cpp \ - tools/drawTools/vtoolpointofintersection.cpp \ - tools/drawTools/vtoolpointofcontact.cpp \ - tools/drawTools/vtoolpoint.cpp \ - tools/drawTools/vtoolnormal.cpp \ - tools/drawTools/vtoollinepoint.cpp \ - tools/drawTools/vtoollineintersect.cpp \ - tools/drawTools/vtoolline.cpp \ - tools/drawTools/vtoolheight.cpp \ - tools/drawTools/vtoolendline.cpp \ - tools/drawTools/vtoolbisector.cpp \ - tools/drawTools/vtoolarc.cpp \ - tools/drawTools/vtoolalongline.cpp \ - tools/drawTools/vdrawtool.cpp \ - tools/drawTools/vtoolsinglepoint.cpp diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 26af32886..7c7795591 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolbisector.h" -#include +#include "../../container/calculator.h" const QString VToolBisector::ToolType = QStringLiteral("bisector"); diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index cbd18add4..38e5f0057 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -21,7 +21,7 @@ #include "vtoolendline.h" #include "widgets/vmaingraphicsscene.h" -#include +#include "../../container/calculator.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 967d7c2c6..69fd7d764 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolnormal.h" -#include +#include "../../container/calculator.h" const QString VToolNormal::ToolType = QStringLiteral("normal"); diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index 35ee84e7c..885f82775 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolpointofcontact.h" -#include +#include "../../container/calculator.h" const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index 894a448f1..efc4ff838 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolshoulderpoint.h" -#include +#include "../../container/calculator.h" const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); diff --git a/tools/modelingTools/modelingTools.pri b/tools/modelingTools/modelingTools.pri deleted file mode 100644 index 165b67fe5..000000000 --- a/tools/modelingTools/modelingTools.pri +++ /dev/null @@ -1,38 +0,0 @@ -HEADERS += \ - tools/modelingTools/vmodelingtriangle.h \ - tools/modelingTools/vmodelingtool.h \ - tools/modelingTools/vmodelingsplinepath.h \ - tools/modelingTools/vmodelingspline.h \ - tools/modelingTools/vmodelingshoulderpoint.h \ - tools/modelingTools/vmodelingpointofintersection.h \ - tools/modelingTools/vmodelingpointofcontact.h \ - tools/modelingTools/vmodelingpoint.h \ - tools/modelingTools/vmodelingnormal.h \ - tools/modelingTools/vmodelinglinepoint.h \ - tools/modelingTools/vmodelinglineintersect.h \ - tools/modelingTools/vmodelingline.h \ - tools/modelingTools/vmodelingheight.h \ - tools/modelingTools/vmodelingendline.h \ - tools/modelingTools/vmodelingbisector.h \ - tools/modelingTools/vmodelingarc.h \ - tools/modelingTools/vmodelingalongline.h \ - tools/modelingTools/modelingtools.h - -SOURCES += \ - tools/modelingTools/vmodelingtriangle.cpp \ - tools/modelingTools/vmodelingtool.cpp \ - tools/modelingTools/vmodelingsplinepath.cpp \ - tools/modelingTools/vmodelingspline.cpp \ - tools/modelingTools/vmodelingshoulderpoint.cpp \ - tools/modelingTools/vmodelingpointofintersection.cpp \ - tools/modelingTools/vmodelingpointofcontact.cpp \ - tools/modelingTools/vmodelingpoint.cpp \ - tools/modelingTools/vmodelingnormal.cpp \ - tools/modelingTools/vmodelinglinepoint.cpp \ - tools/modelingTools/vmodelinglineintersect.cpp \ - tools/modelingTools/vmodelingline.cpp \ - tools/modelingTools/vmodelingheight.cpp \ - tools/modelingTools/vmodelingendline.cpp \ - tools/modelingTools/vmodelingbisector.cpp \ - tools/modelingTools/vmodelingarc.cpp \ - tools/modelingTools/vmodelingalongline.cpp diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index 34870255b..1524260e8 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -21,7 +21,7 @@ #include "vmodelingbisector.h" #include "../drawTools/vtoolbisector.h" -#include +#include "../../container/calculator.h" const QString VModelingBisector::ToolType = QStringLiteral("bisector"); diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index d5d2349d8..db778dbc4 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingendline.h" -#include +#include "../../container/calculator.h" const QString VModelingEndLine::ToolType = QStringLiteral("endLine"); diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index 57e0da070..bafd2f52f 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -21,7 +21,7 @@ #include "vmodelingnormal.h" #include "../drawTools/vtoolnormal.h" -#include +#include "../../container/calculator.h" const QString VModelingNormal::ToolType = QStringLiteral("normal"); diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index f87a094ad..035aa437d 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -21,7 +21,7 @@ #include "vmodelingpointofcontact.h" #include "../drawTools/vtoolpointofcontact.h" -#include +#include "../../container/calculator.h" const QString VModelingPointOfContact::ToolType = QStringLiteral("pointOfContact"); diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index ac27b5392..ee5cdd3ec 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -21,7 +21,7 @@ #include "vmodelingshoulderpoint.h" #include "../drawTools/vtoolshoulderpoint.h" -#include +#include "../../container/calculator.h" const QString VModelingShoulderPoint::ToolType = QStringLiteral("shoulder"); diff --git a/tools/nodeDetails/nodeDetails.pri b/tools/nodeDetails/nodeDetails.pri deleted file mode 100644 index c79444f12..000000000 --- a/tools/nodeDetails/nodeDetails.pri +++ /dev/null @@ -1,14 +0,0 @@ -HEADERS += \ - tools/nodeDetails/vnodesplinepath.h \ - tools/nodeDetails/vnodespline.h \ - tools/nodeDetails/vnodepoint.h \ - tools/nodeDetails/vnodearc.h \ - tools/nodeDetails/vabstractnode.h \ - tools/nodeDetails/nodedetails.h - -SOURCES += \ - tools/nodeDetails/vnodesplinepath.cpp \ - tools/nodeDetails/vnodespline.cpp \ - tools/nodeDetails/vnodepoint.cpp \ - tools/nodeDetails/vnodearc.cpp \ - tools/nodeDetails/vabstractnode.cpp diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index a5a398d56..e917552b1 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -23,7 +23,7 @@ #define VABSTRACTTOOL_H #include "vdatatool.h" -#include +#include "../xml/vdomdocument.h" class VAbstractTool: public VDataTool { diff --git a/tools/vdatatool.h b/tools/vdatatool.h index 9b8dda925..4c9aa6285 100644 --- a/tools/vdatatool.h +++ b/tools/vdatatool.h @@ -22,7 +22,7 @@ #ifndef VDATATOOL_H #define VDATATOOL_H -#include +#include "../container/vcontainer.h" //We need QObject class because we use qobject_cast. class VDataTool : public QObject diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 76c73c831..5fb79c282 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -20,19 +20,19 @@ ****************************************************************************/ #include "vdomdocument.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "../exception/vexceptionwrongparameterid.h" +#include "../exception/vexceptionconversionerror.h" +#include "../exception/vexceptionemptyparameter.h" +#include "../exception/vexceptionuniqueid.h" +#include "../tools/vtooldetail.h" +#include "../exception/vexceptionobjecterror.h" +#include "../exception/vexceptionbadid.h" +#include "../tools/drawTools/drawtools.h" +#include "../tools/modelingTools/modelingtools.h" +#include "../tools/nodeDetails/vnodepoint.h" +#include "../tools/nodeDetails/vnodespline.h" +#include "../tools/nodeDetails/vnodesplinepath.h" +#include "../tools/nodeDetails/vnodearc.h" VDomDocument::VDomDocument(VContainer *data, QComboBox *comboBoxDraws, Draw::Draws *mode) : QDomDocument(), map(QHash()), nameActivDraw(QString()), data(data), diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index fbd67550b..6000638b9 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -23,9 +23,9 @@ #define VDOMDOCUMENT_H #include -#include -#include -#include +#include "../container/vcontainer.h" +#include "../widgets/vmaingraphicsscene.h" +#include "../tools/vdatatool.h" #include "vtoolrecord.h" namespace Document From b9a99cd0cfafd09707f3d6818d4a284060cdce6a Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 18:37:51 +0200 Subject: [PATCH 62/83] Q_DECL_NOEXCEPT_EXPR(true) instead noexcept(true). --HG-- branch : develop --- exception/vexception.h | 4 ++-- exception/vexceptionbadid.h | 2 +- exception/vexceptionconversionerror.h | 2 +- exception/vexceptionemptyparameter.h | 2 +- exception/vexceptionobjecterror.h | 2 +- exception/vexceptionuniqueid.h | 2 +- exception/vexceptionwrongparameterid.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/exception/vexception.h b/exception/vexception.h index 87b34cfc0..94b064d21 100644 --- a/exception/vexception.h +++ b/exception/vexception.h @@ -29,8 +29,8 @@ class VException : public QException { public: VException(const QString &what); - VException(const VException &e):what(e.What()){} - virtual ~VException() noexcept(true){} + VException(const VException &e):what(e.What()){} + virtual ~VException() Q_DECL_NOEXCEPT_EXPR(true){} inline void raise() const { throw *this; } inline VException *clone() const { return new VException(*this); } virtual QString ErrorMessage() const; diff --git a/exception/vexceptionbadid.h b/exception/vexceptionbadid.h index 6ddf034c5..dbf1b17a1 100644 --- a/exception/vexceptionbadid.h +++ b/exception/vexceptionbadid.h @@ -33,7 +33,7 @@ public: :VException(what), id(0), key(key){} VExceptionBadId(const VExceptionBadId &e) :VException(e), id(e.BadId()), key(e.BadKey()){} - virtual ~VExceptionBadId() noexcept(true){} + virtual ~VExceptionBadId() Q_DECL_NOEXCEPT_EXPR(true){} virtual QString ErrorMessage() const; inline qint64 BadId() const {return id; } inline QString BadKey() const {return key; } diff --git a/exception/vexceptionconversionerror.h b/exception/vexceptionconversionerror.h index bd8313b3d..0e88427ab 100644 --- a/exception/vexceptionconversionerror.h +++ b/exception/vexceptionconversionerror.h @@ -30,7 +30,7 @@ public: VExceptionConversionError(const QString &what, const QString &str); VExceptionConversionError(const VExceptionConversionError &e) :VException(e), str(e.String()){} - virtual ~VExceptionConversionError() noexcept(true) {} + virtual ~VExceptionConversionError() Q_DECL_NOEXCEPT_EXPR(true) {} virtual QString ErrorMessage() const; inline QString String() const {return str;} protected: diff --git a/exception/vexceptionemptyparameter.h b/exception/vexceptionemptyparameter.h index c7fbae985..7dfbaa2ea 100644 --- a/exception/vexceptionemptyparameter.h +++ b/exception/vexceptionemptyparameter.h @@ -31,7 +31,7 @@ public: VExceptionEmptyParameter(const VExceptionEmptyParameter &e) :VException(e), name(e.Name()), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionEmptyParameter() noexcept(true) {} + virtual ~VExceptionEmptyParameter() Q_DECL_NOEXCEPT_EXPR(true) {} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; inline QString Name() const {return name;} diff --git a/exception/vexceptionobjecterror.h b/exception/vexceptionobjecterror.h index f564347b8..76cdebbec 100644 --- a/exception/vexceptionobjecterror.h +++ b/exception/vexceptionobjecterror.h @@ -31,7 +31,7 @@ public: VExceptionObjectError(const VExceptionObjectError &e) :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()), moreInfo(e.MoreInformation()){} - virtual ~VExceptionObjectError() noexcept(true) {} + virtual ~VExceptionObjectError() Q_DECL_NOEXCEPT_EXPR(true) {} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; inline QString TagText() const {return tagText;} diff --git a/exception/vexceptionuniqueid.h b/exception/vexceptionuniqueid.h index d3d618598..f34f2e56e 100644 --- a/exception/vexceptionuniqueid.h +++ b/exception/vexceptionuniqueid.h @@ -30,7 +30,7 @@ public: VExceptionUniqueId(const QString &what, const QDomElement &domElement); VExceptionUniqueId(const VExceptionUniqueId &e) :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionUniqueId() noexcept(true){} + virtual ~VExceptionUniqueId() Q_DECL_NOEXCEPT_EXPR(true){} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; inline QString TagText() const {return tagText;} diff --git a/exception/vexceptionwrongparameterid.h b/exception/vexceptionwrongparameterid.h index 905f32f11..69de87b8c 100644 --- a/exception/vexceptionwrongparameterid.h +++ b/exception/vexceptionwrongparameterid.h @@ -30,7 +30,7 @@ public: VExceptionWrongParameterId(const QString &what, const QDomElement &domElement); VExceptionWrongParameterId(const VExceptionWrongParameterId &e) :VException(e), tagText(e.TagText()), tagName(e.TagName()), lineNumber(e.LineNumber()){} - virtual ~VExceptionWrongParameterId() noexcept(true){} + virtual ~VExceptionWrongParameterId() Q_DECL_NOEXCEPT_EXPR(true){} virtual QString ErrorMessage() const; virtual QString DetailedInformation() const; inline QString TagText() const {return tagText;} From 95b4a34e6c2684917dda9e2ac3a8cdbb45b2025a Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 19:06:00 +0200 Subject: [PATCH 63/83] Refactoring include for Visual Studio. --HG-- branch : develop --- container/vcontainer.h | 8 ++++---- dialogs/dialoghistory.cpp | 6 +++--- dialogs/dialoghistory.h | 2 +- dialogs/dialogincrements.h | 2 +- dialogs/dialogsplinepath.cpp | 2 +- dialogs/dialogsplinepath.h | 2 +- geometry/vnodedetail.h | 2 +- tools/drawTools/vtoolalongline.cpp | 2 +- tools/drawTools/vtoolalongline.h | 2 +- tools/drawTools/vtoolarc.cpp | 2 +- tools/drawTools/vtoolarc.h | 4 ++-- tools/drawTools/vtoolbisector.h | 2 +- tools/drawTools/vtoolendline.cpp | 2 +- tools/drawTools/vtoolendline.h | 2 +- tools/drawTools/vtoolheight.h | 2 +- tools/drawTools/vtoolline.h | 4 ++-- tools/drawTools/vtoollineintersect.h | 2 +- tools/drawTools/vtoolnormal.h | 2 +- tools/drawTools/vtoolpoint.h | 2 +- tools/drawTools/vtoolpointofcontact.h | 2 +- tools/drawTools/vtoolpointofintersection.h | 2 +- tools/drawTools/vtoolshoulderpoint.h | 2 +- tools/drawTools/vtoolsinglepoint.h | 2 +- tools/drawTools/vtoolspline.cpp | 2 +- tools/drawTools/vtoolspline.h | 6 +++--- tools/drawTools/vtoolsplinepath.h | 4 ++-- tools/drawTools/vtooltriangle.h | 2 +- tools/modelingTools/vmodelingalongline.cpp | 2 +- tools/modelingTools/vmodelingalongline.h | 2 +- tools/modelingTools/vmodelingarc.cpp | 2 +- tools/modelingTools/vmodelingarc.h | 4 ++-- tools/modelingTools/vmodelingbisector.h | 2 +- tools/modelingTools/vmodelingendline.h | 2 +- tools/modelingTools/vmodelingheight.h | 2 +- tools/modelingTools/vmodelingline.h | 4 ++-- tools/modelingTools/vmodelinglineintersect.h | 2 +- tools/modelingTools/vmodelingnormal.h | 2 +- tools/modelingTools/vmodelingpoint.cpp | 2 +- tools/modelingTools/vmodelingpoint.h | 2 +- tools/modelingTools/vmodelingpointofcontact.h | 2 +- tools/modelingTools/vmodelingpointofintersection.h | 2 +- tools/modelingTools/vmodelingshoulderpoint.h | 2 +- tools/modelingTools/vmodelingspline.cpp | 2 +- tools/modelingTools/vmodelingspline.h | 6 +++--- tools/modelingTools/vmodelingsplinepath.h | 4 ++-- tools/modelingTools/vmodelingtriangle.h | 2 +- tools/nodeDetails/vnodepoint.h | 2 +- tools/vtooldetail.h | 2 +- widgets/vapplication.cpp | 10 +++++----- widgets/vcontrolpointspline.h | 2 +- 50 files changed, 69 insertions(+), 69 deletions(-) diff --git a/container/vcontainer.h b/container/vcontainer.h index 5937bb03e..1e33e2f0e 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -24,10 +24,10 @@ #include "vstandarttablecell.h" #include "vincrementtablerow.h" -#include "geometry/varc.h" -#include "geometry/vsplinepath.h" -#include "geometry/vdetail.h" -#include "widgets/vitem.h" +#include "../geometry/varc.h" +#include "../geometry/vsplinepath.h" +#include "../geometry/vdetail.h" +#include "../widgets/vitem.h" /** * @brief The VContainer class diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index 8b175b3f5..92849163e 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -21,9 +21,9 @@ #include "dialoghistory.h" #include "ui_dialoghistory.h" -#include "geometry/varc.h" -#include "geometry/vspline.h" -#include "geometry/vsplinepath.h" +#include "../geometry/varc.h" +#include "../geometry/vspline.h" +#include "../geometry/vsplinepath.h" #include DialogHistory::DialogHistory(VContainer *data, VDomDocument *doc, QWidget *parent) diff --git a/dialogs/dialoghistory.h b/dialogs/dialoghistory.h index c3b51156c..21c7c4bab 100644 --- a/dialogs/dialoghistory.h +++ b/dialogs/dialoghistory.h @@ -23,7 +23,7 @@ #define DIALOGHISTORY_H #include "dialogtool.h" -#include "xml/vdomdocument.h" +#include "../xml/vdomdocument.h" namespace Ui { diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h index bc4260052..bb476393b 100644 --- a/dialogs/dialogincrements.h +++ b/dialogs/dialogincrements.h @@ -23,7 +23,7 @@ #define DIALOGINCREMENTS_H #include "dialogtool.h" -#include "xml/vdomdocument.h" +#include "../xml/vdomdocument.h" namespace Ui { diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index d671ef182..7321f2989 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -21,7 +21,7 @@ #include "dialogsplinepath.h" #include "ui_dialogsplinepath.h" -#include "geometry/vsplinepoint.h" +#include "../geometry/vsplinepoint.h" DialogSplinePath::DialogSplinePath(const VContainer *data, Draw::Draws mode, QWidget *parent) :DialogTool(data, mode, parent), ui(new Ui::DialogSplinePath), path(VSplinePath()) diff --git a/dialogs/dialogsplinepath.h b/dialogs/dialogsplinepath.h index 394e79356..d3ebff753 100644 --- a/dialogs/dialogsplinepath.h +++ b/dialogs/dialogsplinepath.h @@ -23,7 +23,7 @@ #define DIALOGSPLINEPATH_H #include "dialogtool.h" -#include "geometry/vsplinepath.h" +#include "../geometry/vsplinepath.h" namespace Ui { diff --git a/geometry/vnodedetail.h b/geometry/vnodedetail.h index 9735445d4..38a3caced 100644 --- a/geometry/vnodedetail.h +++ b/geometry/vnodedetail.h @@ -23,7 +23,7 @@ #define VNODEDETAIL_H #include -#include "options.h" +#include "../options.h" namespace NodeDetail { diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index e95cd586e..c47034ae6 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolalongline.h" -#include "container/calculator.h" +#include "../../container/calculator.h" const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index 22b0e7996..974e7d29e 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -23,7 +23,7 @@ #define VTOOLALONGLINE_H #include "vtoollinepoint.h" -#include "dialogs/dialogalongline.h" +#include "../../dialogs/dialogalongline.h" class VToolAlongLine : public VToolLinePoint { diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index bda386b36..8c7c146d6 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolarc.h" -#include "container/calculator.h" +#include "../../container/calculator.h" const QString VToolArc::TagName = QStringLiteral("arc"); const QString VToolArc::ToolType = QStringLiteral("simple"); diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index 75ea37bfa..a199ad10a 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -24,8 +24,8 @@ #include "vdrawtool.h" #include -#include "dialogs/dialogarc.h" -#include "widgets/vcontrolpointspline.h" +#include "../../dialogs/dialogarc.h" +#include "../../widgets/vcontrolpointspline.h" class VToolArc :public VDrawTool, public QGraphicsPathItem { diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 9f7434538..b072bf052 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -23,7 +23,7 @@ #define VTOOLBISECTOR_H #include "vtoollinepoint.h" -#include "dialogs/dialogbisector.h" +#include "../../dialogs/dialogbisector.h" class VToolBisector : public VToolLinePoint { diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index 38e5f0057..98fc7d4d9 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolendline.h" -#include "widgets/vmaingraphicsscene.h" +#include "../../widgets/vmaingraphicsscene.h" #include "../../container/calculator.h" const QString VToolEndLine::ToolType = QStringLiteral("endLine"); diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index 9e7171a7f..d9819a378 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -23,7 +23,7 @@ #define VTOOLENDLINE_H #include "vtoollinepoint.h" -#include "dialogs/dialogendline.h" +#include "../../dialogs/dialogendline.h" class VToolEndLine : public VToolLinePoint { diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h index 2dd0145e7..3777d85b0 100644 --- a/tools/drawTools/vtoolheight.h +++ b/tools/drawTools/vtoolheight.h @@ -23,7 +23,7 @@ #define VTOOLHEIGHT_H #include "vtoollinepoint.h" -#include "dialogs/dialogheight.h" +#include "../../dialogs/dialogheight.h" class VToolHeight: public VToolLinePoint { diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index 43469b535..9e9700eed 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -23,8 +23,8 @@ #define VTOOLLINE_H #include "vdrawtool.h" -#include "QGraphicsLineItem" -#include "dialogs/dialogline.h" +#include +#include "../../dialogs/dialogline.h" class VToolLine: public VDrawTool, public QGraphicsLineItem { diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index 5d9058dbd..141f123d0 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -23,7 +23,7 @@ #define VTOOLLINEINTERSECT_H #include "vtoolpoint.h" -#include "dialogs/dialoglineintersect.h" +#include "../../dialogs/dialoglineintersect.h" class VToolLineIntersect:public VToolPoint { diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 2ce571cd7..bf6d0292e 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -23,7 +23,7 @@ #define VTOOLNORMAL_H #include "vtoollinepoint.h" -#include "dialogs/dialognormal.h" +#include "../../dialogs/dialognormal.h" class VToolNormal : public VToolLinePoint { diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index ae04e6fb7..fedd8dad6 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -23,7 +23,7 @@ #define VTOOLPOINT_H #include "vdrawtool.h" -#include "widgets/vgraphicssimpletextitem.h" +#include "../../widgets/vgraphicssimpletextitem.h" class VToolPoint: public VDrawTool, public QGraphicsEllipseItem { diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index a5f76f046..ad3854c3a 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -23,7 +23,7 @@ #define VTOOLPOINTOFCONTACT_H #include "vtoolpoint.h" -#include "dialogs/dialogpointofcontact.h" +#include "../../dialogs/dialogpointofcontact.h" class VToolPointOfContact : public VToolPoint { diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h index 45ea6ea70..d7701c979 100644 --- a/tools/drawTools/vtoolpointofintersection.h +++ b/tools/drawTools/vtoolpointofintersection.h @@ -23,7 +23,7 @@ #define VTOOLPOINTOFINTERSECTION_H #include "vtoolpoint.h" -#include "dialogs/dialogpointofintersection.h" +#include "../../dialogs/dialogpointofintersection.h" class VToolPointOfIntersection : public VToolPoint { diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index e557fdbb2..bfb8d3b9f 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -23,7 +23,7 @@ #define VTOOLSHOULDERPOINT_H #include "vtoollinepoint.h" -#include "dialogs/dialogshoulderpoint.h" +#include "../../dialogs/dialogshoulderpoint.h" class VToolShoulderPoint : public VToolLinePoint { diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index 4265f8f83..466d76eef 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -22,8 +22,8 @@ #ifndef VTOOLSINGLEPOINT_H #define VTOOLSINGLEPOINT_H -#include "dialogs/dialogsinglepoint.h" #include "vtoolpoint.h" +#include "../../dialogs/dialogsinglepoint.h" class VToolSinglePoint : public VToolPoint { diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 0c058806b..df7b0e81c 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vtoolspline.h" -#include "geometry/vspline.h" +#include "../../geometry/vspline.h" const QString VToolSpline::TagName = QStringLiteral("spline"); const QString VToolSpline::ToolType = QStringLiteral("simple"); diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index bc5ccb9fa..0b2d5488e 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -24,9 +24,9 @@ #include "vdrawtool.h" #include -#include "dialogs/dialogspline.h" -#include "widgets/vcontrolpointspline.h" -#include "geometry/vsplinepath.h" +#include "../../dialogs/dialogspline.h" +#include "../../widgets/vcontrolpointspline.h" +#include "../../geometry/vsplinepath.h" class VToolSpline:public VDrawTool, public QGraphicsPathItem { diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index a1c3c51be..d495a7240 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -24,8 +24,8 @@ #include "vdrawtool.h" #include -#include "dialogs/dialogsplinepath.h" -#include "widgets/vcontrolpointspline.h" +#include "../../dialogs/dialogsplinepath.h" +#include "../../widgets/vcontrolpointspline.h" class VToolSplinePath:public VDrawTool, public QGraphicsPathItem { diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index 349ced7fd..d83aa184c 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -23,7 +23,7 @@ #define VTOOLTRIANGLE_H #include "vtoolpoint.h" -#include "dialogs/dialogtriangle.h" +#include "../../dialogs/dialogtriangle.h" class VToolTriangle : public VToolPoint { diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index eda3d393d..535598a7b 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingalongline.h" -#include "container/calculator.h" +#include "../../container/calculator.h" const QString VModelingAlongLine::ToolType = QStringLiteral("alongLine"); diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index 10806c529..943836b67 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -23,7 +23,7 @@ #define VMODELINGALONGLINE_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogalongline.h" +#include "../../dialogs/dialogalongline.h" class VModelingAlongLine : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index 79cd93d05..fe6c8f309 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingarc.h" -#include "container/calculator.h" +#include "../../container/calculator.h" const QString VModelingArc::TagName = QStringLiteral("arc"); const QString VModelingArc::ToolType = QStringLiteral("simple"); diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index 5604adf1b..9aba52347 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -24,8 +24,8 @@ #include "vmodelingtool.h" #include -#include "dialogs/dialogarc.h" -#include "widgets/vcontrolpointspline.h" +#include "../../dialogs/dialogarc.h" +#include "../../widgets/vcontrolpointspline.h" class VModelingArc :public VModelingTool, public QGraphicsPathItem { diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index a80bfdb20..20a422f47 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -23,7 +23,7 @@ #define VMODELINGBISECTOR_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogbisector.h" +#include "../../dialogs/dialogbisector.h" class VModelingBisector : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index 7142d2b6c..8561048ff 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -23,7 +23,7 @@ #define VMODELINGENDLINE_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogendline.h" +#include "../../dialogs/dialogendline.h" class VModelingEndLine : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index 073b7bfae..5dfd82e96 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -23,7 +23,7 @@ #define VMODELINGHEIGHT_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogheight.h" +#include "../../dialogs/dialogheight.h" class VModelingHeight : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index f91380eaa..0149f9be5 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -23,8 +23,8 @@ #define VMODELINGLINE_H #include "vmodelingtool.h" -#include "QGraphicsLineItem" -#include "dialogs/dialogline.h" +#include +#include "../../dialogs/dialogline.h" class VModelingLine: public VModelingTool, public QGraphicsLineItem { diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index f6b1cc3e0..93f2f75c7 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -23,7 +23,7 @@ #define VMODELINGLINEINTERSECT_H #include "vmodelingpoint.h" -#include "dialogs/dialoglineintersect.h" +#include "../../dialogs/dialoglineintersect.h" class VModelingLineIntersect:public VModelingPoint { diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index 91dcaef62..56a0167ec 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -23,7 +23,7 @@ #define VMODELINGNORMAL_H #include "vmodelinglinepoint.h" -#include "dialogs/dialognormal.h" +#include "../../dialogs/dialognormal.h" class VModelingNormal : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingpoint.cpp b/tools/modelingTools/vmodelingpoint.cpp index 50bb89a03..9c0e225da 100644 --- a/tools/modelingTools/vmodelingpoint.cpp +++ b/tools/modelingTools/vmodelingpoint.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingpoint.h" -#include "container/vpointf.h" +#include "../../container/vpointf.h" const QString VModelingPoint::TagName = QStringLiteral("point"); diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h index ff5558185..360db6153 100644 --- a/tools/modelingTools/vmodelingpoint.h +++ b/tools/modelingTools/vmodelingpoint.h @@ -23,7 +23,7 @@ #define VMODELINGPOINT_H #include "vmodelingtool.h" -#include "widgets/vgraphicssimpletextitem.h" +#include "../../widgets/vgraphicssimpletextitem.h" class VModelingPoint: public VModelingTool, public QGraphicsEllipseItem { diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index 64418b636..3e23b9c3b 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -23,7 +23,7 @@ #define VMODELINGPOINTOFCONTACT_H #include "vmodelingpoint.h" -#include "dialogs/dialogpointofcontact.h" +#include "../../dialogs/dialogpointofcontact.h" class VModelingPointOfContact : public VModelingPoint { diff --git a/tools/modelingTools/vmodelingpointofintersection.h b/tools/modelingTools/vmodelingpointofintersection.h index 6890998d5..00740a439 100644 --- a/tools/modelingTools/vmodelingpointofintersection.h +++ b/tools/modelingTools/vmodelingpointofintersection.h @@ -23,7 +23,7 @@ #define VMODELINGPOINTOFINTERSECTION_H #include "vmodelingpoint.h" -#include "dialogs/dialogpointofintersection.h" +#include "../../dialogs/dialogpointofintersection.h" class VModelingPointOfIntersection : public VModelingPoint { diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index e1d86995e..7795a387b 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -23,7 +23,7 @@ #define VMODELINGSHOULDERPOINT_H #include "vmodelinglinepoint.h" -#include "dialogs/dialogshoulderpoint.h" +#include "../../dialogs/dialogshoulderpoint.h" class VModelingShoulderPoint : public VModelingLinePoint { diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index 7d3a39e69..cd7fd4823 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -20,7 +20,7 @@ ****************************************************************************/ #include "vmodelingspline.h" -#include "geometry/vspline.h" +#include "../../geometry/vspline.h" const QString VModelingSpline::TagName = QStringLiteral("spline"); const QString VModelingSpline::ToolType = QStringLiteral("simple"); diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index 66d1bbd1c..5661f1557 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -24,9 +24,9 @@ #include "vmodelingtool.h" #include -#include "dialogs/dialogspline.h" -#include "widgets/vcontrolpointspline.h" -#include "geometry/vsplinepath.h" +#include "../../dialogs/dialogspline.h" +#include "../../widgets/vcontrolpointspline.h" +#include "../../geometry/vsplinepath.h" class VModelingSpline:public VModelingTool, public QGraphicsPathItem { diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index 4071c1c70..3b7551c62 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -24,8 +24,8 @@ #include "vmodelingtool.h" #include -#include "dialogs/dialogsplinepath.h" -#include "widgets/vcontrolpointspline.h" +#include "../../dialogs/dialogsplinepath.h" +#include "../../widgets/vcontrolpointspline.h" class VModelingSplinePath:public VModelingTool, public QGraphicsPathItem { diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index cc1007291..f4573ff74 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -24,7 +24,7 @@ #include "vmodelingpoint.h" #include "../drawTools/vtooltriangle.h" -#include "dialogs/dialogtriangle.h" +#include "../../dialogs/dialogtriangle.h" class VModelingTriangle : public VModelingPoint { diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index e90393e7d..5b2613b19 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -23,7 +23,7 @@ #define VNODEPOINT_H #include "vabstractnode.h" -#include "widgets/vgraphicssimpletextitem.h" +#include "../../widgets/vgraphicssimpletextitem.h" class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem { diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index a5da79b37..f20186b25 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -24,7 +24,7 @@ #include "vabstracttool.h" #include -#include "dialogs/dialogdetail.h" +#include "../dialogs/dialogdetail.h" class VToolDetail: public VAbstractTool, public QGraphicsPathItem { diff --git a/widgets/vapplication.cpp b/widgets/vapplication.cpp index efabe6acb..3b05da39b 100644 --- a/widgets/vapplication.cpp +++ b/widgets/vapplication.cpp @@ -20,11 +20,11 @@ ****************************************************************************/ #include "vapplication.h" -#include "exception/vexceptionobjecterror.h" -#include "exception/vexceptionbadid.h" -#include "exception/vexceptionconversionerror.h" -#include "exception/vexceptionemptyparameter.h" -#include "exception/vexceptionwrongparameterid.h" +#include "../exception/vexceptionobjecterror.h" +#include "../exception/vexceptionbadid.h" +#include "../exception/vexceptionconversionerror.h" +#include "../exception/vexceptionemptyparameter.h" +#include "../exception/vexceptionwrongparameterid.h" // reimplemented from QApplication so we can throw exceptions in slots bool VApplication::notify(QObject *receiver, QEvent *event) diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h index 56f51ef93..3d8bf86cb 100644 --- a/widgets/vcontrolpointspline.h +++ b/widgets/vcontrolpointspline.h @@ -24,7 +24,7 @@ #include #include -#include "geometry/vsplinepath.h" +#include "../geometry/vsplinepath.h" class VControlPointSpline : public QObject, public QGraphicsEllipseItem { From f3fbb1cd9c896e37010d8b1c78c8ce35f31d8476 Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 19:59:20 +0200 Subject: [PATCH 64/83] Added macros Q_CC_GNU. --HG-- branch : develop --- xml/vdomdocument.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index 6000638b9..495f801d6 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -35,8 +35,10 @@ namespace Document } Q_DECLARE_OPERATORS_FOR_FLAGS(Document::Documents) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Weffc++" +#ifdef Q_CC_GNU + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Weffc++" +#endif class VDomDocument : public QObject, public QDomDocument { Q_OBJECT @@ -116,6 +118,8 @@ private: void CollectId(QDomElement node, QVector &vector)const; }; -#pragma GCC diagnostic pop +#ifdef Q_CC_GNU + #pragma GCC diagnostic pop +#endif #endif // VDOMDOCUMENT_H From 8293f697610404160c8f0d21fea00a2f624d5e0a Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 20:05:28 +0200 Subject: [PATCH 65/83] Change in precompiled headers. --HG-- branch : develop --- Valentina.pro | 4 ++++ stable.cpp | 23 +++++++++++++++++++++++ stable.h | 10 ++++++++++ 3 files changed, 37 insertions(+) create mode 100644 stable.cpp diff --git a/Valentina.pro b/Valentina.pro index 1de130512..5b88224a5 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -21,6 +21,9 @@ QMAKE_CXX = ccache g++ # Precompiled headers (PCH) PRECOMPILED_HEADER = stable.h +win32-msvc* { + PRECOMPILED_SOURCE = stable.cpp +} # directory for executable file DESTDIR = bin @@ -48,6 +51,7 @@ include(xml/xml.pri) SOURCES += main.cpp\ mainwindow.cpp \ tablewindow.cpp \ + stable.cpp HEADERS += mainwindow.h \ options.h \ diff --git a/stable.cpp b/stable.cpp new file mode 100644 index 000000000..7de5f227a --- /dev/null +++ b/stable.cpp @@ -0,0 +1,23 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** + ** This file is part of Valentina. + ** + ** Tox is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. + ** + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. + ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . + ** + ****************************************************************************/ + +// Build the precompiled headers. +#include "stable.h" diff --git a/stable.h b/stable.h index 32c6762e7..dffda05ae 100644 --- a/stable.h +++ b/stable.h @@ -19,6 +19,14 @@ ** ****************************************************************************/ +#ifndef STABLE_H +#define STABLE_H + +/* I like to include this pragma too, +so the build log indicates if pre-compiled headers +were in use. */ +#pragma message("Compiling precompiled headers.\n") + /* Add C includes here */ #if defined __cplusplus @@ -31,3 +39,5 @@ #include #include "options.h" #endif + +#endif // STABLE_H From 93db4385b72e9d14aa53408c818635b4bc98a081 Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 21:27:43 +0200 Subject: [PATCH 66/83] Use memsize-type. --HG-- branch : develop --- geometry/vdetail.cpp | 2 +- geometry/vdetail.h | 2 +- geometry/vsplinepath.cpp | 2 +- geometry/vsplinepath.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/geometry/vdetail.cpp b/geometry/vdetail.cpp index 6bfdf3add..105c90cba 100644 --- a/geometry/vdetail.cpp +++ b/geometry/vdetail.cpp @@ -70,7 +70,7 @@ bool VDetail::Containes(const qint64 &id) const return false; } -VNodeDetail &VDetail::operator [](int indx) +VNodeDetail &VDetail::operator [](ptrdiff_t indx) { return nodes[indx]; } diff --git a/geometry/vdetail.h b/geometry/vdetail.h index c715ea8da..c85b411a0 100644 --- a/geometry/vdetail.h +++ b/geometry/vdetail.h @@ -46,7 +46,7 @@ public: void Clear(); inline qint32 CountNode() const {return nodes.size();} bool Containes(const qint64 &id)const; - VNodeDetail & operator[](int indx); + VNodeDetail & operator[](ptrdiff_t indx); inline QString getName() const {return name;} inline void setName(const QString &value) {name = value;} inline qreal getMx() const {return mx;} diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index 23c5d45b0..01eb67bc4 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -146,7 +146,7 @@ VSplinePath &VSplinePath::operator =(const VSplinePath &path) return *this; } -VSplinePoint & VSplinePath::operator[](int indx) +VSplinePoint & VSplinePath::operator[](ptrdiff_t indx) { return path[indx]; } diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index 94279c109..77d7c956d 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -74,7 +74,7 @@ public: inline void setKCurve(const qreal &value) {kCurve = value;} inline const QVector *GetPoint() const {return &path;} VSplinePath &operator=(const VSplinePath &path); - VSplinePoint &operator[](int indx); + VSplinePoint &operator[](ptrdiff_t indx); inline Draw::Draws getMode() const {return mode;} inline void setMode(const Draw::Draws &value) {mode = value;} From 6ae5a001466ba77c1e877dbb01d54b1dbae6100c Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 21:46:07 +0200 Subject: [PATCH 67/83] Little optimization. --HG-- branch : develop --- dialogs/dialogalongline.cpp | 2 +- dialogs/dialogalongline.h | 2 +- dialogs/dialogarc.cpp | 2 +- dialogs/dialogarc.h | 2 +- dialogs/dialogbisector.cpp | 2 +- dialogs/dialogbisector.h | 2 +- dialogs/dialogdetail.cpp | 2 +- dialogs/dialogdetail.h | 2 +- dialogs/dialogendline.cpp | 2 +- dialogs/dialogendline.h | 2 +- dialogs/dialogheight.cpp | 2 +- dialogs/dialogheight.h | 2 +- dialogs/dialogline.cpp | 2 +- dialogs/dialogline.h | 2 +- dialogs/dialoglineintersect.cpp | 2 +- dialogs/dialoglineintersect.h | 2 +- dialogs/dialognormal.cpp | 2 +- dialogs/dialognormal.h | 2 +- dialogs/dialogpointofcontact.cpp | 2 +- dialogs/dialogpointofcontact.h | 2 +- dialogs/dialogpointofintersection.cpp | 2 +- dialogs/dialogpointofintersection.h | 2 +- dialogs/dialogshoulderpoint.cpp | 2 +- dialogs/dialogshoulderpoint.h | 2 +- dialogs/dialogspline.cpp | 2 +- dialogs/dialogspline.h | 2 +- dialogs/dialogsplinepath.cpp | 2 +- dialogs/dialogsplinepath.h | 2 +- dialogs/dialogtool.cpp | 2 +- dialogs/dialogtool.h | 2 +- dialogs/dialogtriangle.cpp | 2 +- dialogs/dialogtriangle.h | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index 00846dfa9..866b4bbf0 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -72,7 +72,7 @@ DialogAlongLine::~DialogAlongLine() delete ui; } -void DialogAlongLine::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogAlongLine::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index bda9b31f3..f4a425163 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -47,7 +47,7 @@ public: inline qint64 getSecondPointId() const {return secondPointId;} void setSecondPointId(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogAlongLine) diff --git a/dialogs/dialogarc.cpp b/dialogs/dialogarc.cpp index 16989d44e..47c43239e 100644 --- a/dialogs/dialogarc.cpp +++ b/dialogs/dialogarc.cpp @@ -107,7 +107,7 @@ void DialogArc::SetRadius(const QString &value) ui->lineEditRadius->setText(radius); } -void DialogArc::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogArc::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogarc.h b/dialogs/dialogarc.h index c701ba582..1267f6943 100644 --- a/dialogs/dialogarc.h +++ b/dialogs/dialogarc.h @@ -44,7 +44,7 @@ public: inline QString GetF2() const {return f2;} void SetF2(const QString &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); virtual void ValChenged(int row); void PutRadius(); diff --git a/dialogs/dialogbisector.cpp b/dialogs/dialogbisector.cpp index afd97c41c..a9869ca03 100644 --- a/dialogs/dialogbisector.cpp +++ b/dialogs/dialogbisector.cpp @@ -72,7 +72,7 @@ DialogBisector::~DialogBisector() delete ui; } -void DialogBisector::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogBisector::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogbisector.h b/dialogs/dialogbisector.h index c9b0260dc..4ea1f3fb3 100644 --- a/dialogs/dialogbisector.h +++ b/dialogs/dialogbisector.h @@ -49,7 +49,7 @@ public: inline qint64 getThirdPointId() const {return thirdPointId;} void setThirdPointId(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogBisector) diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index add670998..de397de89 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -43,7 +43,7 @@ DialogDetail::DialogDetail(const VContainer *data, Draw::Draws mode, QWidget *pa connect(ui.lineEditNameDetail, &QLineEdit::textChanged, this, &DialogDetail::NamePointChanged); } -void DialogDetail::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogDetail::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogdetail.h b/dialogs/dialogdetail.h index 8a6a12cdf..c49a57f6d 100644 --- a/dialogs/dialogdetail.h +++ b/dialogs/dialogdetail.h @@ -33,7 +33,7 @@ public: inline VDetail getDetails() const {return details;} void setDetails(const VDetail &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); void BiasXChanged(qreal d); void BiasYChanged(qreal d); diff --git a/dialogs/dialogendline.cpp b/dialogs/dialogendline.cpp index 9770166b0..db41ac062 100644 --- a/dialogs/dialogendline.cpp +++ b/dialogs/dialogendline.cpp @@ -82,7 +82,7 @@ DialogEndLine::DialogEndLine(const VContainer *data, Draw::Draws mode, QWidget * connect(ui->lineEditFormula, &QLineEdit::textChanged, this, &DialogEndLine::FormulaChanged); } -void DialogEndLine::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogEndLine::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogendline.h b/dialogs/dialogendline.h index 489d264c4..300b8d201 100644 --- a/dialogs/dialogendline.h +++ b/dialogs/dialogendline.h @@ -46,7 +46,7 @@ public: inline qint64 getBasePointId() const {return basePointId;} void setBasePointId(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogEndLine) diff --git a/dialogs/dialogheight.cpp b/dialogs/dialogheight.cpp index db2039bce..5f3411532 100644 --- a/dialogs/dialogheight.cpp +++ b/dialogs/dialogheight.cpp @@ -76,7 +76,7 @@ void DialogHeight::setP2LineId(const qint64 &value, const qint64 &id) setCurrentPointId(ui->comboBoxP2Line, p2LineId, value, id); } -void DialogHeight::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogHeight::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogheight.h b/dialogs/dialogheight.h index e737ad5a3..4b787ff3b 100644 --- a/dialogs/dialogheight.h +++ b/dialogs/dialogheight.h @@ -47,7 +47,7 @@ public: inline qint64 getP2LineId() const{return p2LineId;} void setP2LineId(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogHeight) diff --git a/dialogs/dialogline.cpp b/dialogs/dialogline.cpp index ecdf6cb9d..4d95c7522 100644 --- a/dialogs/dialogline.cpp +++ b/dialogs/dialogline.cpp @@ -72,7 +72,7 @@ void DialogLine::DialogAccepted() DialogClosed(QDialog::Accepted); } -void DialogLine::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogLine::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogline.h b/dialogs/dialogline.h index 9957eca16..2693d2734 100644 --- a/dialogs/dialogline.h +++ b/dialogs/dialogline.h @@ -40,7 +40,7 @@ public: inline qint64 getSecondPoint() const {return secondPoint;} void setSecondPoint(const qint64 &value); public slots: - void ChoosedObject(qint64 id, Scene::Scenes type); + void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogLine) diff --git a/dialogs/dialoglineintersect.cpp b/dialogs/dialoglineintersect.cpp index 4961e0db3..480476c08 100644 --- a/dialogs/dialoglineintersect.cpp +++ b/dialogs/dialoglineintersect.cpp @@ -47,7 +47,7 @@ DialogLineIntersect::~DialogLineIntersect() delete ui; } -void DialogLineIntersect::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogLineIntersect::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialoglineintersect.h b/dialogs/dialoglineintersect.h index 9c5195df5..574a83455 100644 --- a/dialogs/dialoglineintersect.h +++ b/dialogs/dialoglineintersect.h @@ -47,7 +47,7 @@ public: inline QString getPointName() const {return pointName;} void setPointName(const QString &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); void P1Line1Changed( int index); void P2Line1Changed( int index); diff --git a/dialogs/dialognormal.cpp b/dialogs/dialognormal.cpp index d13aeab95..c105e8445 100644 --- a/dialogs/dialognormal.cpp +++ b/dialogs/dialognormal.cpp @@ -88,7 +88,7 @@ DialogNormal::~DialogNormal() delete ui; } -void DialogNormal::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogNormal::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialognormal.h b/dialogs/dialognormal.h index 84a661522..782305582 100644 --- a/dialogs/dialognormal.h +++ b/dialogs/dialognormal.h @@ -48,7 +48,7 @@ public: inline qint64 getSecondPointId() const {return secondPointId;} void setSecondPointId(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogNormal) diff --git a/dialogs/dialogpointofcontact.cpp b/dialogs/dialogpointofcontact.cpp index 6b551df7e..e9caa7905 100644 --- a/dialogs/dialogpointofcontact.cpp +++ b/dialogs/dialogpointofcontact.cpp @@ -65,7 +65,7 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, Draw::Draws m connect(ui.lineEditFormula, &QLineEdit::textChanged, this, &DialogPointOfContact::FormulaChanged); } -void DialogPointOfContact::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogPointOfContact::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogpointofcontact.h b/dialogs/dialogpointofcontact.h index 35af0835a..37171e72e 100644 --- a/dialogs/dialogpointofcontact.h +++ b/dialogs/dialogpointofcontact.h @@ -42,7 +42,7 @@ public: inline qint64 getSecondPoint() const {return secondPoint;} void setSecondPoint(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogPointOfContact) diff --git a/dialogs/dialogpointofintersection.cpp b/dialogs/dialogpointofintersection.cpp index 299eaadee..7adcd8b28 100644 --- a/dialogs/dialogpointofintersection.cpp +++ b/dialogs/dialogpointofintersection.cpp @@ -50,7 +50,7 @@ void DialogPointOfIntersection::setSecondPointId(const qint64 &value, const qint setCurrentPointId(ui->comboBoxSecondPoint, secondPointId, value, id); } -void DialogPointOfIntersection::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogPointOfIntersection::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogpointofintersection.h b/dialogs/dialogpointofintersection.h index 556b9b3ea..e6971853c 100644 --- a/dialogs/dialogpointofintersection.h +++ b/dialogs/dialogpointofintersection.h @@ -43,7 +43,7 @@ public: inline qint64 getSecondPointId() const {return secondPointId;} void setSecondPointId(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogPointOfIntersection) diff --git a/dialogs/dialogshoulderpoint.cpp b/dialogs/dialogshoulderpoint.cpp index 0224eb90b..809516519 100644 --- a/dialogs/dialogshoulderpoint.cpp +++ b/dialogs/dialogshoulderpoint.cpp @@ -73,7 +73,7 @@ DialogShoulderPoint::~DialogShoulderPoint() delete ui; } -void DialogShoulderPoint::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogShoulderPoint::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogshoulderpoint.h b/dialogs/dialogshoulderpoint.h index 8d06393e6..ba516c4dd 100644 --- a/dialogs/dialogshoulderpoint.h +++ b/dialogs/dialogshoulderpoint.h @@ -49,7 +49,7 @@ public: inline qint64 getPShoulder() const {return pShoulder;} void setPShoulder(const qint64 &value, const qint64 &id); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogShoulderPoint) diff --git a/dialogs/dialogspline.cpp b/dialogs/dialogspline.cpp index 16baab710..5f0d42123 100644 --- a/dialogs/dialogspline.cpp +++ b/dialogs/dialogspline.cpp @@ -44,7 +44,7 @@ DialogSpline::~DialogSpline() delete ui; } -void DialogSpline::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogSpline::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogspline.h b/dialogs/dialogspline.h index bcb69ce87..f155910b6 100644 --- a/dialogs/dialogspline.h +++ b/dialogs/dialogspline.h @@ -50,7 +50,7 @@ public: inline qreal getKCurve() const {return kCurve;} void setKCurve(const qreal &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogSpline) diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index 7321f2989..76efb8bd8 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -67,7 +67,7 @@ void DialogSplinePath::SetPath(const VSplinePath &value) } -void DialogSplinePath::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogSplinePath::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogsplinepath.h b/dialogs/dialogsplinepath.h index d3ebff753..b6eb49813 100644 --- a/dialogs/dialogsplinepath.h +++ b/dialogs/dialogsplinepath.h @@ -40,7 +40,7 @@ public: inline VSplinePath GetPath() const {return path;} void SetPath(const VSplinePath &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); void PointChenged(int row); void currentPointChanged( int index ); diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index beaa36183..a07413b69 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -254,7 +254,7 @@ void DialogTool::CheckState() bOk->setEnabled(flagFormula && flagName); } -void DialogTool::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogTool::ChoosedObject(qint64 id, const Scene::Scenes &type) { Q_UNUSED(id); Q_UNUSED(type); diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index 119eba2e9..79dfeb517 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -37,7 +37,7 @@ signals: void DialogClosed(int result); void ToolTip(const QString &toolTip); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); void NamePointChanged(); virtual void DialogAccepted(); virtual void DialogRejected(); diff --git a/dialogs/dialogtriangle.cpp b/dialogs/dialogtriangle.cpp index 96b136c2c..7e8a0015b 100644 --- a/dialogs/dialogtriangle.cpp +++ b/dialogs/dialogtriangle.cpp @@ -46,7 +46,7 @@ DialogTriangle::~DialogTriangle() delete ui; } -void DialogTriangle::ChoosedObject(qint64 id, Scene::Scenes type) +void DialogTriangle::ChoosedObject(qint64 id, const Scene::Scenes &type) { if (idDetail == 0 && mode == Draw::Modeling) { diff --git a/dialogs/dialogtriangle.h b/dialogs/dialogtriangle.h index 3c43fc89f..ec2c1da08 100644 --- a/dialogs/dialogtriangle.h +++ b/dialogs/dialogtriangle.h @@ -46,7 +46,7 @@ public: inline QString getPointName() const {return pointName;} void setPointName(const QString &value); public slots: - virtual void ChoosedObject(qint64 id, Scene::Scenes type); + virtual void ChoosedObject(qint64 id, const Scene::Scenes &type); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogTriangle) From 40c58022e79945ddce6ac42f11f5f99668c2eb7f Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 6 Nov 2013 23:11:12 +0200 Subject: [PATCH 68/83] Little optimization. --HG-- branch : develop --- container/vcontainer.cpp | 12 +++++------ container/vcontainer.h | 13 ++++++------ dialogs/dialogdetail.cpp | 4 ++-- dialogs/dialogdetail.h | 4 ++-- dialogs/dialogsinglepoint.cpp | 4 ++-- dialogs/dialogsinglepoint.h | 4 ++-- mainwindow.cpp | 2 +- mainwindow.h | 2 +- tools/drawTools/vdrawtool.cpp | 6 +++--- tools/drawTools/vdrawtool.h | 6 +++--- tools/drawTools/vtoolalongline.cpp | 4 ++-- tools/drawTools/vtoolalongline.h | 4 ++-- tools/drawTools/vtoolarc.cpp | 6 +++--- tools/drawTools/vtoolarc.h | 6 +++--- tools/drawTools/vtoolbisector.cpp | 4 ++-- tools/drawTools/vtoolbisector.h | 4 ++-- tools/drawTools/vtoolendline.cpp | 4 ++-- tools/drawTools/vtoolendline.h | 4 ++-- tools/drawTools/vtoolheight.cpp | 4 ++-- tools/drawTools/vtoolheight.h | 4 ++-- tools/drawTools/vtoolline.cpp | 6 +++--- tools/drawTools/vtoolline.h | 6 +++--- tools/drawTools/vtoollineintersect.cpp | 4 ++-- tools/drawTools/vtoollineintersect.h | 4 ++-- tools/drawTools/vtoollinepoint.cpp | 2 +- tools/drawTools/vtoollinepoint.h | 2 +- tools/drawTools/vtoolnormal.cpp | 4 ++-- tools/drawTools/vtoolnormal.h | 4 ++-- tools/drawTools/vtoolpoint.cpp | 2 +- tools/drawTools/vtoolpoint.h | 2 +- tools/drawTools/vtoolpointofcontact.cpp | 4 ++-- tools/drawTools/vtoolpointofcontact.h | 4 ++-- tools/drawTools/vtoolpointofintersection.cpp | 4 ++-- tools/drawTools/vtoolpointofintersection.h | 4 ++-- tools/drawTools/vtoolshoulderpoint.cpp | 4 ++-- tools/drawTools/vtoolshoulderpoint.h | 4 ++-- tools/drawTools/vtoolsinglepoint.cpp | 4 ++-- tools/drawTools/vtoolsinglepoint.h | 4 ++-- tools/drawTools/vtoolspline.cpp | 6 +++--- tools/drawTools/vtoolspline.h | 6 +++--- tools/drawTools/vtoolsplinepath.cpp | 6 +++--- tools/drawTools/vtoolsplinepath.h | 6 +++--- tools/drawTools/vtooltriangle.cpp | 4 ++-- tools/drawTools/vtooltriangle.h | 4 ++-- tools/modelingTools/vmodelingalongline.cpp | 4 ++-- tools/modelingTools/vmodelingalongline.h | 4 ++-- tools/modelingTools/vmodelingarc.cpp | 4 ++-- tools/modelingTools/vmodelingarc.h | 4 ++-- tools/modelingTools/vmodelingbisector.cpp | 4 ++-- tools/modelingTools/vmodelingbisector.h | 4 ++-- tools/modelingTools/vmodelingendline.cpp | 4 ++-- tools/modelingTools/vmodelingendline.h | 4 ++-- tools/modelingTools/vmodelingheight.cpp | 4 ++-- tools/modelingTools/vmodelingheight.h | 4 ++-- tools/modelingTools/vmodelingline.cpp | 4 ++-- tools/modelingTools/vmodelingline.h | 4 ++-- .../modelingTools/vmodelinglineintersect.cpp | 4 ++-- tools/modelingTools/vmodelinglineintersect.h | 4 ++-- tools/modelingTools/vmodelingnormal.cpp | 7 ++++--- tools/modelingTools/vmodelingnormal.h | 7 ++++--- .../modelingTools/vmodelingpointofcontact.cpp | 4 ++-- tools/modelingTools/vmodelingpointofcontact.h | 4 ++-- .../vmodelingpointofintersection.cpp | 4 ++-- .../vmodelingpointofintersection.h | 4 ++-- .../modelingTools/vmodelingshoulderpoint.cpp | 2 +- tools/modelingTools/vmodelingshoulderpoint.h | 2 +- tools/modelingTools/vmodelingspline.cpp | 4 ++-- tools/modelingTools/vmodelingspline.h | 4 ++-- tools/modelingTools/vmodelingsplinepath.cpp | 4 ++-- tools/modelingTools/vmodelingsplinepath.h | 4 ++-- tools/modelingTools/vmodelingtriangle.cpp | 4 ++-- tools/modelingTools/vmodelingtriangle.h | 4 ++-- tools/nodeDetails/vnodearc.cpp | 4 ++-- tools/nodeDetails/vnodearc.h | 4 ++-- tools/nodeDetails/vnodepoint.cpp | 4 ++-- tools/nodeDetails/vnodepoint.h | 4 ++-- tools/nodeDetails/vnodespline.cpp | 4 ++-- tools/nodeDetails/vnodespline.h | 4 ++-- tools/nodeDetails/vnodesplinepath.cpp | 4 ++-- tools/nodeDetails/vnodesplinepath.h | 4 ++-- tools/vabstracttool.cpp | 16 +++++++------- tools/vabstracttool.h | 7 ++++--- tools/vtooldetail.cpp | 4 ++-- tools/vtooldetail.h | 4 ++-- widgets/vcontrolpointspline.cpp | 6 +++--- widgets/vcontrolpointspline.h | 7 ++++--- widgets/vmaingraphicsscene.cpp | 2 +- widgets/vmaingraphicsscene.h | 2 +- widgets/vmaingraphicsview.cpp | 2 +- xml/vdomdocument.cpp | 19 +++++++++-------- xml/vdomdocument.h | 21 ++++++++++--------- 91 files changed, 223 insertions(+), 214 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index b99b862b8..3033bf1f1 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -613,7 +613,7 @@ qreal VContainer::FindVar(const QString &name, bool *ok)const return 0; } -void VContainer::AddLine(const qint64 &firstPointId, const qint64 &secondPointId, Draw::Draws mode) +void VContainer::AddLine(const qint64 &firstPointId, const qint64 &secondPointId, const Draw::Draws &mode) { QString nameLine = GetNameLine(firstPointId, secondPointId, mode); VPointF first; @@ -671,7 +671,7 @@ qint64 VContainer::AddObject(QHash &obj, const val& value) return id; } -QString VContainer::GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint, Draw::Draws mode) const +QString VContainer::GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint, const Draw::Draws &mode) const { VPointF first; VPointF second; @@ -688,7 +688,7 @@ QString VContainer::GetNameLine(const qint64 &firstPoint, const qint64 &secondPo return QString("Line_%1_%2").arg(first.name(), second.name()); } -QString VContainer::GetNameLineAngle(const qint64 &firstPoint, const qint64 &secondPoint, Draw::Draws mode) const +QString VContainer::GetNameLineAngle(const qint64 &firstPoint, const qint64 &secondPoint, const Draw::Draws &mode) const { VPointF first; VPointF second; @@ -705,7 +705,7 @@ QString VContainer::GetNameLineAngle(const qint64 &firstPoint, const qint64 &sec return QString("AngleLine_%1_%2").arg(first.name(), second.name()); } -QString VContainer::GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint, Draw::Draws mode) const +QString VContainer::GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint, const Draw::Draws &mode) const { VPointF first; VPointF second; @@ -722,7 +722,7 @@ QString VContainer::GetNameSpline(const qint64 &firstPoint, const qint64 &second return QString("Spl_%1_%2").arg(first.name(), second.name()); } -QString VContainer::GetNameSplinePath(const VSplinePath &path, Draw::Draws mode) const +QString VContainer::GetNameSplinePath(const VSplinePath &path, const Draw::Draws &mode) const { if (path.Count() == 0) { @@ -750,7 +750,7 @@ QString VContainer::GetNameSplinePath(const VSplinePath &path, Draw::Draws mode) return name; } -QString VContainer::GetNameArc(const qint64 ¢er, const qint64 &id, Draw::Draws mode) const +QString VContainer::GetNameArc(const qint64 ¢er, const qint64 &id, const Draw::Draws &mode) const { VPointF centerPoint; if (mode == Draw::Calculation) diff --git a/container/vcontainer.h b/container/vcontainer.h index 1e33e2f0e..1173fbc23 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -77,7 +77,7 @@ public: void AddLengthArc(const QString &name, const qreal &value); void AddLineAngle(const QString &name, const qreal &value); void AddLine(const qint64 &firstPointId, const qint64 &secondPointId, - Draw::Draws mode = Draw::Calculation); + const Draw::Draws &mode = Draw::Calculation); qint64 AddSpline(const VSpline& spl); qint64 AddModelingSpline(const VSpline& spl); qint64 AddSplinePath(const VSplinePath& splPath); @@ -85,14 +85,15 @@ public: qint64 AddArc(const VArc& arc); qint64 AddModelingArc(const VArc& arc); QString GetNameLine(const qint64 &firstPoint, const qint64 &secondPoint, - Draw::Draws mode = Draw::Calculation) const; + const Draw::Draws &mode = Draw::Calculation) const; QString GetNameLineAngle(const qint64 &firstPoint, const qint64 &secondPoint, - Draw::Draws mode = Draw::Calculation) const; + const Draw::Draws &mode = Draw::Calculation) const; QString GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint, - Draw::Draws mode = Draw::Calculation) const; + const Draw::Draws &mode = Draw::Calculation) const; QString GetNameSplinePath(const VSplinePath &path, - Draw::Draws mode = Draw::Calculation) const; - QString GetNameArc(const qint64 ¢er, const qint64 &id, Draw::Draws mode = Draw::Calculation) const; + const Draw::Draws &mode = Draw::Calculation) const; + QString GetNameArc(const qint64 ¢er, const qint64 &id, + const Draw::Draws &mode = Draw::Calculation) const; void UpdatePoint(qint64 id, const VPointF& point); void UpdateModelingPoint(qint64 id, const VPointF& point); void UpdateDetail(qint64 id, const VDetail& detail); diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index de397de89..2e64e986e 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -100,8 +100,8 @@ void DialogDetail::DialogAccepted() emit DialogClosed(QDialog::Accepted); } -void DialogDetail::NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, - qreal mx, qreal my) +void DialogDetail::NewItem(qint64 id, const Tool::Tools &typeTool, const Draw::Draws &mode, + const NodeDetail::NodeDetails &typeNode, qreal mx, qreal my) { QString name; switch (typeTool) diff --git a/dialogs/dialogdetail.h b/dialogs/dialogdetail.h index c49a57f6d..b39a7036f 100644 --- a/dialogs/dialogdetail.h +++ b/dialogs/dialogdetail.h @@ -45,8 +45,8 @@ private: VDetail details; bool supplement; bool closed; - void NewItem(qint64 id, Tool::Tools typeTool, Draw::Draws mode, NodeDetail::NodeDetails typeNode, - qreal mx = 0, qreal my = 0); + void NewItem(qint64 id, const Tool::Tools &typeTool, const Draw::Draws &mode, + const NodeDetail::NodeDetails &typeNode, qreal mx = 0, qreal my = 0); }; #endif // DIALOGDETAIL_H diff --git a/dialogs/dialogsinglepoint.cpp b/dialogs/dialogsinglepoint.cpp index ddf12c14e..5abcfb5ba 100644 --- a/dialogs/dialogsinglepoint.cpp +++ b/dialogs/dialogsinglepoint.cpp @@ -39,7 +39,7 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent) connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogSinglePoint::NamePointChanged); } -void DialogSinglePoint::mousePress(QPointF scenePos) +void DialogSinglePoint::mousePress(const QPointF &scenePos) { if (isInitialized == false) { @@ -61,7 +61,7 @@ void DialogSinglePoint::DialogAccepted() emit DialogClosed(QDialog::Accepted); } -void DialogSinglePoint::setData(const QString name, const QPointF point) +void DialogSinglePoint::setData(const QString &name, const QPointF &point) { this->name = name; this->point = point; diff --git a/dialogs/dialogsinglepoint.h b/dialogs/dialogsinglepoint.h index 48adcf8a9..3d3d71ef2 100644 --- a/dialogs/dialogsinglepoint.h +++ b/dialogs/dialogsinglepoint.h @@ -34,12 +34,12 @@ class DialogSinglePoint : public DialogTool Q_OBJECT public: DialogSinglePoint(const VContainer *data, QWidget *parent = 0); - void setData(const QString name, const QPointF point); + void setData(const QString &name, const QPointF &point); inline QString getName()const {return name;} inline QPointF getPoint()const {return point;} ~DialogSinglePoint(); public slots: - void mousePress(QPointF scenePos); + void mousePress(const QPointF &scenePos); virtual void DialogAccepted(); private: Q_DISABLE_COPY(DialogSinglePoint) diff --git a/mainwindow.cpp b/mainwindow.cpp index 167d19f71..21d895f9d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -639,7 +639,7 @@ void MainWindow::currentDrawChanged( int index ) } } -void MainWindow::mouseMove(QPointF scenePos) +void MainWindow::mouseMove(const QPointF &scenePos) { QString string = QString("%1, %2") .arg(static_cast(toMM(scenePos.x()))) diff --git a/mainwindow.h b/mainwindow.h index 5d8027420..933d69aa2 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -45,7 +45,7 @@ public: ~MainWindow(); void OpenPattern(const QString &fileName); public slots: - void mouseMove(QPointF scenePos); + void mouseMove(const QPointF &scenePos); void ActionAroowTool(); void ActionDraw(bool checked); void ActionDetails(bool checked); diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index 28e3a859b..13fdf65a7 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -32,7 +32,7 @@ VDrawTool::VDrawTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *pa connect(this->doc, &VDomDocument::ShowTool, this, &VDrawTool::ShowTool); } -void VDrawTool::AddRecord(const qint64 id, Tool::Tools toolType, VDomDocument *doc) +void VDrawTool::AddRecord(const qint64 id, const Tool::Tools &toolType, VDomDocument *doc) { qint64 cursor = doc->getCursor(); QVector *history = doc->getHistory(); @@ -63,7 +63,7 @@ void VDrawTool::ShowTool(qint64 id, Qt::GlobalColor color, bool enable) Q_UNUSED(enable); } -void VDrawTool::ChangedActivDraw(const QString newName) +void VDrawTool::ChangedActivDraw(const QString &newName) { if (nameActivDraw == newName) { @@ -75,7 +75,7 @@ void VDrawTool::ChangedActivDraw(const QString newName) } } -void VDrawTool::ChangedNameDraw(const QString oldName, const QString newName) +void VDrawTool::ChangedNameDraw(const QString &oldName, const QString &newName) { if (nameActivDraw == oldName) { diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index 215a48ba9..59d00de8c 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -31,12 +31,12 @@ public: VDrawTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); virtual ~VDrawTool() {} virtual void setDialog() {} - static void AddRecord(const qint64 id, Tool::Tools toolType, VDomDocument *doc); + static void AddRecord(const qint64 id, const Tool::Tools &toolType, VDomDocument *doc); void ignoreContextMenu(bool enable) {ignoreContextMenuEvent = enable;} public slots: virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); - virtual void ChangedActivDraw(const QString newName); - void ChangedNameDraw(const QString oldName, const QString newName); + virtual void ChangedActivDraw(const QString &newName); + void ChangedNameDraw(const QString &oldName, const QString &newName); virtual void FullUpdateFromGui(int result)=0; virtual void SetFactor(qreal factor); protected: diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index c47034ae6..947276c29 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -26,7 +26,7 @@ const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); VToolAlongLine::VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, - const QString &typeLine, Tool::Sources typeCreation, + const QString &typeLine, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, 0, parent), secondPointId(secondPointId), dialogAlongLine(QSharedPointer()) @@ -131,7 +131,7 @@ void VToolAlongLine::Create(QSharedPointer &dialog, VMainGraphi void VToolAlongLine::Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) { VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index 974e7d29e..48ca90c24 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -31,14 +31,14 @@ class VToolAlongLine : public VToolLinePoint public: VToolAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index 8c7c146d6..1e3940aa9 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -25,7 +25,7 @@ const QString VToolArc::TagName = QStringLiteral("arc"); const QString VToolArc::ToolType = QStringLiteral("simple"); -VToolArc::VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, +VToolArc::VToolArc(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogArc(QSharedPointer()) { @@ -66,7 +66,7 @@ void VToolArc::Create(QSharedPointer &dialog, VMainGraphicsScene *sce void VToolArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; @@ -142,7 +142,7 @@ void VToolArc::FullUpdateFromGui(int result) dialogArc.clear(); } -void VToolArc::ChangedActivDraw(const QString newName) +void VToolArc::ChangedActivDraw(const QString &newName) { bool selectable = false; if (nameActivDraw == newName) diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index a199ad10a..cbfba5490 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -31,20 +31,20 @@ class VToolArc :public VDrawTool, public QGraphicsPathItem { Q_OBJECT public: - VToolArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + VToolArc(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); - virtual void ChangedActivDraw(const QString newName); + virtual void ChangedActivDraw(const QString &newName); virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); virtual void SetFactor(qreal factor); protected: diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 7c7795591..f9b6af717 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -26,7 +26,7 @@ const QString VToolBisector::ToolType = QStringLiteral("bisector"); VToolBisector::VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, + const qint64 &secondPointId, const qint64 &thirdPointId, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VToolLinePoint(doc, data, id, typeLine, formula, secondPointId, 0, parent), firstPointId(0), thirdPointId(0), dialogBisector(QSharedPointer()) @@ -88,7 +88,7 @@ void VToolBisector::Create(const qint64 _id, const QString &formula, const qint6 const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index b072bf052..396affed0 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -30,7 +30,7 @@ class VToolBisector : public VToolLinePoint public: VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, - const qint64 &thirdPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const qint64 &thirdPointId, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint, const qreal& length); virtual void setDialog(); @@ -40,7 +40,7 @@ public: const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index 98fc7d4d9..5199dfbbf 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -27,7 +27,7 @@ const QString VToolEndLine::ToolType = QStringLiteral("endLine"); VToolEndLine::VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, - Tool::Sources typeCreation, QGraphicsItem *parent) + const Tool::Sources &typeCreation, QGraphicsItem *parent) :VToolLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), dialogEndLine(QSharedPointer()) { @@ -64,7 +64,7 @@ void VToolEndLine::Create(QSharedPointer &dialog, VMainGraphicsSc void VToolEndLine::Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) { VPointF basePoint = data->GetPoint(basePointId); QLineF line = QLineF(basePoint.toQPointF(), QPointF(basePoint.x()+100, basePoint.y())); diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index d9819a378..a6d755b88 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -31,14 +31,14 @@ class VToolEndLine : public VToolLinePoint public: VToolEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/drawTools/vtoolheight.cpp b/tools/drawTools/vtoolheight.cpp index 0165e6481..ad4f41cee 100644 --- a/tools/drawTools/vtoolheight.cpp +++ b/tools/drawTools/vtoolheight.cpp @@ -25,7 +25,7 @@ const QString VToolHeight::ToolType = QStringLiteral("height"); VToolHeight::VToolHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, - Tool::Sources typeCreation, QGraphicsItem * parent) + const Tool::Sources &typeCreation, QGraphicsItem * parent) :VToolLinePoint(doc, data, id, typeLine, QString(), basePointId, 0, parent), dialogHeight(QSharedPointer()), p1LineId(p1LineId), p2LineId(p2LineId) { @@ -63,7 +63,7 @@ void VToolHeight::Create(QSharedPointer &dialog, VMainGraphicsScen void VToolHeight::Create(const qint64 _id, const QString &pointName, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) { VPointF basePoint = data->GetPoint(basePointId); VPointF p1Line = data->GetPoint(p1LineId); diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h index 3777d85b0..3a975b693 100644 --- a/tools/drawTools/vtoolheight.h +++ b/tools/drawTools/vtoolheight.h @@ -31,14 +31,14 @@ class VToolHeight: public VToolLinePoint public: VToolHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &pointName, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); static QPointF FindPoint(const QLineF &line, const QPointF &point); static const QString ToolType; public slots: diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 2dccf5b97..1cfc76e1a 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -24,7 +24,7 @@ const QString VToolLine::TagName = QStringLiteral("line"); VToolLine::VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, qint64 secondPoint, - Tool::Sources typeCreation, QGraphicsItem *parent) + const Tool::Sources &typeCreation, QGraphicsItem *parent) :VDrawTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint), dialogLine(QSharedPointer()) { @@ -60,7 +60,7 @@ void VToolLine::Create(QSharedPointer &dialog, VMainGraphicsScene *s void VToolLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { Q_ASSERT(scene != 0); Q_ASSERT(doc != 0); @@ -126,7 +126,7 @@ void VToolLine::SetFactor(qreal factor) RefreshGeometry(); } -void VToolLine::ChangedActivDraw(const QString newName) +void VToolLine::ChangedActivDraw(const QString &newName) { bool selectable = false; if (nameActivDraw == newName) diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index 9e9700eed..2c0c87ab5 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -31,17 +31,17 @@ class VToolLine: public VDrawTool, public QGraphicsLineItem Q_OBJECT public: VToolLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + qint64 secondPoint, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; public slots: virtual void FullUpdateFromFile(); - virtual void ChangedActivDraw(const QString newName); + virtual void ChangedActivDraw(const QString &newName); virtual void FullUpdateFromGui(int result); virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); virtual void SetFactor(qreal factor); diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index f02c897cf..e50ad42ee 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -25,7 +25,7 @@ const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect"); VToolLineIntersect::VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Sources typeCreation, + const qint64 &p2Line2, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()) @@ -64,7 +64,7 @@ void VToolLineIntersect::Create(const qint64 _id, const qint64 &p1Line1Id, const const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VPointF p1Line1 = data->GetPoint(p1Line1Id); VPointF p2Line1 = data->GetPoint(p2Line1Id); diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index 141f123d0..6d4dd0fdf 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -31,14 +31,14 @@ class VToolLineIntersect:public VToolPoint public: VToolLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 &p2Line1Id, const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index 4ebfa443b..cb829f953 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -44,7 +44,7 @@ VToolLinePoint::VToolLinePoint(VDomDocument *doc, VContainer *data, const qint64 } } -void VToolLinePoint::ChangedActivDraw(const QString newName) +void VToolLinePoint::ChangedActivDraw(const QString &newName) { if (nameActivDraw == newName) { diff --git a/tools/drawTools/vtoollinepoint.h b/tools/drawTools/vtoollinepoint.h index 3a0e0e9f0..516ce890c 100644 --- a/tools/drawTools/vtoollinepoint.h +++ b/tools/drawTools/vtoollinepoint.h @@ -32,7 +32,7 @@ public: const QString &formula, const qint64 &basePointId, const qreal &angle, QGraphicsItem * parent = 0); public slots: - virtual void ChangedActivDraw(const QString newName); + virtual void ChangedActivDraw(const QString &newName); virtual void SetFactor(qreal factor); protected: QString typeLine; diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 69fd7d764..138410b3e 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -26,7 +26,7 @@ const QString VToolNormal::ToolType = QStringLiteral("normal"); VToolNormal::VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) + const qint64 &secondPointId, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), secondPointId(secondPointId), dialogNormal(QSharedPointer()) { @@ -67,7 +67,7 @@ void VToolNormal::Create(const qint64 _id, const QString &formula, const qint64 const qint64 &secondPointId, const QString typeLine, const QString pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index bf6d0292e..9ad7322c1 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -31,7 +31,7 @@ class VToolNormal : public VToolLinePoint public: VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const qint64 &secondPointId, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); @@ -39,7 +39,7 @@ public: const qint64 &secondPointId, const QString typeLine, const QString pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + const Tool::Sources &typeCreation); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const qreal &length, const qreal &angle = 0); static const QString ToolType; diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index cc12a21c6..e4b0368b6 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -58,7 +58,7 @@ void VToolPoint::UpdateNamePosition(qreal mx, qreal my) } } -void VToolPoint::ChangedActivDraw(const QString newName) +void VToolPoint::ChangedActivDraw(const QString &newName) { bool selectable = false; if (nameActivDraw == newName) diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index fedd8dad6..993744961 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -34,7 +34,7 @@ public: static const QString TagName; public slots: void NameChangePosition(const QPointF pos); - virtual void ChangedActivDraw(const QString newName); + virtual void ChangedActivDraw(const QString &newName); virtual void FullUpdateFromGui(int result) = 0; virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); virtual void SetFactor(qreal factor); diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index 885f82775..b14f31e69 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -27,7 +27,7 @@ const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); VToolPointOfContact::VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem *parent) + const Tool::Sources &typeCreation, QGraphicsItem *parent) : VToolPoint(doc, data, id, parent), radius(radius), center(center), firstPointId(firstPointId), secondPointId(secondPointId), dialogPointOfContact(QSharedPointer()) { @@ -90,7 +90,7 @@ void VToolPointOfContact::Create(const qint64 _id, const QString &radius, const const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { VPointF centerP = data->GetPoint(center); VPointF firstP = data->GetPoint(firstPointId); diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index ad3854c3a..1fc40c264 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -31,7 +31,7 @@ public: VToolPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static QPointF FindPoint(const qreal &radius, const QPointF ¢er, const QPointF &firstPoint, const QPointF &secondPoint); @@ -40,7 +40,7 @@ public: static void Create(const qint64 _id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/drawTools/vtoolpointofintersection.cpp b/tools/drawTools/vtoolpointofintersection.cpp index 87984ca44..e53811d0d 100644 --- a/tools/drawTools/vtoolpointofintersection.cpp +++ b/tools/drawTools/vtoolpointofintersection.cpp @@ -25,7 +25,7 @@ const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfInters VToolPointOfIntersection::VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem *parent) + const Tool::Sources &typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), firstPointId(firstPointId), secondPointId(secondPointId), dialogPointOfIntersection(QSharedPointer()) { @@ -57,7 +57,7 @@ void VToolPointOfIntersection::Create(QSharedPointer void VToolPointOfIntersection::Create(const qint64 _id, const QString &pointName, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { VPointF firstPoint = data->GetPoint(firstPointId); VPointF secondPoint = data->GetPoint(secondPointId); diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h index d7701c979..47029b577 100644 --- a/tools/drawTools/vtoolpointofintersection.h +++ b/tools/drawTools/vtoolpointofintersection.h @@ -31,14 +31,14 @@ class VToolPointOfIntersection : public VToolPoint public: VToolPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &pointName, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index efc4ff838..26e5d2762 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -26,7 +26,7 @@ const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); VToolShoulderPoint::VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, + const qint64 &p2Line, const qint64 &pShoulder, const Tool::Sources &typeCreation, QGraphicsItem * parent) :VToolLinePoint(doc, data, id, typeLine, formula, p1Line, 0, parent), p2Line(p2Line), pShoulder(pShoulder), dialogShoulderPoint(QSharedPointer()) @@ -92,7 +92,7 @@ void VToolShoulderPoint::Create(const qint64 _id, const QString &formula, const const qint64 &p2Line, const qint64 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { VPointF firstPoint = data->GetPoint(p1Line); VPointF secondPoint = data->GetPoint(p2Line); diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index bfb8d3b9f..f67bcbf49 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -30,7 +30,7 @@ class VToolShoulderPoint : public VToolLinePoint public: VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, - const qint64 &pShoulder, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const qint64 &pShoulder, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, const qreal &length); @@ -39,7 +39,7 @@ public: static void Create(const qint64 _id, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, const qint64 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index 043c80a69..a9c85ea0d 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -23,7 +23,7 @@ const QString VToolSinglePoint::ToolType = QStringLiteral("single"); -VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, +VToolSinglePoint::VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem * parent ) :VToolPoint(doc, data, id, parent), dialogSinglePoint(QSharedPointer()) { @@ -127,7 +127,7 @@ void VToolSinglePoint::FullUpdateFromGui(int result) dialogSinglePoint.clear(); } -void VToolSinglePoint::ChangedActivDraw(const QString newName) +void VToolSinglePoint::ChangedActivDraw(const QString &newName) { if (nameActivDraw == newName) { diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index 466d76eef..98e3f491c 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -29,14 +29,14 @@ class VToolSinglePoint : public VToolPoint { Q_OBJECT public: - VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + VToolSinglePoint (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); - virtual void ChangedActivDraw(const QString newName); + virtual void ChangedActivDraw(const QString &newName); virtual void SetFactor(qreal factor); signals: void FullUpdateTree(); diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index df7b0e81c..a03cf5f9a 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -25,7 +25,7 @@ const QString VToolSpline::TagName = QStringLiteral("spline"); const QString VToolSpline::ToolType = QStringLiteral("simple"); -VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, +VToolSpline::VToolSpline(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogSpline(QSharedPointer()), controlPoints(QVector()) @@ -93,7 +93,7 @@ void VToolSpline::Create(QSharedPointer &dialog, VMainGraphicsScen void VToolSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { VSpline spline = VSpline(data->DataPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); qint64 id = _id; @@ -271,7 +271,7 @@ void VToolSpline::RefreshGeometry() } -void VToolSpline::ChangedActivDraw(const QString newName) +void VToolSpline::ChangedActivDraw(const QString &newName) { bool selectable = false; if (nameActivDraw == newName) diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index 0b2d5488e..9bcf09bc9 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -32,7 +32,7 @@ class VToolSpline:public VDrawTool, public QGraphicsPathItem { Q_OBJECT public: - VToolSpline (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + VToolSpline (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, @@ -40,7 +40,7 @@ public: static void Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; signals: @@ -52,7 +52,7 @@ public slots: virtual void FullUpdateFromGui ( int result ); void ControlPointChangePosition ( const qint32 &indexSpline, SplinePoint::Position position, const QPointF pos); - virtual void ChangedActivDraw ( const QString newName ); + virtual void ChangedActivDraw ( const QString &newName ); virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); virtual void SetFactor(qreal factor); protected: diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index fe793e24c..c6162d01d 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -24,7 +24,7 @@ const QString VToolSplinePath::TagName = QStringLiteral("spline"); const QString VToolSplinePath::ToolType = QStringLiteral("path"); -VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, +VToolSplinePath::VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VDrawTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), controlPoints(QVector()) @@ -84,7 +84,7 @@ void VToolSplinePath::Create(QSharedPointer &dialog, VMainGrap void VToolSplinePath::Create(const qint64 _id, const VSplinePath &path, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { qint64 id = _id; if (typeCreation == Tool::FromGui) @@ -211,7 +211,7 @@ void VToolSplinePath::UpdatePathPoint(QDomNode& node, VSplinePath &path) } } -void VToolSplinePath::ChangedActivDraw(const QString newName) +void VToolSplinePath::ChangedActivDraw(const QString &newName) { bool selectable = false; if (nameActivDraw == newName) diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index d495a7240..734615815 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -31,14 +31,14 @@ class VToolSplinePath:public VDrawTool, public QGraphicsPathItem { Q_OBJECT public: - VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + VToolSplinePath(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const VSplinePath &path, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; signals: @@ -50,7 +50,7 @@ public slots: virtual void FullUpdateFromGui(int result); void ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, const QPointF pos); - virtual void ChangedActivDraw(const QString newName); + virtual void ChangedActivDraw(const QString &newName); virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); virtual void SetFactor(qreal factor); protected: diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index bd36becc9..683cf9a5a 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -25,7 +25,7 @@ const QString VToolTriangle::ToolType = QStringLiteral("triangle"); VToolTriangle::VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) + const qint64 &secondPointId, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), firstPointId(firstPointId), secondPointId(secondPointId), dialogTriangle(QSharedPointer()) { @@ -62,7 +62,7 @@ void VToolTriangle::Create(QSharedPointer &dialog, VMainGraphics void VToolTriangle::Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) { VPointF axisP1 = data->GetPoint(axisP1Id); VPointF axisP2 = data->GetPoint(axisP2Id); diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index d83aa184c..eed07c6a2 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -31,14 +31,14 @@ class VToolTriangle : public VToolPoint public: VToolTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static QPointF FindPoint(const QPointF axisP1, const QPointF axisP2, const QPointF firstPoint, const QPointF secondPoint); static const QString ToolType; diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index 535598a7b..5a27bb510 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -27,7 +27,7 @@ const QString VModelingAlongLine::ToolType = QStringLiteral("alongLine"); VModelingAlongLine::VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, - Tool::Sources typeCreation, QGraphicsItem *parent) + const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingLinePoint(doc, data, id, typeLine, formula, firstPointId, 0, parent), secondPointId(secondPointId), dialogAlongLine(QSharedPointer()) { @@ -126,7 +126,7 @@ VModelingAlongLine *VModelingAlongLine::Create(const qint64 _id, const QString & const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VModelingAlongLine *point = 0; VPointF firstPoint = data->GetModelingPoint(firstPointId); diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index 943836b67..e5ecd0e69 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -32,13 +32,13 @@ public: VModelingAlongLine(VDomDocument *doc, VContainer *data, qint64 id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const QString &typeLine, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingAlongLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingAlongLine* Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index fe6c8f309..7a8e9c8d5 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -25,7 +25,7 @@ const QString VModelingArc::TagName = QStringLiteral("arc"); const QString VModelingArc::ToolType = QStringLiteral("simple"); -VModelingArc::VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, +VModelingArc::VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogArc(QSharedPointer()) { @@ -61,7 +61,7 @@ VModelingArc* VModelingArc::Create(QSharedPointer &dialog, VDomDocume VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) { VModelingArc *toolArc = 0; qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index 9aba52347..44a6439e0 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -31,13 +31,13 @@ class VModelingArc :public VModelingTool, public QGraphicsPathItem { Q_OBJECT public: - VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + VModelingArc(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingArc* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingArc* Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, const QString &f2, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index 1524260e8..6a1c57b52 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -27,7 +27,7 @@ const QString VModelingBisector::ToolType = QStringLiteral("bisector"); VModelingBisector::VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const qint64 &thirdPointId, Tool::Sources typeCreation, + const qint64 &secondPointId, const qint64 &thirdPointId, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingLinePoint(doc, data, id, typeLine, formula, secondPointId, 0, parent), firstPointId(0), thirdPointId(0), dialogBisector(QSharedPointer()) @@ -71,7 +71,7 @@ VModelingBisector *VModelingBisector::Create(const qint64 _id, const QString &fo const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VModelingBisector *point = 0; VPointF firstPoint = data->GetModelingPoint(firstPointId); diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index 20a422f47..d29840403 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -32,14 +32,14 @@ public: VModelingBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, - const qint64 &thirdPointId, Tool::Sources typeCreation, + const qint64 &thirdPointId, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingBisector* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingBisector* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index db778dbc4..f929a48bd 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -26,7 +26,7 @@ const QString VModelingEndLine::ToolType = QStringLiteral("endLine"); VModelingEndLine::VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, - const qint64 &basePointId, Tool::Sources typeCreation, QGraphicsItem *parent) + const qint64 &basePointId, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent), dialogEndLine(QSharedPointer()) { @@ -62,7 +62,7 @@ VModelingEndLine *VModelingEndLine::Create(const qint64 _id, const QString &poin const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { VModelingEndLine *point = 0; VPointF basePoint = data->GetModelingPoint(basePointId); diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index 8561048ff..cf33c3058 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -31,14 +31,14 @@ class VModelingEndLine : public VModelingLinePoint public: VModelingEndLine(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, - const qint64 &basePointId, Tool::Sources typeCreation, + const qint64 &basePointId, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingEndLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingEndLine* Create(const qint64 _id, const QString &pointName, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &basePointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingheight.cpp b/tools/modelingTools/vmodelingheight.cpp index 50024d09e..68439713e 100644 --- a/tools/modelingTools/vmodelingheight.cpp +++ b/tools/modelingTools/vmodelingheight.cpp @@ -26,7 +26,7 @@ const QString VModelingHeight::ToolType = QStringLiteral("height"); VModelingHeight::VModelingHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, - const qint64 &p2LineId, Tool::Sources typeCreation, + const qint64 &p2LineId, const Tool::Sources &typeCreation, QGraphicsItem * parent) :VModelingLinePoint(doc, data, id, typeLine, QString(), basePointId, 0, parent), dialogHeight(QSharedPointer()), p1LineId(p1LineId), p2LineId(p2LineId) @@ -65,7 +65,7 @@ VModelingHeight *VModelingHeight::Create(const qint64 _id, const QString &pointN const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { VModelingHeight *point = 0; VPointF basePoint = data->GetModelingPoint(basePointId); diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index 5dfd82e96..681c1e034 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -31,14 +31,14 @@ class VModelingHeight : public VModelingLinePoint public: VModelingHeight(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, - const qint64 &p2LineId, Tool::Sources typeCreation, + const qint64 &p2LineId, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingHeight* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingHeight* Create(const qint64 _id, const QString &pointName, const QString &typeLine, const qint64 &basePointId, const qint64 &p1LineId, const qint64 &p2LineId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index 7f077bca1..d019f4d68 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -24,7 +24,7 @@ const QString VModelingLine::TagName = QStringLiteral("line"); VModelingLine::VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem *parent): + qint64 secondPoint, const Tool::Sources &typeCreation, QGraphicsItem *parent): VModelingTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint), dialogLine(QSharedPointer()) { @@ -58,7 +58,7 @@ VModelingLine *VModelingLine::Create(QSharedPointer &dialog, VDomDoc VModelingLine *VModelingLine::Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VModelingLine *line = 0; Q_ASSERT(doc != 0); diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index 0149f9be5..272dcbe68 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -31,12 +31,12 @@ class VModelingLine: public VModelingTool, public QGraphicsLineItem Q_OBJECT public: VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + qint64 secondPoint, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingLine* Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp index f73afb5be..2665df105 100644 --- a/tools/modelingTools/vmodelinglineintersect.cpp +++ b/tools/modelingTools/vmodelinglineintersect.cpp @@ -25,7 +25,7 @@ const QString VModelingLineIntersect::ToolType = QStringLiteral("lineIntersect") VModelingLineIntersect::VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, - const qint64 &p2Line2, Tool::Sources typeCreation, QGraphicsItem *parent) + const qint64 &p2Line2, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), p2Line2(p2Line2), dialogLineIntersect(QSharedPointer()) { @@ -64,7 +64,7 @@ VModelingLineIntersect *VModelingLineIntersect::Create(const qint64 _id, const q const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VModelingLineIntersect *point = 0; VPointF p1Line1 = data->GetModelingPoint(p1Line1Id); diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index 93f2f75c7..12b55cf83 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -32,14 +32,14 @@ public: VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingLineIntersect* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingLineIntersect* Create(const qint64 _id, const qint64 &p1Line1Id, const qint64 &p2Line1Id, const qint64 &p1Line2Id, const qint64 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index bafd2f52f..c4205734d 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -27,7 +27,7 @@ const QString VModelingNormal::ToolType = QStringLiteral("normal"); VModelingNormal::VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, Tool::Sources typeCreation, QGraphicsItem *parent) + const qint64 &secondPointId, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), secondPointId(secondPointId), dialogNormal(QSharedPointer()) { @@ -62,9 +62,10 @@ VModelingNormal* VModelingNormal::Create(QSharedPointer &dialog, V } VModelingNormal *VModelingNormal::Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const QString typeLine, const QString pointName, + const qint64 &secondPointId, const QString &typeLine, const QString &pointName, const qreal angle, const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) + VContainer *data, const Document::Documents &parse, + const Tool::Sources &typeCreation) { VModelingNormal *point = 0; VPointF firstPoint = data->GetModelingPoint(firstPointId); diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index 56a0167ec..03a952983 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -32,13 +32,14 @@ public: VModelingNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingNormal* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingNormal* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const QString typeLine, const QString pointName, + const qint64 &secondPointId, const QString &typeLine, const QString &pointName, const qreal angle, const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + VContainer *data, const Document::Documents &parse, + const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index 035aa437d..87de20af4 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -28,7 +28,7 @@ const QString VModelingPointOfContact::ToolType = QStringLiteral("pointOfContact VModelingPointOfContact::VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem *parent) + const Tool::Sources &typeCreation, QGraphicsItem *parent) : VModelingPoint(doc, data, id, parent), radius(radius), center(center), firstPointId(firstPointId), secondPointId(secondPointId), dialogPointOfContact(QSharedPointer()) { @@ -67,7 +67,7 @@ VModelingPointOfContact *VModelingPointOfContact::Create(const qint64 _id, const const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VModelingPointOfContact *point = 0; VPointF centerP = data->GetModelingPoint(center); diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index 3e23b9c3b..a6a965cde 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -32,7 +32,7 @@ public: VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingPointOfContact* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); @@ -40,7 +40,7 @@ public: const qint64 &firstPointId, const qint64 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingpointofintersection.cpp b/tools/modelingTools/vmodelingpointofintersection.cpp index a56e3b4d7..f66c5be85 100644 --- a/tools/modelingTools/vmodelingpointofintersection.cpp +++ b/tools/modelingTools/vmodelingpointofintersection.cpp @@ -25,7 +25,7 @@ const QString VModelingPointOfIntersection::ToolType = QStringLiteral("pointOfIn VModelingPointOfIntersection::VModelingPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem *parent) + const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingPoint(doc, data, id, parent), firstPointId(firstPointId), secondPointId(secondPointId), dialogPointOfIntersection(QSharedPointer()) { @@ -59,7 +59,7 @@ VModelingPointOfIntersection *VModelingPointOfIntersection::Create(const qint64 const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VModelingPointOfIntersection *tool = 0; VPointF firstPoint = data->GetPoint(firstPointId); diff --git a/tools/modelingTools/vmodelingpointofintersection.h b/tools/modelingTools/vmodelingpointofintersection.h index 00740a439..7496940fb 100644 --- a/tools/modelingTools/vmodelingpointofintersection.h +++ b/tools/modelingTools/vmodelingpointofintersection.h @@ -31,7 +31,7 @@ class VModelingPointOfIntersection : public VModelingPoint public: VModelingPointOfIntersection(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingPointOfIntersection* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); @@ -39,7 +39,7 @@ public: const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index ee5cdd3ec..a13cc463f 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -27,7 +27,7 @@ const QString VModelingShoulderPoint::ToolType = QStringLiteral("shoulder"); VModelingShoulderPoint::VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, - const qint64 &p2Line, const qint64 &pShoulder, Tool::Sources typeCreation, + const qint64 &p2Line, const qint64 &pShoulder, const Tool::Sources &typeCreation, QGraphicsItem * parent) :VModelingLinePoint(doc, data, id, typeLine, formula, p1Line, 0, parent), p2Line(p2Line), pShoulder(pShoulder), dialogShoulderPoint(QSharedPointer()) diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index 7795a387b..496856f70 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -31,7 +31,7 @@ class VModelingShoulderPoint : public VModelingLinePoint public: VModelingShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, - const qint64 &pShoulder, Tool::Sources typeCreation, + const qint64 &pShoulder, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingShoulderPoint* Create(QSharedPointer &dialog, VDomDocument *doc, diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index cd7fd4823..40ebf04fc 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -25,7 +25,7 @@ const QString VModelingSpline::TagName = QStringLiteral("spline"); const QString VModelingSpline::ToolType = QStringLiteral("simple"); -VModelingSpline::VModelingSpline(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, +VModelingSpline::VModelingSpline(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSpline(QSharedPointer()), controlPoints(QVector()) @@ -91,7 +91,7 @@ VModelingSpline *VModelingSpline::Create(QSharedPointer &dialog, V VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) { VModelingSpline *spl = 0; VSpline spline = VSpline(data->DataModelingPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index 5661f1557..e52bb13b0 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -32,14 +32,14 @@ class VModelingSpline:public VModelingTool, public QGraphicsPathItem { Q_OBJECT public: - VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, + VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); static VModelingSpline* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSpline* Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; signals: diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 3022c060c..0a79618f8 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -24,7 +24,7 @@ const QString VModelingSplinePath::TagName = QStringLiteral("spline"); const QString VModelingSplinePath::ToolType = QStringLiteral("path"); -VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, Tool::Sources typeCreation, +VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), controlPoints(QVector()) @@ -84,7 +84,7 @@ VModelingSplinePath *VModelingSplinePath::Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSplinePath* Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation); + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; signals: diff --git a/tools/modelingTools/vmodelingtriangle.cpp b/tools/modelingTools/vmodelingtriangle.cpp index d22de1f75..e1e50d3e9 100644 --- a/tools/modelingTools/vmodelingtriangle.cpp +++ b/tools/modelingTools/vmodelingtriangle.cpp @@ -26,7 +26,7 @@ const QString VModelingTriangle::ToolType = QStringLiteral("triangle"); VModelingTriangle::VModelingTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem *parent) + const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), firstPointId(firstPointId), secondPointId(secondPointId), dialogTriangle(QSharedPointer()) { @@ -63,7 +63,7 @@ VModelingTriangle *VModelingTriangle::Create(const qint64 _id, const QString &po const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VModelingTriangle *tool = 0; VPointF axisP1 = data->GetPoint(axisP1Id); diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index f4573ff74..edf9a4dfd 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -32,13 +32,13 @@ class VModelingTriangle : public VModelingPoint public: VModelingTriangle(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingTriangle* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingTriangle* Create(const qint64 _id, const QString &pointName, const qint64 &axisP1Id, const qint64 &axisP2Id, const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VDomDocument *doc, VContainer *data, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/nodeDetails/vnodearc.cpp b/tools/nodeDetails/vnodearc.cpp index 7f8a1cdef..77b654b23 100644 --- a/tools/nodeDetails/vnodearc.cpp +++ b/tools/nodeDetails/vnodearc.cpp @@ -25,7 +25,7 @@ const QString VNodeArc::TagName = QStringLiteral("arc"); const QString VNodeArc::ToolType = QStringLiteral("modeling"); VNodeArc::VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, - Tool::Sources typeCreation, QGraphicsItem * parent) + const Tool::Sources &typeCreation, QGraphicsItem * parent) :VAbstractNode(doc, data, id, idArc, typeobject), QGraphicsPathItem(parent) { RefreshGeometry(); @@ -40,7 +40,7 @@ VNodeArc::VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, } void VNodeArc::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { if (parse == Document::FullParse) { diff --git a/tools/nodeDetails/vnodearc.h b/tools/nodeDetails/vnodearc.h index 9b07ffba9..eb419e858 100644 --- a/tools/nodeDetails/vnodearc.h +++ b/tools/nodeDetails/vnodearc.h @@ -30,9 +30,9 @@ class VNodeArc :public VAbstractNode, public QGraphicsPathItem Q_OBJECT public: VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation); + Draw::Draws typeobject, const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: diff --git a/tools/nodeDetails/vnodepoint.cpp b/tools/nodeDetails/vnodepoint.cpp index a42370749..ddba6ebfd 100644 --- a/tools/nodeDetails/vnodepoint.cpp +++ b/tools/nodeDetails/vnodepoint.cpp @@ -25,7 +25,7 @@ const QString VNodePoint::TagName = QStringLiteral("point"); const QString VNodePoint::ToolType = QStringLiteral("modeling"); VNodePoint::VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, - Tool::Sources typeCreation, QGraphicsItem *parent) + const Tool::Sources &typeCreation, QGraphicsItem *parent) :VAbstractNode(doc, data, id, idPoint, typeobject), QGraphicsEllipseItem(parent), radius(toPixel(1.5)), namePoint(0), lineName(0) { @@ -45,7 +45,7 @@ VNodePoint::VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 id } void VNodePoint::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, - const Document::Documents &parse, Tool::Sources typeCreation) + const Document::Documents &parse, const Tool::Sources &typeCreation) { if (parse == Document::FullParse) { diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index 5b2613b19..eb4dbda0a 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -30,9 +30,9 @@ class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem Q_OBJECT public: VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, - Tool::Sources typeCreation, QGraphicsItem * parent = 0 ); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0 ); static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: diff --git a/tools/nodeDetails/vnodespline.cpp b/tools/nodeDetails/vnodespline.cpp index b315878ae..c78ebc5e6 100644 --- a/tools/nodeDetails/vnodespline.cpp +++ b/tools/nodeDetails/vnodespline.cpp @@ -25,7 +25,7 @@ const QString VNodeSpline::TagName = QStringLiteral("spline"); const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline"); VNodeSpline::VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, - Tool::Sources typeCreation, QGraphicsItem * parent) + const Tool::Sources &typeCreation, QGraphicsItem * parent) :VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent) { RefreshGeometry(); @@ -41,7 +41,7 @@ VNodeSpline::VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 VNodeSpline *VNodeSpline::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, const Document::Documents &parse, - Tool::Sources typeCreation) + const Tool::Sources &typeCreation) { VNodeSpline *spl = 0; if (parse == Document::FullParse) diff --git a/tools/nodeDetails/vnodespline.h b/tools/nodeDetails/vnodespline.h index 6af937ab7..bf7be5854 100644 --- a/tools/nodeDetails/vnodespline.h +++ b/tools/nodeDetails/vnodespline.h @@ -30,9 +30,9 @@ class VNodeSpline:public VAbstractNode, public QGraphicsPathItem Q_OBJECT public: VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, - Tool::Sources typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); static VNodeSpline *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: diff --git a/tools/nodeDetails/vnodesplinepath.cpp b/tools/nodeDetails/vnodesplinepath.cpp index 2f226afb3..985209598 100644 --- a/tools/nodeDetails/vnodesplinepath.cpp +++ b/tools/nodeDetails/vnodesplinepath.cpp @@ -25,7 +25,7 @@ const QString VNodeSplinePath::TagName = QStringLiteral("spline"); const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); VNodeSplinePath::VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent) + Draw::Draws typeobject, const Tool::Sources &typeCreation, QGraphicsItem * parent) :VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent) { RefreshGeometry(); @@ -40,7 +40,7 @@ VNodeSplinePath::VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, } void VNodeSplinePath::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Document::Documents &parse, Tool::Sources typeCreation) + Draw::Draws typeobject, const Document::Documents &parse, const Tool::Sources &typeCreation) { if (parse == Document::FullParse) { diff --git a/tools/nodeDetails/vnodesplinepath.h b/tools/nodeDetails/vnodesplinepath.h index 6ee6ee980..e2fa1dbea 100644 --- a/tools/nodeDetails/vnodesplinepath.h +++ b/tools/nodeDetails/vnodesplinepath.h @@ -30,9 +30,9 @@ class VNodeSplinePath : public VAbstractNode, public QGraphicsPathItem Q_OBJECT public: VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, Tool::Sources typeCreation, QGraphicsItem * parent = 0); + Draw::Draws typeobject, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, - const Document::Documents &parse, Tool::Sources typeCreation); + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index df6bcb14e..1b94e56e7 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -95,7 +95,8 @@ QPointF VAbstractTool::LineIntersectRect(QRectF rec, QLineF line) return point; } -qint32 VAbstractTool::LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, QPointF &p2) +qint32 VAbstractTool::LineIntersectCircle(const QPointF ¢er, qreal radius, const QLineF &line, QPointF &p1, + QPointF &p2) { const qreal eps = 1e-8; //коефіцієнти для рівняння відрізку @@ -130,7 +131,7 @@ qint32 VAbstractTool::LineIntersectCircle(QPointF center, qreal radius, QLineF l return flag; } -QPointF VAbstractTool::ClosestPoint(QLineF line, QPointF p) +QPointF VAbstractTool::ClosestPoint(const QLineF &line, const QPointF &p) { QLineF lineP2pointFrom = QLineF(line.p2(), p); qreal angle = 180-line.angleTo(lineP2pointFrom)-90; @@ -146,14 +147,14 @@ QPointF VAbstractTool::ClosestPoint(QLineF line, QPointF p) { if ( type == QLineF::NoIntersection || type == QLineF::UnboundedIntersection ) { - Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "Немає точки перетину."); + Q_ASSERT_X(type != QLineF::BoundedIntersection, Q_FUNC_INFO, "Don't have point of intersection."); return point; } } return point; } -QPointF VAbstractTool::addVector(QPointF p, QPointF p1, QPointF p2, qreal k) +QPointF VAbstractTool::addVector(const QPointF &p, const QPointF &p1, const QPointF &p2, qreal k) { return QPointF (p.x() + (p2.x() - p1.x()) * k, p.y() + (p2.y() - p1.y()) * k); } @@ -172,7 +173,8 @@ void VAbstractTool::RemoveAllChild(QDomElement &domElement) void VAbstractTool::LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c) { //коефіцієнти для рівняння відрізку - *a = line.p2().y() - line.p1().y(); - *b = line.p1().x() - line.p2().x(); - *c = - *a * line.p1().x() - *b * line.p1().y(); + QPointF p1 = line.p1(); + *a = line.p2().y() - p1.y(); + *b = p1.x() - line.p2().x(); + *c = - *a * p1.x() - *b * p1.y(); } diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index e917552b1..44539711e 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -32,9 +32,10 @@ public: VAbstractTool(VDomDocument *doc, VContainer *data, qint64 id, QObject *parent = 0); virtual ~VAbstractTool() {} static QPointF LineIntersectRect(QRectF rec, QLineF line); - static qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, QPointF &p2); - static QPointF ClosestPoint(QLineF line, QPointF p); - static QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k); + static qint32 LineIntersectCircle(const QPointF ¢er, qreal radius, const QLineF &line, QPointF &p1, + QPointF &p2); + static QPointF ClosestPoint(const QLineF &line, const QPointF &p); + static QPointF addVector (const QPointF &p, const QPointF &p1, const QPointF &p2, qreal k); inline qint64 getId() const {return id;} static void LineCoefficients(const QLineF &line, qreal *a, qreal *b, qreal *c); static const QString AttrId; diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index d51e0fc57..7d8983511 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -34,7 +34,7 @@ const QString VToolDetail::AttrNodeType = QStringLiteral("nodeType"); const QString VToolDetail::NodeTypeContour = QStringLiteral("Contour"); const QString VToolDetail::NodeTypeModeling = QStringLiteral("Modeling"); -VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, Tool::Sources typeCreation, +VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, const Tool::Sources &typeCreation, VMainGraphicsScene *scene, QGraphicsItem *parent) :VAbstractTool(doc, data, id), QGraphicsPathItem(parent), dialogDetail(QSharedPointer()), sceneDetails(scene) @@ -208,7 +208,7 @@ void VToolDetail::Create(QSharedPointer &dialog, VMainGraphicsScen } void VToolDetail::Create(const qint64 _id, VDetail &newDetail, VMainGraphicsScene *scene, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, Tool::Sources typeCreation) + VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) { qint64 id = _id; if (typeCreation == Tool::FromGui) diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index f20186b25..93b6c3fa0 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -31,14 +31,14 @@ class VToolDetail: public VAbstractTool, public QGraphicsPathItem Q_OBJECT public: VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, - Tool::Sources typeCreation, VMainGraphicsScene *scene, + const Tool::Sources &typeCreation, VMainGraphicsScene *scene, QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, VDetail &newDetail, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, - Tool::Sources typeCreation); + const Tool::Sources &typeCreation); template void AddTool(T *tool, const qint64 &id, Tool::Tools typeTool) { diff --git a/widgets/vcontrolpointspline.cpp b/widgets/vcontrolpointspline.cpp index 5b25e4d86..626ad5e1d 100644 --- a/widgets/vcontrolpointspline.cpp +++ b/widgets/vcontrolpointspline.cpp @@ -69,7 +69,7 @@ QVariant VControlPointSpline::itemChange(QGraphicsItem::GraphicsItemChange chang return QGraphicsItem::itemChange(change, value); } -qint32 VControlPointSpline::LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, +qint32 VControlPointSpline::LineIntersectCircle(const QPointF ¢er, qreal radius, const QLineF &line, QPointF &p1, QPointF &p2) const { const qreal eps = 1e-8; @@ -107,7 +107,7 @@ qint32 VControlPointSpline::LineIntersectCircle(QPointF center, qreal radius, QL return flag; } -QPointF VControlPointSpline::ClosestPoint(QLineF line, QPointF p) const +QPointF VControlPointSpline::ClosestPoint(const QLineF &line, const QPointF &p) const { QLineF lineP2pointFrom = QLineF(line.p2(), p); qreal angle = 180-line.angleTo(lineP2pointFrom)-90; @@ -130,7 +130,7 @@ QPointF VControlPointSpline::ClosestPoint(QLineF line, QPointF p) const return point; } -QPointF VControlPointSpline::addVector(QPointF p, QPointF p1, QPointF p2, qreal k) const +QPointF VControlPointSpline::addVector(const QPointF &p, const QPointF &p1, const QPointF &p2, qreal k) const { return QPointF (p.x() + (p2.x() - p1.x()) * k, p.y() + (p2.y() - p1.y()) * k); } diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h index 3d8bf86cb..c535f981a 100644 --- a/widgets/vcontrolpointspline.h +++ b/widgets/vcontrolpointspline.h @@ -50,9 +50,10 @@ private: Q_DISABLE_COPY(VControlPointSpline) qint32 indexSpline; SplinePoint::Position position; - qint32 LineIntersectCircle(QPointF center, qreal radius, QLineF line, QPointF &p1, QPointF &p2) const; - QPointF ClosestPoint(QLineF line, QPointF p) const; - QPointF addVector (QPointF p, QPointF p1, QPointF p2, qreal k) const; + qint32 LineIntersectCircle(const QPointF ¢er, qreal radius, const QLineF &line, QPointF &p1, + QPointF &p2) const; + QPointF ClosestPoint(const QLineF &line, const QPointF &p) const; + QPointF addVector (const QPointF &p, const QPointF &p1, const QPointF &p2, qreal k) const; }; diff --git a/widgets/vmaingraphicsscene.cpp b/widgets/vmaingraphicsscene.cpp index 91fc1d32f..2a6839bb4 100644 --- a/widgets/vmaingraphicsscene.cpp +++ b/widgets/vmaingraphicsscene.cpp @@ -39,7 +39,7 @@ void VMainGraphicsScene::mousePressEvent(QGraphicsSceneMouseEvent *event) QGraphicsScene::mousePressEvent(event); } -void VMainGraphicsScene::ChoosedItem(qint64 id, Scene::Scenes type) +void VMainGraphicsScene::ChoosedItem(qint64 id, const Scene::Scenes &type) { emit ChoosedObject(id, type); } diff --git a/widgets/vmaingraphicsscene.h b/widgets/vmaingraphicsscene.h index 0f3cb116d..bf78f156b 100644 --- a/widgets/vmaingraphicsscene.h +++ b/widgets/vmaingraphicsscene.h @@ -35,7 +35,7 @@ public: inline qint32 getVerScrollBar() const {return verScrollBar;} inline void setVerScrollBar(const qint32 &value) {verScrollBar = value;} public slots: - void ChoosedItem(qint64 id, Scene::Scenes type); + void ChoosedItem(qint64 id, const Scene::Scenes &type); inline void RemoveTool(QGraphicsItem *tool) {this->removeItem(tool);} void SetFactor(qreal factor); protected: diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index 9aab81ce1..e2fd79c91 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -50,7 +50,7 @@ void VMainGraphicsView::wheelEvent(QWheelEvent *event) void VMainGraphicsView::scalingTime(qreal x) { Q_UNUSED(x); - qreal factor = 1.0 + qreal(_numScheduledScalings) / 300.0; + qreal factor = 1.0 + static_cast(_numScheduledScalings) / 300.0; if (QApplication::keyboardModifiers() == Qt::ControlModifier) {// If you press CTRL this code will execute scale(factor, factor); diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 5fb79c282..be966b64b 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -72,7 +72,7 @@ QDomElement VDomDocument::elementById(const QString& id) return QDomElement(); } -bool VDomDocument::find(QDomElement node, const QString& id) +bool VDomDocument::find(const QDomElement &node, const QString& id) { if (node.hasAttribute("id")) { @@ -175,7 +175,7 @@ bool VDomDocument::appendDraw(const QString& name) return false; } -void VDomDocument::ChangeActivDraw(const QString& name, Document::Documents parse) +void VDomDocument::ChangeActivDraw(const QString& name, const Document::Documents &parse) { Q_ASSERT_X(name.isEmpty() == false, "ChangeActivDraw", "name draw is empty"); if (CheckNameDraw(name) == true) @@ -306,7 +306,8 @@ bool VDomDocument::GetActivNodeElement(const QString& name, QDomElement &element } } -void VDomDocument::Parse(Document::Documents parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail) +void VDomDocument::Parse(const Document::Documents &parse, VMainGraphicsScene *sceneDraw, + VMainGraphicsScene *sceneDetail) { Q_ASSERT(sceneDraw != 0); Q_ASSERT(sceneDetail != 0); @@ -450,7 +451,7 @@ void VDomDocument::TestUniqueId() const CollectId(this->documentElement(), vector); } -void VDomDocument::CollectId(QDomElement node, QVector &vector) const +void VDomDocument::CollectId(const QDomElement &node, QVector &vector) const { if (node.hasAttribute("id")) { @@ -503,7 +504,7 @@ void VDomDocument::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphics } void VDomDocument::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, - const QDomNode& node, const Document::Documents &parse, Draw::Draws mode) + const QDomNode& node, const Document::Documents &parse, const Draw::Draws &mode) { Q_ASSERT(sceneDraw != 0); Q_ASSERT(sceneDetail != 0); @@ -702,7 +703,7 @@ void VDomDocument::ParseDetails(VMainGraphicsScene *sceneDetail, const QDomEleme } void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, const QString& type, Draw::Draws mode) + const Document::Documents &parse, const QString& type, const Draw::Draws &mode) { Q_ASSERT(scene != 0); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); @@ -1097,7 +1098,7 @@ void VDomDocument::ParsePointElement(VMainGraphicsScene *scene, const QDomElemen } void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &domElement, - const Document::Documents &parse, Draw::Draws mode) + const Document::Documents &parse, const Draw::Draws &mode) { Q_ASSERT(scene != 0); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); @@ -1126,7 +1127,7 @@ void VDomDocument::ParseLineElement(VMainGraphicsScene *scene, const QDomElement } void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement &domElement, - const Document::Documents &parse, const QString &type, Draw::Draws mode) + const Document::Documents &parse, const QString &type, const Draw::Draws &mode) { Q_ASSERT(scene != 0); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); @@ -1278,7 +1279,7 @@ void VDomDocument::ParseSplineElement(VMainGraphicsScene *scene, const QDomEleme } void VDomDocument::ParseArcElement(VMainGraphicsScene *scene, const QDomElement &domElement, - const Document::Documents &parse, const QString &type, Draw::Draws mode) + const Document::Documents &parse, const QString &type, const Draw::Draws &mode) { Q_ASSERT(scene != 0); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index 495f801d6..d49114ada 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -50,7 +50,7 @@ public: ~VDomDocument(){} QDomElement elementById(const QString& id); void CreateEmptyFile(); - void ChangeActivDraw(const QString& name, Document::Documents parse = Document::FullParse); + void ChangeActivDraw(const QString& name, const Document::Documents &parse = Document::FullParse); inline QString GetNameActivDraw() const {return nameActivDraw;} bool GetActivDrawElement(QDomElement &element); bool GetActivCalculationElement(QDomElement &element); @@ -58,7 +58,8 @@ public: bool GetActivDetailsElement(QDomElement &element); bool appendDraw(const QString& name); bool SetNameDraw(const QString& name); - void Parse(Document::Documents parse, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail); + void Parse(const Document::Documents &parse, VMainGraphicsScene *sceneDraw, + VMainGraphicsScene *sceneDetail); inline QHash* getTools() {return &tools;} inline QVector *getHistory() {return &history;} inline qint64 getCursor() const {return cursor;} @@ -70,7 +71,7 @@ public: void DecrementReferens(qint64 id) const; void TestUniqueId() const; signals: - void ChangedActivDraw(const QString newName); + void ChangedActivDraw(const QString &newName); void ChangedNameDraw(const QString oldName, const QString newName); void FullUpdateFromFile(); void haveChange(); @@ -90,32 +91,32 @@ private: qint64 cursor; QComboBox *comboBoxDraws; Draw::Draws *mode; - bool find(QDomElement node, const QString& id); + bool find(const QDomElement &node, const QString& id); bool CheckNameDraw(const QString& name) const; void SetActivDraw(const QString& name); bool GetActivNodeElement(const QString& name, QDomElement& element); void ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, const QDomNode& node, const Document::Documents &parse); void ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, - const QDomNode& node, const Document::Documents &parse, Draw::Draws mode); + const QDomNode& node, const Document::Documents &parse, const Draw::Draws &mode); void ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, const Document::Documents &parse); void ParseDetails(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, const Document::Documents &parse); void ParsePointElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, const QString &type, Draw::Draws mode); + const Document::Documents &parse, const QString &type, const Draw::Draws &mode); void ParseLineElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, Draw::Draws mode); + const Document::Documents &parse, const Draw::Draws &mode); void ParseSplineElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, const QString& type, Draw::Draws mode); + const Document::Documents &parse, const QString& type, const Draw::Draws &mode); void ParseArcElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, const QString& type, Draw::Draws mode); + const Document::Documents &parse, const QString& type, const Draw::Draws &mode); void ParseIncrementsElement(const QDomNode& node); qint64 GetParametrId(const QDomElement& domElement) const; qint64 GetParametrLongLong(const QDomElement& domElement, const QString &name) const; QString GetParametrString(const QDomElement& domElement, const QString &name) const; qreal GetParametrDouble(const QDomElement& domElement, const QString &name) const; - void CollectId(QDomElement node, QVector &vector)const; + void CollectId(const QDomElement &node, QVector &vector)const; }; #ifdef Q_CC_GNU From 3119c75981fb34915f795072720f2ff49efc6c2a Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 7 Nov 2013 16:40:39 +0200 Subject: [PATCH 69/83] Little optimization. --HG-- branch : develop --- container/vcontainer.cpp | 2 +- dialogs/dialogdetail.cpp | 2 +- dialogs/dialogtool.cpp | 2 +- geometry/vspline.cpp | 12 ++++++------ geometry/vspline.h | 11 ++++++----- geometry/vsplinepath.cpp | 4 ++-- geometry/vsplinepath.h | 4 ++-- tools/drawTools/vtoolnormal.cpp | 2 +- tools/drawTools/vtoolnormal.h | 5 +++-- tools/drawTools/vtoolpoint.cpp | 2 +- tools/drawTools/vtoolpoint.h | 2 +- tools/drawTools/vtoolspline.cpp | 4 ++-- tools/drawTools/vtoolspline.h | 4 ++-- tools/drawTools/vtoolsplinepath.cpp | 4 ++-- tools/drawTools/vtoolsplinepath.h | 4 ++-- tools/drawTools/vtooltriangle.cpp | 4 ++-- tools/drawTools/vtooltriangle.h | 4 ++-- tools/modelingTools/vmodelingpoint.cpp | 2 +- tools/modelingTools/vmodelingpoint.h | 2 +- tools/modelingTools/vmodelingspline.cpp | 2 +- tools/modelingTools/vmodelingspline.h | 2 +- tools/modelingTools/vmodelingsplinepath.cpp | 2 +- tools/modelingTools/vmodelingsplinepath.h | 2 +- tools/nodeDetails/vnodearc.cpp | 2 +- tools/nodeDetails/vnodearc.h | 4 ++-- tools/nodeDetails/vnodepoint.cpp | 4 ++-- tools/nodeDetails/vnodepoint.h | 4 ++-- tools/nodeDetails/vnodespline.cpp | 2 +- tools/nodeDetails/vnodespline.h | 5 +++-- tools/nodeDetails/vnodesplinepath.cpp | 5 +++-- tools/nodeDetails/vnodesplinepath.h | 2 +- tools/vtooldetail.cpp | 10 +++++----- widgets/vtablegraphicsview.cpp | 18 +++++++++++------- 33 files changed, 74 insertions(+), 66 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 3033bf1f1..5a50e0d95 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -163,7 +163,7 @@ QPainterPath VContainer::ContourPath(qint64 idDetail) const VDetail detail = GetDetail(idDetail); QVector points; QVector pointsEkv; - for (qint32 i = 0; i< detail.CountNode(); ++i) + for (ptrdiff_t i = 0; i< detail.CountNode(); ++i) { switch (detail[i].getTypeTool()) { diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index 2e64e986e..91d339552 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -188,7 +188,7 @@ void DialogDetail::setDetails(const VDetail &value) { details = value; ui.listWidget->clear(); - for (qint32 i = 0; i < details.CountNode(); ++i) + for (ptrdiff_t i = 0; i < details.CountNode(); ++i) { NewItem(details[i].getId(), details[i].getTypeTool(), details[i].getMode(), details[i].getTypeNode(), details[i].getMx(), details[i].getMy()); diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index a07413b69..2e4ea80f5 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -79,7 +79,7 @@ void DialogTool::FillComboBoxPoints(QComboBox *box, const qint64 &id) const return; } VDetail det = data->GetDetail(idDetail); - for (qint32 i = 0; i< det.CountNode(); ++i) + for (ptrdiff_t i = 0; i< det.CountNode(); ++i) { if (det[i].getTypeTool() == Tool::NodePoint || det[i].getTypeTool() == Tool::AlongLineTool || diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 67ab29023..25b56b8db 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -76,7 +76,7 @@ void VSpline::ModifiSpl ( qint64 p1, qint64 p4, qreal angle1, qreal angle2, this->p3 = p4p3.p2(); } -void VSpline::ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve) +void VSpline::ModifiSpl (const qint64 &p1, const QPointF &p2, const QPointF &p3, const qint64 &p4, const qreal &kCurve) { this->p1 = p1; this->p2 = p2; @@ -278,7 +278,7 @@ QVector VSpline::GetPoints () const // } } -QVector VSpline::GetPoints (QPointF p1, QPointF p2, QPointF p3, QPointF p4) +QVector VSpline::GetPoints (const QPointF &p1, const QPointF &p2, const QPointF &p3, const QPointF &p4) { QVector pvector; QVector x; @@ -298,7 +298,7 @@ QVector VSpline::GetPoints (QPointF p1, QPointF p2, QPointF p3, QPointF return pvector; } -qreal VSpline::LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const +qreal VSpline::LengthBezier ( const QPointF &p1, const QPointF &p2, const QPointF &p3, const QPointF &p4 ) const { QPainterPath splinePath; QVector points = GetPoints (p1, p2, p3, p4); @@ -351,8 +351,8 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, double dx = x4-x1; double dy = y4-y1; - double d2 = fabs(((x2 - x4) * dy - (y2 - y4) * dx)); - double d3 = fabs(((x3 - x4) * dy - (y3 - y4) * dx)); + double d2 = fabs((x2 - x4) * dy - (y2 - y4) * dx); + double d3 = fabs((x3 - x4) * dy - (y3 - y4) * dx); double da1, da2, k; switch ((static_cast(d2 > curve_collinearity_epsilon) << 1) + @@ -747,7 +747,7 @@ QPainterPath VSpline::GetPath() const // this->ModifiSpl(P1, P2, P3, P4); //} -QVector VSpline::SplinePoints(QPointF p1, QPointF p4, qreal angle1, qreal angle2, qreal kAsm1, +QVector VSpline::SplinePoints(const QPointF &p1, const QPointF &p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve) { QLineF p1pX(p1.x(), p1.y(), p1.x() + 100, p1.y()); diff --git a/geometry/vspline.h b/geometry/vspline.h index abbc90121..a8245de01 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -79,7 +79,8 @@ public: * @param p3 друга контролююча точка сплайну. * @param p4 кінцева точка сплайну. */ - void ModifiSpl (qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve); + void ModifiSpl (const qint64 &p1, const QPointF &p2, const QPointF &p3, const qint64 &p4, + const qreal &kCurve); /** * @brief RotationSpl поворот сплайна навколо точки на кут в градусах проти годиникової стрілки. * @param pRotate точка навколо якої повертаємо. @@ -178,8 +179,8 @@ public: // void Mirror(const QPointF Pmirror); inline Draw::Draws getMode() const {return mode;} inline void setMode(const Draw::Draws &value) {mode = value;} - static QVector SplinePoints(QPointF p1, QPointF p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, - qreal kCurve); + static QVector SplinePoints(const QPointF &p1, const QPointF &p4, qreal angle1, qreal angle2, qreal kAsm1, + qreal kAsm2, qreal kCurve); inline qint64 getIdObject() const {return idObject;} inline void setIdObject(const qint64 &value) {idObject = value;} VSpline &operator=(const VSpline &spl); @@ -192,7 +193,7 @@ protected: * @param p4 кінцева точка сплайну. * @return список точок. */ - static QVector GetPoints ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ); + static QVector GetPoints (const QPointF &p1, const QPointF &p2, const QPointF &p3, const QPointF &p4 ); private: /** * @brief p1 початкова точка сплайну @@ -232,7 +233,7 @@ private: * @param p4 кінцева точка сплайну. * @return дожина сплайну. */ - qreal LengthBezier ( QPointF p1, QPointF p2, QPointF p3, QPointF p4 ) const; + qreal LengthBezier (const QPointF &p1, const QPointF &p2, const QPointF &p3, const QPointF &p4 ) const; /** * @brief PointBezier_r знаходить точки сплайну по його чотирьом точках. * @param x1 х координата першої точки сплайну. diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index 01eb67bc4..df3baad54 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -32,7 +32,7 @@ VSplinePath::VSplinePath(const VSplinePath &splPath) : path(*splPath.GetPoint()), kCurve(splPath.getKCurve()), mode(splPath.getMode()), points(splPath.GetDataPoints()), idObject(splPath.getIdObject()){} -void VSplinePath::append(VSplinePoint point) +void VSplinePath::append(const VSplinePoint &point) { path.append(point); } @@ -104,7 +104,7 @@ qreal VSplinePath::GetLength() const return length; } -void VSplinePath::UpdatePoint(qint32 indexSpline, SplinePoint::Position pos, VSplinePoint point) +void VSplinePath::UpdatePoint(qint32 indexSpline, const SplinePoint::Position &pos, const VSplinePoint &point) { if (indexSpline < 1 || indexSpline > Count()) { diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index 77d7c956d..412afb317 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -55,7 +55,7 @@ public: * @brief append додає точку сплайну до шляху. * @param point точка. */ - void append(VSplinePoint point); + void append(const VSplinePoint &point); qint32 Count() const; inline qint32 CountPoint() const {return path.size();} VSpline GetSpline(qint32 index) const; @@ -64,7 +64,7 @@ public: inline QVector GetSplinePath() const {return path;} qreal GetLength() const; inline QHash GetDataPoints() const {return points;} - void UpdatePoint(qint32 indexSpline, SplinePoint::Position pos, VSplinePoint point); + void UpdatePoint(qint32 indexSpline, const SplinePoint::Position &pos, const VSplinePoint &point); VSplinePoint GetSplinePoint(qint32 indexSpline, SplinePoint::Position pos) const; /** * @brief Clear очищає шлях сплайнів. diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 138410b3e..4334eef3a 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -64,7 +64,7 @@ void VToolNormal::Create(QSharedPointer &dialog, VMainGraphicsScen } void VToolNormal::Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const QString typeLine, const QString pointName, + const qint64 &secondPointId, const QString &typeLine, const QString &pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 9ad7322c1..598496309 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -31,12 +31,13 @@ class VToolNormal : public VToolLinePoint public: VToolNormal(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qreal &angle, const qint64 &firstPointId, - const qint64 &secondPointId, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + const qint64 &secondPointId, const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); static void Create(QSharedPointer &dialog, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data); static void Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, - const qint64 &secondPointId, const QString typeLine, const QString pointName, + const qint64 &secondPointId, const QString &typeLine, const QString &pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index e4b0368b6..37ac56ec9 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -36,7 +36,7 @@ VToolPoint::VToolPoint(VDomDocument *doc, VContainer *data, qint64 id, QGraphics RefreshPointGeometry(VAbstractTool::data.GetPoint(id)); } -void VToolPoint::NameChangePosition(const QPointF pos) +void VToolPoint::NameChangePosition(const QPointF &pos) { VPointF point = VAbstractTool::data.GetPoint(id); QPointF p = pos - this->pos(); diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index 993744961..8bcd8c0b0 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -33,7 +33,7 @@ public: virtual ~VToolPoint(){} static const QString TagName; public slots: - void NameChangePosition(const QPointF pos); + void NameChangePosition(const QPointF &pos); virtual void ChangedActivDraw(const QString &newName); virtual void FullUpdateFromGui(int result) = 0; virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index a03cf5f9a..c2324bbe3 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -167,8 +167,8 @@ void VToolSpline::FullUpdateFromGui(int result) dialogSpline.clear(); } -void VToolSpline::ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos) +void VToolSpline::ControlPointChangePosition(const qint32 &indexSpline, const SplinePoint::Position &position, + const QPointF &pos) { Q_UNUSED(indexSpline); VSpline spl = VAbstractTool::data.GetSpline(id); diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index 9bcf09bc9..1960981e0 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -50,8 +50,8 @@ signals: public slots: virtual void FullUpdateFromFile (); virtual void FullUpdateFromGui ( int result ); - void ControlPointChangePosition ( const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos); + void ControlPointChangePosition (const qint32 &indexSpline, const SplinePoint::Position &position, + const QPointF &pos); virtual void ChangedActivDraw ( const QString &newName ); virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); virtual void SetFactor(qreal factor); diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index c6162d01d..230b9a696 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -156,8 +156,8 @@ void VToolSplinePath::FullUpdateFromGui(int result) dialogSplinePath.clear(); } -void VToolSplinePath::ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos) +void VToolSplinePath::ControlPointChangePosition(const qint32 &indexSpline, const SplinePoint::Position &position, + const QPointF &pos) { VSplinePath splPath = VAbstractTool::data.GetSplinePath(id); VSpline spl = splPath.GetSpline(indexSpline); diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index 734615815..804eddedf 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -48,8 +48,8 @@ signals: public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); - void ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos); + void ControlPointChangePosition(const qint32 &indexSpline, const SplinePoint::Position &position, + const QPointF &pos); virtual void ChangedActivDraw(const QString &newName); virtual void ShowTool(qint64 id, Qt::GlobalColor color, bool enable); virtual void SetFactor(qreal factor); diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index 683cf9a5a..94affbaea 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -101,8 +101,8 @@ void VToolTriangle::Create(const qint64 _id, const QString &pointName, const qin } } -QPointF VToolTriangle::FindPoint(const QPointF axisP1, const QPointF axisP2, const QPointF firstPoint, - const QPointF secondPoint) +QPointF VToolTriangle::FindPoint(const QPointF &axisP1, const QPointF &axisP2, const QPointF &firstPoint, + const QPointF &secondPoint) { qreal c = QLineF(firstPoint, secondPoint).length(); qreal a = QLineF(axisP2, firstPoint).length(); diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index eed07c6a2..5990ef214 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -39,8 +39,8 @@ public: const qint64 &firstPointId, const qint64 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VDomDocument *doc, VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); - static QPointF FindPoint(const QPointF axisP1, const QPointF axisP2, const QPointF firstPoint, - const QPointF secondPoint); + static QPointF FindPoint(const QPointF &axisP1, const QPointF &axisP2, const QPointF &firstPoint, + const QPointF &secondPoint); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingpoint.cpp b/tools/modelingTools/vmodelingpoint.cpp index 9c0e225da..948e1bb17 100644 --- a/tools/modelingTools/vmodelingpoint.cpp +++ b/tools/modelingTools/vmodelingpoint.cpp @@ -38,7 +38,7 @@ VModelingPoint::VModelingPoint(VDomDocument *doc, VContainer *data, qint64 id, Q RefreshPointGeometry(VAbstractTool::data.GetModelingPoint(id)); } -void VModelingPoint::NameChangePosition(const QPointF pos) +void VModelingPoint::NameChangePosition(const QPointF &pos) { VPointF point = VAbstractTool::data.GetModelingPoint(id); QPointF p = pos - this->pos(); diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h index 360db6153..33d446263 100644 --- a/tools/modelingTools/vmodelingpoint.h +++ b/tools/modelingTools/vmodelingpoint.h @@ -33,7 +33,7 @@ public: virtual ~VModelingPoint() {} static const QString TagName; public slots: - void NameChangePosition(const QPointF pos); + void NameChangePosition(const QPointF &pos); virtual void FullUpdateFromGui(int result) = 0; protected: qreal radius; diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index 40ebf04fc..d1ffd0640 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -163,7 +163,7 @@ void VModelingSpline::FullUpdateFromGui(int result) } void VModelingSpline::ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos) + const QPointF &pos) { Q_UNUSED(indexSpline); VSpline spl = VAbstractTool::data.GetModelingSpline(id); diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index e52bb13b0..04d07348c 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -50,7 +50,7 @@ public slots: virtual void FullUpdateFromFile (); virtual void FullUpdateFromGui ( int result ); void ControlPointChangePosition (const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos); + const QPointF &pos); protected: virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); virtual void AddToFile (); diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 0a79618f8..c91e3bbc7 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -153,7 +153,7 @@ void VModelingSplinePath::FullUpdateFromGui(int result) } void VModelingSplinePath::ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos) + const QPointF &pos) { VSplinePath splPath = VAbstractTool::data.GetModelingSplinePath(id); VSpline spl = splPath.GetSpline(indexSpline); diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index 6ae804c74..141bf5317 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -47,7 +47,7 @@ public slots: virtual void FullUpdateFromFile(); virtual void FullUpdateFromGui(int result); void ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, - const QPointF pos); + const QPointF &pos); protected: virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ); virtual void AddToFile(); diff --git a/tools/nodeDetails/vnodearc.cpp b/tools/nodeDetails/vnodearc.cpp index 77b654b23..254247d58 100644 --- a/tools/nodeDetails/vnodearc.cpp +++ b/tools/nodeDetails/vnodearc.cpp @@ -39,7 +39,7 @@ VNodeArc::VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, } } -void VNodeArc::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, +void VNodeArc::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, const Draw::Draws &typeobject, const Document::Documents &parse, const Tool::Sources &typeCreation) { if (parse == Document::FullParse) diff --git a/tools/nodeDetails/vnodearc.h b/tools/nodeDetails/vnodearc.h index eb419e858..a580113d8 100644 --- a/tools/nodeDetails/vnodearc.h +++ b/tools/nodeDetails/vnodearc.h @@ -31,8 +31,8 @@ class VNodeArc :public VAbstractNode, public QGraphicsPathItem public: VNodeArc(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, Draw::Draws typeobject, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); - static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, - Draw::Draws typeobject, const Document::Documents &parse, const Tool::Sources &typeCreation); + static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idArc, const Draw::Draws &typeobject, + const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: diff --git a/tools/nodeDetails/vnodepoint.cpp b/tools/nodeDetails/vnodepoint.cpp index ddba6ebfd..734b0434e 100644 --- a/tools/nodeDetails/vnodepoint.cpp +++ b/tools/nodeDetails/vnodepoint.cpp @@ -44,7 +44,7 @@ VNodePoint::VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 id } } -void VNodePoint::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, +void VNodePoint::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, const Draw::Draws &typeobject, const Document::Documents &parse, const Tool::Sources &typeCreation) { if (parse == Document::FullParse) @@ -109,7 +109,7 @@ void VNodePoint::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) } -void VNodePoint::NameChangePosition(const QPointF pos) +void VNodePoint::NameChangePosition(const QPointF &pos) { VPointF point = VAbstractTool::data.GetModelingPoint(id); QPointF p = pos - this->pos(); diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index eb4dbda0a..162e1f036 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -31,13 +31,13 @@ class VNodePoint: public VAbstractNode, public QGraphicsEllipseItem public: VNodePoint(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0 ); - static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, Draw::Draws typeobject, + static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idPoint, const Draw::Draws &typeobject, const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: virtual void FullUpdateFromFile(); - void NameChangePosition(const QPointF pos); + void NameChangePosition(const QPointF &pos); protected: qreal radius; VGraphicsSimpleTextItem *namePoint; diff --git a/tools/nodeDetails/vnodespline.cpp b/tools/nodeDetails/vnodespline.cpp index c78ebc5e6..53dcaa9b6 100644 --- a/tools/nodeDetails/vnodespline.cpp +++ b/tools/nodeDetails/vnodespline.cpp @@ -40,7 +40,7 @@ VNodeSpline::VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 } VNodeSpline *VNodeSpline::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Document::Documents &parse, + const Draw::Draws &typeobject, const Document::Documents &parse, const Tool::Sources &typeCreation) { VNodeSpline *spl = 0; diff --git a/tools/nodeDetails/vnodespline.h b/tools/nodeDetails/vnodespline.h index bf7be5854..5e0f1cb7f 100644 --- a/tools/nodeDetails/vnodespline.h +++ b/tools/nodeDetails/vnodespline.h @@ -31,8 +31,9 @@ class VNodeSpline:public VAbstractNode, public QGraphicsPathItem public: VNodeSpline(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); - static VNodeSpline *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, - const Document::Documents &parse, const Tool::Sources &typeCreation); + static VNodeSpline *Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, + const Draw::Draws &typeobject, const Document::Documents &parse, + const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; public slots: diff --git a/tools/nodeDetails/vnodesplinepath.cpp b/tools/nodeDetails/vnodesplinepath.cpp index 985209598..a185cc4bd 100644 --- a/tools/nodeDetails/vnodesplinepath.cpp +++ b/tools/nodeDetails/vnodesplinepath.cpp @@ -25,7 +25,7 @@ const QString VNodeSplinePath::TagName = QStringLiteral("spline"); const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); VNodeSplinePath::VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Tool::Sources &typeCreation, QGraphicsItem * parent) + Draw::Draws typeobject, const Tool::Sources &typeCreation, QGraphicsItem * parent) :VAbstractNode(doc, data, id, idSpline, typeobject), QGraphicsPathItem(parent) { RefreshGeometry(); @@ -40,7 +40,8 @@ VNodeSplinePath::VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, } void VNodeSplinePath::Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, - Draw::Draws typeobject, const Document::Documents &parse, const Tool::Sources &typeCreation) + const Draw::Draws &typeobject, const Document::Documents &parse, + const Tool::Sources &typeCreation) { if (parse == Document::FullParse) { diff --git a/tools/nodeDetails/vnodesplinepath.h b/tools/nodeDetails/vnodesplinepath.h index e2fa1dbea..596701428 100644 --- a/tools/nodeDetails/vnodesplinepath.h +++ b/tools/nodeDetails/vnodesplinepath.h @@ -31,7 +31,7 @@ class VNodeSplinePath : public VAbstractNode, public QGraphicsPathItem public: VNodeSplinePath(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); - static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, Draw::Draws typeobject, + static void Create(VDomDocument *doc, VContainer *data, qint64 id, qint64 idSpline, const Draw::Draws &typeobject, const Document::Documents &parse, const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 7d8983511..419224977 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -40,7 +40,7 @@ VToolDetail::VToolDetail(VDomDocument *doc, VContainer *data, const qint64 &id, sceneDetails(scene) { VDetail detail = data->GetDetail(id); - for (qint32 i = 0; i< detail.CountNode(); ++i) + for (ptrdiff_t i = 0; i< detail.CountNode(); ++i) { switch (detail[i].getTypeTool()) { @@ -127,7 +127,7 @@ void VToolDetail::Create(QSharedPointer &dialog, VMainGraphicsScen { VDetail detail = dialog->getDetails(); VDetail det; - for (qint32 i = 0; i< detail.CountNode(); ++i) + for (ptrdiff_t i = 0; i< detail.CountNode(); ++i) { qint64 id = 0; switch (detail[i].getTypeTool()) @@ -252,7 +252,7 @@ void VToolDetail::FullUpdateFromGui(int result) domElement.setAttribute(AttrClosed, QString().setNum(det.getClosed())); domElement.setAttribute(AttrWidth, QString().setNum(det.getWidth())); RemoveAllChild(domElement); - for (qint32 i = 0; i < det.CountNode(); ++i) + for (ptrdiff_t i = 0; i < det.CountNode(); ++i) { AddNode(domElement, det[i]); } @@ -275,7 +275,7 @@ void VToolDetail::AddToFile() AddAttribute(domElement, AttrClosed, detail.getClosed()); AddAttribute(domElement, AttrWidth, detail.getWidth()); - for (qint32 i = 0; i < detail.CountNode(); ++i) + for (ptrdiff_t i = 0; i < detail.CountNode(); ++i) { AddNode(domElement, detail[i]); } @@ -371,7 +371,7 @@ void VToolDetail::contextMenuEvent(QGraphicsSceneContextMenuEvent *event) void VToolDetail::RemoveReferens() { VDetail detail = VAbstractTool::data.GetDetail(id); - for (qint32 i = 0; i< detail.CountNode(); ++i) + for (ptrdiff_t i = 0; i< detail.CountNode(); ++i) { doc->DecrementReferens(detail[i].getId()); } diff --git a/widgets/vtablegraphicsview.cpp b/widgets/vtablegraphicsview.cpp index c6716255e..8bc74f639 100644 --- a/widgets/vtablegraphicsview.cpp +++ b/widgets/vtablegraphicsview.cpp @@ -50,9 +50,11 @@ void VTableGraphicsView::MirrorItem() { for ( qint32 i = 0; i < list.count(); ++i ) { - QRectF itemRectOld = list.at(i)->sceneBoundingRect(); + QGraphicsItem *item = list.at(i); + Q_ASSERT(item != 0); + QRectF itemRectOld = item->sceneBoundingRect(); //Get the current transform - QTransform transform(list.at(i)->transform()); + QTransform transform(item->transform()); qreal m11 = transform.m11(); // Horizontal scaling qreal m12 = transform.m12(); // Vertical shearing @@ -71,12 +73,12 @@ void VTableGraphicsView::MirrorItem() transform.setMatrix(m11, m12, m13, m21, m22, m23, m31, m32, m33); // Set the items transformation - list.at(i)->setTransform(transform); - QRectF itemRectNew = list.at(i)->sceneBoundingRect(); + item->setTransform(transform); + QRectF itemRectNew = item->sceneBoundingRect(); qreal dx, dy; dx = itemRectOld.center().x()-itemRectNew.center().x(); dy = itemRectOld.center().y()-itemRectNew.center().y(); - list.at(i)->moveBy(dx, dy); + item->moveBy(dx, dy); } } } @@ -154,8 +156,10 @@ void VTableGraphicsView::rotateIt() { for ( qint32 i = 0; i < list.count(); ++i ) { - list.at(i)->setTransformOriginPoint(list.at(i)->boundingRect().center()); - list.at(i)->setRotation(list.at(i)->rotation() + 180); + QGraphicsItem *item = list.at(i); + Q_ASSERT(item != 0); + item->setTransformOriginPoint(item->boundingRect().center()); + item->setRotation(item->rotation() + 180); } } } From 3c12ffaccadac194811b8c8c30b018888ce200ef Mon Sep 17 00:00:00 2001 From: dismine Date: Thu, 7 Nov 2013 16:44:55 +0200 Subject: [PATCH 70/83] Code style error. --HG-- branch : develop --- exception/vexception.h | 2 +- tools/drawTools/vtoolbisector.h | 3 ++- tools/drawTools/vtoolshoulderpoint.h | 3 ++- tools/modelingTools/vmodelingarc.cpp | 6 +++--- tools/modelingTools/vmodelingbisector.h | 3 ++- tools/modelingTools/vmodelingline.h | 3 ++- tools/modelingTools/vmodelinglineintersect.h | 3 ++- tools/modelingTools/vmodelingpointofcontact.h | 3 ++- tools/modelingTools/vmodelingspline.cpp | 3 ++- tools/modelingTools/vmodelingspline.h | 4 ++-- tools/modelingTools/vmodelingsplinepath.cpp | 4 ++-- tools/modelingTools/vmodelingsplinepath.h | 3 ++- 12 files changed, 24 insertions(+), 16 deletions(-) diff --git a/exception/vexception.h b/exception/vexception.h index 94b064d21..5a68cbad7 100644 --- a/exception/vexception.h +++ b/exception/vexception.h @@ -29,7 +29,7 @@ class VException : public QException { public: VException(const QString &what); - VException(const VException &e):what(e.What()){} + VException(const VException &e):what(e.What()){} virtual ~VException() Q_DECL_NOEXCEPT_EXPR(true){} inline void raise() const { throw *this; } inline VException *clone() const { return new VException(*this); } diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 396affed0..1b6fc5077 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -30,7 +30,8 @@ class VToolBisector : public VToolLinePoint public: VToolBisector(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, - const qint64 &thirdPointId, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + const qint64 &thirdPointId, const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); static QPointF FindPoint(const QPointF &firstPoint, const QPointF &secondPoint, const QPointF &thirdPoint, const qreal& length); virtual void setDialog(); diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index f67bcbf49..71a2c30b3 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -30,7 +30,8 @@ class VToolShoulderPoint : public VToolLinePoint public: VToolShoulderPoint(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &typeLine, const QString &formula, const qint64 &p1Line, const qint64 &p2Line, - const qint64 &pShoulder, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + const qint64 &pShoulder, const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); static QPointF FindPoint(const QPointF &p1Line, const QPointF &p2Line, const QPointF &pShoulder, const qreal &length); diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index 7a8e9c8d5..f1ca4c913 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -59,9 +59,9 @@ VModelingArc* VModelingArc::Create(QSharedPointer &dialog, VDomDocume return Create(0, center, radius, f1, f2, doc, data, Document::FullParse, Tool::FromGui); } -VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, - const QString &f1, const QString &f2, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) +VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const QString &radius, const QString &f1, + const QString &f2, VDomDocument *doc, VContainer *data, + const Document::Documents &parse, const Tool::Sources &typeCreation) { VModelingArc *toolArc = 0; qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index d29840403..ed454812c 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -39,7 +39,8 @@ public: static VModelingBisector* Create(const qint64 _id, const QString &formula, const qint64 &firstPointId, const qint64 &secondPointId, const qint64 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); + VContainer *data, const Document::Documents &parse, + const Tool::Sources &typeCreation); static const QString ToolType; public slots: virtual void FullUpdateFromFile(); diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index 272dcbe68..0d7cb96ef 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -31,7 +31,8 @@ class VModelingLine: public VModelingTool, public QGraphicsLineItem Q_OBJECT public: VModelingLine(VDomDocument *doc, VContainer *data, qint64 id, qint64 firstPoint, - qint64 secondPoint, const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + qint64 secondPoint, const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingLine* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingLine* Create(const qint64 &_id, const qint64 &firstPoint, const qint64 &secondPoint, diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index 12b55cf83..93282c731 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -32,7 +32,8 @@ public: VModelingLineIntersect(VDomDocument *doc, VContainer *data, const qint64 &id, const qint64 &p1Line1, const qint64 &p2Line1, const qint64 &p1Line2, const qint64 &p2Line2, - const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingLineIntersect* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index a6a965cde..50fd4eb1f 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -32,7 +32,8 @@ public: VModelingPointOfContact(VDomDocument *doc, VContainer *data, const qint64 &id, const QString &radius, const qint64 ¢er, const qint64 &firstPointId, const qint64 &secondPointId, - const Tool::Sources &typeCreation, QGraphicsItem * parent = 0); + const Tool::Sources &typeCreation, + QGraphicsItem * parent = 0); virtual void setDialog(); static VModelingPointOfContact* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index d1ffd0640..5806b5fc2 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -91,7 +91,8 @@ VModelingSpline *VModelingSpline::Create(QSharedPointer &dialog, V VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation) + VContainer *data, const Document::Documents &parse, + const Tool::Sources &typeCreation) { VModelingSpline *spl = 0; VSpline spline = VSpline(data->DataModelingPoints(), p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve); diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index 04d07348c..0b69d5dcf 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -32,8 +32,8 @@ class VModelingSpline:public VModelingTool, public QGraphicsPathItem { Q_OBJECT public: - VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, - QGraphicsItem * parent = 0 ); + VModelingSpline (VDomDocument *doc, VContainer *data, qint64 id, + const Tool::Sources &typeCreation, QGraphicsItem * parent = 0 ); virtual void setDialog(); static VModelingSpline* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSpline* Create(const qint64 _id, const qint64 &p1, const qint64 &p4, const qreal &kAsm1, diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index c91e3bbc7..975b8acd8 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -24,8 +24,8 @@ const QString VModelingSplinePath::TagName = QStringLiteral("spline"); const QString VModelingSplinePath::ToolType = QStringLiteral("path"); -VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, const Tool::Sources &typeCreation, - QGraphicsItem *parent) +VModelingSplinePath::VModelingSplinePath(VDomDocument *doc, VContainer *data, qint64 id, + const Tool::Sources &typeCreation, QGraphicsItem *parent) :VModelingTool(doc, data, id), QGraphicsPathItem(parent), dialogSplinePath(QSharedPointer()), controlPoints(QVector()) { diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index 141bf5317..a93925bb2 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -36,7 +36,8 @@ public: virtual void setDialog(); static VModelingSplinePath* Create(QSharedPointer &dialog, VDomDocument *doc, VContainer *data); static VModelingSplinePath* Create(const qint64 _id, const VSplinePath &path, VDomDocument *doc, - VContainer *data, const Document::Documents &parse, const Tool::Sources &typeCreation); + VContainer *data, const Document::Documents &parse, + const Tool::Sources &typeCreation); static const QString TagName; static const QString ToolType; signals: From 8aea1ee3f3c1918e8c52def25523ac54ed47aeda Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 12 Nov 2013 14:48:45 +0200 Subject: [PATCH 71/83] Arc, spline, spline path store their name by yourself. --HG-- branch : develop --- Valentina.pro | 2 +- dialogs/dialogdetail.cpp | 4 ++-- dialogs/dialogsplinepath.cpp | 1 + geometry/varc.cpp | 21 ++++++++++++++++----- geometry/varc.h | 8 ++++++++ geometry/vspline.cpp | 11 +++++++---- geometry/vspline.h | 5 +++++ geometry/vsplinepath.cpp | 18 +++++++++++++++--- geometry/vsplinepath.h | 4 +++- tablewindow.cpp | 3 +++ 10 files changed, 61 insertions(+), 16 deletions(-) diff --git a/Valentina.pro b/Valentina.pro index 5b88224a5..229bd92d1 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -78,7 +78,7 @@ CONFIG(debug, debug|release){ -isystem "/usr/include/qt5/QtCore" -isystem "$$OUT_PWD/uic" -isystem "$$OUT_PWD/moc/" \ -Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \ -Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \ - -Wunreachable-code + -Wunreachable-code -gdwarf-3 }else{ # Release TARGET = $$RELEASE_TARGET diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index 91d339552..106ac5cba 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -131,7 +131,7 @@ void DialogDetail::NewItem(qint64 id, const Tool::Tools &typeTool, const Draw::D { arc = data->GetModelingArc(id); } - name = data->GetNameArc(arc.GetCenter(), id, mode); + name = arc.name(); break; } case (Tool::NodeSpline): @@ -159,7 +159,7 @@ void DialogDetail::NewItem(qint64 id, const Tool::Tools &typeTool, const Draw::D { splPath = data->GetModelingSplinePath(id); } - name = data->GetNameSplinePath(splPath, mode); + name = splPath.name(); break; } default: diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index 76efb8bd8..132e12179 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -101,6 +101,7 @@ void DialogSplinePath::DialogAccepted() path.append( qvariant_cast(item->data(Qt::UserRole))); } path.setKCurve(ui->doubleSpinBoxKcurve->value()); + path.setName(data->GetNameSplinePath(path, mode)); emit ToolTip(""); emit DialogClosed(QDialog::Accepted); } diff --git a/geometry/varc.cpp b/geometry/varc.cpp index d7f5ef860..dff1f8840 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -22,20 +22,25 @@ #include "varc.h" #include "../exception/vexception.h" +class QRectF; + VArc::VArc () : f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), formulaRadius(QString()), - center(0), points(QHash()), mode(Draw::Calculation), idObject(0){} + center(0), points(QHash()), mode(Draw::Calculation), idObject(0), _name(QString()){} VArc::VArc (const QHash *points, qint64 center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1, qreal f2, QString formulaF2, Draw::Draws mode, qint64 idObject) : f1(f1), formulaF1(formulaF1), f2(f2), formulaF2(formulaF2), radius(radius), formulaRadius(formulaRadius), - center(center), points(*points), mode(mode), idObject(idObject){} + center(center), points(*points), mode(mode), idObject(idObject), _name(QString()) +{ + _name = QString ("Arc_%1_%2").arg(this->GetCenterVPoint().name()).arg(radius); +} VArc::VArc(const VArc &arc) : f1(arc.GetF1()), formulaF1(arc.GetFormulaF1()), f2(arc.GetF2()), formulaF2(arc.GetFormulaF2()), radius(arc.GetRadius()), formulaRadius(arc.GetFormulaRadius()), center(arc.GetCenter()), points(arc.GetDataPoints()), mode(arc.getMode()), - idObject(arc.getIdObject()){} + idObject(arc.getIdObject()), _name(arc.name()){} VArc &VArc::operator =(const VArc &arc) { @@ -49,21 +54,27 @@ VArc &VArc::operator =(const VArc &arc) this->center = arc.GetCenter(); this->mode = arc.getMode(); this->idObject = arc.getIdObject(); + this->_name = arc.name(); return *this; } QPointF VArc::GetCenterPoint() const +{ + return GetCenterVPoint().toQPointF(); +} + +VPointF VArc::GetCenterVPoint() const { if (points.contains(center)) { - return points.value(center).toQPointF(); + return points.value(center); } else { QString error = QString(tr("Can't find id = %1 in table.")).arg(center); throw VException(error); } - return QPointF(); + return VPointF(); } QPointF VArc::GetP1() const diff --git a/geometry/varc.h b/geometry/varc.h index 6f4b4771b..5c658b453 100644 --- a/geometry/varc.h +++ b/geometry/varc.h @@ -23,6 +23,10 @@ #define VARC_H #include "vspline.h" +class QString; +class QLineF; +class QPainterPath; +class QPointF; /** * @brief VArc клас, що реалізує дугу. Дуга розраховується за годиниковою стрілкою. @@ -76,6 +80,7 @@ public: */ inline qint64 GetCenter () const {return center;} QPointF GetCenterPoint() const; + VPointF GetCenterVPoint() const; /** * @brief GetP1 повертає першу точку з якої починається дуга. * @return точку початку дуги. @@ -100,6 +105,8 @@ public: inline void setMode(const Draw::Draws &value) {mode = value;} inline qint64 getIdObject() const {return idObject;} inline void setIdObject(const qint64 &value) {idObject = value;} + QString name() const {return _name;} + void setName(const QString &name) {_name = name;} private: /** * @brief f1 початковий кут в градусах @@ -123,6 +130,7 @@ private: QHash points; Draw::Draws mode; qint64 idObject; + QString _name; }; #endif // VARC_H diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 25b56b8db..2b6c19c6e 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -23,26 +23,28 @@ VSpline::VSpline() :p1(0), p2(QPointF()), p3(QPointF()), p4(0), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1), - points(QHash()), mode(Draw::Calculation), idObject(0){} + points(QHash()), mode(Draw::Calculation), idObject(0), _name(QString()){} VSpline::VSpline ( const VSpline & spline ) :p1(spline.GetP1 ()), p2(spline.GetP2 ()), p3(spline.GetP3 ()), p4(spline.GetP4 ()), angle1(spline.GetAngle1 ()), angle2(spline.GetAngle2 ()), kAsm1(spline.GetKasm1()), kAsm2(spline.GetKasm2()), kCurve(spline.GetKcurve()), - points(spline.GetDataPoints()), mode(spline.getMode()), idObject(spline.getIdObject()){} + points(spline.GetDataPoints()), mode(spline.getMode()), idObject(spline.getIdObject()), _name(spline.name()){} VSpline::VSpline (const QHash *points, qint64 p1, qint64 p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve, Draw::Draws mode, qint64 idObject) :p1(p1), p2(QPointF()), p3(QPointF()), p4(p4), angle1(angle1), angle2(angle2), kAsm1(kAsm1), kAsm2(kAsm2), - kCurve(kCurve), points(*points), mode(mode), idObject(idObject) + kCurve(kCurve), points(*points), mode(mode), idObject(idObject), _name(QString()) { + _name = QString("Spl_%1_%2").arg(this->GetPointP1().name(), this->GetPointP4().name()); ModifiSpl ( p1, p4, angle1, angle2, kAsm1, kAsm2, kCurve ); } VSpline::VSpline (const QHash *points, qint64 p1, QPointF p2, QPointF p3, qint64 p4, qreal kCurve, Draw::Draws mode, qint64 idObject) :p1(p1), p2(p2), p3(p3), p4(p4), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1), points(*points), mode(mode), - idObject(idObject) + idObject(idObject), _name(QString()) { + _name = QString("Spl_%1_%2").arg(this->GetPointP1().name(), this->GetPointP4().name()); ModifiSpl ( p1, p2, p3, p4, kCurve); } @@ -778,5 +780,6 @@ VSpline &VSpline::operator =(const VSpline &spline) this->points = spline.GetDataPoints(); this->mode = spline.getMode(); this->idObject = spline.getIdObject(); + this->_name = spline.name(); return *this; } diff --git a/geometry/vspline.h b/geometry/vspline.h index a8245de01..874a3d765 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -24,6 +24,8 @@ #include "../container/vpointf.h" +class QString; + #define M_2PI 6.28318530717958647692528676655900576 /** @@ -184,6 +186,8 @@ public: inline qint64 getIdObject() const {return idObject;} inline void setIdObject(const qint64 &value) {idObject = value;} VSpline &operator=(const VSpline &spl); + QString name() const {return _name;} + void setName(const QString &name) {_name = name;} protected: /** * @brief GetPoints повертає точки з яких складається сплайн. @@ -225,6 +229,7 @@ private: QHash points; Draw::Draws mode; qint64 idObject; + QString _name; /** * @brief LengthBezier повертає дожину сплайну за його чотирьма точками. * @param p1 початкова точка сплайну. diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index df3baad54..3f7af17d5 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -23,18 +23,29 @@ #include "../exception/vexception.h" VSplinePath::VSplinePath() - : path(QVector()), kCurve(1), mode(Draw::Calculation), points(QHash()), idObject(0){} + : path(QVector()), kCurve(1), mode(Draw::Calculation), points(QHash()), idObject(0), + _name(QString()){} VSplinePath::VSplinePath(const QHash *points, qreal kCurve, Draw::Draws mode, qint64 idObject) - : path(QVector()), kCurve(kCurve), mode(mode), points(*points), idObject(idObject){} + : path(QVector()), kCurve(kCurve), mode(mode), points(*points), idObject(idObject), _name(QString()) +{} VSplinePath::VSplinePath(const VSplinePath &splPath) : path(*splPath.GetPoint()), kCurve(splPath.getKCurve()), mode(splPath.getMode()), points(splPath.GetDataPoints()), - idObject(splPath.getIdObject()){} + idObject(splPath.getIdObject()), _name(splPath.name()){} void VSplinePath::append(const VSplinePoint &point) { path.append(point); + _name = QString("SplPath"); + for (qint32 i = 1; i <= this->Count(); ++i) + { + VSpline spl = this->GetSpline(i); + VPointF first = spl.GetPointP1(); + VPointF second = spl.GetPointP4(); + QString splName = QString("_%1_%2").arg(first.name(), second.name()); + _name.append(splName); + } } qint32 VSplinePath::Count() const @@ -143,6 +154,7 @@ VSplinePath &VSplinePath::operator =(const VSplinePath &path) this->mode = path.getMode(); this->points = path.GetDataPoints(); this->idObject = path.getIdObject(); + this->_name = path.name(); return *this; } diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index 412afb317..60657783d 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -80,7 +80,8 @@ public: inline qint64 getIdObject() const {return idObject;} inline void setIdObject(const qint64 &value) {idObject = value;} - + QString name() const {return _name;} + void setName(const QString &name) {_name = name;} protected: /** * @brief path вектор з точок сплайна. @@ -90,6 +91,7 @@ protected: Draw::Draws mode; QHash points; qint64 idObject; + QString _name; }; #endif // VSPLINEPATH_H diff --git a/tablewindow.cpp b/tablewindow.cpp index d597590ff..a704e91e3 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -23,6 +23,7 @@ #include "ui_tablewindow.h" #include "widgets/vtablegraphicsview.h" #include "options.h" +#include TableWindow::TableWindow(QWidget *parent) :QMainWindow(parent), numberDetal(0), colission(0), ui(new Ui::TableWindow), @@ -375,6 +376,8 @@ void TableWindow::SvgFile(const QString &name) const generator.setTitle(tr("SVG Generator Example Drawing")); generator.setDescription(tr("An SVG drawing created by the SVG Generator " "Example provided with Qt.")); + generator.setResolution(PrintDPI); + qDebug()<<"resolution is" << generator.resolution(); QPainter painter; painter.begin(&generator); painter.setFont( QFont( "Arial", 8, QFont::Normal ) ); From 2621e7064519a186de76e6bd68811ed4e732314b Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 12 Nov 2013 15:04:18 +0200 Subject: [PATCH 72/83] VContainer no more create names of VArc, VSpline and VSplinePath. --HG-- branch : develop --- container/vcontainer.cpp | 63 +-------------------- container/vcontainer.h | 8 +-- dialogs/dialogsplinepath.cpp | 1 - tools/drawTools/vtoolarc.cpp | 4 +- tools/drawTools/vtoolspline.cpp | 4 +- tools/drawTools/vtoolsplinepath.cpp | 4 +- tools/modelingTools/vmodelingarc.cpp | 2 +- tools/modelingTools/vmodelingspline.cpp | 2 +- tools/modelingTools/vmodelingsplinepath.cpp | 2 +- 9 files changed, 12 insertions(+), 78 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 5a50e0d95..eee1923cc 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -511,9 +511,9 @@ void VContainer::AddLengthSpline(const QString &name, const qreal &value) lengthSplines[name] = value; } -void VContainer::AddLengthArc(const qint64 ¢er, const qint64 &id) +void VContainer::AddLengthArc(const qint64 &id) { - AddLengthArc(GetNameArc(center, id), toMM(GetArc(id).GetLength())); + AddLengthArc(GetArc(id).name(), toMM(GetArc(id).GetLength())); } void VContainer::AddLengthArc(const QString &name, const qreal &value) @@ -705,65 +705,6 @@ QString VContainer::GetNameLineAngle(const qint64 &firstPoint, const qint64 &sec return QString("AngleLine_%1_%2").arg(first.name(), second.name()); } -QString VContainer::GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint, const Draw::Draws &mode) const -{ - VPointF first; - VPointF second; - if (mode == Draw::Calculation) - { - first = GetPoint(firstPoint); - second = GetPoint(secondPoint); - } - else - { - first = GetModelingPoint(firstPoint); - second = GetModelingPoint(secondPoint); - } - return QString("Spl_%1_%2").arg(first.name(), second.name()); -} - -QString VContainer::GetNameSplinePath(const VSplinePath &path, const Draw::Draws &mode) const -{ - if (path.Count() == 0) - { - return QString(); - } - QString name("SplPath"); - for (qint32 i = 1; i <= path.Count(); ++i) - { - VSpline spl = path.GetSpline(i); - VPointF first; - VPointF second; - if (mode == Draw::Calculation) - { - first = GetPoint(spl.GetP1()); - second = GetPoint(spl.GetP4()); - } - else - { - first = GetModelingPoint(spl.GetP1()); - second = GetModelingPoint(spl.GetP4()); - } - QString splName = QString("_%1_%2").arg(first.name(), second.name()); - name.append(splName); - } - return name; -} - -QString VContainer::GetNameArc(const qint64 ¢er, const qint64 &id, const Draw::Draws &mode) const -{ - VPointF centerPoint; - if (mode == Draw::Calculation) - { - centerPoint = GetPoint(center); - } - else - { - centerPoint = GetModelingPoint(center); - } - return QString ("Arc_%1_%2").arg(centerPoint.name()).arg(id); -} - void VContainer::UpdatePoint(qint64 id, const VPointF &point) { UpdateObject(points, id, point); diff --git a/container/vcontainer.h b/container/vcontainer.h index 1173fbc23..7e135f4c8 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -73,7 +73,7 @@ public: {incrementTable[name] = cell;} void AddLengthLine(const QString &name, const qreal &value); void AddLengthSpline(const QString &name, const qreal &value); - void AddLengthArc(const qint64 ¢er, const qint64 &id); + void AddLengthArc(const qint64 &id); void AddLengthArc(const QString &name, const qreal &value); void AddLineAngle(const QString &name, const qreal &value); void AddLine(const qint64 &firstPointId, const qint64 &secondPointId, @@ -88,12 +88,6 @@ public: const Draw::Draws &mode = Draw::Calculation) const; QString GetNameLineAngle(const qint64 &firstPoint, const qint64 &secondPoint, const Draw::Draws &mode = Draw::Calculation) const; - QString GetNameSpline(const qint64 &firstPoint, const qint64 &secondPoint, - const Draw::Draws &mode = Draw::Calculation) const; - QString GetNameSplinePath(const VSplinePath &path, - const Draw::Draws &mode = Draw::Calculation) const; - QString GetNameArc(const qint64 ¢er, const qint64 &id, - const Draw::Draws &mode = Draw::Calculation) const; void UpdatePoint(qint64 id, const VPointF& point); void UpdateModelingPoint(qint64 id, const VPointF& point); void UpdateDetail(qint64 id, const VDetail& detail); diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index 132e12179..76efb8bd8 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -101,7 +101,6 @@ void DialogSplinePath::DialogAccepted() path.append( qvariant_cast(item->data(Qt::UserRole))); } path.setKCurve(ui->doubleSpinBoxKcurve->value()); - path.setName(data->GetNameSplinePath(path, mode)); emit ToolTip(""); emit DialogClosed(QDialog::Accepted); } diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index 1e3940aa9..6d249cf06 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -97,12 +97,12 @@ void VToolArc::Create(const qint64 _id, const qint64 ¢er, const QString &rad if (typeCreation == Tool::FromGui) { id = data->AddArc(arc); - data->AddLengthArc(data->GetNameArc(center, id), toMM(arc.GetLength())); + data->AddLengthArc(arc.name(), toMM(arc.GetLength())); } else { data->UpdateArc(id, arc); - data->AddLengthArc(data->GetNameArc(center, id), toMM(arc.GetLength())); + data->AddLengthArc(arc.name(), toMM(arc.GetLength())); if (parse != Document::FullParse) { doc->UpdateToolData(id, data); diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index c2324bbe3..65b3c4f7a 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -100,12 +100,12 @@ void VToolSpline::Create(const qint64 _id, const qint64 &p1, const qint64 &p4, c if (typeCreation == Tool::FromGui) { id = data->AddSpline(spline); - data->AddLengthSpline(data->GetNameSpline(p1, p4), toMM(spline.GetLength())); + data->AddLengthSpline(spline.name(), toMM(spline.GetLength())); } else { data->UpdateSpline(id, spline); - data->AddLengthSpline(data->GetNameSpline(p1, p4), toMM(spline.GetLength())); + data->AddLengthSpline(spline.name(), toMM(spline.GetLength())); if (parse != Document::FullParse) { doc->UpdateToolData(id, data); diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index 230b9a696..1fc91c843 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -90,12 +90,12 @@ void VToolSplinePath::Create(const qint64 _id, const VSplinePath &path, VMainGra if (typeCreation == Tool::FromGui) { id = data->AddSplinePath(path); - data->AddLengthSpline(data->GetNameSplinePath(path), toMM(path.GetLength())); + data->AddLengthSpline(path.name(), toMM(path.GetLength())); } else { data->UpdateSplinePath(id, path); - data->AddLengthSpline(data->GetNameSplinePath(path), toMM(path.GetLength())); + data->AddLengthSpline(path.name(), toMM(path.GetLength())); if (parse != Document::FullParse) { doc->UpdateToolData(id, data); diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index f1ca4c913..6a64019a2 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -102,7 +102,7 @@ VModelingArc* VModelingArc::Create(const qint64 _id, const qint64 ¢er, const doc->UpdateToolData(id, data); } } - data->AddLengthArc(data->GetNameArc(center, id, Draw::Modeling), toMM(arc.GetLength())); + data->AddLengthArc(arc.name(), toMM(arc.GetLength())); if (parse == Document::FullParse) { toolArc = new VModelingArc(doc, data, id, typeCreation); diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index 5806b5fc2..65ea14951 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -109,7 +109,7 @@ VModelingSpline *VModelingSpline::Create(const qint64 _id, const qint64 &p1, con doc->UpdateToolData(id, data); } } - data->AddLengthSpline(data->GetNameSpline(p1, p4, Draw::Modeling), toMM(spline.GetLength())); + data->AddLengthSpline(spline.name(), toMM(spline.GetLength())); if (parse == Document::FullParse) { spl = new VModelingSpline(doc, data, id, typeCreation); diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 975b8acd8..9706fbfd7 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -100,7 +100,7 @@ VModelingSplinePath * VModelingSplinePath::Create(const qint64 _id, const VSplin doc->UpdateToolData(id, data); } } - data->AddLengthSpline(data->GetNameSplinePath(path), toMM(path.GetLength())); + data->AddLengthSpline(path.name(), toMM(path.GetLength())); if (parse == Document::FullParse) { spl = new VModelingSplinePath(doc, data, id, typeCreation); From fab9fa4bfbba0bfaf2e2654308f94a7e15547e4c Mon Sep 17 00:00:00 2001 From: dismine Date: Tue, 12 Nov 2013 20:29:03 +0200 Subject: [PATCH 73/83] New gcc warnings. --HG-- branch : develop --- Valentina.pro | 9 ++++++++- container/calculator.cpp | 2 ++ container/vcontainer.cpp | 2 ++ dialogs/dialogheight.cpp | 2 ++ dialogs/dialogincrements.cpp | 2 ++ dialogs/dialogtriangle.cpp | 2 ++ geometry/vspline.cpp | 10 ++++++---- main.cpp | 2 ++ mainwindow.cpp | 2 ++ tablewindow.cpp | 4 ++-- tools/drawTools/vtoolpointofcontact.cpp | 2 +- tools/drawTools/vtoolshoulderpoint.cpp | 2 +- tools/drawTools/vtooltriangle.cpp | 6 +++--- widgets/vtablegraphicsview.cpp | 4 ++++ 14 files changed, 39 insertions(+), 12 deletions(-) diff --git a/Valentina.pro b/Valentina.pro index 229bd92d1..13ee22a43 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -76,9 +76,16 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ -isystem "/usr/include/qt5/QtXml" -isystem "/usr/include/qt5/QtGui" \ -isystem "/usr/include/qt5/QtCore" -isystem "$$OUT_PWD/uic" -isystem "$$OUT_PWD/moc/" \ + -isystem "$$OUT_PWD/rcc/" \ -Og -Wall -Wextra -pedantic -Weffc++ -Woverloaded-virtual -Wctor-dtor-privacy \ -Wnon-virtual-dtor -Wold-style-cast -Wconversion -Winit-self \ - -Wunreachable-code -gdwarf-3 + -Wunreachable-code -Wcast-align -Wcast-qual -Wdisabled-optimization -Wfloat-equal \ + -Wformat -Wformat=2 -Wformat-nonliteral -Wformat-security -Wformat-y2k\ + -Winvalid-pch -Wunsafe-loop-optimizations -Wlong-long -Wmissing-format-attribute \ + -Wmissing-include-dirs -Wpacked -Wredundant-decls \ + -Wswitch-default -Wswitch-enum -Wuninitialized -Wunused-parameter -Wvariadic-macros \ + -Wlogical-op -Wnoexcept \ + -Wstrict-null-sentinel -Wstrict-overflow=5 -Wundef -Wno-unused -gdwarf-3 }else{ # Release TARGET = $$RELEASE_TARGET diff --git a/container/calculator.cpp b/container/calculator.cpp index 1ba0a8477..b9667ae68 100644 --- a/container/calculator.cpp +++ b/container/calculator.cpp @@ -195,6 +195,8 @@ void Calculator::arith(QChar o, qreal *r, qreal *h) // for(t=*h-1; t>0; --t) // *r = (*r) * ex; break; + default: + break; } } diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index eee1923cc..5c7908b28 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -424,6 +424,8 @@ QVector VContainer::EkvPoint(const QLineF &line1, const QLineF &line2, points.append(bigLine1.p2()); return points; break; + default: + break; } return points; } diff --git a/dialogs/dialogheight.cpp b/dialogs/dialogheight.cpp index 5f3411532..10cb66285 100644 --- a/dialogs/dialogheight.cpp +++ b/dialogs/dialogheight.cpp @@ -125,6 +125,8 @@ void DialogHeight::ChoosedObject(qint64 id, const Scene::Scenes &type) this->show(); } break; + default: + break; } } } diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 3a499d8f3..6066a09c9 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -499,6 +499,8 @@ void DialogIncrements::cellChanged ( qint32 row, qint32 column ) emit haveLiteChange(); } break; + default: + break; } } diff --git a/dialogs/dialogtriangle.cpp b/dialogs/dialogtriangle.cpp index 7e8a0015b..ad63163d5 100644 --- a/dialogs/dialogtriangle.cpp +++ b/dialogs/dialogtriangle.cpp @@ -100,6 +100,8 @@ void DialogTriangle::ChoosedObject(qint64 id, const Scene::Scenes &type) this->show(); } break; + default: + break; } } } diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 2b6c19c6e..5e8d4c1d3 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -364,7 +364,7 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, // All collinear OR p1==p4 //---------------------- k = dx*dx + dy*dy; - if (k == 0) + if (k < 0.000000001) { d2 = CalcSqDistance(x1, y1, x2, y2); d3 = CalcSqDistance(x4, y4, x3, y3); @@ -468,7 +468,7 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, return; } - if (m_cusp_limit != 0.0) + if (m_cusp_limit > 0.0 || m_cusp_limit < 0.0) { if (da1 > m_cusp_limit) { @@ -517,7 +517,7 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, return; } - if (m_cusp_limit != 0.0) + if (m_cusp_limit > 0.0 || m_cusp_limit < 0.0) { if (da1 > m_cusp_limit) { @@ -573,7 +573,7 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, return; } - if (m_cusp_limit != 0.0) + if (m_cusp_limit > 0.0 || m_cusp_limit < 0.0) { if (da1 > m_cusp_limit) { @@ -591,6 +591,8 @@ void VSpline::PointBezier_r ( qreal x1, qreal y1, qreal x2, qreal y2, } } break; + default: + break; } // Continue subdivision diff --git a/main.cpp b/main.cpp index bc8d1598c..9e871793e 100644 --- a/main.cpp +++ b/main.cpp @@ -45,6 +45,8 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function); abort(); + default: + break; } } diff --git a/mainwindow.cpp b/mainwindow.cpp index 21d895f9d..1ef3d6eba 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -775,6 +775,8 @@ void MainWindow::keyPressEvent ( QKeyEvent * event ) case Qt::Key_Escape: ArrowTool(); break; + default: + break; } QMainWindow::keyPressEvent ( event ); } diff --git a/tablewindow.cpp b/tablewindow.cpp index a704e91e3..655f6593d 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -330,7 +330,7 @@ void TableWindow::AddLength() void TableWindow::RemoveLength() { - if (sceneRect.height()<=currentScene->sceneRect().height()-100) + if (sceneRect.height() <= currentScene->sceneRect().height() - 100) { QRectF rect = currentScene->sceneRect(); rect.setHeight(rect.height()-toPixel(279)); @@ -341,7 +341,7 @@ void TableWindow::RemoveLength() rect = paper->rect(); rect.setHeight(rect.height()-toPixel(279)); paper->setRect(rect); - if (sceneRect.height()==currentScene->sceneRect().height()) + if (fabs(sceneRect.height() - currentScene->sceneRect().height()) < 0.01) { ui->actionRemove->setDisabled(true); } diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index b14f31e69..9a8cf807f 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -58,7 +58,7 @@ QPointF VToolPointOfContact::FindPoint(const qreal &radius, const QPointF ¢e s_x = secondPoint.x()-(qAbs(secondPoint.x()-firstPoint.x()))*s; s_y = secondPoint.y()-(qAbs(secondPoint.y()-firstPoint.y()))*s; distans = QLineF(center.x(), center.y(), s_x, s_y).length(); - if (ceil(distans*10) == ceil(radius*10)) + if (fabs(distans*10 - radius*10) < 0.1) { pArc.rx() = s_x; pArc.ry() = s_y; diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index 26e5d2762..ed7fd7bdf 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -59,7 +59,7 @@ QPointF VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Li qDebug()<<"A3П2="< listSelectedItems = scene()->selectedItems(); if (listSelectedItems.size()>0) From 63f9f621983ff324b3159fc9bd8f3d8103294cfb Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 13 Nov 2013 16:07:40 +0200 Subject: [PATCH 74/83] Wrong define of widthMainLine. In SVG file don't show paper only details. In png file paper stayed. --HG-- branch : develop --- options.h | 2 +- tablewindow.cpp | 31 +++++++++++++++---------------- widgets/vitem.cpp | 13 +++++++++++-- widgets/vitem.h | 9 +++++++-- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/options.h b/options.h index bf2fbad48..8891d0d72 100644 --- a/options.h +++ b/options.h @@ -28,7 +28,7 @@ #define PaperSize 50000 #define toPixel(mm) ((mm / 25.4) * PrintDPI) #define toMM(pix) ((pix / PrintDPI) * 25.4) -#define widthMainLine toPixel(1.2) +#define widthMainLine 1.2 #define widthHairLine widthMainLine/3 namespace Scene diff --git a/tablewindow.cpp b/tablewindow.cpp index 655f6593d..69b22e5eb 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -72,7 +72,7 @@ void TableWindow::AddPaper() shadowPaper->setBrush(QBrush(Qt::black)); currentScene->addItem(shadowPaper); paper = new QGraphicsRectItem(QRectF(x1, y1, x2, y2)); - paper->setPen(QPen(Qt::black, toPixel(widthMainLine))); + paper->setPen(QPen(Qt::black, widthMainLine)); paper->setBrush(QBrush(Qt::white)); currentScene->addItem(paper); qDebug()<rect().size().toSize(); @@ -88,13 +88,14 @@ void TableWindow::AddDetail() QObject::connect(Detail, SIGNAL(itemColliding(QList, int)), this, SLOT(itemColliding(QList, int))); QObject::connect(this, SIGNAL(LengthChanged()), Detail, SLOT(LengthChanged())); - Detail->setPen(QPen(Qt::black, toPixel(widthMainLine))); + Detail->setPen(QPen(Qt::black, 1)); Detail->setBrush(QBrush(Qt::white)); Detail->setPos(paper->boundingRect().center()); Detail->setFlag(QGraphicsItem::ItemIsMovable, true); Detail->setFlag(QGraphicsItem::ItemIsSelectable, true); Detail->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); - Detail->setParentItem(paper); + Detail->setPaper(paper); + currentScene->addItem(Detail); Detail->setSelected(true); indexDetail++; if (indexDetail==listDetails.count()) @@ -160,27 +161,26 @@ void TableWindow::saveScene() brush->setColor( QColor( Qt::white ) ); currentScene->setBackgroundBrush( *brush ); currentScene->clearSelection(); // Selections would also render to the file - shadowPaper->setBrush(QBrush(Qt::white)); - shadowPaper->setPen(QPen(Qt::white, 0.1)); - paper->setPen(QPen(Qt::white, 0.1)); - paper->setBrush(QBrush(Qt::white)); - currentScene->setSceneRect(currentScene->itemsBoundingRect()); - + shadowPaper->setVisible(false); QFileInfo fi(name); if (fi.suffix() == "svg") { + paper->setVisible(false); SvgFile(name); + paper->setVisible(true); } else if (fi.suffix() == "png") { + paper->setPen(QPen(Qt::white, 0.1, Qt::NoPen)); PngFile(name); + paper->setPen(QPen(Qt::black, widthMainLine)); } brush->setColor( QColor( Qt::gray ) ); brush->setStyle( Qt::SolidPattern ); currentScene->setBackgroundBrush( *brush ); - paper->setPen(QPen(Qt::black, widthMainLine)); - shadowPaper->setBrush(QBrush(Qt::black)); + shadowPaper->setVisible(true); + delete brush; } void TableWindow::itemChect(bool flag) @@ -254,7 +254,7 @@ void TableWindow::itemColliding(QList list, int number) } else { - bitem->setPen(QPen(Qt::black, toPixel(widthMainLine))); + bitem->setPen(QPen(Qt::black, widthMainLine)); } listCollidingItems.removeAt(i); } @@ -269,7 +269,7 @@ void TableWindow::itemColliding(QList list, int number) } else { - bitem->setPen(QPen(Qt::black, toPixel(widthMainLine))); + bitem->setPen(QPen(Qt::black, widthMainLine)); } listCollidingItems.clear(); collidingItems = true; @@ -372,7 +372,6 @@ void TableWindow::SvgFile(const QString &name) const QSvgGenerator generator; generator.setFileName(name); generator.setSize(paper->rect().size().toSize()); - //generator.setViewBox(QRect(0, 0, 200, 200)); generator.setTitle(tr("SVG Generator Example Drawing")); generator.setDescription(tr("An SVG drawing created by the SVG Generator " "Example provided with Qt.")); @@ -382,7 +381,7 @@ void TableWindow::SvgFile(const QString &name) const painter.begin(&generator); painter.setFont( QFont( "Arial", 8, QFont::Normal ) ); painter.setRenderHint(QPainter::Antialiasing, true); - painter.setPen(QPen(Qt::black, widthMainLine, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + painter.setPen(QPen(Qt::black, 1.2, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); painter.setBrush ( QBrush ( Qt::NoBrush ) ); currentScene->render(&painter); painter.end(); @@ -399,7 +398,7 @@ void TableWindow::PngFile(const QString &name) const QPainter painter(&image); painter.setFont( QFont( "Arial", 8, QFont::Normal ) ); painter.setRenderHint(QPainter::Antialiasing, true); - painter.setPen(QPen(Qt::black, toPixel(widthMainLine), Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); + painter.setPen(QPen(Qt::black, widthMainLine, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin)); painter.setBrush ( QBrush ( Qt::NoBrush ) ); currentScene->render(&painter); image.save(name); diff --git a/widgets/vitem.cpp b/widgets/vitem.cpp index 963a693da..bfc184409 100644 --- a/widgets/vitem.cpp +++ b/widgets/vitem.cpp @@ -20,15 +20,24 @@ ****************************************************************************/ #include "vitem.h" +#include VItem::VItem (const QPainterPath & path, int numInList, QGraphicsItem * parent ) - :QGraphicsPathItem ( path, parent ), numInOutList(numInList) + :QGraphicsPathItem ( path, parent ), numInOutList(numInList), paper(0) { } void VItem::checkItemChange() { - QRectF rect = parentItem()->sceneBoundingRect(); + QRectF rect; + if(paper == 0){ + qDebug()<<"Don't set paper for detail!!!!"; + rect = this->scene()->sceneRect(); + } + else + { + rect = paper->sceneBoundingRect(); + } QRectF myrect = sceneBoundingRect(); if ( rect.contains( myrect )==true ) { diff --git a/widgets/vitem.h b/widgets/vitem.h index cff2136c8..868848ba7 100644 --- a/widgets/vitem.h +++ b/widgets/vitem.h @@ -36,14 +36,15 @@ public: * @brief VItem конструктор за замовчуванням *Конструктор генерує пусту деталь з номером в списку, що дорівнює 0. */ - VItem ():numInOutList(0){} + VItem ():numInOutList(0), paper(0){} /** * @brief VItem конструктор * @param numInList номер в списку деталей, що передається у вікно де *укладаються деталі. * @param parent батьківський об'єкт на сцені для даного. За замовчуванням немає. */ - VItem (int numInList, QGraphicsItem * parent = 0):QGraphicsPathItem (parent), numInOutList(numInList){} + VItem (int numInList, QGraphicsItem * parent = 0):QGraphicsPathItem (parent), numInOutList(numInList), + paper(0){} /** * @brief VItem конструктор * @param path зображення що буде показуватися на сцені - об’єкт класу QPainterPath. @@ -57,6 +58,8 @@ public: * @param angle кут в градусах на який повертається деталь. */ void Rotate ( qreal angle ); + QGraphicsRectItem *getPaper() const {return paper;} + void setPaper(QGraphicsRectItem *value) {paper = value;} public slots: /** * @brief LengthChanged слот який обробляє сигнал зміни довжини листа. @@ -82,11 +85,13 @@ protected: */ void checkItemChange (); private: + Q_DISABLE_COPY(VItem) /** * @brief numInOutList для зберігання інформації про колізії від кожної деталі необхідно знати її *номер. */ qint32 numInOutList; + QGraphicsRectItem* paper; signals: /** * @brief itemOut сигнал виходу за межі листа. Посилається у будь-якому випадку. From 4df358ce47d2f54d89c4f3d07fb810ac7c3ab645 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 15 Nov 2013 14:41:26 +0200 Subject: [PATCH 75/83] Change in license. --HG-- branch : develop --- container/calculator.cpp | 17 ++++-- container/calculator.h | 17 ++++-- container/vcontainer.cpp | 17 ++++-- container/vcontainer.h | 17 ++++-- container/vincrementtablerow.cpp | 17 ++++-- container/vincrementtablerow.h | 17 ++++-- container/vpointf.cpp | 17 ++++-- container/vpointf.h | 17 ++++-- container/vstandarttablecell.cpp | 17 ++++-- container/vstandarttablecell.h | 17 ++++-- dialogs/dialogalongline.cpp | 17 ++++-- dialogs/dialogalongline.h | 17 ++++-- dialogs/dialogarc.cpp | 17 ++++-- dialogs/dialogarc.h | 17 ++++-- dialogs/dialogbisector.cpp | 17 ++++-- dialogs/dialogbisector.h | 17 ++++-- dialogs/dialogdetail.cpp | 17 ++++-- dialogs/dialogdetail.h | 17 ++++-- dialogs/dialogendline.cpp | 17 ++++-- dialogs/dialogendline.h | 17 ++++-- dialogs/dialogheight.cpp | 17 ++++-- dialogs/dialogheight.h | 17 ++++-- dialogs/dialoghistory.cpp | 17 ++++-- dialogs/dialoghistory.h | 17 ++++-- dialogs/dialogincrements.cpp | 17 ++++-- dialogs/dialogincrements.h | 17 ++++-- dialogs/dialogline.cpp | 17 ++++-- dialogs/dialogline.h | 17 ++++-- dialogs/dialoglineintersect.cpp | 17 ++++-- dialogs/dialoglineintersect.h | 17 ++++-- dialogs/dialognormal.cpp | 17 ++++-- dialogs/dialognormal.h | 17 ++++-- dialogs/dialogpointofcontact.cpp | 17 ++++-- dialogs/dialogpointofcontact.h | 17 ++++-- dialogs/dialogpointofintersection.cpp | 17 ++++-- dialogs/dialogpointofintersection.h | 17 ++++-- dialogs/dialogs.h | 17 ++++-- dialogs/dialogshoulderpoint.cpp | 17 ++++-- dialogs/dialogshoulderpoint.h | 17 ++++-- dialogs/dialogsinglepoint.cpp | 17 ++++-- dialogs/dialogsinglepoint.h | 17 ++++-- dialogs/dialogspline.cpp | 17 ++++-- dialogs/dialogspline.h | 17 ++++-- dialogs/dialogsplinepath.cpp | 17 ++++-- dialogs/dialogsplinepath.h | 17 ++++-- dialogs/dialogtool.cpp | 17 ++++-- dialogs/dialogtool.h | 17 ++++-- dialogs/dialogtriangle.cpp | 17 ++++-- dialogs/dialogtriangle.h | 17 ++++-- exception/vexception.cpp | 17 ++++-- exception/vexception.h | 17 ++++-- exception/vexceptionbadid.cpp | 17 ++++-- exception/vexceptionbadid.h | 17 ++++-- exception/vexceptionconversionerror.cpp | 17 ++++-- exception/vexceptionconversionerror.h | 17 ++++-- exception/vexceptionemptyparameter.cpp | 17 ++++-- exception/vexceptionemptyparameter.h | 17 ++++-- exception/vexceptionobjecterror.cpp | 17 ++++-- exception/vexceptionobjecterror.h | 17 ++++-- exception/vexceptionuniqueid.cpp | 17 ++++-- exception/vexceptionuniqueid.h | 17 ++++-- exception/vexceptionwrongparameterid.cpp | 17 ++++-- exception/vexceptionwrongparameterid.h | 17 ++++-- geometry/varc.cpp | 17 ++++-- geometry/varc.h | 17 ++++-- geometry/vdetail.cpp | 17 ++++-- geometry/vdetail.h | 17 ++++-- geometry/vnodedetail.cpp | 17 ++++-- geometry/vnodedetail.h | 17 ++++-- geometry/vspline.cpp | 17 ++++-- geometry/vspline.h | 17 ++++-- geometry/vsplinepath.cpp | 17 ++++-- geometry/vsplinepath.h | 17 ++++-- geometry/vsplinepoint.cpp | 17 ++++-- geometry/vsplinepoint.h | 17 ++++-- main.cpp | 17 ++++-- mainwindow.cpp | 17 ++++-- mainwindow.h | 17 ++++-- options.h | 17 ++++-- stable.cpp | 17 ++++-- stable.h | 17 ++++-- tablewindow.cpp | 17 ++++-- tablewindow.h | 17 ++++-- tools/drawTools/drawtools.h | 17 ++++-- tools/drawTools/vdrawtool.cpp | 17 ++++-- tools/drawTools/vdrawtool.h | 17 ++++-- tools/drawTools/vtoolalongline.cpp | 17 ++++-- tools/drawTools/vtoolalongline.h | 17 ++++-- tools/drawTools/vtoolarc.cpp | 17 ++++-- tools/drawTools/vtoolarc.h | 17 ++++-- tools/drawTools/vtoolbisector.cpp | 17 ++++-- tools/drawTools/vtoolbisector.h | 17 ++++-- tools/drawTools/vtoolendline.cpp | 17 ++++-- tools/drawTools/vtoolendline.h | 17 ++++-- tools/drawTools/vtoolheight.cpp | 17 ++++-- tools/drawTools/vtoolheight.h | 17 ++++-- tools/drawTools/vtoolline.cpp | 17 ++++-- tools/drawTools/vtoolline.h | 17 ++++-- tools/drawTools/vtoollineintersect.cpp | 17 ++++-- tools/drawTools/vtoollineintersect.h | 17 ++++-- tools/drawTools/vtoollinepoint.cpp | 17 ++++-- tools/drawTools/vtoollinepoint.h | 17 ++++-- tools/drawTools/vtoolnormal.cpp | 17 ++++-- tools/drawTools/vtoolnormal.h | 17 ++++-- tools/drawTools/vtoolpoint.cpp | 17 ++++-- tools/drawTools/vtoolpoint.h | 17 ++++-- tools/drawTools/vtoolpointofcontact.cpp | 17 ++++-- tools/drawTools/vtoolpointofcontact.h | 17 ++++-- tools/drawTools/vtoolpointofintersection.cpp | 17 ++++-- tools/drawTools/vtoolpointofintersection.h | 17 ++++-- tools/drawTools/vtoolshoulderpoint.cpp | 17 ++++-- tools/drawTools/vtoolshoulderpoint.h | 17 ++++-- tools/drawTools/vtoolsinglepoint.cpp | 17 ++++-- tools/drawTools/vtoolsinglepoint.h | 17 ++++-- tools/drawTools/vtoolspline.cpp | 17 ++++-- tools/drawTools/vtoolspline.h | 17 ++++-- tools/drawTools/vtoolsplinepath.cpp | 17 ++++-- tools/drawTools/vtoolsplinepath.h | 17 ++++-- tools/drawTools/vtooltriangle.cpp | 17 ++++-- tools/drawTools/vtooltriangle.h | 17 ++++-- tools/modelingTools/modelingtools.h | 17 ++++-- tools/modelingTools/vmodelingalongline.cpp | 17 ++++-- tools/modelingTools/vmodelingalongline.h | 17 ++++-- tools/modelingTools/vmodelingarc.cpp | 17 ++++-- tools/modelingTools/vmodelingarc.h | 17 ++++-- tools/modelingTools/vmodelingbisector.cpp | 17 ++++-- tools/modelingTools/vmodelingbisector.h | 17 ++++-- tools/modelingTools/vmodelingendline.cpp | 17 ++++-- tools/modelingTools/vmodelingendline.h | 17 ++++-- tools/modelingTools/vmodelingheight.cpp | 17 ++++-- tools/modelingTools/vmodelingheight.h | 17 ++++-- tools/modelingTools/vmodelingline.cpp | 17 ++++-- tools/modelingTools/vmodelingline.h | 17 ++++-- .../modelingTools/vmodelinglineintersect.cpp | 17 ++++-- tools/modelingTools/vmodelinglineintersect.h | 17 ++++-- tools/modelingTools/vmodelinglinepoint.cpp | 17 ++++-- tools/modelingTools/vmodelinglinepoint.h | 17 ++++-- tools/modelingTools/vmodelingnormal.cpp | 17 ++++-- tools/modelingTools/vmodelingnormal.h | 17 ++++-- tools/modelingTools/vmodelingpoint.cpp | 17 ++++-- tools/modelingTools/vmodelingpoint.h | 17 ++++-- .../modelingTools/vmodelingpointofcontact.cpp | 17 ++++-- tools/modelingTools/vmodelingpointofcontact.h | 17 ++++-- .../vmodelingpointofintersection.cpp | 17 ++++-- .../vmodelingpointofintersection.h | 17 ++++-- .../modelingTools/vmodelingshoulderpoint.cpp | 17 ++++-- tools/modelingTools/vmodelingshoulderpoint.h | 17 ++++-- tools/modelingTools/vmodelingspline.cpp | 17 ++++-- tools/modelingTools/vmodelingspline.h | 17 ++++-- tools/modelingTools/vmodelingsplinepath.cpp | 17 ++++-- tools/modelingTools/vmodelingsplinepath.h | 17 ++++-- tools/modelingTools/vmodelingtool.cpp | 17 ++++-- tools/modelingTools/vmodelingtool.h | 17 ++++-- tools/modelingTools/vmodelingtriangle.cpp | 17 ++++-- tools/modelingTools/vmodelingtriangle.h | 17 ++++-- tools/nodeDetails/nodedetails.h | 17 ++++-- tools/nodeDetails/vabstractnode.cpp | 17 ++++-- tools/nodeDetails/vabstractnode.h | 17 ++++-- tools/nodeDetails/vnodearc.cpp | 17 ++++-- tools/nodeDetails/vnodearc.h | 17 ++++-- tools/nodeDetails/vnodepoint.cpp | 17 ++++-- tools/nodeDetails/vnodepoint.h | 17 ++++-- tools/nodeDetails/vnodespline.cpp | 17 ++++-- tools/nodeDetails/vnodespline.h | 17 ++++-- tools/nodeDetails/vnodesplinepath.cpp | 17 ++++-- tools/nodeDetails/vnodesplinepath.h | 17 ++++-- tools/tools.h | 17 ++++-- tools/vabstracttool.cpp | 17 ++++-- tools/vabstracttool.h | 17 ++++-- tools/vdatatool.cpp | 17 ++++-- tools/vdatatool.h | 17 ++++-- tools/vtooldetail.cpp | 17 ++++-- tools/vtooldetail.h | 17 ++++-- version.h | 17 ++++-- widgets/doubledelegate.cpp | 54 ++++++++----------- widgets/doubledelegate.h | 54 ++++++++----------- widgets/vapplication.cpp | 17 ++++-- widgets/vapplication.h | 17 ++++-- widgets/vcontrolpointspline.cpp | 17 ++++-- widgets/vcontrolpointspline.h | 17 ++++-- widgets/vgraphicssimpletextitem.cpp | 17 ++++-- widgets/vgraphicssimpletextitem.h | 17 ++++-- widgets/vitem.cpp | 17 ++++-- widgets/vitem.h | 17 ++++-- widgets/vmaingraphicsscene.cpp | 17 ++++-- widgets/vmaingraphicsscene.h | 17 ++++-- widgets/vmaingraphicsview.cpp | 17 ++++-- widgets/vmaingraphicsview.h | 17 ++++-- widgets/vtablegraphicsview.cpp | 17 ++++-- widgets/vtablegraphicsview.h | 17 ++++-- xml/vdomdocument.cpp | 17 ++++-- xml/vdomdocument.h | 17 ++++-- xml/vtoolrecord.cpp | 17 ++++-- xml/vtoolrecord.h | 17 ++++-- 194 files changed, 2346 insertions(+), 1026 deletions(-) diff --git a/container/calculator.cpp b/container/calculator.cpp index b9667ae68..247672312 100644 --- a/container/calculator.cpp +++ b/container/calculator.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file calculator.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "calculator.h" diff --git a/container/calculator.h b/container/calculator.h index 6fa29c3ed..181dc99fc 100644 --- a/container/calculator.h +++ b/container/calculator.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file calculator.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef CALCULATOR_H #define CALCULATOR_H diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 5c7908b28..56e4e7bd6 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vcontainer.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vcontainer.h" #include "../exception/vexceptionbadid.h" diff --git a/container/vcontainer.h b/container/vcontainer.h index 7e135f4c8..e86b6a8c3 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vcontainer.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VCONTAINER_H #define VCONTAINER_H diff --git a/container/vincrementtablerow.cpp b/container/vincrementtablerow.cpp index e7adbca73..eae1d3402 100644 --- a/container/vincrementtablerow.cpp +++ b/container/vincrementtablerow.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vincrementtablerow.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vincrementtablerow.h" diff --git a/container/vincrementtablerow.h b/container/vincrementtablerow.h index c3d82b6d4..0e055e861 100644 --- a/container/vincrementtablerow.h +++ b/container/vincrementtablerow.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vincrementtablerow.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VINCREMENTTABLEROW_H #define VINCREMENTTABLEROW_H diff --git a/container/vpointf.cpp b/container/vpointf.cpp index bb5a2a8ad..a7b69d871 100644 --- a/container/vpointf.cpp +++ b/container/vpointf.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vpointf.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vpointf.h" diff --git a/container/vpointf.h b/container/vpointf.h index 2a71599d0..bbeda2001 100644 --- a/container/vpointf.h +++ b/container/vpointf.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vpointf.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VPOINTF_H #define VPOINTF_H diff --git a/container/vstandarttablecell.cpp b/container/vstandarttablecell.cpp index 4f08ae346..97bfbf97a 100644 --- a/container/vstandarttablecell.cpp +++ b/container/vstandarttablecell.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vstandarttablecell.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vstandarttablecell.h" diff --git a/container/vstandarttablecell.h b/container/vstandarttablecell.h index e5247f7a2..198488ce6 100644 --- a/container/vstandarttablecell.h +++ b/container/vstandarttablecell.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vstandarttablecell.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VSTANDARTTABLECELL_H #define VSTANDARTTABLECELL_H diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index 866b4bbf0..c00252c56 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogalongline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogalongline.h" #include "ui_dialogalongline.h" diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index f4a425163..32820bf08 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogalongline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGALONGLINE_H #define DIALOGALONGLINE_H diff --git a/dialogs/dialogarc.cpp b/dialogs/dialogarc.cpp index 47c43239e..0a26dea23 100644 --- a/dialogs/dialogarc.cpp +++ b/dialogs/dialogarc.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogarc.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogarc.h" #include "ui_dialogarc.h" diff --git a/dialogs/dialogarc.h b/dialogs/dialogarc.h index 1267f6943..a801714f4 100644 --- a/dialogs/dialogarc.h +++ b/dialogs/dialogarc.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogarc.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGARC_H #define DIALOGARC_H diff --git a/dialogs/dialogbisector.cpp b/dialogs/dialogbisector.cpp index a9869ca03..3ba18b79f 100644 --- a/dialogs/dialogbisector.cpp +++ b/dialogs/dialogbisector.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogbisector.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogbisector.h" #include "ui_dialogbisector.h" diff --git a/dialogs/dialogbisector.h b/dialogs/dialogbisector.h index 4ea1f3fb3..72f0ae42d 100644 --- a/dialogs/dialogbisector.h +++ b/dialogs/dialogbisector.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogbisector.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGBISECTOR_H #define DIALOGBISECTOR_H diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index 106ac5cba..a4d94e8fb 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogdetail.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogdetail.h" diff --git a/dialogs/dialogdetail.h b/dialogs/dialogdetail.h index b39a7036f..b26a32a95 100644 --- a/dialogs/dialogdetail.h +++ b/dialogs/dialogdetail.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogdetail.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGDETAIL_H #define DIALOGDETAIL_H diff --git a/dialogs/dialogendline.cpp b/dialogs/dialogendline.cpp index db41ac062..a6a3bb01a 100644 --- a/dialogs/dialogendline.cpp +++ b/dialogs/dialogendline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogendline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogendline.h" #include "ui_dialogendline.h" diff --git a/dialogs/dialogendline.h b/dialogs/dialogendline.h index 300b8d201..f3dcac149 100644 --- a/dialogs/dialogendline.h +++ b/dialogs/dialogendline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogendline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGENDLINE_H #define DIALOGENDLINE_H diff --git a/dialogs/dialogheight.cpp b/dialogs/dialogheight.cpp index 10cb66285..ff01b473c 100644 --- a/dialogs/dialogheight.cpp +++ b/dialogs/dialogheight.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogheight.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogheight.h" #include "ui_dialogheight.h" diff --git a/dialogs/dialogheight.h b/dialogs/dialogheight.h index 4b787ff3b..2c5d11d6c 100644 --- a/dialogs/dialogheight.h +++ b/dialogs/dialogheight.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogheight.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGHEIGHT_H #define DIALOGHEIGHT_H diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index 92849163e..ac8227cae 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialoghistory.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialoghistory.h" #include "ui_dialoghistory.h" diff --git a/dialogs/dialoghistory.h b/dialogs/dialoghistory.h index 21c7c4bab..1fb325c99 100644 --- a/dialogs/dialoghistory.h +++ b/dialogs/dialoghistory.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialoghistory.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGHISTORY_H #define DIALOGHISTORY_H diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 6066a09c9..148601f54 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogincrements.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogincrements.h" #include "ui_dialogincrements.h" diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h index bb476393b..667068b54 100644 --- a/dialogs/dialogincrements.h +++ b/dialogs/dialogincrements.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogincrements.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGINCREMENTS_H #define DIALOGINCREMENTS_H diff --git a/dialogs/dialogline.cpp b/dialogs/dialogline.cpp index 4d95c7522..ca71c9875 100644 --- a/dialogs/dialogline.cpp +++ b/dialogs/dialogline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogline.h" #include "ui_dialogline.h" diff --git a/dialogs/dialogline.h b/dialogs/dialogline.h index 2693d2734..312048720 100644 --- a/dialogs/dialogline.h +++ b/dialogs/dialogline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGLINE_H #define DIALOGLINE_H diff --git a/dialogs/dialoglineintersect.cpp b/dialogs/dialoglineintersect.cpp index 480476c08..05c4ae270 100644 --- a/dialogs/dialoglineintersect.cpp +++ b/dialogs/dialoglineintersect.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialoglineintersect.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialoglineintersect.h" #include "ui_dialoglineintersect.h" diff --git a/dialogs/dialoglineintersect.h b/dialogs/dialoglineintersect.h index 574a83455..3a6c22e41 100644 --- a/dialogs/dialoglineintersect.h +++ b/dialogs/dialoglineintersect.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialoglineintersect.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGLINEINTERSECT_H #define DIALOGLINEINTERSECT_H diff --git a/dialogs/dialognormal.cpp b/dialogs/dialognormal.cpp index c105e8445..45f2eaf23 100644 --- a/dialogs/dialognormal.cpp +++ b/dialogs/dialognormal.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialognormal.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialognormal.h" #include "ui_dialognormal.h" diff --git a/dialogs/dialognormal.h b/dialogs/dialognormal.h index 782305582..c4e2bdc5d 100644 --- a/dialogs/dialognormal.h +++ b/dialogs/dialognormal.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialognormal.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGNORMAL_H #define DIALOGNORMAL_H diff --git a/dialogs/dialogpointofcontact.cpp b/dialogs/dialogpointofcontact.cpp index e9caa7905..584d72a84 100644 --- a/dialogs/dialogpointofcontact.cpp +++ b/dialogs/dialogpointofcontact.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogpointofcontact.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogpointofcontact.h" diff --git a/dialogs/dialogpointofcontact.h b/dialogs/dialogpointofcontact.h index 37171e72e..3aaf37abf 100644 --- a/dialogs/dialogpointofcontact.h +++ b/dialogs/dialogpointofcontact.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogpointofcontact.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGPOINTOFCONTACT_H #define DIALOGPOINTOFCONTACT_H diff --git a/dialogs/dialogpointofintersection.cpp b/dialogs/dialogpointofintersection.cpp index 7adcd8b28..032acff85 100644 --- a/dialogs/dialogpointofintersection.cpp +++ b/dialogs/dialogpointofintersection.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogpointofintersection.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogpointofintersection.h" #include "ui_dialogpointofintersection.h" diff --git a/dialogs/dialogpointofintersection.h b/dialogs/dialogpointofintersection.h index e6971853c..31f9ff7d2 100644 --- a/dialogs/dialogpointofintersection.h +++ b/dialogs/dialogpointofintersection.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogpointofintersection.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGPOINTOFINTERSECTION_H #define DIALOGPOINTOFINTERSECTION_H diff --git a/dialogs/dialogs.h b/dialogs/dialogs.h index 82faf687b..16c0e5481 100644 --- a/dialogs/dialogs.h +++ b/dialogs/dialogs.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogs.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGS_H #define DIALOGS_H diff --git a/dialogs/dialogshoulderpoint.cpp b/dialogs/dialogshoulderpoint.cpp index 809516519..ad06456fb 100644 --- a/dialogs/dialogshoulderpoint.cpp +++ b/dialogs/dialogshoulderpoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogshoulderpoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogshoulderpoint.h" #include "ui_dialogshoulderpoint.h" diff --git a/dialogs/dialogshoulderpoint.h b/dialogs/dialogshoulderpoint.h index ba516c4dd..7fba9f447 100644 --- a/dialogs/dialogshoulderpoint.h +++ b/dialogs/dialogshoulderpoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogshoulderpoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGSHOULDERPOINT_H #define DIALOGSHOULDERPOINT_H diff --git a/dialogs/dialogsinglepoint.cpp b/dialogs/dialogsinglepoint.cpp index 5abcfb5ba..18a9f00aa 100644 --- a/dialogs/dialogsinglepoint.cpp +++ b/dialogs/dialogsinglepoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogsinglepoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogsinglepoint.h" #include "ui_dialogsinglepoint.h" diff --git a/dialogs/dialogsinglepoint.h b/dialogs/dialogsinglepoint.h index 3d3d71ef2..e475df6af 100644 --- a/dialogs/dialogsinglepoint.h +++ b/dialogs/dialogsinglepoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogsinglepoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGSINGLEPOINT_H #define DIALOGSINGLEPOINT_H diff --git a/dialogs/dialogspline.cpp b/dialogs/dialogspline.cpp index 5f0d42123..9fb854423 100644 --- a/dialogs/dialogspline.cpp +++ b/dialogs/dialogspline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogspline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogspline.h" #include "ui_dialogspline.h" diff --git a/dialogs/dialogspline.h b/dialogs/dialogspline.h index f155910b6..c42c0b0bb 100644 --- a/dialogs/dialogspline.h +++ b/dialogs/dialogspline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogspline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGSPLINE_H #define DIALOGSPLINE_H diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index 76efb8bd8..07a6eb418 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogsplinepath.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogsplinepath.h" #include "ui_dialogsplinepath.h" diff --git a/dialogs/dialogsplinepath.h b/dialogs/dialogsplinepath.h index b6eb49813..d6757aed1 100644 --- a/dialogs/dialogsplinepath.h +++ b/dialogs/dialogsplinepath.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogsplinepath.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGSPLINEPATH_H #define DIALOGSPLINEPATH_H diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index 2e4ea80f5..091bedf82 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogtool.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogtool.h" #include "../container/calculator.h" diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index 79dfeb517..70908e4e3 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogtool.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGTOOL_H #define DIALOGTOOL_H diff --git a/dialogs/dialogtriangle.cpp b/dialogs/dialogtriangle.cpp index ad63163d5..8f5509855 100644 --- a/dialogs/dialogtriangle.cpp +++ b/dialogs/dialogtriangle.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogtriangle.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "dialogtriangle.h" #include "ui_dialogtriangle.h" diff --git a/dialogs/dialogtriangle.h b/dialogs/dialogtriangle.h index ec2c1da08..b54200fe4 100644 --- a/dialogs/dialogtriangle.h +++ b/dialogs/dialogtriangle.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file dialogtriangle.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DIALOGTRIANGLE_H #define DIALOGTRIANGLE_H diff --git a/exception/vexception.cpp b/exception/vexception.cpp index 07aaa4795..b53d046f6 100644 --- a/exception/vexception.cpp +++ b/exception/vexception.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexception.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vexception.h" diff --git a/exception/vexception.h b/exception/vexception.h index 5a68cbad7..ede2f942f 100644 --- a/exception/vexception.h +++ b/exception/vexception.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexception.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VEXCEPTION_H diff --git a/exception/vexceptionbadid.cpp b/exception/vexceptionbadid.cpp index f11841124..d7073cc90 100644 --- a/exception/vexceptionbadid.cpp +++ b/exception/vexceptionbadid.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionbadid.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vexceptionbadid.h" diff --git a/exception/vexceptionbadid.h b/exception/vexceptionbadid.h index dbf1b17a1..ed21121e3 100644 --- a/exception/vexceptionbadid.h +++ b/exception/vexceptionbadid.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionbadid.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VEXCEPTIONBADID_H #define VEXCEPTIONBADID_H diff --git a/exception/vexceptionconversionerror.cpp b/exception/vexceptionconversionerror.cpp index 9e53d1a54..76bb92150 100644 --- a/exception/vexceptionconversionerror.cpp +++ b/exception/vexceptionconversionerror.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionconversionerror.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vexceptionconversionerror.h" diff --git a/exception/vexceptionconversionerror.h b/exception/vexceptionconversionerror.h index 0e88427ab..9bff003e3 100644 --- a/exception/vexceptionconversionerror.h +++ b/exception/vexceptionconversionerror.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionconversionerror.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VEXCEPTIONCONVERSIONERROR_H #define VEXCEPTIONCONVERSIONERROR_H diff --git a/exception/vexceptionemptyparameter.cpp b/exception/vexceptionemptyparameter.cpp index 038f98f1d..21185861f 100644 --- a/exception/vexceptionemptyparameter.cpp +++ b/exception/vexceptionemptyparameter.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionemptyparameter.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vexceptionemptyparameter.h" diff --git a/exception/vexceptionemptyparameter.h b/exception/vexceptionemptyparameter.h index 7dfbaa2ea..eeeab750b 100644 --- a/exception/vexceptionemptyparameter.h +++ b/exception/vexceptionemptyparameter.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionemptyparameter.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VEXCEPTIONEMPTYPARAMETER_H #define VEXCEPTIONEMPTYPARAMETER_H diff --git a/exception/vexceptionobjecterror.cpp b/exception/vexceptionobjecterror.cpp index b1dcbfd5c..98eb26c0c 100644 --- a/exception/vexceptionobjecterror.cpp +++ b/exception/vexceptionobjecterror.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionobjecterror.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vexceptionobjecterror.h" #include diff --git a/exception/vexceptionobjecterror.h b/exception/vexceptionobjecterror.h index 76cdebbec..920e0ff9f 100644 --- a/exception/vexceptionobjecterror.h +++ b/exception/vexceptionobjecterror.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionobjecterror.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VEXCEPTIONOBJECTERROR_H #define VEXCEPTIONOBJECTERROR_H diff --git a/exception/vexceptionuniqueid.cpp b/exception/vexceptionuniqueid.cpp index df7c506ae..7da610fca 100644 --- a/exception/vexceptionuniqueid.cpp +++ b/exception/vexceptionuniqueid.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionuniqueid.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vexceptionuniqueid.h" diff --git a/exception/vexceptionuniqueid.h b/exception/vexceptionuniqueid.h index f34f2e56e..0ddb14b39 100644 --- a/exception/vexceptionuniqueid.h +++ b/exception/vexceptionuniqueid.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionuniqueid.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VEXCEPTIONUNIQUEID_H #define VEXCEPTIONUNIQUEID_H diff --git a/exception/vexceptionwrongparameterid.cpp b/exception/vexceptionwrongparameterid.cpp index 4e10560e3..f86e5bd25 100644 --- a/exception/vexceptionwrongparameterid.cpp +++ b/exception/vexceptionwrongparameterid.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionwrongparameterid.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vexceptionwrongparameterid.h" #include diff --git a/exception/vexceptionwrongparameterid.h b/exception/vexceptionwrongparameterid.h index 69de87b8c..9a1b3f10c 100644 --- a/exception/vexceptionwrongparameterid.h +++ b/exception/vexceptionwrongparameterid.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vexceptionwrongparameterid.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VEXCEPTIONWRONGPARAMETERID_H #define VEXCEPTIONWRONGPARAMETERID_H diff --git a/geometry/varc.cpp b/geometry/varc.cpp index dff1f8840..8c2f99f89 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file varc.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "varc.h" #include "../exception/vexception.h" diff --git a/geometry/varc.h b/geometry/varc.h index 5c658b453..69fdd5e57 100644 --- a/geometry/varc.h +++ b/geometry/varc.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file varc.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VARC_H #define VARC_H diff --git a/geometry/vdetail.cpp b/geometry/vdetail.cpp index 105c90cba..acb74a574 100644 --- a/geometry/vdetail.cpp +++ b/geometry/vdetail.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vdetail.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vdetail.h" diff --git a/geometry/vdetail.h b/geometry/vdetail.h index c85b411a0..aad92c934 100644 --- a/geometry/vdetail.h +++ b/geometry/vdetail.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vdetail.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VDETAIL_H #define VDETAIL_H diff --git a/geometry/vnodedetail.cpp b/geometry/vnodedetail.cpp index a3e62e51f..55385ad0f 100644 --- a/geometry/vnodedetail.cpp +++ b/geometry/vnodedetail.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodedetail.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vnodedetail.h" diff --git a/geometry/vnodedetail.h b/geometry/vnodedetail.h index 38a3caced..8a6572346 100644 --- a/geometry/vnodedetail.h +++ b/geometry/vnodedetail.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodedetail.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VNODEDETAIL_H #define VNODEDETAIL_H diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 5e8d4c1d3..1a77b2b9c 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vspline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vspline.h" diff --git a/geometry/vspline.h b/geometry/vspline.h index 874a3d765..58221954c 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vspline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VSPLINE_H #define VSPLINE_H diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index 3f7af17d5..e77f9f465 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vsplinepath.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vsplinepath.h" #include "../exception/vexception.h" diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index 60657783d..6133ee91b 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vsplinepath.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VSPLINEPATH_H #define VSPLINEPATH_H diff --git a/geometry/vsplinepoint.cpp b/geometry/vsplinepoint.cpp index 7913d0fe9..a76e7883a 100644 --- a/geometry/vsplinepoint.cpp +++ b/geometry/vsplinepoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vsplinepoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vsplinepoint.h" diff --git a/geometry/vsplinepoint.h b/geometry/vsplinepoint.h index 41f2f9672..1454808fc 100644 --- a/geometry/vsplinepoint.h +++ b/geometry/vsplinepoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vsplinepoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VSPLINEPOINT_H #define VSPLINEPOINT_H diff --git a/main.cpp b/main.cpp index 9e871793e..61fc5f1bb 100644 --- a/main.cpp +++ b/main.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file main.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "mainwindow.h" #include "widgets/vapplication.h" diff --git a/mainwindow.cpp b/mainwindow.cpp index 1ef3d6eba..1c7db04bf 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file mainwindow.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "mainwindow.h" #include "ui_mainwindow.h" diff --git a/mainwindow.h b/mainwindow.h index 933d69aa2..05e96baa6 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file mainwindow.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/options.h b/options.h index 8891d0d72..a45dcf221 100644 --- a/options.h +++ b/options.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file options.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef OPTIONS_H #define OPTIONS_H diff --git a/stable.cpp b/stable.cpp index 7de5f227a..4bb989f56 100644 --- a/stable.cpp +++ b/stable.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file stable.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ // Build the precompiled headers. #include "stable.h" diff --git a/stable.h b/stable.h index dffda05ae..772227291 100644 --- a/stable.h +++ b/stable.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file stable.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef STABLE_H #define STABLE_H diff --git a/tablewindow.cpp b/tablewindow.cpp index 69b22e5eb..81eb1908d 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file tablewindow.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "tablewindow.h" #include "ui_tablewindow.h" diff --git a/tablewindow.h b/tablewindow.h index 33facb88e..b9b40740c 100644 --- a/tablewindow.h +++ b/tablewindow.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file tablewindow.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef TABLEWINDOW_H #define TABLEWINDOW_H diff --git a/tools/drawTools/drawtools.h b/tools/drawTools/drawtools.h index 4889ad878..2e75cbd56 100644 --- a/tools/drawTools/drawtools.h +++ b/tools/drawTools/drawtools.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file drawtools.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef DRAWTOOLS_H #define DRAWTOOLS_H diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index 13fdf65a7..21e599c19 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vdrawtool.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vdrawtool.h" diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index 59d00de8c..eae38e092 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vdrawtool.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VDRAWTOOL_H #define VDRAWTOOL_H diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index 947276c29..b65e8fb20 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolalongline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolalongline.h" #include "../../container/calculator.h" diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index 48ca90c24..2a5141c0c 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolalongline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLALONGLINE_H #define VTOOLALONGLINE_H diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index 6d249cf06..c914f4a94 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolarc.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolarc.h" #include "../../container/calculator.h" diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index cbfba5490..3f8f7b18d 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolarc.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLARC_H #define VTOOLARC_H diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index f9b6af717..564ce8c19 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolbisector.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolbisector.h" #include "../../container/calculator.h" diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index 1b6fc5077..ab1316a04 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolbisector.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLBISECTOR_H #define VTOOLBISECTOR_H diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index 5199dfbbf..be53189fc 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolendline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolendline.h" #include "../../widgets/vmaingraphicsscene.h" diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index a6d755b88..b5806b1b3 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolendline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLENDLINE_H #define VTOOLENDLINE_H diff --git a/tools/drawTools/vtoolheight.cpp b/tools/drawTools/vtoolheight.cpp index ad4f41cee..599d55686 100644 --- a/tools/drawTools/vtoolheight.cpp +++ b/tools/drawTools/vtoolheight.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolheight.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolheight.h" diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h index 3a975b693..14cf3dd17 100644 --- a/tools/drawTools/vtoolheight.h +++ b/tools/drawTools/vtoolheight.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolheight.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLHEIGHT_H #define VTOOLHEIGHT_H diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 1cfc76e1a..161cee5b0 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolline.h" diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index 2c0c87ab5..934afa987 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLLINE_H #define VTOOLLINE_H diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index e50ad42ee..5b5adfdf7 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoollineintersect.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoollineintersect.h" diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index 6d4dd0fdf..c9b328344 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoollineintersect.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLLINEINTERSECT_H #define VTOOLLINEINTERSECT_H diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index cb829f953..89c9c0f44 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoollinepoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoollinepoint.h" diff --git a/tools/drawTools/vtoollinepoint.h b/tools/drawTools/vtoollinepoint.h index 516ce890c..4faf640d4 100644 --- a/tools/drawTools/vtoollinepoint.h +++ b/tools/drawTools/vtoollinepoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoollinepoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLLINEPOINT_H #define VTOOLLINEPOINT_H diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index 4334eef3a..abd9af816 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolnormal.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolnormal.h" #include "../../container/calculator.h" diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index 598496309..b1f7bc6dd 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolnormal.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLNORMAL_H #define VTOOLNORMAL_H diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index 37ac56ec9..bd8181f1e 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolpoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolpoint.h" diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index 8bcd8c0b0..25584de2b 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolpoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLPOINT_H #define VTOOLPOINT_H diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index 9a8cf807f..56f73f7fe 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolpointofcontact.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolpointofcontact.h" #include "../../container/calculator.h" diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index 1fc40c264..75ce0d73c 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolpointofcontact.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLPOINTOFCONTACT_H #define VTOOLPOINTOFCONTACT_H diff --git a/tools/drawTools/vtoolpointofintersection.cpp b/tools/drawTools/vtoolpointofintersection.cpp index e53811d0d..b6b8c368e 100644 --- a/tools/drawTools/vtoolpointofintersection.cpp +++ b/tools/drawTools/vtoolpointofintersection.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolpointofintersection.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolpointofintersection.h" diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h index 47029b577..99255449f 100644 --- a/tools/drawTools/vtoolpointofintersection.h +++ b/tools/drawTools/vtoolpointofintersection.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolpointofintersection.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLPOINTOFINTERSECTION_H #define VTOOLPOINTOFINTERSECTION_H diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index ed7fd7bdf..df21f544b 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolshoulderpoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolshoulderpoint.h" #include "../../container/calculator.h" diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index 71a2c30b3..ef7986571 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolshoulderpoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLSHOULDERPOINT_H #define VTOOLSHOULDERPOINT_H diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index a9c85ea0d..7abb58219 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolsinglepoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolsinglepoint.h" diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index 98e3f491c..ca7f067ec 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolsinglepoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLSINGLEPOINT_H #define VTOOLSINGLEPOINT_H diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index 65b3c4f7a..fe47cbcce 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolspline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolspline.h" #include "../../geometry/vspline.h" diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index 1960981e0..3424e87fb 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolspline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLSPLINE_H #define VTOOLSPLINE_H diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index 1fc91c843..302a5ffd4 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolsplinepath.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolsplinepath.h" diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index 804eddedf..7ff780504 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolsplinepath.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLSPLINEPATH_H #define VTOOLSPLINEPATH_H diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index 7e3da1574..dee16eac7 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtooltriangle.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtooltriangle.h" diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index 5990ef214..329028df9 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtooltriangle.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLTRIANGLE_H #define VTOOLTRIANGLE_H diff --git a/tools/modelingTools/modelingtools.h b/tools/modelingTools/modelingtools.h index 7a336be62..8ce388dd0 100644 --- a/tools/modelingTools/modelingtools.h +++ b/tools/modelingTools/modelingtools.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file modelingtools.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef MODELINGTOOLS_H #define MODELINGTOOLS_H diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index 5a27bb510..1f504b46a 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingalongline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingalongline.h" #include "../../container/calculator.h" diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index e5ecd0e69..a063f151b 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingalongline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGALONGLINE_H #define VMODELINGALONGLINE_H diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index 6a64019a2..c8aa15d1f 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingarc.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingarc.h" #include "../../container/calculator.h" diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index 44a6439e0..bdf51efd1 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingarc.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGARC_H #define VMODELINGARC_H diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index 6a1c57b52..11324c531 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingbisector.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingbisector.h" #include "../drawTools/vtoolbisector.h" diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index ed454812c..3676fb0ad 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingbisector.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGBISECTOR_H #define VMODELINGBISECTOR_H diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index f929a48bd..7eaf8f668 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingendline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingendline.h" #include "../../container/calculator.h" diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index cf33c3058..fe2aec5ca 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingbisector.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGENDLINE_H #define VMODELINGENDLINE_H diff --git a/tools/modelingTools/vmodelingheight.cpp b/tools/modelingTools/vmodelingheight.cpp index 68439713e..497a53346 100644 --- a/tools/modelingTools/vmodelingheight.cpp +++ b/tools/modelingTools/vmodelingheight.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingheight.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingheight.h" #include "../drawTools/vtoolheight.h" diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index 681c1e034..016a6d777 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingheight.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGHEIGHT_H #define VMODELINGHEIGHT_H diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index d019f4d68..edd109a26 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingline.h" diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index 0d7cb96ef..c04e04c1b 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGLINE_H #define VMODELINGLINE_H diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp index 2665df105..327dfa3d0 100644 --- a/tools/modelingTools/vmodelinglineintersect.cpp +++ b/tools/modelingTools/vmodelinglineintersect.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelinglineintersect.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelinglineintersect.h" diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index 93282c731..dfa6ce0fd 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelinglineintersect.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGLINEINTERSECT_H #define VMODELINGLINEINTERSECT_H diff --git a/tools/modelingTools/vmodelinglinepoint.cpp b/tools/modelingTools/vmodelinglinepoint.cpp index 55802477a..f22649405 100644 --- a/tools/modelingTools/vmodelinglinepoint.cpp +++ b/tools/modelingTools/vmodelinglinepoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelinglinepoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelinglinepoint.h" diff --git a/tools/modelingTools/vmodelinglinepoint.h b/tools/modelingTools/vmodelinglinepoint.h index be3afec2e..24a0b36c9 100644 --- a/tools/modelingTools/vmodelinglinepoint.h +++ b/tools/modelingTools/vmodelinglinepoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelinglinepoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGLINEPOINT_H #define VMODELINGLINEPOINT_H diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index c4205734d..0d89bb995 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingnormal.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingnormal.h" #include "../drawTools/vtoolnormal.h" diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index 03a952983..a9c70e392 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingnormal.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGNORMAL_H #define VMODELINGNORMAL_H diff --git a/tools/modelingTools/vmodelingpoint.cpp b/tools/modelingTools/vmodelingpoint.cpp index 948e1bb17..14d74453f 100644 --- a/tools/modelingTools/vmodelingpoint.cpp +++ b/tools/modelingTools/vmodelingpoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingpoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingpoint.h" #include "../../container/vpointf.h" diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h index 33d446263..d88d9d54a 100644 --- a/tools/modelingTools/vmodelingpoint.h +++ b/tools/modelingTools/vmodelingpoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingpoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGPOINT_H #define VMODELINGPOINT_H diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index 87de20af4..b6b3e8b41 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingpointofcontact.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingpointofcontact.h" #include "../drawTools/vtoolpointofcontact.h" diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index 50fd4eb1f..f44d2f5f8 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingpointofcontact.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGPOINTOFCONTACT_H #define VMODELINGPOINTOFCONTACT_H diff --git a/tools/modelingTools/vmodelingpointofintersection.cpp b/tools/modelingTools/vmodelingpointofintersection.cpp index f66c5be85..c027fb372 100644 --- a/tools/modelingTools/vmodelingpointofintersection.cpp +++ b/tools/modelingTools/vmodelingpointofintersection.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingpointofintersection.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingpointofintersection.h" diff --git a/tools/modelingTools/vmodelingpointofintersection.h b/tools/modelingTools/vmodelingpointofintersection.h index 7496940fb..b958256ad 100644 --- a/tools/modelingTools/vmodelingpointofintersection.h +++ b/tools/modelingTools/vmodelingpointofintersection.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingpointofintersection.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGPOINTOFINTERSECTION_H #define VMODELINGPOINTOFINTERSECTION_H diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index a13cc463f..c2a699750 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingshoulderpoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingshoulderpoint.h" #include "../drawTools/vtoolshoulderpoint.h" diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index 496856f70..5881ed81b 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingshoulderpoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGSHOULDERPOINT_H #define VMODELINGSHOULDERPOINT_H diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index 65ea14951..ca760b419 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingspline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingspline.h" #include "../../geometry/vspline.h" diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index 0b69d5dcf..a04cb3518 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingspline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGSPLINE_H #define VMODELINGSPLINE_H diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 9706fbfd7..4424a3590 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingsplinepath.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingsplinepath.h" diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index a93925bb2..462088c5b 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingsplinepath.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGSPLINEPATH_H #define VMODELINGSPLINEPATH_H diff --git a/tools/modelingTools/vmodelingtool.cpp b/tools/modelingTools/vmodelingtool.cpp index cc0d58cb9..926aee6bf 100644 --- a/tools/modelingTools/vmodelingtool.cpp +++ b/tools/modelingTools/vmodelingtool.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingtool.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingtool.h" #include diff --git a/tools/modelingTools/vmodelingtool.h b/tools/modelingTools/vmodelingtool.h index e40edaacd..6bac46ff9 100644 --- a/tools/modelingTools/vmodelingtool.h +++ b/tools/modelingTools/vmodelingtool.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingtool.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGTOOL_H #define VMODELINGTOOL_H diff --git a/tools/modelingTools/vmodelingtriangle.cpp b/tools/modelingTools/vmodelingtriangle.cpp index e1e50d3e9..a09aff744 100644 --- a/tools/modelingTools/vmodelingtriangle.cpp +++ b/tools/modelingTools/vmodelingtriangle.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingtriangle.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmodelingtriangle.h" #include "../drawTools/vtooltriangle.h" diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index edf9a4dfd..8b6ae8cad 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmodelingtriangle.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMODELINGTRIANGLE_H #define VMODELINGTRIANGLE_H diff --git a/tools/nodeDetails/nodedetails.h b/tools/nodeDetails/nodedetails.h index e9ed16c37..1b736daa5 100644 --- a/tools/nodeDetails/nodedetails.h +++ b/tools/nodeDetails/nodedetails.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file nodedetails.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef NODEDETAILS_H #define NODEDETAILS_H diff --git a/tools/nodeDetails/vabstractnode.cpp b/tools/nodeDetails/vabstractnode.cpp index ab9c6473f..2e240050b 100644 --- a/tools/nodeDetails/vabstractnode.cpp +++ b/tools/nodeDetails/vabstractnode.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vabstractnode.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vabstractnode.h" #include diff --git a/tools/nodeDetails/vabstractnode.h b/tools/nodeDetails/vabstractnode.h index a7553b878..65665cec9 100644 --- a/tools/nodeDetails/vabstractnode.h +++ b/tools/nodeDetails/vabstractnode.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vabstractnode.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VABSTRACTNODE_H #define VABSTRACTNODE_H diff --git a/tools/nodeDetails/vnodearc.cpp b/tools/nodeDetails/vnodearc.cpp index 254247d58..5d2ba5360 100644 --- a/tools/nodeDetails/vnodearc.cpp +++ b/tools/nodeDetails/vnodearc.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodearc.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vnodearc.h" diff --git a/tools/nodeDetails/vnodearc.h b/tools/nodeDetails/vnodearc.h index a580113d8..8473997b8 100644 --- a/tools/nodeDetails/vnodearc.h +++ b/tools/nodeDetails/vnodearc.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodearc.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VNODEARC_H #define VNODEARC_H diff --git a/tools/nodeDetails/vnodepoint.cpp b/tools/nodeDetails/vnodepoint.cpp index 734b0434e..3729dadb2 100644 --- a/tools/nodeDetails/vnodepoint.cpp +++ b/tools/nodeDetails/vnodepoint.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodepoint.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vnodepoint.h" diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index 162e1f036..975a5a69c 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodepoint.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VNODEPOINT_H #define VNODEPOINT_H diff --git a/tools/nodeDetails/vnodespline.cpp b/tools/nodeDetails/vnodespline.cpp index 53dcaa9b6..1e358df25 100644 --- a/tools/nodeDetails/vnodespline.cpp +++ b/tools/nodeDetails/vnodespline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodespline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vnodespline.h" diff --git a/tools/nodeDetails/vnodespline.h b/tools/nodeDetails/vnodespline.h index 5e0f1cb7f..3cc972108 100644 --- a/tools/nodeDetails/vnodespline.h +++ b/tools/nodeDetails/vnodespline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodespline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VNODESPLINE_H #define VNODESPLINE_H diff --git a/tools/nodeDetails/vnodesplinepath.cpp b/tools/nodeDetails/vnodesplinepath.cpp index a185cc4bd..ab4ebe51b 100644 --- a/tools/nodeDetails/vnodesplinepath.cpp +++ b/tools/nodeDetails/vnodesplinepath.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodesplinepath.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vnodesplinepath.h" diff --git a/tools/nodeDetails/vnodesplinepath.h b/tools/nodeDetails/vnodesplinepath.h index 596701428..00d8887b4 100644 --- a/tools/nodeDetails/vnodesplinepath.h +++ b/tools/nodeDetails/vnodesplinepath.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vnodesplinepath.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VNODESPLINEPATH_H #define VNODESPLINEPATH_H diff --git a/tools/tools.h b/tools/tools.h index 998771f91..42748ee27 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file tools.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef TOOLS_H #define TOOLS_H diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index 1b94e56e7..5dad4aea7 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vabstracttool.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vabstracttool.h" diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index 44539711e..42ed64df2 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vabstracttool.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VABSTRACTTOOL_H #define VABSTRACTTOOL_H diff --git a/tools/vdatatool.cpp b/tools/vdatatool.cpp index d5f3ebefd..49d987c31 100644 --- a/tools/vdatatool.cpp +++ b/tools/vdatatool.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vdatatool.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vdatatool.h" diff --git a/tools/vdatatool.h b/tools/vdatatool.h index 4c9aa6285..179714baa 100644 --- a/tools/vdatatool.h +++ b/tools/vdatatool.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vdatatool.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VDATATOOL_H #define VDATATOOL_H diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 419224977..3a7342cf2 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtooldetail.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtooldetail.h" #include "nodeDetails/nodedetails.h" diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index 93b6c3fa0..1b4265b78 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtooldetail.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLDETAIL_H #define VTOOLDETAIL_H diff --git a/version.h b/version.h index a7ac52cdc..d307318ff 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file version.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VERSION_H #define VERSION_H diff --git a/widgets/doubledelegate.cpp b/widgets/doubledelegate.cpp index 480e68f0e..c7311bfcb 100644 --- a/widgets/doubledelegate.cpp +++ b/widgets/doubledelegate.cpp @@ -1,42 +1,30 @@ - /**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/legal + ** @file doubledelegate.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of the examples of the Qt Toolkit. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** $QT_BEGIN_LICENSE:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names - ** of its contributors may be used to endorse or promote products derived - ** from this software without specific prior written permission. + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ + *************************************************************************/ /* doubledelegate.cpp diff --git a/widgets/doubledelegate.h b/widgets/doubledelegate.h index 948b91851..8c0316f1f 100644 --- a/widgets/doubledelegate.h +++ b/widgets/doubledelegate.h @@ -1,42 +1,30 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/legal + ** @file doubledelegate.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of the examples of the Qt Toolkit. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** $QT_BEGIN_LICENSE:BSD$ - ** You may use this file under the terms of the BSD license as follows: + ** Valentina is free software: you can redistribute it and/or modify + ** it under the terms of the GNU General Public License as published by + ** the Free Software Foundation, either version 3 of the License, or + ** (at your option) any later version. ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names - ** of its contributors may be used to endorse or promote products derived - ** from this software without specific prior written permission. + ** Valentina is distributed in the hope that it will be useful, + ** but WITHOUT ANY WARRANTY; without even the implied warranty of + ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ** GNU General Public License for more details. ** + ** You should have received a copy of the GNU General Public License + ** along with Valentina. If not, see . ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ + *************************************************************************/ #ifndef DOUBLEDELEGATE_H #define DOUBLEDELEGATE_H diff --git a/widgets/vapplication.cpp b/widgets/vapplication.cpp index 3b05da39b..dc5bd11c6 100644 --- a/widgets/vapplication.cpp +++ b/widgets/vapplication.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vapplication.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vapplication.h" #include "../exception/vexceptionobjecterror.h" diff --git a/widgets/vapplication.h b/widgets/vapplication.h index 1e04c118b..0a314ec36 100644 --- a/widgets/vapplication.h +++ b/widgets/vapplication.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vapplication.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VAPPLICATION_H #define VAPPLICATION_H diff --git a/widgets/vcontrolpointspline.cpp b/widgets/vcontrolpointspline.cpp index 626ad5e1d..22ad0c8b9 100644 --- a/widgets/vcontrolpointspline.cpp +++ b/widgets/vcontrolpointspline.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vcontrolpointspline.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vcontrolpointspline.h" diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h index c535f981a..2d9cf83d9 100644 --- a/widgets/vcontrolpointspline.h +++ b/widgets/vcontrolpointspline.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vcontrolpointspline.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VCONTROLPOINTSPLINE_H #define VCONTROLPOINTSPLINE_H diff --git a/widgets/vgraphicssimpletextitem.cpp b/widgets/vgraphicssimpletextitem.cpp index 55fa10187..56d15d16e 100644 --- a/widgets/vgraphicssimpletextitem.cpp +++ b/widgets/vgraphicssimpletextitem.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vgraphicssimpletextitem.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vgraphicssimpletextitem.h" diff --git a/widgets/vgraphicssimpletextitem.h b/widgets/vgraphicssimpletextitem.h index dacf920ce..b60303180 100644 --- a/widgets/vgraphicssimpletextitem.h +++ b/widgets/vgraphicssimpletextitem.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vgraphicssimpletextitem.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VGRAPHICSSIMPLETEXTITEM_H #define VGRAPHICSSIMPLETEXTITEM_H diff --git a/widgets/vitem.cpp b/widgets/vitem.cpp index bfc184409..f2606a38a 100644 --- a/widgets/vitem.cpp +++ b/widgets/vitem.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vitem.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vitem.h" #include diff --git a/widgets/vitem.h b/widgets/vitem.h index 868848ba7..7c05eb75a 100644 --- a/widgets/vitem.h +++ b/widgets/vitem.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vitem.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VITEM_H #define VITEM_H diff --git a/widgets/vmaingraphicsscene.cpp b/widgets/vmaingraphicsscene.cpp index 2a6839bb4..b7ff49b3b 100644 --- a/widgets/vmaingraphicsscene.cpp +++ b/widgets/vmaingraphicsscene.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmaingraphicsscene.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmaingraphicsscene.h" diff --git a/widgets/vmaingraphicsscene.h b/widgets/vmaingraphicsscene.h index bf78f156b..5ca3d91ce 100644 --- a/widgets/vmaingraphicsscene.h +++ b/widgets/vmaingraphicsscene.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmaingraphicsscene.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMAINGRAPHICSSCENE_H #define VMAINGRAPHICSSCENE_H diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index e2fd79c91..3632ad520 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmaingraphicsview.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vmaingraphicsview.h" diff --git a/widgets/vmaingraphicsview.h b/widgets/vmaingraphicsview.h index f4ad052ef..3ce745c59 100644 --- a/widgets/vmaingraphicsview.h +++ b/widgets/vmaingraphicsview.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vmaingraphicsview.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VMAINGRAPHICSVIEW_H #define VMAINGRAPHICSVIEW_H diff --git a/widgets/vtablegraphicsview.cpp b/widgets/vtablegraphicsview.cpp index 0dcc3b719..a62191ec9 100644 --- a/widgets/vtablegraphicsview.cpp +++ b/widgets/vtablegraphicsview.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtablegraphicsview.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtablegraphicsview.h" diff --git a/widgets/vtablegraphicsview.h b/widgets/vtablegraphicsview.h index 3f78d7f4f..2e7e4b45c 100644 --- a/widgets/vtablegraphicsview.h +++ b/widgets/vtablegraphicsview.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtablegraphicsview.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTABLEGRAPHICSVIEW_H #define VTABLEGRAPHICSVIEW_H diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index be966b64b..3f7ef557d 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vdomdocument.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vdomdocument.h" #include "../exception/vexceptionwrongparameterid.h" diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index d49114ada..1ef7995e4 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vdomdocument.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VDOMDOCUMENT_H #define VDOMDOCUMENT_H diff --git a/xml/vtoolrecord.cpp b/xml/vtoolrecord.cpp index 1df97da1f..8b0fbdded 100644 --- a/xml/vtoolrecord.cpp +++ b/xml/vtoolrecord.cpp @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolrecord.cpp + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #include "vtoolrecord.h" diff --git a/xml/vtoolrecord.h b/xml/vtoolrecord.h index 3a4184e63..a430e450a 100644 --- a/xml/vtoolrecord.h +++ b/xml/vtoolrecord.h @@ -1,10 +1,17 @@ -/**************************************************************************** +/************************************************************************ ** - ** Copyright (C) 2013 Valentina project All Rights Reserved. + ** @file vtoolrecord.h + ** @author Roman Telezhinsky + ** @date Friday November 15, 2013 ** - ** This file is part of Valentina. + ** @brief + ** @copyright + ** This source code is part of the Valentine project, a pattern making + ** program, whose allow create and modeling patterns of clothing. + ** Copyright (C) 2013 Valentina project + ** All Rights Reserved. ** - ** Tox is free software: you can redistribute it and/or modify + ** Valentina is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by ** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. @@ -17,7 +24,7 @@ ** You should have received a copy of the GNU General Public License ** along with Valentina. If not, see . ** - ****************************************************************************/ + *************************************************************************/ #ifndef VTOOLRECORD_H #define VTOOLRECORD_H From 2cbe79c803ed72e354d2f65d171f3f7caf0fcaa3 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 15 Nov 2013 14:50:05 +0200 Subject: [PATCH 76/83] Change in license. --HG-- branch : develop --- container/calculator.cpp | 4 ++-- container/calculator.h | 4 ++-- container/vcontainer.cpp | 4 ++-- container/vcontainer.h | 4 ++-- container/vincrementtablerow.cpp | 4 ++-- container/vincrementtablerow.h | 4 ++-- container/vpointf.cpp | 4 ++-- container/vpointf.h | 4 ++-- container/vstandarttablecell.cpp | 4 ++-- container/vstandarttablecell.h | 4 ++-- dialogs/dialogalongline.cpp | 4 ++-- dialogs/dialogalongline.h | 4 ++-- dialogs/dialogarc.cpp | 4 ++-- dialogs/dialogarc.h | 4 ++-- dialogs/dialogbisector.cpp | 4 ++-- dialogs/dialogbisector.h | 4 ++-- dialogs/dialogdetail.cpp | 4 ++-- dialogs/dialogdetail.h | 4 ++-- dialogs/dialogendline.cpp | 4 ++-- dialogs/dialogendline.h | 4 ++-- dialogs/dialogheight.cpp | 4 ++-- dialogs/dialogheight.h | 4 ++-- dialogs/dialoghistory.cpp | 4 ++-- dialogs/dialoghistory.h | 4 ++-- dialogs/dialogincrements.cpp | 4 ++-- dialogs/dialogincrements.h | 4 ++-- dialogs/dialogline.cpp | 4 ++-- dialogs/dialogline.h | 4 ++-- dialogs/dialoglineintersect.cpp | 4 ++-- dialogs/dialoglineintersect.h | 4 ++-- dialogs/dialognormal.cpp | 4 ++-- dialogs/dialognormal.h | 4 ++-- dialogs/dialogpointofcontact.cpp | 4 ++-- dialogs/dialogpointofcontact.h | 4 ++-- dialogs/dialogpointofintersection.cpp | 4 ++-- dialogs/dialogpointofintersection.h | 4 ++-- dialogs/dialogs.h | 4 ++-- dialogs/dialogshoulderpoint.cpp | 4 ++-- dialogs/dialogshoulderpoint.h | 4 ++-- dialogs/dialogsinglepoint.cpp | 4 ++-- dialogs/dialogsinglepoint.h | 4 ++-- dialogs/dialogspline.cpp | 4 ++-- dialogs/dialogspline.h | 4 ++-- dialogs/dialogsplinepath.cpp | 4 ++-- dialogs/dialogsplinepath.h | 4 ++-- dialogs/dialogtool.cpp | 4 ++-- dialogs/dialogtool.h | 4 ++-- dialogs/dialogtriangle.cpp | 4 ++-- dialogs/dialogtriangle.h | 4 ++-- exception/vexception.cpp | 4 ++-- exception/vexception.h | 4 ++-- exception/vexceptionbadid.cpp | 4 ++-- exception/vexceptionbadid.h | 4 ++-- exception/vexceptionconversionerror.cpp | 4 ++-- exception/vexceptionconversionerror.h | 4 ++-- exception/vexceptionemptyparameter.cpp | 4 ++-- exception/vexceptionemptyparameter.h | 4 ++-- exception/vexceptionobjecterror.cpp | 4 ++-- exception/vexceptionobjecterror.h | 4 ++-- exception/vexceptionuniqueid.cpp | 4 ++-- exception/vexceptionuniqueid.h | 4 ++-- exception/vexceptionwrongparameterid.cpp | 4 ++-- exception/vexceptionwrongparameterid.h | 4 ++-- geometry/varc.cpp | 4 ++-- geometry/varc.h | 4 ++-- geometry/vdetail.cpp | 4 ++-- geometry/vdetail.h | 4 ++-- geometry/vnodedetail.cpp | 4 ++-- geometry/vnodedetail.h | 4 ++-- geometry/vspline.cpp | 4 ++-- geometry/vspline.h | 4 ++-- geometry/vsplinepath.cpp | 4 ++-- geometry/vsplinepath.h | 4 ++-- geometry/vsplinepoint.cpp | 4 ++-- geometry/vsplinepoint.h | 4 ++-- main.cpp | 4 ++-- mainwindow.cpp | 4 ++-- mainwindow.h | 4 ++-- options.h | 4 ++-- stable.cpp | 4 ++-- stable.h | 4 ++-- tablewindow.cpp | 4 ++-- tablewindow.h | 4 ++-- tools/drawTools/drawtools.h | 4 ++-- tools/drawTools/vdrawtool.cpp | 4 ++-- tools/drawTools/vdrawtool.h | 4 ++-- tools/drawTools/vtoolalongline.cpp | 4 ++-- tools/drawTools/vtoolalongline.h | 4 ++-- tools/drawTools/vtoolarc.cpp | 4 ++-- tools/drawTools/vtoolarc.h | 4 ++-- tools/drawTools/vtoolbisector.cpp | 4 ++-- tools/drawTools/vtoolbisector.h | 4 ++-- tools/drawTools/vtoolendline.cpp | 4 ++-- tools/drawTools/vtoolendline.h | 4 ++-- tools/drawTools/vtoolheight.cpp | 4 ++-- tools/drawTools/vtoolheight.h | 4 ++-- tools/drawTools/vtoolline.cpp | 4 ++-- tools/drawTools/vtoolline.h | 4 ++-- tools/drawTools/vtoollineintersect.cpp | 4 ++-- tools/drawTools/vtoollineintersect.h | 4 ++-- tools/drawTools/vtoollinepoint.cpp | 4 ++-- tools/drawTools/vtoollinepoint.h | 4 ++-- tools/drawTools/vtoolnormal.cpp | 4 ++-- tools/drawTools/vtoolnormal.h | 4 ++-- tools/drawTools/vtoolpoint.cpp | 4 ++-- tools/drawTools/vtoolpoint.h | 4 ++-- tools/drawTools/vtoolpointofcontact.cpp | 4 ++-- tools/drawTools/vtoolpointofcontact.h | 4 ++-- tools/drawTools/vtoolpointofintersection.cpp | 4 ++-- tools/drawTools/vtoolpointofintersection.h | 4 ++-- tools/drawTools/vtoolshoulderpoint.cpp | 4 ++-- tools/drawTools/vtoolshoulderpoint.h | 4 ++-- tools/drawTools/vtoolsinglepoint.cpp | 4 ++-- tools/drawTools/vtoolsinglepoint.h | 4 ++-- tools/drawTools/vtoolspline.cpp | 4 ++-- tools/drawTools/vtoolspline.h | 4 ++-- tools/drawTools/vtoolsplinepath.cpp | 4 ++-- tools/drawTools/vtoolsplinepath.h | 4 ++-- tools/drawTools/vtooltriangle.cpp | 4 ++-- tools/drawTools/vtooltriangle.h | 4 ++-- tools/modelingTools/modelingtools.h | 4 ++-- tools/modelingTools/vmodelingalongline.cpp | 4 ++-- tools/modelingTools/vmodelingalongline.h | 4 ++-- tools/modelingTools/vmodelingarc.cpp | 4 ++-- tools/modelingTools/vmodelingarc.h | 4 ++-- tools/modelingTools/vmodelingbisector.cpp | 4 ++-- tools/modelingTools/vmodelingbisector.h | 4 ++-- tools/modelingTools/vmodelingendline.cpp | 4 ++-- tools/modelingTools/vmodelingendline.h | 4 ++-- tools/modelingTools/vmodelingheight.cpp | 4 ++-- tools/modelingTools/vmodelingheight.h | 4 ++-- tools/modelingTools/vmodelingline.cpp | 4 ++-- tools/modelingTools/vmodelingline.h | 4 ++-- tools/modelingTools/vmodelinglineintersect.cpp | 4 ++-- tools/modelingTools/vmodelinglineintersect.h | 4 ++-- tools/modelingTools/vmodelinglinepoint.cpp | 4 ++-- tools/modelingTools/vmodelinglinepoint.h | 4 ++-- tools/modelingTools/vmodelingnormal.cpp | 4 ++-- tools/modelingTools/vmodelingnormal.h | 4 ++-- tools/modelingTools/vmodelingpoint.cpp | 4 ++-- tools/modelingTools/vmodelingpoint.h | 4 ++-- tools/modelingTools/vmodelingpointofcontact.cpp | 4 ++-- tools/modelingTools/vmodelingpointofcontact.h | 4 ++-- tools/modelingTools/vmodelingpointofintersection.cpp | 4 ++-- tools/modelingTools/vmodelingpointofintersection.h | 4 ++-- tools/modelingTools/vmodelingshoulderpoint.cpp | 4 ++-- tools/modelingTools/vmodelingshoulderpoint.h | 4 ++-- tools/modelingTools/vmodelingspline.cpp | 4 ++-- tools/modelingTools/vmodelingspline.h | 4 ++-- tools/modelingTools/vmodelingsplinepath.cpp | 4 ++-- tools/modelingTools/vmodelingsplinepath.h | 4 ++-- tools/modelingTools/vmodelingtool.cpp | 4 ++-- tools/modelingTools/vmodelingtool.h | 4 ++-- tools/modelingTools/vmodelingtriangle.cpp | 4 ++-- tools/modelingTools/vmodelingtriangle.h | 4 ++-- tools/nodeDetails/nodedetails.h | 4 ++-- tools/nodeDetails/vabstractnode.cpp | 4 ++-- tools/nodeDetails/vabstractnode.h | 4 ++-- tools/nodeDetails/vnodearc.cpp | 4 ++-- tools/nodeDetails/vnodearc.h | 4 ++-- tools/nodeDetails/vnodepoint.cpp | 4 ++-- tools/nodeDetails/vnodepoint.h | 4 ++-- tools/nodeDetails/vnodespline.cpp | 4 ++-- tools/nodeDetails/vnodespline.h | 4 ++-- tools/nodeDetails/vnodesplinepath.cpp | 4 ++-- tools/nodeDetails/vnodesplinepath.h | 4 ++-- tools/tools.h | 4 ++-- tools/vabstracttool.cpp | 4 ++-- tools/vabstracttool.h | 4 ++-- tools/vdatatool.cpp | 4 ++-- tools/vdatatool.h | 4 ++-- tools/vtooldetail.cpp | 4 ++-- tools/vtooldetail.h | 4 ++-- version.h | 4 ++-- widgets/doubledelegate.cpp | 4 ++-- widgets/doubledelegate.h | 4 ++-- widgets/vapplication.cpp | 4 ++-- widgets/vapplication.h | 4 ++-- widgets/vcontrolpointspline.cpp | 4 ++-- widgets/vcontrolpointspline.h | 4 ++-- widgets/vgraphicssimpletextitem.cpp | 4 ++-- widgets/vgraphicssimpletextitem.h | 4 ++-- widgets/vitem.cpp | 4 ++-- widgets/vitem.h | 4 ++-- widgets/vmaingraphicsscene.cpp | 4 ++-- widgets/vmaingraphicsscene.h | 4 ++-- widgets/vmaingraphicsview.cpp | 4 ++-- widgets/vmaingraphicsview.h | 4 ++-- widgets/vtablegraphicsview.cpp | 4 ++-- widgets/vtablegraphicsview.h | 4 ++-- xml/vdomdocument.cpp | 4 ++-- xml/vdomdocument.h | 4 ++-- xml/vtoolrecord.cpp | 4 ++-- xml/vtoolrecord.h | 4 ++-- 194 files changed, 388 insertions(+), 388 deletions(-) diff --git a/container/calculator.cpp b/container/calculator.cpp index 247672312..40ea60196 100644 --- a/container/calculator.cpp +++ b/container/calculator.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file calculator.cpp + ** @file calculator.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/container/calculator.h b/container/calculator.h index 181dc99fc..b18dd6d85 100644 --- a/container/calculator.h +++ b/container/calculator.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file calculator.h + ** @file calculator.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 56e4e7bd6..649c2b2d4 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vcontainer.cpp + ** @file vcontainer.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/container/vcontainer.h b/container/vcontainer.h index e86b6a8c3..f6370e1ae 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vcontainer.h + ** @file vcontainer.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/container/vincrementtablerow.cpp b/container/vincrementtablerow.cpp index eae1d3402..7b7b00655 100644 --- a/container/vincrementtablerow.cpp +++ b/container/vincrementtablerow.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vincrementtablerow.cpp + ** @file vincrementtablerow.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/container/vincrementtablerow.h b/container/vincrementtablerow.h index 0e055e861..5aa643e7d 100644 --- a/container/vincrementtablerow.h +++ b/container/vincrementtablerow.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vincrementtablerow.h + ** @file vincrementtablerow.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/container/vpointf.cpp b/container/vpointf.cpp index a7b69d871..9bae8f96f 100644 --- a/container/vpointf.cpp +++ b/container/vpointf.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vpointf.cpp + ** @file vpointf.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/container/vpointf.h b/container/vpointf.h index bbeda2001..b2396ce54 100644 --- a/container/vpointf.h +++ b/container/vpointf.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vpointf.h + ** @file vpointf.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/container/vstandarttablecell.cpp b/container/vstandarttablecell.cpp index 97bfbf97a..4a824bba9 100644 --- a/container/vstandarttablecell.cpp +++ b/container/vstandarttablecell.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vstandarttablecell.cpp + ** @file vstandarttablecell.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/container/vstandarttablecell.h b/container/vstandarttablecell.h index 198488ce6..b0fe41bb0 100644 --- a/container/vstandarttablecell.h +++ b/container/vstandarttablecell.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vstandarttablecell.h + ** @file vstandarttablecell.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogalongline.cpp b/dialogs/dialogalongline.cpp index c00252c56..adaa26647 100644 --- a/dialogs/dialogalongline.cpp +++ b/dialogs/dialogalongline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogalongline.cpp + ** @file dialogalongline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogalongline.h b/dialogs/dialogalongline.h index 32820bf08..819498b1d 100644 --- a/dialogs/dialogalongline.h +++ b/dialogs/dialogalongline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogalongline.h + ** @file dialogalongline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogarc.cpp b/dialogs/dialogarc.cpp index 0a26dea23..ed4beb7a2 100644 --- a/dialogs/dialogarc.cpp +++ b/dialogs/dialogarc.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogarc.cpp + ** @file dialogarc.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogarc.h b/dialogs/dialogarc.h index a801714f4..014955cce 100644 --- a/dialogs/dialogarc.h +++ b/dialogs/dialogarc.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogarc.h + ** @file dialogarc.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogbisector.cpp b/dialogs/dialogbisector.cpp index 3ba18b79f..2eda284bc 100644 --- a/dialogs/dialogbisector.cpp +++ b/dialogs/dialogbisector.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogbisector.cpp + ** @file dialogbisector.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogbisector.h b/dialogs/dialogbisector.h index 72f0ae42d..99a665ce9 100644 --- a/dialogs/dialogbisector.h +++ b/dialogs/dialogbisector.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogbisector.h + ** @file dialogbisector.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogdetail.cpp b/dialogs/dialogdetail.cpp index a4d94e8fb..f7ab1e834 100644 --- a/dialogs/dialogdetail.cpp +++ b/dialogs/dialogdetail.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogdetail.cpp + ** @file dialogdetail.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogdetail.h b/dialogs/dialogdetail.h index b26a32a95..e4024f9f2 100644 --- a/dialogs/dialogdetail.h +++ b/dialogs/dialogdetail.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogdetail.h + ** @file dialogdetail.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogendline.cpp b/dialogs/dialogendline.cpp index a6a3bb01a..550ea4e0e 100644 --- a/dialogs/dialogendline.cpp +++ b/dialogs/dialogendline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogendline.cpp + ** @file dialogendline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogendline.h b/dialogs/dialogendline.h index f3dcac149..0dfd06401 100644 --- a/dialogs/dialogendline.h +++ b/dialogs/dialogendline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogendline.h + ** @file dialogendline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogheight.cpp b/dialogs/dialogheight.cpp index ff01b473c..3ce7fb730 100644 --- a/dialogs/dialogheight.cpp +++ b/dialogs/dialogheight.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogheight.cpp + ** @file dialogheight.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogheight.h b/dialogs/dialogheight.h index 2c5d11d6c..186af6873 100644 --- a/dialogs/dialogheight.h +++ b/dialogs/dialogheight.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogheight.h + ** @file dialogheight.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialoghistory.cpp b/dialogs/dialoghistory.cpp index ac8227cae..fb2dcb0ca 100644 --- a/dialogs/dialoghistory.cpp +++ b/dialogs/dialoghistory.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialoghistory.cpp + ** @file dialoghistory.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialoghistory.h b/dialogs/dialoghistory.h index 1fb325c99..692f265c3 100644 --- a/dialogs/dialoghistory.h +++ b/dialogs/dialoghistory.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialoghistory.h + ** @file dialoghistory.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogincrements.cpp b/dialogs/dialogincrements.cpp index 148601f54..a50fd47dc 100644 --- a/dialogs/dialogincrements.cpp +++ b/dialogs/dialogincrements.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogincrements.cpp + ** @file dialogincrements.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogincrements.h b/dialogs/dialogincrements.h index 667068b54..58fa46611 100644 --- a/dialogs/dialogincrements.h +++ b/dialogs/dialogincrements.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogincrements.h + ** @file dialogincrements.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogline.cpp b/dialogs/dialogline.cpp index ca71c9875..f14c311d8 100644 --- a/dialogs/dialogline.cpp +++ b/dialogs/dialogline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogline.cpp + ** @file dialogline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogline.h b/dialogs/dialogline.h index 312048720..d0e3c9d1c 100644 --- a/dialogs/dialogline.h +++ b/dialogs/dialogline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogline.h + ** @file dialogline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialoglineintersect.cpp b/dialogs/dialoglineintersect.cpp index 05c4ae270..29ac3375f 100644 --- a/dialogs/dialoglineintersect.cpp +++ b/dialogs/dialoglineintersect.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialoglineintersect.cpp + ** @file dialoglineintersect.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialoglineintersect.h b/dialogs/dialoglineintersect.h index 3a6c22e41..ff3183c3c 100644 --- a/dialogs/dialoglineintersect.h +++ b/dialogs/dialoglineintersect.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialoglineintersect.h + ** @file dialoglineintersect.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialognormal.cpp b/dialogs/dialognormal.cpp index 45f2eaf23..4cf6e1d21 100644 --- a/dialogs/dialognormal.cpp +++ b/dialogs/dialognormal.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialognormal.cpp + ** @file dialognormal.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialognormal.h b/dialogs/dialognormal.h index c4e2bdc5d..b2a7329f5 100644 --- a/dialogs/dialognormal.h +++ b/dialogs/dialognormal.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialognormal.h + ** @file dialognormal.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogpointofcontact.cpp b/dialogs/dialogpointofcontact.cpp index 584d72a84..115379648 100644 --- a/dialogs/dialogpointofcontact.cpp +++ b/dialogs/dialogpointofcontact.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogpointofcontact.cpp + ** @file dialogpointofcontact.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogpointofcontact.h b/dialogs/dialogpointofcontact.h index 3aaf37abf..416e5adcf 100644 --- a/dialogs/dialogpointofcontact.h +++ b/dialogs/dialogpointofcontact.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogpointofcontact.h + ** @file dialogpointofcontact.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogpointofintersection.cpp b/dialogs/dialogpointofintersection.cpp index 032acff85..abcd9a7da 100644 --- a/dialogs/dialogpointofintersection.cpp +++ b/dialogs/dialogpointofintersection.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogpointofintersection.cpp + ** @file dialogpointofintersection.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogpointofintersection.h b/dialogs/dialogpointofintersection.h index 31f9ff7d2..9ea655f58 100644 --- a/dialogs/dialogpointofintersection.h +++ b/dialogs/dialogpointofintersection.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogpointofintersection.h + ** @file dialogpointofintersection.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogs.h b/dialogs/dialogs.h index 16c0e5481..c205f2522 100644 --- a/dialogs/dialogs.h +++ b/dialogs/dialogs.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogs.h + ** @file dialogs.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogshoulderpoint.cpp b/dialogs/dialogshoulderpoint.cpp index ad06456fb..92afa2a92 100644 --- a/dialogs/dialogshoulderpoint.cpp +++ b/dialogs/dialogshoulderpoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogshoulderpoint.cpp + ** @file dialogshoulderpoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogshoulderpoint.h b/dialogs/dialogshoulderpoint.h index 7fba9f447..b9c4df8c2 100644 --- a/dialogs/dialogshoulderpoint.h +++ b/dialogs/dialogshoulderpoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogshoulderpoint.h + ** @file dialogshoulderpoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogsinglepoint.cpp b/dialogs/dialogsinglepoint.cpp index 18a9f00aa..752d0b141 100644 --- a/dialogs/dialogsinglepoint.cpp +++ b/dialogs/dialogsinglepoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogsinglepoint.cpp + ** @file dialogsinglepoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogsinglepoint.h b/dialogs/dialogsinglepoint.h index e475df6af..02c456bd4 100644 --- a/dialogs/dialogsinglepoint.h +++ b/dialogs/dialogsinglepoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogsinglepoint.h + ** @file dialogsinglepoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogspline.cpp b/dialogs/dialogspline.cpp index 9fb854423..9d478f9ea 100644 --- a/dialogs/dialogspline.cpp +++ b/dialogs/dialogspline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogspline.cpp + ** @file dialogspline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogspline.h b/dialogs/dialogspline.h index c42c0b0bb..6ae6b45fc 100644 --- a/dialogs/dialogspline.h +++ b/dialogs/dialogspline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogspline.h + ** @file dialogspline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogsplinepath.cpp b/dialogs/dialogsplinepath.cpp index 07a6eb418..1446f4f8b 100644 --- a/dialogs/dialogsplinepath.cpp +++ b/dialogs/dialogsplinepath.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogsplinepath.cpp + ** @file dialogsplinepath.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogsplinepath.h b/dialogs/dialogsplinepath.h index d6757aed1..1ea4d587b 100644 --- a/dialogs/dialogsplinepath.h +++ b/dialogs/dialogsplinepath.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogsplinepath.h + ** @file dialogsplinepath.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogtool.cpp b/dialogs/dialogtool.cpp index 091bedf82..d394b1967 100644 --- a/dialogs/dialogtool.cpp +++ b/dialogs/dialogtool.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogtool.cpp + ** @file dialogtool.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogtool.h b/dialogs/dialogtool.h index 70908e4e3..34b9ce76e 100644 --- a/dialogs/dialogtool.h +++ b/dialogs/dialogtool.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogtool.h + ** @file dialogtool.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogtriangle.cpp b/dialogs/dialogtriangle.cpp index 8f5509855..49d607e38 100644 --- a/dialogs/dialogtriangle.cpp +++ b/dialogs/dialogtriangle.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogtriangle.cpp + ** @file dialogtriangle.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/dialogs/dialogtriangle.h b/dialogs/dialogtriangle.h index b54200fe4..a3aa2393d 100644 --- a/dialogs/dialogtriangle.h +++ b/dialogs/dialogtriangle.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file dialogtriangle.h + ** @file dialogtriangle.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexception.cpp b/exception/vexception.cpp index b53d046f6..478a7613f 100644 --- a/exception/vexception.cpp +++ b/exception/vexception.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexception.cpp + ** @file vexception.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexception.h b/exception/vexception.h index ede2f942f..426a2c4fb 100644 --- a/exception/vexception.h +++ b/exception/vexception.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexception.h + ** @file vexception.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionbadid.cpp b/exception/vexceptionbadid.cpp index d7073cc90..78bfc6327 100644 --- a/exception/vexceptionbadid.cpp +++ b/exception/vexceptionbadid.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionbadid.cpp + ** @file vexceptionbadid.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionbadid.h b/exception/vexceptionbadid.h index ed21121e3..d15c695e9 100644 --- a/exception/vexceptionbadid.h +++ b/exception/vexceptionbadid.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionbadid.h + ** @file vexceptionbadid.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionconversionerror.cpp b/exception/vexceptionconversionerror.cpp index 76bb92150..cfc0634c5 100644 --- a/exception/vexceptionconversionerror.cpp +++ b/exception/vexceptionconversionerror.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionconversionerror.cpp + ** @file vexceptionconversionerror.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionconversionerror.h b/exception/vexceptionconversionerror.h index 9bff003e3..a864fc98e 100644 --- a/exception/vexceptionconversionerror.h +++ b/exception/vexceptionconversionerror.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionconversionerror.h + ** @file vexceptionconversionerror.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionemptyparameter.cpp b/exception/vexceptionemptyparameter.cpp index 21185861f..af84d8ebd 100644 --- a/exception/vexceptionemptyparameter.cpp +++ b/exception/vexceptionemptyparameter.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionemptyparameter.cpp + ** @file vexceptionemptyparameter.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionemptyparameter.h b/exception/vexceptionemptyparameter.h index eeeab750b..e877f3220 100644 --- a/exception/vexceptionemptyparameter.h +++ b/exception/vexceptionemptyparameter.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionemptyparameter.h + ** @file vexceptionemptyparameter.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionobjecterror.cpp b/exception/vexceptionobjecterror.cpp index 98eb26c0c..7b77be4a3 100644 --- a/exception/vexceptionobjecterror.cpp +++ b/exception/vexceptionobjecterror.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionobjecterror.cpp + ** @file vexceptionobjecterror.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionobjecterror.h b/exception/vexceptionobjecterror.h index 920e0ff9f..c0b3fbaf7 100644 --- a/exception/vexceptionobjecterror.h +++ b/exception/vexceptionobjecterror.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionobjecterror.h + ** @file vexceptionobjecterror.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionuniqueid.cpp b/exception/vexceptionuniqueid.cpp index 7da610fca..10a3136ca 100644 --- a/exception/vexceptionuniqueid.cpp +++ b/exception/vexceptionuniqueid.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionuniqueid.cpp + ** @file vexceptionuniqueid.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionuniqueid.h b/exception/vexceptionuniqueid.h index 0ddb14b39..2ca8b1be2 100644 --- a/exception/vexceptionuniqueid.h +++ b/exception/vexceptionuniqueid.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionuniqueid.h + ** @file vexceptionuniqueid.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionwrongparameterid.cpp b/exception/vexceptionwrongparameterid.cpp index f86e5bd25..14f5ab8ef 100644 --- a/exception/vexceptionwrongparameterid.cpp +++ b/exception/vexceptionwrongparameterid.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionwrongparameterid.cpp + ** @file vexceptionwrongparameterid.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/exception/vexceptionwrongparameterid.h b/exception/vexceptionwrongparameterid.h index 9a1b3f10c..ab5d2f2ee 100644 --- a/exception/vexceptionwrongparameterid.h +++ b/exception/vexceptionwrongparameterid.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vexceptionwrongparameterid.h + ** @file vexceptionwrongparameterid.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/varc.cpp b/geometry/varc.cpp index 8c2f99f89..771f59b1f 100644 --- a/geometry/varc.cpp +++ b/geometry/varc.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file varc.cpp + ** @file varc.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/varc.h b/geometry/varc.h index 69fdd5e57..5939e7bf4 100644 --- a/geometry/varc.h +++ b/geometry/varc.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file varc.h + ** @file varc.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vdetail.cpp b/geometry/vdetail.cpp index acb74a574..a5453788c 100644 --- a/geometry/vdetail.cpp +++ b/geometry/vdetail.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vdetail.cpp + ** @file vdetail.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vdetail.h b/geometry/vdetail.h index aad92c934..2b366c547 100644 --- a/geometry/vdetail.h +++ b/geometry/vdetail.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vdetail.h + ** @file vdetail.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vnodedetail.cpp b/geometry/vnodedetail.cpp index 55385ad0f..b7b09a005 100644 --- a/geometry/vnodedetail.cpp +++ b/geometry/vnodedetail.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodedetail.cpp + ** @file vnodedetail.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vnodedetail.h b/geometry/vnodedetail.h index 8a6572346..799a355aa 100644 --- a/geometry/vnodedetail.h +++ b/geometry/vnodedetail.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodedetail.h + ** @file vnodedetail.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vspline.cpp b/geometry/vspline.cpp index 1a77b2b9c..572ce9342 100644 --- a/geometry/vspline.cpp +++ b/geometry/vspline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vspline.cpp + ** @file vspline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vspline.h b/geometry/vspline.h index 58221954c..644ff709d 100644 --- a/geometry/vspline.h +++ b/geometry/vspline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vspline.h + ** @file vspline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vsplinepath.cpp b/geometry/vsplinepath.cpp index e77f9f465..79b2acf76 100644 --- a/geometry/vsplinepath.cpp +++ b/geometry/vsplinepath.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vsplinepath.cpp + ** @file vsplinepath.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vsplinepath.h b/geometry/vsplinepath.h index 6133ee91b..212bda56c 100644 --- a/geometry/vsplinepath.h +++ b/geometry/vsplinepath.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vsplinepath.h + ** @file vsplinepath.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vsplinepoint.cpp b/geometry/vsplinepoint.cpp index a76e7883a..e57a7363a 100644 --- a/geometry/vsplinepoint.cpp +++ b/geometry/vsplinepoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vsplinepoint.cpp + ** @file vsplinepoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/geometry/vsplinepoint.h b/geometry/vsplinepoint.h index 1454808fc..d6f6ef6d5 100644 --- a/geometry/vsplinepoint.h +++ b/geometry/vsplinepoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vsplinepoint.h + ** @file vsplinepoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/main.cpp b/main.cpp index 61fc5f1bb..8a2cf8320 100644 --- a/main.cpp +++ b/main.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file main.cpp + ** @file main.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/mainwindow.cpp b/mainwindow.cpp index 1c7db04bf..f8f742463 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file mainwindow.cpp + ** @file mainwindow.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/mainwindow.h b/mainwindow.h index 05e96baa6..2c0f2c47e 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file mainwindow.h + ** @file mainwindow.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/options.h b/options.h index a45dcf221..beccd32d3 100644 --- a/options.h +++ b/options.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file options.h + ** @file options.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/stable.cpp b/stable.cpp index 4bb989f56..57b3c2027 100644 --- a/stable.cpp +++ b/stable.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file stable.cpp + ** @file stable.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/stable.h b/stable.h index 772227291..bcc23a610 100644 --- a/stable.h +++ b/stable.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file stable.h + ** @file stable.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tablewindow.cpp b/tablewindow.cpp index 81eb1908d..132c3a5e8 100644 --- a/tablewindow.cpp +++ b/tablewindow.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file tablewindow.cpp + ** @file tablewindow.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tablewindow.h b/tablewindow.h index b9b40740c..8d3ca8801 100644 --- a/tablewindow.h +++ b/tablewindow.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file tablewindow.h + ** @file tablewindow.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/drawtools.h b/tools/drawTools/drawtools.h index 2e75cbd56..b0102c570 100644 --- a/tools/drawTools/drawtools.h +++ b/tools/drawTools/drawtools.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file drawtools.h + ** @file drawtools.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vdrawtool.cpp b/tools/drawTools/vdrawtool.cpp index 21e599c19..20c93c55b 100644 --- a/tools/drawTools/vdrawtool.cpp +++ b/tools/drawTools/vdrawtool.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vdrawtool.cpp + ** @file vdrawtool.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vdrawtool.h b/tools/drawTools/vdrawtool.h index eae38e092..86632645c 100644 --- a/tools/drawTools/vdrawtool.h +++ b/tools/drawTools/vdrawtool.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vdrawtool.h + ** @file vdrawtool.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolalongline.cpp b/tools/drawTools/vtoolalongline.cpp index b65e8fb20..c8bb272c2 100644 --- a/tools/drawTools/vtoolalongline.cpp +++ b/tools/drawTools/vtoolalongline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolalongline.cpp + ** @file vtoolalongline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolalongline.h b/tools/drawTools/vtoolalongline.h index 2a5141c0c..797383e95 100644 --- a/tools/drawTools/vtoolalongline.h +++ b/tools/drawTools/vtoolalongline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolalongline.h + ** @file vtoolalongline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolarc.cpp b/tools/drawTools/vtoolarc.cpp index c914f4a94..9951bfcfb 100644 --- a/tools/drawTools/vtoolarc.cpp +++ b/tools/drawTools/vtoolarc.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolarc.cpp + ** @file vtoolarc.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolarc.h b/tools/drawTools/vtoolarc.h index 3f8f7b18d..17a757f88 100644 --- a/tools/drawTools/vtoolarc.h +++ b/tools/drawTools/vtoolarc.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolarc.h + ** @file vtoolarc.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolbisector.cpp b/tools/drawTools/vtoolbisector.cpp index 564ce8c19..e29886be5 100644 --- a/tools/drawTools/vtoolbisector.cpp +++ b/tools/drawTools/vtoolbisector.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolbisector.cpp + ** @file vtoolbisector.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolbisector.h b/tools/drawTools/vtoolbisector.h index ab1316a04..f449a462e 100644 --- a/tools/drawTools/vtoolbisector.h +++ b/tools/drawTools/vtoolbisector.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolbisector.h + ** @file vtoolbisector.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolendline.cpp b/tools/drawTools/vtoolendline.cpp index be53189fc..0f08affbc 100644 --- a/tools/drawTools/vtoolendline.cpp +++ b/tools/drawTools/vtoolendline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolendline.cpp + ** @file vtoolendline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolendline.h b/tools/drawTools/vtoolendline.h index b5806b1b3..a9ce3fa14 100644 --- a/tools/drawTools/vtoolendline.h +++ b/tools/drawTools/vtoolendline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolendline.h + ** @file vtoolendline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolheight.cpp b/tools/drawTools/vtoolheight.cpp index 599d55686..528f1515c 100644 --- a/tools/drawTools/vtoolheight.cpp +++ b/tools/drawTools/vtoolheight.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolheight.cpp + ** @file vtoolheight.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolheight.h b/tools/drawTools/vtoolheight.h index 14cf3dd17..1d070a225 100644 --- a/tools/drawTools/vtoolheight.h +++ b/tools/drawTools/vtoolheight.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolheight.h + ** @file vtoolheight.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolline.cpp b/tools/drawTools/vtoolline.cpp index 161cee5b0..5b6e0f3bf 100644 --- a/tools/drawTools/vtoolline.cpp +++ b/tools/drawTools/vtoolline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolline.cpp + ** @file vtoolline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolline.h b/tools/drawTools/vtoolline.h index 934afa987..bcc7ac170 100644 --- a/tools/drawTools/vtoolline.h +++ b/tools/drawTools/vtoolline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolline.h + ** @file vtoolline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoollineintersect.cpp b/tools/drawTools/vtoollineintersect.cpp index 5b5adfdf7..1663b4c71 100644 --- a/tools/drawTools/vtoollineintersect.cpp +++ b/tools/drawTools/vtoollineintersect.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoollineintersect.cpp + ** @file vtoollineintersect.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoollineintersect.h b/tools/drawTools/vtoollineintersect.h index c9b328344..aeb34b54d 100644 --- a/tools/drawTools/vtoollineintersect.h +++ b/tools/drawTools/vtoollineintersect.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoollineintersect.h + ** @file vtoollineintersect.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoollinepoint.cpp b/tools/drawTools/vtoollinepoint.cpp index 89c9c0f44..e0042b60d 100644 --- a/tools/drawTools/vtoollinepoint.cpp +++ b/tools/drawTools/vtoollinepoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoollinepoint.cpp + ** @file vtoollinepoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoollinepoint.h b/tools/drawTools/vtoollinepoint.h index 4faf640d4..dc10aeb17 100644 --- a/tools/drawTools/vtoollinepoint.h +++ b/tools/drawTools/vtoollinepoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoollinepoint.h + ** @file vtoollinepoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolnormal.cpp b/tools/drawTools/vtoolnormal.cpp index abd9af816..0acb05cdf 100644 --- a/tools/drawTools/vtoolnormal.cpp +++ b/tools/drawTools/vtoolnormal.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolnormal.cpp + ** @file vtoolnormal.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolnormal.h b/tools/drawTools/vtoolnormal.h index b1f7bc6dd..0f2b1fd07 100644 --- a/tools/drawTools/vtoolnormal.h +++ b/tools/drawTools/vtoolnormal.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolnormal.h + ** @file vtoolnormal.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolpoint.cpp b/tools/drawTools/vtoolpoint.cpp index bd8181f1e..3deec4002 100644 --- a/tools/drawTools/vtoolpoint.cpp +++ b/tools/drawTools/vtoolpoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolpoint.cpp + ** @file vtoolpoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolpoint.h b/tools/drawTools/vtoolpoint.h index 25584de2b..c7e26939e 100644 --- a/tools/drawTools/vtoolpoint.h +++ b/tools/drawTools/vtoolpoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolpoint.h + ** @file vtoolpoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolpointofcontact.cpp b/tools/drawTools/vtoolpointofcontact.cpp index 56f73f7fe..9d94bc7e9 100644 --- a/tools/drawTools/vtoolpointofcontact.cpp +++ b/tools/drawTools/vtoolpointofcontact.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolpointofcontact.cpp + ** @file vtoolpointofcontact.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolpointofcontact.h b/tools/drawTools/vtoolpointofcontact.h index 75ce0d73c..54025adde 100644 --- a/tools/drawTools/vtoolpointofcontact.h +++ b/tools/drawTools/vtoolpointofcontact.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolpointofcontact.h + ** @file vtoolpointofcontact.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolpointofintersection.cpp b/tools/drawTools/vtoolpointofintersection.cpp index b6b8c368e..dc0d4d7e8 100644 --- a/tools/drawTools/vtoolpointofintersection.cpp +++ b/tools/drawTools/vtoolpointofintersection.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolpointofintersection.cpp + ** @file vtoolpointofintersection.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolpointofintersection.h b/tools/drawTools/vtoolpointofintersection.h index 99255449f..f311b5cbe 100644 --- a/tools/drawTools/vtoolpointofintersection.h +++ b/tools/drawTools/vtoolpointofintersection.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolpointofintersection.h + ** @file vtoolpointofintersection.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolshoulderpoint.cpp b/tools/drawTools/vtoolshoulderpoint.cpp index df21f544b..115cc7b47 100644 --- a/tools/drawTools/vtoolshoulderpoint.cpp +++ b/tools/drawTools/vtoolshoulderpoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolshoulderpoint.cpp + ** @file vtoolshoulderpoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolshoulderpoint.h b/tools/drawTools/vtoolshoulderpoint.h index ef7986571..efede5abd 100644 --- a/tools/drawTools/vtoolshoulderpoint.h +++ b/tools/drawTools/vtoolshoulderpoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolshoulderpoint.h + ** @file vtoolshoulderpoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolsinglepoint.cpp b/tools/drawTools/vtoolsinglepoint.cpp index 7abb58219..0308f2963 100644 --- a/tools/drawTools/vtoolsinglepoint.cpp +++ b/tools/drawTools/vtoolsinglepoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolsinglepoint.cpp + ** @file vtoolsinglepoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolsinglepoint.h b/tools/drawTools/vtoolsinglepoint.h index ca7f067ec..d0d482fd4 100644 --- a/tools/drawTools/vtoolsinglepoint.h +++ b/tools/drawTools/vtoolsinglepoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolsinglepoint.h + ** @file vtoolsinglepoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolspline.cpp b/tools/drawTools/vtoolspline.cpp index fe47cbcce..b1ab4c6dd 100644 --- a/tools/drawTools/vtoolspline.cpp +++ b/tools/drawTools/vtoolspline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolspline.cpp + ** @file vtoolspline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolspline.h b/tools/drawTools/vtoolspline.h index 3424e87fb..d4277af40 100644 --- a/tools/drawTools/vtoolspline.h +++ b/tools/drawTools/vtoolspline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolspline.h + ** @file vtoolspline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolsplinepath.cpp b/tools/drawTools/vtoolsplinepath.cpp index 302a5ffd4..bd656dc79 100644 --- a/tools/drawTools/vtoolsplinepath.cpp +++ b/tools/drawTools/vtoolsplinepath.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolsplinepath.cpp + ** @file vtoolsplinepath.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtoolsplinepath.h b/tools/drawTools/vtoolsplinepath.h index 7ff780504..a58ddc2ee 100644 --- a/tools/drawTools/vtoolsplinepath.h +++ b/tools/drawTools/vtoolsplinepath.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolsplinepath.h + ** @file vtoolsplinepath.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtooltriangle.cpp b/tools/drawTools/vtooltriangle.cpp index dee16eac7..7f0c65081 100644 --- a/tools/drawTools/vtooltriangle.cpp +++ b/tools/drawTools/vtooltriangle.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtooltriangle.cpp + ** @file vtooltriangle.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/drawTools/vtooltriangle.h b/tools/drawTools/vtooltriangle.h index 329028df9..dc848c76b 100644 --- a/tools/drawTools/vtooltriangle.h +++ b/tools/drawTools/vtooltriangle.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtooltriangle.h + ** @file vtooltriangle.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/modelingtools.h b/tools/modelingTools/modelingtools.h index 8ce388dd0..3203357b1 100644 --- a/tools/modelingTools/modelingtools.h +++ b/tools/modelingTools/modelingtools.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file modelingtools.h + ** @file modelingtools.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingalongline.cpp b/tools/modelingTools/vmodelingalongline.cpp index 1f504b46a..fce43cb07 100644 --- a/tools/modelingTools/vmodelingalongline.cpp +++ b/tools/modelingTools/vmodelingalongline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingalongline.cpp + ** @file vmodelingalongline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingalongline.h b/tools/modelingTools/vmodelingalongline.h index a063f151b..7bdba7e28 100644 --- a/tools/modelingTools/vmodelingalongline.h +++ b/tools/modelingTools/vmodelingalongline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingalongline.h + ** @file vmodelingalongline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingarc.cpp b/tools/modelingTools/vmodelingarc.cpp index c8aa15d1f..49ece909d 100644 --- a/tools/modelingTools/vmodelingarc.cpp +++ b/tools/modelingTools/vmodelingarc.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingarc.cpp + ** @file vmodelingarc.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingarc.h b/tools/modelingTools/vmodelingarc.h index bdf51efd1..510ba9d07 100644 --- a/tools/modelingTools/vmodelingarc.h +++ b/tools/modelingTools/vmodelingarc.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingarc.h + ** @file vmodelingarc.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingbisector.cpp b/tools/modelingTools/vmodelingbisector.cpp index 11324c531..7cdf15366 100644 --- a/tools/modelingTools/vmodelingbisector.cpp +++ b/tools/modelingTools/vmodelingbisector.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingbisector.cpp + ** @file vmodelingbisector.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingbisector.h b/tools/modelingTools/vmodelingbisector.h index 3676fb0ad..cb5196cd2 100644 --- a/tools/modelingTools/vmodelingbisector.h +++ b/tools/modelingTools/vmodelingbisector.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingbisector.h + ** @file vmodelingbisector.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingendline.cpp b/tools/modelingTools/vmodelingendline.cpp index 7eaf8f668..1886c0672 100644 --- a/tools/modelingTools/vmodelingendline.cpp +++ b/tools/modelingTools/vmodelingendline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingendline.cpp + ** @file vmodelingendline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingendline.h b/tools/modelingTools/vmodelingendline.h index fe2aec5ca..2bf52d30a 100644 --- a/tools/modelingTools/vmodelingendline.h +++ b/tools/modelingTools/vmodelingendline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingbisector.h + ** @file vmodelingbisector.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingheight.cpp b/tools/modelingTools/vmodelingheight.cpp index 497a53346..53ae05ac1 100644 --- a/tools/modelingTools/vmodelingheight.cpp +++ b/tools/modelingTools/vmodelingheight.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingheight.cpp + ** @file vmodelingheight.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingheight.h b/tools/modelingTools/vmodelingheight.h index 016a6d777..791779e46 100644 --- a/tools/modelingTools/vmodelingheight.h +++ b/tools/modelingTools/vmodelingheight.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingheight.h + ** @file vmodelingheight.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingline.cpp b/tools/modelingTools/vmodelingline.cpp index edd109a26..619467dd5 100644 --- a/tools/modelingTools/vmodelingline.cpp +++ b/tools/modelingTools/vmodelingline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingline.cpp + ** @file vmodelingline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingline.h b/tools/modelingTools/vmodelingline.h index c04e04c1b..2798eadb7 100644 --- a/tools/modelingTools/vmodelingline.h +++ b/tools/modelingTools/vmodelingline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingline.h + ** @file vmodelingline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelinglineintersect.cpp b/tools/modelingTools/vmodelinglineintersect.cpp index 327dfa3d0..4a3eec24b 100644 --- a/tools/modelingTools/vmodelinglineintersect.cpp +++ b/tools/modelingTools/vmodelinglineintersect.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelinglineintersect.cpp + ** @file vmodelinglineintersect.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelinglineintersect.h b/tools/modelingTools/vmodelinglineintersect.h index dfa6ce0fd..b8ca4d2eb 100644 --- a/tools/modelingTools/vmodelinglineintersect.h +++ b/tools/modelingTools/vmodelinglineintersect.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelinglineintersect.h + ** @file vmodelinglineintersect.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelinglinepoint.cpp b/tools/modelingTools/vmodelinglinepoint.cpp index f22649405..2c88505ad 100644 --- a/tools/modelingTools/vmodelinglinepoint.cpp +++ b/tools/modelingTools/vmodelinglinepoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelinglinepoint.cpp + ** @file vmodelinglinepoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelinglinepoint.h b/tools/modelingTools/vmodelinglinepoint.h index 24a0b36c9..4ca0e9ced 100644 --- a/tools/modelingTools/vmodelinglinepoint.h +++ b/tools/modelingTools/vmodelinglinepoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelinglinepoint.h + ** @file vmodelinglinepoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingnormal.cpp b/tools/modelingTools/vmodelingnormal.cpp index 0d89bb995..d0d662b1c 100644 --- a/tools/modelingTools/vmodelingnormal.cpp +++ b/tools/modelingTools/vmodelingnormal.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingnormal.cpp + ** @file vmodelingnormal.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingnormal.h b/tools/modelingTools/vmodelingnormal.h index a9c70e392..3d9062a0e 100644 --- a/tools/modelingTools/vmodelingnormal.h +++ b/tools/modelingTools/vmodelingnormal.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingnormal.h + ** @file vmodelingnormal.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingpoint.cpp b/tools/modelingTools/vmodelingpoint.cpp index 14d74453f..af97dd218 100644 --- a/tools/modelingTools/vmodelingpoint.cpp +++ b/tools/modelingTools/vmodelingpoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingpoint.cpp + ** @file vmodelingpoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingpoint.h b/tools/modelingTools/vmodelingpoint.h index d88d9d54a..e03799136 100644 --- a/tools/modelingTools/vmodelingpoint.h +++ b/tools/modelingTools/vmodelingpoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingpoint.h + ** @file vmodelingpoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingpointofcontact.cpp b/tools/modelingTools/vmodelingpointofcontact.cpp index b6b3e8b41..9c4ba59b0 100644 --- a/tools/modelingTools/vmodelingpointofcontact.cpp +++ b/tools/modelingTools/vmodelingpointofcontact.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingpointofcontact.cpp + ** @file vmodelingpointofcontact.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingpointofcontact.h b/tools/modelingTools/vmodelingpointofcontact.h index f44d2f5f8..d9be2cda2 100644 --- a/tools/modelingTools/vmodelingpointofcontact.h +++ b/tools/modelingTools/vmodelingpointofcontact.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingpointofcontact.h + ** @file vmodelingpointofcontact.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingpointofintersection.cpp b/tools/modelingTools/vmodelingpointofintersection.cpp index c027fb372..cfa4006d7 100644 --- a/tools/modelingTools/vmodelingpointofintersection.cpp +++ b/tools/modelingTools/vmodelingpointofintersection.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingpointofintersection.cpp + ** @file vmodelingpointofintersection.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingpointofintersection.h b/tools/modelingTools/vmodelingpointofintersection.h index b958256ad..4a859ea84 100644 --- a/tools/modelingTools/vmodelingpointofintersection.h +++ b/tools/modelingTools/vmodelingpointofintersection.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingpointofintersection.h + ** @file vmodelingpointofintersection.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingshoulderpoint.cpp b/tools/modelingTools/vmodelingshoulderpoint.cpp index c2a699750..ceec80d1b 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.cpp +++ b/tools/modelingTools/vmodelingshoulderpoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingshoulderpoint.cpp + ** @file vmodelingshoulderpoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingshoulderpoint.h b/tools/modelingTools/vmodelingshoulderpoint.h index 5881ed81b..7b9d27027 100644 --- a/tools/modelingTools/vmodelingshoulderpoint.h +++ b/tools/modelingTools/vmodelingshoulderpoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingshoulderpoint.h + ** @file vmodelingshoulderpoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingspline.cpp b/tools/modelingTools/vmodelingspline.cpp index ca760b419..951bc7efc 100644 --- a/tools/modelingTools/vmodelingspline.cpp +++ b/tools/modelingTools/vmodelingspline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingspline.cpp + ** @file vmodelingspline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingspline.h b/tools/modelingTools/vmodelingspline.h index a04cb3518..7173fc501 100644 --- a/tools/modelingTools/vmodelingspline.h +++ b/tools/modelingTools/vmodelingspline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingspline.h + ** @file vmodelingspline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingsplinepath.cpp b/tools/modelingTools/vmodelingsplinepath.cpp index 4424a3590..515e80a96 100644 --- a/tools/modelingTools/vmodelingsplinepath.cpp +++ b/tools/modelingTools/vmodelingsplinepath.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingsplinepath.cpp + ** @file vmodelingsplinepath.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingsplinepath.h b/tools/modelingTools/vmodelingsplinepath.h index 462088c5b..09d77d2ff 100644 --- a/tools/modelingTools/vmodelingsplinepath.h +++ b/tools/modelingTools/vmodelingsplinepath.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingsplinepath.h + ** @file vmodelingsplinepath.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingtool.cpp b/tools/modelingTools/vmodelingtool.cpp index 926aee6bf..d3b8f05fd 100644 --- a/tools/modelingTools/vmodelingtool.cpp +++ b/tools/modelingTools/vmodelingtool.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingtool.cpp + ** @file vmodelingtool.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingtool.h b/tools/modelingTools/vmodelingtool.h index 6bac46ff9..53c57236c 100644 --- a/tools/modelingTools/vmodelingtool.h +++ b/tools/modelingTools/vmodelingtool.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingtool.h + ** @file vmodelingtool.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingtriangle.cpp b/tools/modelingTools/vmodelingtriangle.cpp index a09aff744..57db01474 100644 --- a/tools/modelingTools/vmodelingtriangle.cpp +++ b/tools/modelingTools/vmodelingtriangle.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingtriangle.cpp + ** @file vmodelingtriangle.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/modelingTools/vmodelingtriangle.h b/tools/modelingTools/vmodelingtriangle.h index 8b6ae8cad..09dfdfb21 100644 --- a/tools/modelingTools/vmodelingtriangle.h +++ b/tools/modelingTools/vmodelingtriangle.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmodelingtriangle.h + ** @file vmodelingtriangle.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/nodedetails.h b/tools/nodeDetails/nodedetails.h index 1b736daa5..d230f7456 100644 --- a/tools/nodeDetails/nodedetails.h +++ b/tools/nodeDetails/nodedetails.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file nodedetails.h + ** @file nodedetails.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vabstractnode.cpp b/tools/nodeDetails/vabstractnode.cpp index 2e240050b..48374a891 100644 --- a/tools/nodeDetails/vabstractnode.cpp +++ b/tools/nodeDetails/vabstractnode.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vabstractnode.cpp + ** @file vabstractnode.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vabstractnode.h b/tools/nodeDetails/vabstractnode.h index 65665cec9..7fff53e9e 100644 --- a/tools/nodeDetails/vabstractnode.h +++ b/tools/nodeDetails/vabstractnode.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vabstractnode.h + ** @file vabstractnode.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vnodearc.cpp b/tools/nodeDetails/vnodearc.cpp index 5d2ba5360..826174a68 100644 --- a/tools/nodeDetails/vnodearc.cpp +++ b/tools/nodeDetails/vnodearc.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodearc.cpp + ** @file vnodearc.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vnodearc.h b/tools/nodeDetails/vnodearc.h index 8473997b8..f71096694 100644 --- a/tools/nodeDetails/vnodearc.h +++ b/tools/nodeDetails/vnodearc.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodearc.h + ** @file vnodearc.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vnodepoint.cpp b/tools/nodeDetails/vnodepoint.cpp index 3729dadb2..e7495c3c3 100644 --- a/tools/nodeDetails/vnodepoint.cpp +++ b/tools/nodeDetails/vnodepoint.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodepoint.cpp + ** @file vnodepoint.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vnodepoint.h b/tools/nodeDetails/vnodepoint.h index 975a5a69c..7874715c6 100644 --- a/tools/nodeDetails/vnodepoint.h +++ b/tools/nodeDetails/vnodepoint.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodepoint.h + ** @file vnodepoint.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vnodespline.cpp b/tools/nodeDetails/vnodespline.cpp index 1e358df25..26dd21a01 100644 --- a/tools/nodeDetails/vnodespline.cpp +++ b/tools/nodeDetails/vnodespline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodespline.cpp + ** @file vnodespline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vnodespline.h b/tools/nodeDetails/vnodespline.h index 3cc972108..fc8dcb202 100644 --- a/tools/nodeDetails/vnodespline.h +++ b/tools/nodeDetails/vnodespline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodespline.h + ** @file vnodespline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vnodesplinepath.cpp b/tools/nodeDetails/vnodesplinepath.cpp index ab4ebe51b..8defab838 100644 --- a/tools/nodeDetails/vnodesplinepath.cpp +++ b/tools/nodeDetails/vnodesplinepath.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodesplinepath.cpp + ** @file vnodesplinepath.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/nodeDetails/vnodesplinepath.h b/tools/nodeDetails/vnodesplinepath.h index 00d8887b4..f5b0c9cba 100644 --- a/tools/nodeDetails/vnodesplinepath.h +++ b/tools/nodeDetails/vnodesplinepath.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vnodesplinepath.h + ** @file vnodesplinepath.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/tools.h b/tools/tools.h index 42748ee27..69adbf1ce 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file tools.h + ** @file tools.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/vabstracttool.cpp b/tools/vabstracttool.cpp index 5dad4aea7..0d52f3faf 100644 --- a/tools/vabstracttool.cpp +++ b/tools/vabstracttool.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vabstracttool.cpp + ** @file vabstracttool.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/vabstracttool.h b/tools/vabstracttool.h index 42ed64df2..f3a2ea372 100644 --- a/tools/vabstracttool.h +++ b/tools/vabstracttool.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vabstracttool.h + ** @file vabstracttool.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/vdatatool.cpp b/tools/vdatatool.cpp index 49d987c31..58a6eb39f 100644 --- a/tools/vdatatool.cpp +++ b/tools/vdatatool.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vdatatool.cpp + ** @file vdatatool.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/vdatatool.h b/tools/vdatatool.h index 179714baa..86d0b2927 100644 --- a/tools/vdatatool.h +++ b/tools/vdatatool.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vdatatool.h + ** @file vdatatool.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/vtooldetail.cpp b/tools/vtooldetail.cpp index 3a7342cf2..3556182cf 100644 --- a/tools/vtooldetail.cpp +++ b/tools/vtooldetail.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtooldetail.cpp + ** @file vtooldetail.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/tools/vtooldetail.h b/tools/vtooldetail.h index 1b4265b78..b0079d5b8 100644 --- a/tools/vtooldetail.h +++ b/tools/vtooldetail.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtooldetail.h + ** @file vtooldetail.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/version.h b/version.h index d307318ff..fb95d4e3b 100644 --- a/version.h +++ b/version.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file version.h + ** @file version.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/doubledelegate.cpp b/widgets/doubledelegate.cpp index c7311bfcb..7e5529553 100644 --- a/widgets/doubledelegate.cpp +++ b/widgets/doubledelegate.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file doubledelegate.cpp + ** @file doubledelegate.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/doubledelegate.h b/widgets/doubledelegate.h index 8c0316f1f..c4bc8ac49 100644 --- a/widgets/doubledelegate.h +++ b/widgets/doubledelegate.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file doubledelegate.h + ** @file doubledelegate.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vapplication.cpp b/widgets/vapplication.cpp index dc5bd11c6..34327663f 100644 --- a/widgets/vapplication.cpp +++ b/widgets/vapplication.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vapplication.cpp + ** @file vapplication.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vapplication.h b/widgets/vapplication.h index 0a314ec36..359dd1806 100644 --- a/widgets/vapplication.h +++ b/widgets/vapplication.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vapplication.h + ** @file vapplication.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vcontrolpointspline.cpp b/widgets/vcontrolpointspline.cpp index 22ad0c8b9..8a81c7f0e 100644 --- a/widgets/vcontrolpointspline.cpp +++ b/widgets/vcontrolpointspline.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vcontrolpointspline.cpp + ** @file vcontrolpointspline.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vcontrolpointspline.h b/widgets/vcontrolpointspline.h index 2d9cf83d9..fddc4ccec 100644 --- a/widgets/vcontrolpointspline.h +++ b/widgets/vcontrolpointspline.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vcontrolpointspline.h + ** @file vcontrolpointspline.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vgraphicssimpletextitem.cpp b/widgets/vgraphicssimpletextitem.cpp index 56d15d16e..5e34555ce 100644 --- a/widgets/vgraphicssimpletextitem.cpp +++ b/widgets/vgraphicssimpletextitem.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vgraphicssimpletextitem.cpp + ** @file vgraphicssimpletextitem.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vgraphicssimpletextitem.h b/widgets/vgraphicssimpletextitem.h index b60303180..3f3b2a2a8 100644 --- a/widgets/vgraphicssimpletextitem.h +++ b/widgets/vgraphicssimpletextitem.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vgraphicssimpletextitem.h + ** @file vgraphicssimpletextitem.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vitem.cpp b/widgets/vitem.cpp index f2606a38a..37c6614cc 100644 --- a/widgets/vitem.cpp +++ b/widgets/vitem.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vitem.cpp + ** @file vitem.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vitem.h b/widgets/vitem.h index 7c05eb75a..750b41305 100644 --- a/widgets/vitem.h +++ b/widgets/vitem.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vitem.h + ** @file vitem.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vmaingraphicsscene.cpp b/widgets/vmaingraphicsscene.cpp index b7ff49b3b..6b5299fb9 100644 --- a/widgets/vmaingraphicsscene.cpp +++ b/widgets/vmaingraphicsscene.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmaingraphicsscene.cpp + ** @file vmaingraphicsscene.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vmaingraphicsscene.h b/widgets/vmaingraphicsscene.h index 5ca3d91ce..8d605d64d 100644 --- a/widgets/vmaingraphicsscene.h +++ b/widgets/vmaingraphicsscene.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmaingraphicsscene.h + ** @file vmaingraphicsscene.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index 3632ad520..8fc8fe703 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmaingraphicsview.cpp + ** @file vmaingraphicsview.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vmaingraphicsview.h b/widgets/vmaingraphicsview.h index 3ce745c59..c4bb43956 100644 --- a/widgets/vmaingraphicsview.h +++ b/widgets/vmaingraphicsview.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vmaingraphicsview.h + ** @file vmaingraphicsview.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vtablegraphicsview.cpp b/widgets/vtablegraphicsview.cpp index a62191ec9..a60b22567 100644 --- a/widgets/vtablegraphicsview.cpp +++ b/widgets/vtablegraphicsview.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtablegraphicsview.cpp + ** @file vtablegraphicsview.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/widgets/vtablegraphicsview.h b/widgets/vtablegraphicsview.h index 2e7e4b45c..da6f9a5fa 100644 --- a/widgets/vtablegraphicsview.h +++ b/widgets/vtablegraphicsview.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtablegraphicsview.h + ** @file vtablegraphicsview.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/xml/vdomdocument.cpp b/xml/vdomdocument.cpp index 3f7ef557d..55071e861 100644 --- a/xml/vdomdocument.cpp +++ b/xml/vdomdocument.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vdomdocument.cpp + ** @file vdomdocument.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/xml/vdomdocument.h b/xml/vdomdocument.h index 1ef7995e4..1042beb9a 100644 --- a/xml/vdomdocument.h +++ b/xml/vdomdocument.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vdomdocument.h + ** @file vdomdocument.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/xml/vtoolrecord.cpp b/xml/vtoolrecord.cpp index 8b0fbdded..e5e69ac0a 100644 --- a/xml/vtoolrecord.cpp +++ b/xml/vtoolrecord.cpp @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolrecord.cpp + ** @file vtoolrecord.cpp ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright diff --git a/xml/vtoolrecord.h b/xml/vtoolrecord.h index a430e450a..a2f964970 100644 --- a/xml/vtoolrecord.h +++ b/xml/vtoolrecord.h @@ -1,8 +1,8 @@ /************************************************************************ ** - ** @file vtoolrecord.h + ** @file vtoolrecord.h ** @author Roman Telezhinsky - ** @date Friday November 15, 2013 + ** @date November 15, 2013 ** ** @brief ** @copyright From e89883f778495d3235648889b7b4a339c5d7bffd Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 15 Nov 2013 15:19:43 +0200 Subject: [PATCH 77/83] Now no need install ccache for build release version of application. --HG-- branch : develop --- Valentina.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Valentina.pro b/Valentina.pro index 13ee22a43..15171136b 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -16,7 +16,6 @@ RELEASE_TARGET = Valentina CONFIG -= debug_and_release debug_and_release_target CONFIG += c++11 precompile_header -QMAKE_CXX = ccache g++ #DEFINES += ... # Precompiled headers (PCH) @@ -71,6 +70,7 @@ TRANSLATIONS += translations/valentina_ru.ts \ CONFIG(debug, debug|release){ # Debug + QMAKE_CXX = ccache g++ TARGET = $$DEBUG_TARGET QMAKE_CXXFLAGS += -isystem "/usr/include/qt5" -isystem "/usr/include/qt5/QtWidgets" \ From 4a15ccf0687c07520ba0bc334d867f8c25f61dd8 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 15 Nov 2013 17:42:24 +0200 Subject: [PATCH 78/83] ChangeLog file. --HG-- branch : develop --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ChangeLog diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 000000000..f43868e56 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,3 @@ +# Version 0.2.0 Released October 29, 2013 + + From f3ff6d430333c4f2847204bae4a8e66b20cc99a7 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 15 Nov 2013 17:48:01 +0200 Subject: [PATCH 79/83] File AUTHORS. --HG-- branch : develop --- AUTHORS | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 AUTHORS diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..dd9952069 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,5 @@ +Author: + + (*) Roman Telezhinsky + Founder of the project. + From fe04b63722e06cd4953a7ff784afc9e57bde6a92 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 15 Nov 2013 19:38:29 +0200 Subject: [PATCH 80/83] This methods can't be inline. --HG-- branch : develop --- container/vcontainer.cpp | 45 ++++++++++++++++++++++++++++++++++++++++ container/vcontainer.h | 18 ++++++++-------- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/container/vcontainer.cpp b/container/vcontainer.cpp index 649c2b2d4..5bbe38e15 100644 --- a/container/vcontainer.cpp +++ b/container/vcontainer.cpp @@ -87,6 +87,16 @@ void VContainer::setData(const VContainer &data) details = *data.DataDetails(); } +VPointF VContainer::GetPoint(qint64 id) const +{ + return GetObject(points, id); +} + +VPointF VContainer::GetModelingPoint(qint64 id) const +{ + return GetObject(modelingPoints, id); +} + template val VContainer::GetObject(const QHash &obj, key id) { @@ -136,6 +146,41 @@ qreal VContainer::GetLineAngle(const QString &name) const return GetObject(lineAngles, name); } +VSpline VContainer::GetSpline(qint64 id) const +{ + return GetObject(splines, id); +} + +VSpline VContainer::GetModelingSpline(qint64 id) const +{ + return GetObject(modelingSplines, id); +} + +VArc VContainer::GetArc(qint64 id) const +{ + return GetObject(arcs, id); +} + +VArc VContainer::GetModelingArc(qint64 id) const +{ + return GetObject(modelingArcs, id); +} + +VSplinePath VContainer::GetSplinePath(qint64 id) const +{ + return GetObject(splinePaths, id); +} + +VSplinePath VContainer::GetModelingSplinePath(qint64 id) const +{ + return GetObject(modelingSplinePaths, id); +} + +VDetail VContainer::GetDetail(qint64 id) const +{ + return GetObject(details, id); +} + qint64 VContainer::AddPoint(const VPointF &point) { return AddObject(points, point); diff --git a/container/vcontainer.h b/container/vcontainer.h index f6370e1ae..3044cec98 100644 --- a/container/vcontainer.h +++ b/container/vcontainer.h @@ -55,21 +55,21 @@ public: * @param id * @return */ - inline VPointF GetPoint(qint64 id) const {return GetObject(points, id);} - inline VPointF GetModelingPoint(qint64 id) const {return GetObject(modelingPoints, id);} + VPointF GetPoint(qint64 id) const; + VPointF GetModelingPoint(qint64 id) const; VStandartTableCell GetStandartTableCell(const QString& name) const; VIncrementTableRow GetIncrementTableRow(const QString& name) const; qreal GetLine(const QString &name) const; qreal GetLengthArc(const QString &name) const; qreal GetLengthSpline(const QString &name) const; qreal GetLineAngle(const QString &name) const; - inline VSpline GetSpline(qint64 id) const {return GetObject(splines, id);} - inline VSpline GetModelingSpline(qint64 id) const {return GetObject(modelingSplines, id);} - inline VArc GetArc(qint64 id) const {return GetObject(arcs, id);} - inline VArc GetModelingArc(qint64 id) const {return GetObject(modelingArcs, id);} - inline VSplinePath GetSplinePath(qint64 id) const {return GetObject(splinePaths, id);} - inline VSplinePath GetModelingSplinePath(qint64 id) const {return GetObject(modelingSplinePaths, id);} - inline VDetail GetDetail(qint64 id) const {return GetObject(details, id);} + VSpline GetSpline(qint64 id) const; + VSpline GetModelingSpline(qint64 id) const; + VArc GetArc(qint64 id) const; + VArc GetModelingArc(qint64 id) const; + VSplinePath GetSplinePath(qint64 id) const; + VSplinePath GetModelingSplinePath(qint64 id) const; + VDetail GetDetail(qint64 id) const; static qint64 getId() {return _id;} qint64 AddPoint(const VPointF& point); qint64 AddModelingPoint(const VPointF& point); From e99268e028130b0101380b688f4ef4b7595e349d Mon Sep 17 00:00:00 2001 From: dismine Date: Sun, 17 Nov 2013 15:20:53 +0200 Subject: [PATCH 81/83] README file. --HG-- branch : develop --- README | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 README diff --git a/README b/README new file mode 100644 index 000000000..e225bef05 --- /dev/null +++ b/README @@ -0,0 +1,38 @@ +Valentina +========== +Open source project of creating a pattern making program, whose allow create and modeling patterns of clothing. + +Supported Platforms +=================== +The standalone binary packages support the following platforms: + +Windows XP SP2 or later +Ubuntu Linux 11.10 (32-bit) or later + +Building the sources requires Qt 5.0.0 or later. + +Compiling Valentina +==================== +Prerequisites: + * Qt 5.0.0 or later + * On Windows: + - MinGW or Visual Studio + +The installed toolchains have to match the one Qt was compiled with. + +You can build Valentina with + + cd $SOURCE_DIRECTORY + qmake -r + make (or mingw32-make or nmake or jom, depending on your platform) + +Installation ("make install") is not needed. + +Note:In order to build and use Valentina, the PATH environment variable needs to be extended: + + PATH - to locate qmake, moc and other Qt tools +This is done by adding c:\Qt\%VERSION%\bin to the PATH variable. + +For newer versions of Windows, PATH can be extended through the Control Panel|System|Advanced|Environment variables menu. + +You may also need to ensure that the locations of your compiler and other build tools are listed in the PATH variable. This will depend on your choice of software development environment. From 22ed94bb0caa460b6c3ad780c8a4369961b17959 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 18 Nov 2013 12:03:47 +0200 Subject: [PATCH 82/83] TODO file. --HG-- branch : develop --- TODO | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 TODO diff --git a/TODO b/TODO new file mode 100644 index 000000000..1499e59a6 --- /dev/null +++ b/TODO @@ -0,0 +1,33 @@ +Valentina TODO file. +For more information see https://bitbucket.org/dismine/valentina/issues + +(c) Valentina Team 2013 + + * Rotate details. + * Reflection details. + * Theme with icon for windows version of program. + * Label on detail. + * Checking integrity of file. + * Description of pattern. + * Type of lines. + * New way create detail. + * Tuck transfer. + * Point on arc, curve and curve path. + * Union details. + * Сonditions. + * New format name. + * Standard table of measurements. + * Localization. + * Window "Option". + * Undo/redo functionality in applications. + * Checking file integrity. + * Sketch drawing. + * Graduation card. + * Individual mode of construction pattern. + * Description about pattern in SVG file. + * Visualization. + + + + + From 65e55ddfb9f47539c457cb7f8ce438717e6c4985 Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 18 Nov 2013 12:08:54 +0200 Subject: [PATCH 83/83] Changes in readme. --HG-- branch : develop --- README | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/README b/README index e225bef05..ccf3d0cc9 100644 --- a/README +++ b/README @@ -1,6 +1,8 @@ Valentina ========== -Open source project of creating a pattern making program, whose allow create and modeling patterns of clothing. +Open source project of creating a pattern making program, whose allow +create and modeling patterns of clothing. +Published under GNU GPL v3 license. Supported Platforms =================== @@ -28,11 +30,15 @@ You can build Valentina with Installation ("make install") is not needed. -Note:In order to build and use Valentina, the PATH environment variable needs to be extended: +Note:In order to build and use Valentina, the PATH environment variable +needs to be extended: PATH - to locate qmake, moc and other Qt tools This is done by adding c:\Qt\%VERSION%\bin to the PATH variable. -For newer versions of Windows, PATH can be extended through the Control Panel|System|Advanced|Environment variables menu. +For newer versions of Windows, PATH can be extended through the +Control Panel|System|Advanced|Environment variables menu. -You may also need to ensure that the locations of your compiler and other build tools are listed in the PATH variable. This will depend on your choice of software development environment. +You may also need to ensure that the locations of your compiler and +other build tools are listed in the PATH variable. This will depend on +your choice of software development environment.