diff --git a/src/app/container/calculator.cpp b/src/app/container/calculator.cpp index 2c7680b17..80684ef1c 100644 --- a/src/app/container/calculator.cpp +++ b/src/app/container/calculator.cpp @@ -151,7 +151,7 @@ qreal Calculator::EvalFormula(const QString &formula) void Calculator::InitVariables(const VContainer *data) { int num = 0; - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { num +=2; } @@ -177,7 +177,7 @@ void Calculator::InitVariables(const VContainer *data) vVarVal = new qreal[num]; int j = 0; - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { vVarVal[j] = data->size(); DefineVar(data->SizeName(), &vVarVal[j]); @@ -236,7 +236,7 @@ void Calculator::InitVariables(const VContainer *data) QHash::const_iterator i = measurements->constBegin(); while (i != measurements->constEnd()) { - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { vVarVal[j] = i.value().GetValue(data->size(), data->height()); } @@ -254,7 +254,7 @@ void Calculator::InitVariables(const VContainer *data) QHash::const_iterator i = increments->constBegin(); while (i != increments->constEnd()) { - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { vVarVal[j] = i.value().GetValue(data->size(), data->height()); } @@ -294,12 +294,12 @@ qreal Calculator::CmUnit(qreal val) qreal unit = val; switch(qApp->patternUnit()) { - case Valentina::Mm: + case Unit::Mm: unit = val * 10.0; break; - case Valentina::Cm: + case Unit::Cm: break; - case Valentina::Inch: + case Unit::Inch: unit = val / 2.54; break; default: @@ -315,12 +315,12 @@ qreal Calculator::MmUnit(qreal val) qreal unit = val; switch(qApp->patternUnit()) { - case Valentina::Mm: + case Unit::Mm: break; - case Valentina::Cm: + case Unit::Cm: unit = val / 10.0; break; - case Valentina::Inch: + case Unit::Inch: unit = val / 25.4; break; default: @@ -336,13 +336,13 @@ qreal Calculator::InchUnit(qreal val) qreal unit = val; switch(qApp->patternUnit()) { - case Valentina::Mm: + case Unit::Mm: unit = val * 25.4; break; - case Valentina::Cm: + case Unit::Cm: unit = val * 2.54; break; - case Valentina::Inch: + case Unit::Inch: break; default: break; diff --git a/src/app/container/vcontainer.cpp b/src/app/container/vcontainer.cpp index 9e933ef4c..ad74f2ae2 100644 --- a/src/app/container/vcontainer.cpp +++ b/src/app/container/vcontainer.cpp @@ -100,16 +100,16 @@ void VContainer::setData(const VContainer &data) i.next(); switch (i.value()->getType()) { - case (GObject::Arc): + case (GOType::Arc): CopyGObject(data, i.key()); break; - case (GObject::Point): + case (GOType::Point): CopyGObject(data, i.key()); break; - case (GObject::Spline): + case (GOType::Spline): CopyGObject(data, i.key()); break; - case (GObject::SplinePath): + case (GOType::SplinePath): CopyGObject(data, i.key()); break; default: @@ -386,7 +386,7 @@ void VContainer::AddLineAngle(const QString &name, const qreal &value) qreal VContainer::GetValueStandardTableRow(const QString& name) const { const VMeasurement m = GetMeasurement(name); - if (qApp->patternType() == Pattern::Individual) + if (qApp->patternType() == MeasurementsType::Individual) { return m.GetValue(); } @@ -405,7 +405,7 @@ qreal VContainer::GetValueStandardTableRow(const QString& name) const qreal VContainer::GetValueIncrementTableRow(const QString& name) const { const VIncrement icr = GetIncrement(name); - if (qApp->patternType() == Pattern::Individual) + if (qApp->patternType() == MeasurementsType::Individual) { return icr.GetValue(); } @@ -454,7 +454,7 @@ void VContainer::ClearCalculationGObjects() while (i.hasNext()) { i.next(); - if (i.value()->getMode() == Valentina::Calculation) + if (i.value()->getMode() == Draw::Calculation) { delete i.value(); gObjects.remove(i.key()); diff --git a/src/app/dialogs/app/dialoghistory.cpp b/src/app/dialogs/app/dialoghistory.cpp index 5e08a6e41..304b3f5a1 100644 --- a/src/app/dialogs/app/dialoghistory.cpp +++ b/src/app/dialogs/app/dialoghistory.cpp @@ -213,22 +213,22 @@ QString DialogHistory::Record(const VToolRecord &tool) { switch ( tool.getTypeTool() ) { - case Valentina::ArrowTool: + case Tool::ArrowTool: Q_UNREACHABLE(); break; - case Valentina::SinglePointTool: + case Tool::SinglePointTool: { const QString name = data->GeometricObject(tool.getId())->name(); return QString(tr("%1 - Base point")).arg(name); } - case Valentina::EndLineTool: + case Tool::EndLineTool: { const quint32 basePointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, "0"); const QString basePointIdName = data->GeometricObject(basePointId)->name(); const QString toolIdName = data->GeometricObject(tool.getId())->name(); return QString(tr("%1_%2 - Line from point %1 to point %2")).arg(basePointIdName, toolIdName); } - case Valentina::LineTool: + case Tool::LineTool: { const quint32 firstPointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); const quint32 secondPointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); @@ -236,7 +236,7 @@ QString DialogHistory::Record(const VToolRecord &tool) const QString secondPointIdName = data->GeometricObject(secondPointId)->name(); return QString(tr("%1_%2 - Line from point %1 to point %2")).arg(firstPointIdName, secondPointIdName); } - case Valentina::AlongLineTool: + case Tool::AlongLineTool: { const quint32 basePointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); const quint32 secondPointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); @@ -245,12 +245,12 @@ QString DialogHistory::Record(const VToolRecord &tool) const QString toolIdName = data->GeometricObject(tool.getId())->name(); return QString(tr("%3 - Point along line %1_%2")).arg(basePointIdName, secondPointIdName, toolIdName); } - case Valentina::ShoulderPointTool: + case Tool::ShoulderPointTool: { const QString name = data->GeometricObject(tool.getId())->name(); return QString(tr("%1 - Point of shoulder")).arg(name); } - case Valentina::NormalTool: + case Tool::NormalTool: { const quint32 basePointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); const quint32 secondPointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); @@ -259,7 +259,7 @@ QString DialogHistory::Record(const VToolRecord &tool) const QString toolIdName = data->GeometricObject(tool.getId())->name(); return QString(tr("%3 - normal to line %1_%2")).arg(basePointIdName, secondPointIdName, toolIdName); } - case Valentina::BisectorTool: + case Tool::BisectorTool: { const quint32 firstPointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); const quint32 secondPointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); @@ -271,7 +271,7 @@ QString DialogHistory::Record(const VToolRecord &tool) return QString(tr("%4 - bisector of angle %1_%2_%3")).arg(firstPointIdName, secondPointIdName, thirdPointIdName, toolIdName); } - case Valentina::LineIntersectTool: + case Tool::LineIntersectTool: { const quint32 p1Line1 = doc->GetParametrUInt(domElement, VAbstractTool::AttrP1Line1, "0"); const quint32 p2Line1 = doc->GetParametrUInt(domElement, VAbstractTool::AttrP2Line1, "0"); @@ -286,7 +286,7 @@ QString DialogHistory::Record(const VToolRecord &tool) p1Line2Name, p2Line2Name, toolIdName); } - case Valentina::SplineTool: + case Tool::SplineTool: { const VSpline *spl = data->GeometricObject(tool.getId()); SCASSERT(spl != nullptr); @@ -294,14 +294,14 @@ QString DialogHistory::Record(const VToolRecord &tool) const QString splP4Name = data->GeometricObject(spl->GetP4().id())->name(); return QString(tr("Curve %1_%2")).arg(splP1Name, splP4Name); } - case Valentina::ArcTool: + case Tool::ArcTool: { const VArc *arc = data->GeometricObject(tool.getId()); SCASSERT(arc != nullptr); const QString arcCenterName = data->GeometricObject(arc->GetCenter().id())->name(); return QString(tr("Arc with center in point %1")).arg(arcCenterName); } - case Valentina::SplinePathTool: + case Tool::SplinePathTool: { const VSplinePath *splPath = data->GeometricObject(tool.getId()); SCASSERT(splPath != nullptr); @@ -324,7 +324,7 @@ QString DialogHistory::Record(const VToolRecord &tool) } return record; } - case Valentina::PointOfContact: + case Tool::PointOfContact: { const quint32 center = doc->GetParametrUInt(domElement, VAbstractTool::AttrCenter, "0"); const quint32 firstPointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); @@ -336,7 +336,7 @@ QString DialogHistory::Record(const VToolRecord &tool) return QString(tr("%4 - point of contact of arc with the center in point %1 and line %2_%3")).arg( centerName, firstPointIdName, secondPointIdName, toolIdName); } - case Valentina::Height: + case Tool::Height: { const quint32 basePointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrBasePoint, "0"); const quint32 p1LineId = doc->GetParametrUInt(domElement, VAbstractTool::AttrP1Line, "0"); @@ -348,7 +348,7 @@ QString DialogHistory::Record(const VToolRecord &tool) p1LineIdName, p2LineIdName); } - case Valentina::Triangle: + case Tool::Triangle: { const quint32 axisP1Id = doc->GetParametrUInt(domElement, VAbstractTool::AttrAxisP1, "0"); const quint32 axisP2Id = doc->GetParametrUInt(domElement, VAbstractTool::AttrAxisP2, "0"); @@ -361,7 +361,7 @@ QString DialogHistory::Record(const VToolRecord &tool) return QString(tr("Triangle: axis %1_%2, points %3 and %4")).arg(axisP1IdName, axisP2IdName, firstPointIdName, secondPointIdName); } - case Valentina::PointOfIntersection: + case Tool::PointOfIntersection: { const quint32 firstPointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrFirstPoint, "0"); const quint32 secondPointId = doc->GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); @@ -371,7 +371,7 @@ QString DialogHistory::Record(const VToolRecord &tool) return QString(tr("%1 - point of intersection %2 and %3")).arg(toolIdName, firstPointIdName, secondPointIdName); } - case Valentina::CutArcTool: + case Tool::CutArcTool: { const quint32 arcId = doc->GetParametrUInt(domElement, VToolCutArc::AttrArc, "0"); const VArc *arc = data->GeometricObject(arcId); @@ -380,7 +380,7 @@ QString DialogHistory::Record(const VToolRecord &tool) const QString toolIdName = data->GeometricObject(tool.getId())->name(); return QString(tr("%1 - cut arc with center %2")).arg(toolIdName, arcCenterName); } - case Valentina::CutSplineTool: + case Tool::CutSplineTool: { const quint32 splineId = doc->GetParametrUInt(domElement, VToolCutSpline::AttrSpline, "0"); const VSpline *spl = data->GeometricObject(splineId); @@ -390,7 +390,7 @@ QString DialogHistory::Record(const VToolRecord &tool) const QString splP4Name = data->GeometricObject(spl->GetP4().id())->name(); return QString(tr("%1 - cut curve %2_%3")).arg(toolIdName, splP1Name, splP4Name); } - case Valentina::CutSplinePathTool: + case Tool::CutSplinePathTool: { const quint32 splinePathId = doc->GetParametrUInt(domElement, VToolCutSplinePath::AttrSplinePath, "0"); const VSplinePath *splPath = data->GeometricObject(splinePathId); @@ -418,17 +418,17 @@ QString DialogHistory::Record(const VToolRecord &tool) } //Because "history" not only show history of pattern, but help restore current data for each pattern's //piece, we need add record about details and nodes, but don't show them. - case Valentina::DetailTool: + case Tool::DetailTool: break; - case Valentina::UnionDetails: + case Tool::UnionDetails: break; - case Valentina::NodeArc: + case Tool::NodeArc: break; - case Valentina::NodePoint: + case Tool::NodePoint: break; - case Valentina::NodeSpline: + case Tool::NodeSpline: break; - case Valentina::NodeSplinePath: + case Tool::NodeSplinePath: break; default: qDebug()<<"Got wrong tool type. Ignore."; diff --git a/src/app/dialogs/app/dialogincrements.cpp b/src/app/dialogs/app/dialogincrements.cpp index 91fe138a0..076d83878 100644 --- a/src/app/dialogs/app/dialogincrements.cpp +++ b/src/app/dialogs/app/dialogincrements.cpp @@ -50,7 +50,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par { ui->setupUi(this); - if (qApp->patternType() == Pattern::Individual) + if (qApp->patternType() == MeasurementsType::Individual) { const QString filePath = doc->MPath(); try @@ -82,7 +82,7 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par FillLengthSplines(); FillLengthArcs(); - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { ui->pagePersonalInformation->setVisible(false); } @@ -106,8 +106,8 @@ DialogIncrements::DialogIncrements(VContainer *data, VPattern *doc, QWidget *par ui->lineEditGivenName->setText(m->GivenName()); ui->lineEditFamilyName->setText(m->FamilyName()); - ui->comboBoxSex->addItem(tr("male"), QVariant(m->GenderToStr(VIndividualMeasurements::Male))); - ui->comboBoxSex->addItem(tr("female"), QVariant(m->GenderToStr(VIndividualMeasurements::Female))); + ui->comboBoxSex->addItem(tr("male"), QVariant(m->GenderToStr(SexType::Male))); + ui->comboBoxSex->addItem(tr("female"), QVariant(m->GenderToStr(SexType::Female))); qint32 index = ui->comboBoxSex->findData(m->GenderToStr(m->Sex())); if (index != -1) { @@ -175,7 +175,7 @@ void DialogIncrements::FillMeasurements() item->setTextAlignment(Qt::AlignLeft); ui->tableWidgetMeasurements->setItem(currentRow, 0, item); - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { QTableWidgetItem *item = new QTableWidgetItem(QString().setNum(data->GetValueStandardTableRow(iMap.key()))); item->setTextAlignment(Qt::AlignHCenter); @@ -190,7 +190,7 @@ void DialogIncrements::FillMeasurements() item->setTextAlignment(Qt::AlignHCenter); ui->tableWidgetMeasurements->setItem(currentRow, 2, item); - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { QTableWidgetItem *item = new QTableWidgetItem(QString().setNum(m.GetKsize())); item->setTextAlignment(Qt::AlignHCenter); @@ -255,7 +255,7 @@ void DialogIncrements::FillIncrements() item->setData(Qt::UserRole, incr.getId()); ui->tableWidgetIncrement->setItem(currentRow, 0, item); - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { item = new QTableWidgetItem(QString().setNum(data->GetValueIncrementTableRow(iMap.value()))); item->setTextAlignment(Qt::AlignHCenter); @@ -270,7 +270,7 @@ void DialogIncrements::FillIncrements() item->setTextAlignment(Qt::AlignHCenter); ui->tableWidgetIncrement->setItem(currentRow, 2, item); - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { item = new QTableWidgetItem(QString().setNum(incr.getKsize())); item->setTextAlignment(Qt::AlignHCenter); @@ -493,7 +493,7 @@ void DialogIncrements::OpenTable() { QString text = tr("Measurements use different units than pattern. This pattern required measurements in %1") .arg(doc->UnitsToStr(qApp->patternUnit())); - if (qApp->patternType() == Pattern::Individual) + if (qApp->patternType() == MeasurementsType::Individual) { const QString filter(tr("Individual measurements (*.vit)")); const QString filePath = QFileDialog::getOpenFileName(this, tr("Open file"), QDir::homePath(), filter); @@ -517,7 +517,7 @@ void DialogIncrements::OpenTable() emit DialogClosed(QDialog::Rejected); return; } - Valentina::Units mUnit = m1->Unit(); + Unit mUnit = m1->MUnit(); if (qApp->patternUnit() != mUnit) { QMessageBox::critical(this, tr("Wrong units."), text); @@ -549,7 +549,7 @@ void DialogIncrements::OpenTable() m1 = new VStandardMeasurements(data); m1->setContent(filePath); - Valentina::Units mUnit = m1->Unit(); + Unit mUnit = m1->MUnit(); if (qApp->patternUnit() != mUnit) { QMessageBox::critical(this, tr("Wrong units."), text); diff --git a/src/app/dialogs/app/dialogindividualmeasurements.cpp b/src/app/dialogs/app/dialogindividualmeasurements.cpp index cfebbdd8a..abcbfee3d 100644 --- a/src/app/dialogs/app/dialogindividualmeasurements.cpp +++ b/src/app/dialogs/app/dialogindividualmeasurements.cpp @@ -103,9 +103,9 @@ void DialogIndividualMeasurements::DialogAccepted() VIndividualMeasurements m(data); m.setContent(_tablePath); const qint32 index = ui->comboBoxUnits->currentIndex(); - Valentina::Units unit = VDomDocument::StrToUnits(ui->comboBoxUnits->itemData(index).toString()); + Unit unit = VDomDocument::StrToUnits(ui->comboBoxUnits->itemData(index).toString()); m.setUnit(unit); - qApp->setPatternUnit( m.Unit()); + qApp->setPatternUnit( m.MUnit()); QFile iMeasur(_tablePath); if (iMeasur.open(QIODevice::WriteOnly| QIODevice::Truncate)) { @@ -236,6 +236,6 @@ void DialogIndividualMeasurements::NewTable() //--------------------------------------------------------------------------------------------------------------------- void DialogIndividualMeasurements::InitUnits() { - ui->comboBoxUnits->addItem(tr("centimeter"), QVariant(VDomDocument::UnitsToStr(Valentina::Cm))); - ui->comboBoxUnits->addItem(tr("inch"), QVariant(VDomDocument::UnitsToStr(Valentina::Inch))); + ui->comboBoxUnits->addItem(tr("centimeter"), QVariant(VDomDocument::UnitsToStr(Unit::Cm))); + ui->comboBoxUnits->addItem(tr("inch"), QVariant(VDomDocument::UnitsToStr(Unit::Inch))); } diff --git a/src/app/dialogs/app/dialogmeasurements.cpp b/src/app/dialogs/app/dialogmeasurements.cpp index 30b7d2967..af84fc440 100644 --- a/src/app/dialogs/app/dialogmeasurements.cpp +++ b/src/app/dialogs/app/dialogmeasurements.cpp @@ -31,7 +31,7 @@ //--------------------------------------------------------------------------------------------------------------------- DialogMeasurements::DialogMeasurements(QWidget *parent) : - QDialog(parent), ui(new Ui::DialogMeasurements), result(Measurements::Individual) + QDialog(parent), ui(new Ui::DialogMeasurements), result(MeasurementsType::Individual) { ui->setupUi(this); connect(ui->toolButtonStandard, &QToolButton::clicked, this, &DialogMeasurements::StandardMeasurements); @@ -45,7 +45,7 @@ DialogMeasurements::~DialogMeasurements() } //--------------------------------------------------------------------------------------------------------------------- -Measurements::Type DialogMeasurements::type() const +MeasurementsType DialogMeasurements::type() const { return result; } @@ -53,13 +53,13 @@ Measurements::Type DialogMeasurements::type() const //--------------------------------------------------------------------------------------------------------------------- void DialogMeasurements::StandardMeasurements() { - result = Measurements::Standard; + result = MeasurementsType::Standard; accept(); } //--------------------------------------------------------------------------------------------------------------------- void DialogMeasurements::IndividualMeasurements() { - result = Measurements::Individual; + result = MeasurementsType::Individual; accept(); } diff --git a/src/app/dialogs/app/dialogmeasurements.h b/src/app/dialogs/app/dialogmeasurements.h index 82d2b9429..6b4bc3941 100644 --- a/src/app/dialogs/app/dialogmeasurements.h +++ b/src/app/dialogs/app/dialogmeasurements.h @@ -30,33 +30,24 @@ #define DIALOGMEASUREMENTS_H #include +#include "../../options.h" namespace Ui { class DialogMeasurements; } -namespace Measurements -{ - /** - * @brief The Type enum pattern measurements. - */ - enum Type { Standard, Individual }; - Q_DECLARE_FLAGS(Types, Type) -} -Q_DECLARE_OPERATORS_FOR_FLAGS( Measurements::Types ) - class DialogMeasurements : public QDialog { Q_OBJECT public: explicit DialogMeasurements(QWidget *parent = nullptr); ~DialogMeasurements(); - Measurements::Type type() const; + MeasurementsType type() const; private: Q_DISABLE_COPY(DialogMeasurements) Ui::DialogMeasurements *ui; - Measurements::Type result; + MeasurementsType result; void StandardMeasurements(); void IndividualMeasurements(); }; diff --git a/src/app/dialogs/app/dialogstandardmeasurements.cpp b/src/app/dialogs/app/dialogstandardmeasurements.cpp index b456d84f9..6af2a7ce1 100644 --- a/src/app/dialogs/app/dialogstandardmeasurements.cpp +++ b/src/app/dialogs/app/dialogstandardmeasurements.cpp @@ -89,7 +89,7 @@ void DialogStandardMeasurements::DialogAccepted() VDomDocument::ValidateXML("://schema/standard_measurements.xsd", _tablePath); VStandardMeasurements m(data); m.setContent(_tablePath); - qApp->setPatternUnit(m.Unit()); + qApp->setPatternUnit(m.MUnit()); } catch (VException &e) { diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp index f5491a0d8..681f30d69 100644 --- a/src/app/dialogs/tools/dialogalongline.cpp +++ b/src/app/dialogs/tools/dialogalongline.cpp @@ -108,9 +108,9 @@ DialogAlongLine::~DialogAlongLine() * @param id id of point or detail * @param type type of object */ -void DialogAlongLine::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogAlongLine::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { if (number == 0) { diff --git a/src/app/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h index 708fca0c2..581d67269 100644 --- a/src/app/dialogs/tools/dialogalongline.h +++ b/src/app/dialogs/tools/dialogalongline.h @@ -61,7 +61,7 @@ public: quint32 getSecondPointId() const; void setSecondPointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp index 44537a814..44a030866 100644 --- a/src/app/dialogs/tools/dialogarc.cpp +++ b/src/app/dialogs/tools/dialogarc.cpp @@ -163,9 +163,9 @@ void DialogArc::SetRadius(const QString &value) * @param id id of point or detail * @param type type of object */ -void DialogArc::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogArc::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); diff --git a/src/app/dialogs/tools/dialogarc.h b/src/app/dialogs/tools/dialogarc.h index 361c8d695..411e46f4a 100644 --- a/src/app/dialogs/tools/dialogarc.h +++ b/src/app/dialogs/tools/dialogarc.h @@ -59,7 +59,7 @@ public: QString GetF2() const; void SetF2(const QString &value); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp index 3240014db..9de20034c 100644 --- a/src/app/dialogs/tools/dialogbisector.cpp +++ b/src/app/dialogs/tools/dialogbisector.cpp @@ -110,9 +110,9 @@ DialogBisector::~DialogBisector() * @param id id of point or detail * @param type type of object */ -void DialogBisector::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogBisector::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); if (number == 0) diff --git a/src/app/dialogs/tools/dialogbisector.h b/src/app/dialogs/tools/dialogbisector.h index 974a94e31..700f48c18 100644 --- a/src/app/dialogs/tools/dialogbisector.h +++ b/src/app/dialogs/tools/dialogbisector.h @@ -66,7 +66,7 @@ public: quint32 getThirdPointId() const; void setThirdPointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp index 972c28b10..5da56bc8c 100644 --- a/src/app/dialogs/tools/dialogcutarc.cpp +++ b/src/app/dialogs/tools/dialogcutarc.cpp @@ -106,9 +106,9 @@ DialogCutArc::~DialogCutArc() * @param id id of point or detail * @param type type of object */ -void DialogCutArc::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogCutArc::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Arc) + if (type == SceneObject::Arc) { const VArc *arc = data->GeometricObject(id); ChangeCurrentText(ui->comboBoxArc, arc->name()); @@ -150,7 +150,7 @@ void DialogCutArc::SaveData() */ void DialogCutArc::setArcId(const quint32 &value, const quint32 &id) { - setCurrentArcId(ui->comboBoxArc, arcId, value, id, ComboMode::CutArc); + setCurrentArcId(ui->comboBoxArc, arcId, value, id, ComboBoxCutArc::CutArc); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/dialogs/tools/dialogcutarc.h b/src/app/dialogs/tools/dialogcutarc.h index 9fceca34d..f4a6b6a13 100644 --- a/src/app/dialogs/tools/dialogcutarc.h +++ b/src/app/dialogs/tools/dialogcutarc.h @@ -57,7 +57,7 @@ public: quint32 getArcId() const; void setArcId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp index 57315db5f..979c3d34f 100644 --- a/src/app/dialogs/tools/dialogcutspline.cpp +++ b/src/app/dialogs/tools/dialogcutspline.cpp @@ -98,7 +98,7 @@ void DialogCutSpline::setFormula(const QString &value) */ void DialogCutSpline::setSplineId(const quint32 &value, const quint32 &id) { - setCurrentSplineId(ui->comboBoxSpline, splineId, value, id, ComboMode::CutSpline); + setCurrentSplineId(ui->comboBoxSpline, splineId, value, id, ComboBoxCutSpline::CutSpline); } //--------------------------------------------------------------------------------------------------------------------- @@ -107,9 +107,9 @@ void DialogCutSpline::setSplineId(const quint32 &value, const quint32 &id) * @param id id of point or detail * @param type type of object */ -void DialogCutSpline::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogCutSpline::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Spline) + if (type == SceneObject::Spline) { const VSpline *spl = data->GeometricObject(id); ChangeCurrentText(ui->comboBoxSpline, spl->name()); diff --git a/src/app/dialogs/tools/dialogcutspline.h b/src/app/dialogs/tools/dialogcutspline.h index 20ef63fa0..03be441cb 100644 --- a/src/app/dialogs/tools/dialogcutspline.h +++ b/src/app/dialogs/tools/dialogcutspline.h @@ -55,7 +55,7 @@ public: quint32 getSplineId() const; void setSplineId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp index 00e758624..725c1ef62 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp @@ -99,7 +99,7 @@ void DialogCutSplinePath::setFormula(const QString &value) */ void DialogCutSplinePath::setSplinePathId(const quint32 &value, const quint32 &id) { - setCurrentSplinePathId(ui->comboBoxSplinePath, splinePathId, value, id, ComboMode::CutSpline); + setCurrentSplinePathId(ui->comboBoxSplinePath, splinePathId, value, id, ComboBoxCutSpline::CutSpline); } //--------------------------------------------------------------------------------------------------------------------- @@ -108,9 +108,9 @@ void DialogCutSplinePath::setSplinePathId(const quint32 &value, const quint32 &i * @param id id of point or detail * @param type type of object */ -void DialogCutSplinePath::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogCutSplinePath::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::SplinePath) + if (type == SceneObject::SplinePath) { const VSplinePath *splPath = data->GeometricObject(id); ChangeCurrentText(ui->comboBoxSplinePath, splPath->name()); diff --git a/src/app/dialogs/tools/dialogcutsplinepath.h b/src/app/dialogs/tools/dialogcutsplinepath.h index a93c2c2bc..0dd7d421f 100644 --- a/src/app/dialogs/tools/dialogcutsplinepath.h +++ b/src/app/dialogs/tools/dialogcutsplinepath.h @@ -55,7 +55,7 @@ public: quint32 getSplinePathId() const; void setSplinePathId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogdetail.cpp b/src/app/dialogs/tools/dialogdetail.cpp index 717f912f7..452419a4e 100644 --- a/src/app/dialogs/tools/dialogdetail.cpp +++ b/src/app/dialogs/tools/dialogdetail.cpp @@ -78,24 +78,26 @@ DialogDetail::DialogDetail(const VContainer *data, QWidget *parent) * @param id id of objects (points, arcs, splines, spline paths) * @param type type of object */ -void DialogDetail::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogDetail::ChoosedObject(quint32 id, const SceneObject &type) { - if (type != Valentina::Line && type != Valentina::Detail) + if (type != SceneObject::Line && type != SceneObject::Detail) { switch (type) { - case (Valentina::Arc): - NewItem(id, Valentina::NodeArc, NodeDetail::Contour); + case (SceneObject::Arc): + NewItem(id, Tool::NodeArc, NodeDetail::Contour); break; - case (Valentina::Point): - NewItem(id, Valentina::NodePoint, NodeDetail::Contour); + case (SceneObject::Point): + NewItem(id, Tool::NodePoint, NodeDetail::Contour); break; - case (Valentina::Spline): - NewItem(id, Valentina::NodeSpline, NodeDetail::Contour); + case (SceneObject::Spline): + NewItem(id, Tool::NodeSpline, NodeDetail::Contour); break; - case (Valentina::SplinePath): - NewItem(id, Valentina::NodeSplinePath, NodeDetail::Contour); + case (SceneObject::SplinePath): + NewItem(id, Tool::NodeSplinePath, NodeDetail::Contour); break; + case (SceneObject::Line): + case (SceneObject::Detail): default: qDebug()<GeometricObject(id); name = point->name(); break; } - case (Valentina::NodeArc): + case (Tool::NodeArc): { const VArc *arc = data->GeometricObject(id); name = arc->name(); break; } - case (Valentina::NodeSpline): + case (Tool::NodeSpline): { const VSpline *spl = data->GeometricObject(id); name = spl->name(); break; } - case (Valentina::NodeSplinePath): + case (Tool::NodeSplinePath): { const VSplinePath *splPath = data->GeometricObject(id); name = splPath->name(); break; } + case (Tool::ArrowTool): + case (Tool::SinglePointTool): + case (Tool::EndLineTool): + case (Tool::LineTool): + case (Tool::AlongLineTool): + case (Tool::ShoulderPointTool): + case (Tool::NormalTool): + case (Tool::BisectorTool): + case (Tool::LineIntersectTool): + case (Tool::SplineTool): + case (Tool::CutSplineTool): + case (Tool::CutArcTool): + case (Tool::ArcTool): + case (Tool::SplinePathTool): + case (Tool::CutSplinePathTool): + case (Tool::PointOfContact): + case (Tool::DetailTool): + case (Tool::Height): + case (Tool::Triangle): + case (Tool::PointOfIntersection): + case (Tool::UnionDetails): default: qDebug()<<"Got wrong tools. Ignore."; break; diff --git a/src/app/dialogs/tools/dialogdetail.h b/src/app/dialogs/tools/dialogdetail.h index ad6cc48b2..ac35e7d15 100644 --- a/src/app/dialogs/tools/dialogdetail.h +++ b/src/app/dialogs/tools/dialogdetail.h @@ -45,7 +45,7 @@ public: VDetail getDetails() const; void setDetails(const VDetail &value); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. @@ -71,7 +71,7 @@ private: /** @brief closed keep option about equdistant (closed or not) */ bool closed; - void NewItem(quint32 id, const Valentina::Tools &typeTool, const NodeDetail::NodeDetails &typeNode, + void NewItem(quint32 id, const Tool &typeTool, const NodeDetail &typeNode, qreal mx = 0, qreal my = 0); }; diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp index ac78ce73e..5ad7150ad 100644 --- a/src/app/dialogs/tools/dialogendline.cpp +++ b/src/app/dialogs/tools/dialogendline.cpp @@ -104,9 +104,9 @@ void DialogEndLine::DeployFormulaTextEdit() * @param id id of point or detail * @param type type of object */ -void DialogEndLine::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogEndLine::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); ChangeCurrentText(ui->comboBoxBasePoint, point->name()); diff --git a/src/app/dialogs/tools/dialogendline.h b/src/app/dialogs/tools/dialogendline.h index 7cba81c13..9f755b7d7 100644 --- a/src/app/dialogs/tools/dialogendline.h +++ b/src/app/dialogs/tools/dialogendline.h @@ -63,7 +63,7 @@ public: quint32 getBasePointId() const; void setBasePointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp index a3e0534b0..6703d2a25 100644 --- a/src/app/dialogs/tools/dialogheight.cpp +++ b/src/app/dialogs/tools/dialogheight.cpp @@ -125,9 +125,9 @@ void DialogHeight::setP2LineId(const quint32 &value, const quint32 &id) * @param id id of point or detail * @param type type of object */ -void DialogHeight::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogHeight::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); switch (number) diff --git a/src/app/dialogs/tools/dialogheight.h b/src/app/dialogs/tools/dialogheight.h index 25f443cf0..15a814a79 100644 --- a/src/app/dialogs/tools/dialogheight.h +++ b/src/app/dialogs/tools/dialogheight.h @@ -61,7 +61,7 @@ public: quint32 getP2LineId() const; void setP2LineId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp index 231c62dce..d62167e77 100644 --- a/src/app/dialogs/tools/dialogline.cpp +++ b/src/app/dialogs/tools/dialogline.cpp @@ -120,9 +120,9 @@ void DialogLine::DialogAccepted() * @param id id of point or detail * @param type type of object */ -void DialogLine::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogLine::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); if (number == 0) diff --git a/src/app/dialogs/tools/dialogline.h b/src/app/dialogs/tools/dialogline.h index 62b61d918..4de61cfbb 100644 --- a/src/app/dialogs/tools/dialogline.h +++ b/src/app/dialogs/tools/dialogline.h @@ -55,7 +55,7 @@ public: QString getTypeLine() const; void setTypeLine(const QString &value); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp index 4914312c0..c460e0610 100644 --- a/src/app/dialogs/tools/dialoglineintersect.cpp +++ b/src/app/dialogs/tools/dialoglineintersect.cpp @@ -68,9 +68,9 @@ DialogLineIntersect::~DialogLineIntersect() * @param id id of point or detail * @param type type of object */ -void DialogLineIntersect::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogLineIntersect::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); if (number == 0) diff --git a/src/app/dialogs/tools/dialoglineintersect.h b/src/app/dialogs/tools/dialoglineintersect.h index be7f400f6..8c02428bf 100644 --- a/src/app/dialogs/tools/dialoglineintersect.h +++ b/src/app/dialogs/tools/dialoglineintersect.h @@ -61,7 +61,7 @@ public: QString getPointName() const; void setPointName(const QString &value); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp index 4d53897d7..dd4558879 100644 --- a/src/app/dialogs/tools/dialognormal.cpp +++ b/src/app/dialogs/tools/dialognormal.cpp @@ -105,9 +105,9 @@ DialogNormal::~DialogNormal() * @param id id of point or detail * @param type type of object */ -void DialogNormal::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogNormal::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { if (number == 0) { diff --git a/src/app/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h index a2e8f7336..2fdcbb6cc 100644 --- a/src/app/dialogs/tools/dialognormal.h +++ b/src/app/dialogs/tools/dialognormal.h @@ -65,7 +65,7 @@ public: quint32 getSecondPointId() const; void setSecondPointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogpointofcontact.cpp b/src/app/dialogs/tools/dialogpointofcontact.cpp index f56b92013..45526a6a7 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.cpp +++ b/src/app/dialogs/tools/dialogpointofcontact.cpp @@ -78,7 +78,7 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, QWidget *pare connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogPointOfContact::PutVal); connect(ui->listWidget, &QListWidget::currentRowChanged, this, &DialogPointOfContact::ValChenged); - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { SizeHeight(); connect(ui->radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogTool::SizeHeight); @@ -133,9 +133,9 @@ void DialogPointOfContact::DeployFormulaTextEdit() * @param id id of point or detail * @param type type of object */ -void DialogPointOfContact::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogPointOfContact::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); if (number == 0) diff --git a/src/app/dialogs/tools/dialogpointofcontact.h b/src/app/dialogs/tools/dialogpointofcontact.h index cc96ef85c..d0517dd2f 100644 --- a/src/app/dialogs/tools/dialogpointofcontact.h +++ b/src/app/dialogs/tools/dialogpointofcontact.h @@ -61,7 +61,7 @@ public: quint32 getSecondPoint() const; void setSecondPoint(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp index 3551b7d06..58b058cdb 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.cpp +++ b/src/app/dialogs/tools/dialogpointofintersection.cpp @@ -78,9 +78,9 @@ void DialogPointOfIntersection::setSecondPointId(const quint32 &value, const qui * @param id id of point or detail * @param type type of object */ -void DialogPointOfIntersection::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogPointOfIntersection::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); if (number == 0) diff --git a/src/app/dialogs/tools/dialogpointofintersection.h b/src/app/dialogs/tools/dialogpointofintersection.h index 326c5fe91..dad79fa31 100644 --- a/src/app/dialogs/tools/dialogpointofintersection.h +++ b/src/app/dialogs/tools/dialogpointofintersection.h @@ -55,7 +55,7 @@ public: quint32 getSecondPointId() const; void setSecondPointId(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp index fdfdd08bf..61ca75e58 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp @@ -110,9 +110,9 @@ DialogShoulderPoint::~DialogShoulderPoint() * @param id id of point or detail * @param type type of object */ -void DialogShoulderPoint::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogShoulderPoint::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); if (number == 0) diff --git a/src/app/dialogs/tools/dialogshoulderpoint.h b/src/app/dialogs/tools/dialogshoulderpoint.h index 6e7e947fc..3b7a389a8 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.h +++ b/src/app/dialogs/tools/dialogshoulderpoint.h @@ -65,7 +65,7 @@ public: quint32 getPShoulder() const; void setPShoulder(const quint32 &value, const quint32 &id); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp index f8dfabe04..bf5a8df41 100644 --- a/src/app/dialogs/tools/dialogspline.cpp +++ b/src/app/dialogs/tools/dialogspline.cpp @@ -71,9 +71,9 @@ quint32 DialogSpline::getP1() const * @param id id of point or detail * @param type type of object */ -void DialogSpline::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogSpline::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); if (number == 0) diff --git a/src/app/dialogs/tools/dialogspline.h b/src/app/dialogs/tools/dialogspline.h index 8d6cd84ca..d90cd2990 100644 --- a/src/app/dialogs/tools/dialogspline.h +++ b/src/app/dialogs/tools/dialogspline.h @@ -67,7 +67,7 @@ public: qreal getKCurve() const; void setKCurve(const qreal &value); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogsplinepath.cpp b/src/app/dialogs/tools/dialogsplinepath.cpp index 80bdcea4e..95e8980bc 100644 --- a/src/app/dialogs/tools/dialogsplinepath.cpp +++ b/src/app/dialogs/tools/dialogsplinepath.cpp @@ -88,9 +88,9 @@ void DialogSplinePath::SetPath(const VSplinePath &value) * @param id id of point or detail * @param type don't show this id in list */ -void DialogSplinePath::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogSplinePath::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { NewItem(id, 1, 0, 1, 180); emit ToolTip(tr("Select point of curve path")); diff --git a/src/app/dialogs/tools/dialogsplinepath.h b/src/app/dialogs/tools/dialogsplinepath.h index 41bf0282c..631ce5478 100644 --- a/src/app/dialogs/tools/dialogsplinepath.h +++ b/src/app/dialogs/tools/dialogsplinepath.h @@ -50,7 +50,7 @@ public: VSplinePath GetPath() const; void SetPath(const VSplinePath &value); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index 8be3dd860..8ae922095 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -107,7 +107,7 @@ void DialogTool::FillComboBoxPoints(QComboBox *box, const quint32 &id) const if (i.key() != id) { VGObject *obj = i.value(); - if (obj->getType() == GObject::Point && obj->getMode() == Valentina::Calculation) + if (obj->getType() == GOType::Point && obj->getMode() == Draw::Calculation) { const VPointF *point = data->GeometricObject(i.key()); list[point->name()] = i.key(); @@ -118,7 +118,7 @@ void DialogTool::FillComboBoxPoints(QComboBox *box, const quint32 &id) const } //--------------------------------------------------------------------------------------------------------------------- -void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboMode::ComboBoxCutArc cut) const +void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboBoxCutArc cut) const { SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); @@ -127,12 +127,12 @@ void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboMode:: while (i.hasNext()) { i.next(); - if (cut == ComboMode::CutArc) + if (cut == ComboBoxCutArc::CutArc) { if (i.key() != id + 1 && i.key() != id + 2) { VGObject *obj = i.value(); - if (obj->getType() == GObject::Arc && obj->getMode() == Valentina::Calculation) + if (obj->getType() == GOType::Arc && obj->getMode() == Draw::Calculation) { const VArc *arc = data->GeometricObject(i.key()); list[arc->name()] = i.key(); @@ -144,7 +144,7 @@ void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboMode:: if (i.key() != id) { VGObject *obj = i.value(); - if (obj->getType() == GObject::Arc && obj->getMode() == Valentina::Calculation) + if (obj->getType() == GOType::Arc && obj->getMode() == Draw::Calculation) { const VArc *arc = data->GeometricObject(i.key()); list[arc->name()] = i.key(); @@ -162,7 +162,7 @@ void DialogTool::FillComboBoxArcs(QComboBox *box, const quint32 &id, ComboMode:: * @param id don't show id in list * @param cut if set to ComboMode::CutSpline don't show id+1 and id+2 */ -void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboMode::ComboBoxCutSpline cut) const +void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboBoxCutSpline cut) const { SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); @@ -171,12 +171,12 @@ void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboMod while (i.hasNext()) { i.next(); - if (cut == ComboMode::CutSpline) + if (cut == ComboBoxCutSpline::CutSpline) { if (i.key() != id + 1 && i.key() != id + 2) { VGObject *obj = i.value(); - if (obj->getType() == GObject::Spline && obj->getMode() == Valentina::Calculation) + if (obj->getType() == GOType::Spline && obj->getMode() == Draw::Calculation) { const VSpline *spl = data->GeometricObject(i.key()); list[spl->name()] = i.key(); @@ -188,7 +188,7 @@ void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboMod if (i.key() != id) { VGObject *obj = i.value(); - if (obj->getType() == GObject::Spline && obj->getMode() == Valentina::Calculation) + if (obj->getType() == GOType::Spline && obj->getMode() == Draw::Calculation) { const VSpline *spl = data->GeometricObject(i.key()); list[spl->name()] = i.key(); @@ -206,7 +206,7 @@ void DialogTool::FillComboBoxSplines(QComboBox *box, const quint32 &id, ComboMod * @param id don't show id in list * @param cut if set to ComboMode::CutSpline don't show id+1 and id+2 */ -void DialogTool::FillComboBoxSplinesPath(QComboBox *box, const quint32 &id, ComboMode::ComboBoxCutSpline cut) const +void DialogTool::FillComboBoxSplinesPath(QComboBox *box, const quint32 &id, ComboBoxCutSpline cut) const { SCASSERT(box != nullptr); const QHash *objs = data->DataGObjects(); @@ -215,12 +215,12 @@ void DialogTool::FillComboBoxSplinesPath(QComboBox *box, const quint32 &id, Comb while (i.hasNext()) { i.next(); - if (cut == ComboMode::CutSpline) + if (cut == ComboBoxCutSpline::CutSpline) { if (i.key() != id + 1 && i.key() != id + 2) { VGObject *obj = i.value(); - if (obj->getType() == GObject::SplinePath && obj->getMode() == Valentina::Calculation) + if (obj->getType() == GOType::SplinePath && obj->getMode() == Draw::Calculation) { const VSplinePath *splPath = data->GeometricObject(i.key()); list[splPath->name()] = i.key(); @@ -232,7 +232,7 @@ void DialogTool::FillComboBoxSplinesPath(QComboBox *box, const quint32 &id, Comb if (i.key() != id) { VGObject *obj = i.value(); - if (obj->getType() == GObject::SplinePath && obj->getMode() == Valentina::Calculation) + if (obj->getType() == GOType::SplinePath && obj->getMode() == Draw::Calculation) { const VSplinePath *splPath = data->GeometricObject(i.key()); list[splPath->name()] = i.key(); @@ -563,7 +563,7 @@ void DialogTool::setCurrentPointId(QComboBox *box, quint32 &pointId, const quint * @param cut if set to ComboMode::CutSpline don't show id+1 and id+2 */ void DialogTool::setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, const quint32 &id, - ComboMode::ComboBoxCutSpline cut) const + ComboBoxCutSpline cut) const { SCASSERT(box != nullptr); FillComboBoxSplines(box, id, cut); @@ -581,7 +581,7 @@ void DialogTool::setCurrentSplineId(QComboBox *box, quint32 &splineId, const qui * @param cut if set to ComboMode::CutArc don't show id+1 and id+2 */ void DialogTool::setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 &value, const quint32 &id, - ComboMode::ComboBoxCutArc cut) const + ComboBoxCutArc cut) const { SCASSERT(box != nullptr); FillComboBoxArcs(box, id, cut); @@ -599,7 +599,7 @@ void DialogTool::setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 & * @param cut if set to ComboMode::CutSpline don't show id+1 and id+2 */ void DialogTool::setCurrentSplinePathId(QComboBox *box, quint32 &splinePathId, const quint32 &value, - const quint32 &id, ComboMode::ComboBoxCutSpline cut) const + const quint32 &id, ComboBoxCutSpline cut) const { SCASSERT(box != nullptr); FillComboBoxSplinesPath(box, id, cut); @@ -684,7 +684,7 @@ void DialogTool::CheckState() * @param id id of point or detail * @param type type of object */ -void DialogTool::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogTool::ChoosedObject(quint32 id, const SceneObject &type) { Q_UNUSED(id); Q_UNUSED(type); diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index ecdf78202..87f308401 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -44,19 +44,8 @@ class VContainer; class QPlainTextEdit; class VAbstractTool; -namespace ComboMode -{ - /** - * @brief The ComboBoxCutSpline enum - */ - enum ComboBoxCutSpline { CutSpline, NoCutSpline }; - Q_DECLARE_FLAGS(ComboBoxCutSplines, ComboBoxCutSpline) - - enum ComboBoxCutArc { CutArc, NoCutArc}; - Q_DECLARE_FLAGS(ComboBoxCutArcs, ComboBoxCutArc) -} -Q_DECLARE_OPERATORS_FOR_FLAGS( ComboMode::ComboBoxCutSplines ) -Q_DECLARE_OPERATORS_FOR_FLAGS( ComboMode::ComboBoxCutArcs ) +enum class ComboBoxCutSpline : char { CutSpline, NoCutSpline }; +enum class ComboBoxCutArc : char { CutArc, NoCutArc}; /** * @brief The DialogTool class parent for all dialog of tools. @@ -85,7 +74,7 @@ signals: */ void ToolTip(const QString &toolTip); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); void NamePointChanged(); virtual void DialogAccepted(); /** @@ -187,11 +176,11 @@ protected: virtual void showEvent( QShowEvent *event ); void FillComboBoxPoints(QComboBox *box, const quint32 &id = 0)const; void FillComboBoxArcs(QComboBox *box, const quint32 &id = 0, - ComboMode::ComboBoxCutArc cut = ComboMode::NoCutArc)const; + ComboBoxCutArc cut = ComboBoxCutArc::NoCutArc)const; void FillComboBoxSplines(QComboBox *box, const quint32 &id = 0, - ComboMode::ComboBoxCutSpline cut = ComboMode::NoCutSpline)const; + ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline)const; void FillComboBoxSplinesPath(QComboBox *box, const quint32 &id = 0, - ComboMode::ComboBoxCutSpline cut = ComboMode::NoCutSpline)const; + ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline)const; void FillComboBoxTypeLine(QComboBox *box) const; virtual void CheckState(); QString GetTypeLine(const QComboBox *box)const; @@ -208,12 +197,12 @@ protected: void Eval(QLineEdit *edit, bool &flag, QTimer *timer, QLabel *label); void setCurrentPointId(QComboBox *box, quint32 &pointId, const quint32 &value, const quint32 &id) const; void setCurrentSplineId(QComboBox *box, quint32 &splineId, const quint32 &value, const quint32 &id, - ComboMode::ComboBoxCutSpline cut = ComboMode::NoCutSpline) const; + ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline) const; void setCurrentArcId(QComboBox *box, quint32 &arcId, const quint32 &value, const quint32 &id, - ComboMode::ComboBoxCutArc cut = ComboMode::NoCutArc) const; + ComboBoxCutArc cut = ComboBoxCutArc::NoCutArc) const; void setCurrentSplinePathId(QComboBox *box, quint32 &splinePathId, const quint32 &value, const quint32 &id, - ComboMode::ComboBoxCutSpline cut = ComboMode::NoCutSpline) const; + ComboBoxCutSpline cut = ComboBoxCutSpline::NoCutSpline) const; quint32 getCurrentObjectId(QComboBox *box) const; bool ChoosedPoint(const quint32 &id, QComboBox *box, const QString &toolTip); template @@ -244,7 +233,7 @@ protected: connect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged); - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { SizeHeight(); connect(radioButtonSizeGrowth, &QRadioButton::clicked, this, &DialogTool::SizeHeight); diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp index c2977052b..b421253fc 100644 --- a/src/app/dialogs/tools/dialogtriangle.cpp +++ b/src/app/dialogs/tools/dialogtriangle.cpp @@ -67,9 +67,9 @@ DialogTriangle::~DialogTriangle() * @param id id of point or detail * @param type type of object */ -void DialogTriangle::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogTriangle::ChoosedObject(quint32 id, const SceneObject &type) { - if (type == Valentina::Point) + if (type == SceneObject::Point) { const VPointF *point = data->GeometricObject(id); switch (number) diff --git a/src/app/dialogs/tools/dialogtriangle.h b/src/app/dialogs/tools/dialogtriangle.h index 0281b1f2e..4c648f6b4 100644 --- a/src/app/dialogs/tools/dialogtriangle.h +++ b/src/app/dialogs/tools/dialogtriangle.h @@ -61,7 +61,7 @@ public: QString getPointName() const; void setPointName(const QString &value); public slots: - virtual void ChoosedObject(quint32 id, const Valentina::Scenes &type); + virtual void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. diff --git a/src/app/dialogs/tools/dialoguniondetails.cpp b/src/app/dialogs/tools/dialoguniondetails.cpp index d11281b13..c0f7cfd6d 100644 --- a/src/app/dialogs/tools/dialoguniondetails.cpp +++ b/src/app/dialogs/tools/dialoguniondetails.cpp @@ -57,7 +57,7 @@ DialogUnionDetails::~DialogUnionDetails() * @param id id of point or detail * @param type type of object */ -void DialogUnionDetails::ChoosedObject(quint32 id, const Valentina::Scenes &type) +void DialogUnionDetails::ChoosedObject(quint32 id, const SceneObject &type) { if (numberD == 0) { @@ -103,12 +103,12 @@ bool DialogUnionDetails::CheckObject(const quint32 &id, const quint32 &idDetail) * @param idDetail id detail * @param index index of edge */ -void DialogUnionDetails::ChoosedDetail(const quint32 &id, const Valentina::Scenes &type, quint32 &idDetail, +void DialogUnionDetails::ChoosedDetail(const quint32 &id, const SceneObject &type, quint32 &idDetail, ptrdiff_t &index) { if (idDetail == 0) { - if (type == Valentina::Detail) + if (type == SceneObject::Detail) { idDetail = id; emit ToolTip(tr("Select first point")); @@ -119,7 +119,7 @@ void DialogUnionDetails::ChoosedDetail(const quint32 &id, const Valentina::Scene { return; } - if (type == Valentina::Point) + if (type == SceneObject::Point) { if (numberP == 0) { diff --git a/src/app/dialogs/tools/dialoguniondetails.h b/src/app/dialogs/tools/dialoguniondetails.h index 4e72252cd..6ef21a3a4 100644 --- a/src/app/dialogs/tools/dialoguniondetails.h +++ b/src/app/dialogs/tools/dialoguniondetails.h @@ -51,7 +51,7 @@ public: ptrdiff_t getIndexD1() const; ptrdiff_t getIndexD2() const; public slots: - void ChoosedObject(quint32 id, const Valentina::Scenes &type); + void ChoosedObject(quint32 id, const SceneObject &type); virtual void DialogAccepted(); /** TODO ISSUE 79 : create real function * @brief DialogApply apply data and emit signal about applied dialog. @@ -88,7 +88,7 @@ private: quint32 p2; bool CheckObject(const quint32 &id, const quint32 &idDetail) const; - void ChoosedDetail(const quint32 &id, const Valentina::Scenes &type, quint32 &idDetail, + void ChoosedDetail(const quint32 &id, const SceneObject &type, quint32 &idDetail, ptrdiff_t &index); }; diff --git a/src/app/geometry/varc.cpp b/src/app/geometry/varc.cpp index 0cc8e6be8..facf84354 100644 --- a/src/app/geometry/varc.cpp +++ b/src/app/geometry/varc.cpp @@ -39,7 +39,7 @@ * @brief VArc default constructor. */ VArc::VArc () - :VGObject(GObject::Arc), f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), + :VGObject(GOType::Arc), f1(0), formulaF1(QString()), f2(0), formulaF2(QString()), radius(0), formulaRadius(QString()), center(VPointF()) {} @@ -52,8 +52,8 @@ VArc::VArc () * @param f2 end angle (degree). */ VArc::VArc (VPointF center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1, qreal f2, - QString formulaF2, quint32 idObject, Valentina::Draws mode) - : VGObject(GObject::Arc, idObject, mode), f1(f1), formulaF1(formulaF1), f2(f2), formulaF2(formulaF2), + QString formulaF2, quint32 idObject, Draw mode) + : VGObject(GOType::Arc, idObject, mode), f1(f1), formulaF1(formulaF1), f2(f2), formulaF2(formulaF2), radius(radius), formulaRadius(formulaRadius), center(center) { _name = QString (arc_+"%1").arg(this->GetCenter().name()); diff --git a/src/app/geometry/varc.h b/src/app/geometry/varc.h index 3aeec81b2..1aa18aa4a 100644 --- a/src/app/geometry/varc.h +++ b/src/app/geometry/varc.h @@ -43,7 +43,7 @@ class VArc: public VGObject public: VArc (); VArc (VPointF center, qreal radius, QString formulaRadius, qreal f1, QString formulaF1, qreal f2, - QString formulaF2, quint32 idObject = 0, Valentina::Draws mode = Valentina::Calculation); + QString formulaF2, quint32 idObject = 0, Draw mode = Draw::Calculation); VArc(const VArc &arc); VArc& operator= (const VArc &arc); QString GetFormulaF1 () const; diff --git a/src/app/geometry/vdetail.cpp b/src/app/geometry/vdetail.cpp index 14bbda395..6e0f6855a 100644 --- a/src/app/geometry/vdetail.cpp +++ b/src/app/geometry/vdetail.cpp @@ -282,7 +282,7 @@ QVector VDetail::listNodePoint() const QVector list; for (ptrdiff_t i = 0; i < nodes.size(); ++i) { - if (nodes.at(i).getTypeTool() == Valentina::NodePoint) + if (nodes.at(i).getTypeTool() == Tool::NodePoint) { list.append(nodes.at(i)); } diff --git a/src/app/geometry/vdetail.h b/src/app/geometry/vdetail.h index a43bc0963..efcf6f7f5 100644 --- a/src/app/geometry/vdetail.h +++ b/src/app/geometry/vdetail.h @@ -34,24 +34,8 @@ class QString; -namespace Detail -{ - /** - * @brief The Contour enum OpenContour - first and last points contour don't match, - * CloseContour - first and last points contour match. - */ - enum Contour { OpenContour, CloseContour }; - Q_DECLARE_FLAGS(Contours, Contour) - - /** - * @brief The Equidistant enum OpenEquidistant - first and last points equidistant don't match, - * CloseEquidistant - first and last points equidistant match. - */ - enum Equidistant { OpenEquidistant, CloseEquidistant }; - Q_DECLARE_FLAGS(Equidistants, Equidistant) -} -Q_DECLARE_OPERATORS_FOR_FLAGS(Detail::Contours) -Q_DECLARE_OPERATORS_FOR_FLAGS(Detail::Equidistants) +enum class Contour : char { OpenContour, CloseContour }; +enum class EquidistantType : char { OpenEquidistant, CloseEquidistant }; /** * @brief The VDetail class for path of object (points, arcs, splines). diff --git a/src/app/geometry/vequidistant.cpp b/src/app/geometry/vequidistant.cpp index a6cb7555f..2f0be784c 100644 --- a/src/app/geometry/vequidistant.cpp +++ b/src/app/geometry/vequidistant.cpp @@ -47,7 +47,7 @@ QPainterPath VEquidistant::ContourPath(const quint32 &idDetail, const VContainer { switch (detail.at(i).getTypeTool()) { - case (Valentina::NodePoint): + case (Tool::NodePoint): { const VPointF *point = data->GeometricObject(detail.at(i).getId()); points.append(point->toQPointF()); @@ -60,7 +60,7 @@ QPainterPath VEquidistant::ContourPath(const quint32 &idDetail, const VContainer } } break; - case (Valentina::NodeArc): + case (Tool::NodeArc): { const VArc *arc = data->GeometricObject(detail.at(i).getId()); qreal len1 = GetLengthContour(points, arc->GetPoints()); @@ -84,7 +84,7 @@ QPainterPath VEquidistant::ContourPath(const quint32 &idDetail, const VContainer } } break; - case (Valentina::NodeSpline): + case (Tool::NodeSpline): { const VSpline *spline = data->GeometricObject(detail.at(i).getId()); qreal len1 = GetLengthContour(points, spline->GetPoints()); @@ -108,7 +108,7 @@ QPainterPath VEquidistant::ContourPath(const quint32 &idDetail, const VContainer } } break; - case (Valentina::NodeSplinePath): + case (Tool::NodeSplinePath): { const VSplinePath *splinePath = data->GeometricObject(detail.at(i).getId()); qreal len1 = GetLengthContour(points, splinePath->GetPathPoints()); @@ -132,8 +132,29 @@ QPainterPath VEquidistant::ContourPath(const quint32 &idDetail, const VContainer } } break; + case (Tool::ArrowTool): + case (Tool::SinglePointTool): + case (Tool::EndLineTool): + case (Tool::LineTool): + case (Tool::AlongLineTool): + case (Tool::ShoulderPointTool): + case (Tool::NormalTool): + case (Tool::BisectorTool): + case (Tool::LineIntersectTool): + case (Tool::SplineTool): + case (Tool::CutSplineTool): + case (Tool::CutArcTool): + case (Tool::ArcTool): + case (Tool::SplinePathTool): + case (Tool::CutSplinePathTool): + case (Tool::PointOfContact): + case (Tool::DetailTool): + case (Tool::Height): + case (Tool::Triangle): + case (Tool::PointOfIntersection): + case (Tool::UnionDetails): default: - qDebug()<<"Get wrong tool type. Ignore."<(detail.at(i).getTypeTool()); break; } } @@ -154,11 +175,11 @@ QPainterPath VEquidistant::ContourPath(const quint32 &idDetail, const VContainer QPainterPath ekv; if (detail.getClosed() == true) { - ekv = Equidistant(pointsEkv, Detail::CloseEquidistant, qApp->toPixel(detail.getWidth())); + ekv = Equidistant(pointsEkv, EquidistantType::CloseEquidistant, qApp->toPixel(detail.getWidth())); } else { - ekv = Equidistant(pointsEkv, Detail::OpenEquidistant, qApp->toPixel(detail.getWidth())); + ekv = Equidistant(pointsEkv, EquidistantType::OpenEquidistant, qApp->toPixel(detail.getWidth())); } path.addPath(ekv); path.setFillRule(Qt::WindingFill); @@ -241,7 +262,7 @@ QVector VEquidistant::CorrectEquidistantPoints(const QVector & } //--------------------------------------------------------------------------------------------------------------------- -QPainterPath VEquidistant::Equidistant(QVector points, const Detail::Equidistant &eqv, const qreal &width) +QPainterPath VEquidistant::Equidistant(QVector points, const EquidistantType &eqv, const qreal &width) { QPainterPath ekv; QVector ekvPoints; @@ -267,29 +288,29 @@ QPainterPath VEquidistant::Equidistant(QVector points, const Detail::Eq } } } - if (eqv == Detail::CloseEquidistant) + if (eqv == EquidistantType::CloseEquidistant) { points.append(points.at(0)); } for (qint32 i = 0; i < points.size(); ++i ) { - if ( i == 0 && eqv == Detail::CloseEquidistant) + if ( i == 0 && eqv == EquidistantType::CloseEquidistant) {//first point, polyline closed ekvPoints< points, const Detail::Equidistant &eqv, const qreal &width); + static QPainterPath Equidistant(QVector points, const EquidistantType &eqv, const qreal &width); /** * @brief CheckLoops seek and delete loops in equidistant. * @param points vector of points of equidistant. diff --git a/src/app/geometry/vgobject.cpp b/src/app/geometry/vgobject.cpp index 4ec61a1c3..17bb1b859 100644 --- a/src/app/geometry/vgobject.cpp +++ b/src/app/geometry/vgobject.cpp @@ -33,7 +33,7 @@ * @brief VGObject default constructor. */ VGObject::VGObject() - :_id(0), type(GObject::Point), idObject(0), _name(QString()), mode(Valentina::Calculation) + :_id(0), type(GOType::Point), idObject(0), _name(QString()), mode(Draw::Calculation) {} //--------------------------------------------------------------------------------------------------------------------- @@ -43,7 +43,7 @@ VGObject::VGObject() * @param idObject id parent object. * @param mode mode creation. Used in modeling mode. */ -VGObject::VGObject(const GObject::Type &type, const quint32 &idObject, const Valentina::Draws &mode) +VGObject::VGObject(const GOType &type, const quint32 &idObject, const Draw &mode) :_id(0), type(type), idObject(idObject), _name(QString()), mode(mode) {} @@ -117,7 +117,7 @@ void VGObject::setName(const QString &name) * @brief getMode return mode creation. * @return mode. */ -Valentina::Draws VGObject::getMode() const +Draw VGObject::getMode() const { return mode; } @@ -127,7 +127,7 @@ Valentina::Draws VGObject::getMode() const * @brief setMode set mode creation. * @param value mode. */ -void VGObject::setMode(const Valentina::Draws &value) +void VGObject::setMode(const Draw &value) { mode = value; } @@ -137,7 +137,7 @@ void VGObject::setMode(const Valentina::Draws &value) * @brief getType return object type. * @return type. */ -GObject::Type VGObject::getType() const +GOType VGObject::getType() const { return type; } diff --git a/src/app/geometry/vgobject.h b/src/app/geometry/vgobject.h index fae9abc7a..e6e86f96c 100644 --- a/src/app/geometry/vgobject.h +++ b/src/app/geometry/vgobject.h @@ -31,15 +31,7 @@ #include "../options.h" -namespace GObject -{ - /** - * @brief The NodeDetail enum type of graphical objects. - */ - enum Type { Point, Arc, Spline, SplinePath }; - Q_DECLARE_FLAGS(Types, Type) -} -Q_DECLARE_OPERATORS_FOR_FLAGS(GObject::Types) +enum class GOType : char { Point, Arc, Spline, SplinePath }; /** * @brief The VGObject class keep information graphical objects. @@ -48,8 +40,7 @@ class VGObject { public: VGObject(); - VGObject(const GObject::Type &type, const quint32 &idObject = 0, - const Valentina::Draws &mode = Valentina::Calculation); + VGObject(const GOType &type, const quint32 &idObject = 0, const Draw &mode = Draw::Calculation); VGObject(const VGObject &obj); VGObject& operator= (const VGObject &obj); virtual ~VGObject(){} @@ -57,9 +48,9 @@ public: void setIdObject(const quint32 &value); virtual QString name() const; void setName(const QString &name); - Valentina::Draws getMode() const; - void setMode(const Valentina::Draws &value); - GObject::Type getType() const; + Draw getMode() const; + void setMode(const Draw &value); + GOType getType() const; quint32 id() const; virtual void setId(const quint32 &id); protected: @@ -67,7 +58,7 @@ protected: quint32 _id; /** @brief type type of graphical object */ - GObject::Type type; + GOType type; /** @brief idObject id of parent object. Only for modeling. All another return 0. */ quint32 idObject; @@ -76,7 +67,7 @@ protected: QString _name; /** @brief mode object created in calculation or drawing mode */ - Valentina::Draws mode; + Draw mode; }; #endif // VGOBJECT_H diff --git a/src/app/geometry/vnodedetail.cpp b/src/app/geometry/vnodedetail.cpp index 02159fb4d..4db005d90 100644 --- a/src/app/geometry/vnodedetail.cpp +++ b/src/app/geometry/vnodedetail.cpp @@ -30,11 +30,11 @@ //--------------------------------------------------------------------------------------------------------------------- VNodeDetail::VNodeDetail() - :id(0), typeTool(Valentina::NodePoint), typeNode(NodeDetail::Contour), mx(0), my(0) + :id(0), typeTool(Tool::NodePoint), typeNode(NodeDetail::Contour), mx(0), my(0) {} //--------------------------------------------------------------------------------------------------------------------- -VNodeDetail::VNodeDetail(quint32 id, Valentina::Tools typeTool, NodeDetail::NodeDetails typeNode, qreal mx, qreal my) +VNodeDetail::VNodeDetail(quint32 id, Tool typeTool, NodeDetail typeNode, qreal mx, qreal my) :id(id), typeTool(typeTool), typeNode(typeNode), mx(mx), my(my) {} diff --git a/src/app/geometry/vnodedetail.h b/src/app/geometry/vnodedetail.h index 6e0c54969..936e06d52 100644 --- a/src/app/geometry/vnodedetail.h +++ b/src/app/geometry/vnodedetail.h @@ -31,15 +31,7 @@ #include "../options.h" -namespace NodeDetail -{ - /** - * @brief The NodeDetail enum node can be node of contour or node modeling. - */ - enum NodeDetail { Contour, Modeling }; - Q_DECLARE_FLAGS(NodeDetails, NodeDetail) -} -Q_DECLARE_OPERATORS_FOR_FLAGS(NodeDetail::NodeDetails) +enum class NodeDetail : char { Contour, Modeling }; /** * @brief The VNodeDetail class keep information about detail node. @@ -59,8 +51,7 @@ public: * @param mx object bias x axis * @param my object bias y axis */ - VNodeDetail(quint32 id, Valentina::Tools typeTool, NodeDetail::NodeDetails typeNode, qreal mx = 0, - qreal my = 0); + VNodeDetail(quint32 id, Tool typeTool, NodeDetail typeNode, qreal mx = 0, qreal my = 0); /** * @brief VNodeDetail copy constructor * @param node node @@ -86,22 +77,22 @@ public: * @brief getTypeTool return tool type. * @return tool type. */ - Valentina::Tools getTypeTool() const; + Tool getTypeTool() const; /** * @brief setTypeTool set tool type. * @param value tool type. */ - void setTypeTool(const Valentina::Tools &value); + void setTypeTool(const Tool &value); /** * @brief getTypeNode return node type. * @return node type. */ - NodeDetail::NodeDetails getTypeNode() const; + NodeDetail getTypeNode() const; /** * @brief setTypeNode set node type. * @param value node type. */ - void setTypeNode(const NodeDetail::NodeDetails &value); + void setTypeNode(const NodeDetail &value); /** * @brief getMx return object bias x axis. * @return bias x axis. @@ -130,11 +121,11 @@ private: /** * @brief typeTool type of tool */ - Valentina::Tools typeTool; + Tool typeTool; /** * @brief typeNode node type. */ - NodeDetail::NodeDetails typeNode; + NodeDetail typeNode; /** * @brief mx bias x axis. */ @@ -155,22 +146,22 @@ inline void VNodeDetail::setId(const quint32 &value) id = value; } -inline Valentina::Tools VNodeDetail::getTypeTool() const +inline Tool VNodeDetail::getTypeTool() const { return typeTool; } -inline void VNodeDetail::setTypeTool(const Valentina::Tools &value) +inline void VNodeDetail::setTypeTool(const Tool &value) { typeTool = value; } -inline NodeDetail::NodeDetails VNodeDetail::getTypeNode() const +inline NodeDetail VNodeDetail::getTypeNode() const { return typeNode; } -inline void VNodeDetail::setTypeNode(const NodeDetail::NodeDetails &value) +inline void VNodeDetail::setTypeNode(const NodeDetail &value) { typeNode = value; } diff --git a/src/app/geometry/vpointf.cpp b/src/app/geometry/vpointf.cpp index a921e4c7c..dfc80a326 100644 --- a/src/app/geometry/vpointf.cpp +++ b/src/app/geometry/vpointf.cpp @@ -38,8 +38,8 @@ * @param mx offset name respect to x * @param my offset name respect to y */ -VPointF::VPointF(qreal x, qreal y, QString name, qreal mx, qreal my, quint32 idObject, Valentina::Draws mode) - :VGObject(GObject::Point, idObject, mode), _mx(mx), _my(my), _x(x), _y(y) +VPointF::VPointF(qreal x, qreal y, QString name, qreal mx, qreal my, quint32 idObject, Draw mode) + :VGObject(GOType::Point, idObject, mode), _mx(mx), _my(my), _x(x), _y(y) { this->_name = name; } @@ -48,7 +48,7 @@ VPointF::VPointF(qreal x, qreal y, QString name, qreal mx, qreal my, quint32 idO /** * @brief VPointF creat empty point */ -VPointF::VPointF() :VGObject(GObject::Point, 0, Valentina::Calculation), _mx(0), _my(0), _x(0), _y(0) +VPointF::VPointF() :VGObject(GOType::Point, 0, Draw::Calculation), _mx(0), _my(0), _x(0), _y(0) {} //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/geometry/vpointf.h b/src/app/geometry/vpointf.h index bf8e7c617..942525ae9 100644 --- a/src/app/geometry/vpointf.h +++ b/src/app/geometry/vpointf.h @@ -44,7 +44,7 @@ public: VPointF (const VPointF &point ); VPointF (const QPointF &point ); VPointF ( qreal x, qreal y, QString name, qreal mx, qreal my, quint32 idObject = 0, - Valentina::Draws mode = Valentina::Calculation); + Draw mode = Draw::Calculation); virtual ~VPointF(){} VPointF &operator=(const VPointF &point); qreal mx() const; diff --git a/src/app/geometry/vspline.cpp b/src/app/geometry/vspline.cpp index dc161432f..ffd837bb5 100644 --- a/src/app/geometry/vspline.cpp +++ b/src/app/geometry/vspline.cpp @@ -38,7 +38,7 @@ * @brief VSpline default constructor */ VSpline::VSpline() - :VGObject(GObject::Spline), p1(VPointF()), p2(QPointF()), p3(QPointF()), p4(VPointF()), angle1(0), angle2(0), + :VGObject(GOType::Spline), p1(VPointF()), p2(QPointF()), p3(QPointF()), p4(VPointF()), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1) {} @@ -65,8 +65,8 @@ VSpline::VSpline ( const VSpline & spline ) * @param kAsm2 coefficient of length second control line. */ VSpline::VSpline (VPointF p1, VPointF p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve, - quint32 idObject, Valentina::Draws mode) - :VGObject(GObject::Spline, idObject, mode), p1(p1), p2(QPointF()), p3(QPointF()), p4(p4), angle1(angle1), + quint32 idObject, Draw mode) + :VGObject(GOType::Spline, idObject, mode), p1(p1), p2(QPointF()), p3(QPointF()), p4(p4), angle1(angle1), angle2(angle2), kAsm1(kAsm1), kAsm2(kAsm2), kCurve(kCurve) { CreateName(); @@ -100,8 +100,8 @@ VSpline::VSpline (VPointF p1, VPointF p4, qreal angle1, qreal angle2, qreal kAsm * @param p3 second control point. * @param p4 second point spline. */ -VSpline::VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, qreal kCurve, quint32 idObject, Valentina::Draws mode) - :VGObject(GObject::Spline, idObject, mode), p1(p1), p2(p2), p3(p3), p4(p4), angle1(0), angle2(0), kAsm1(1), +VSpline::VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, qreal kCurve, quint32 idObject, Draw mode) + :VGObject(GOType::Spline, idObject, mode), p1(p1), p2(p2), p3(p3), p4(p4), angle1(0), angle2(0), kAsm1(1), kAsm2(1), kCurve(1) { CreateName(); diff --git a/src/app/geometry/vspline.h b/src/app/geometry/vspline.h index c5dedf3cb..e749f0863 100644 --- a/src/app/geometry/vspline.h +++ b/src/app/geometry/vspline.h @@ -46,9 +46,9 @@ public: VSpline(); VSpline (const VSpline &spline ); VSpline (VPointF p1, VPointF p4, qreal angle1, qreal angle2, qreal kAsm1, qreal kAsm2, qreal kCurve, - quint32 idObject = 0, Valentina::Draws mode = Valentina::Calculation); + quint32 idObject = 0, Draw mode = Draw::Calculation); VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, qreal kCurve, quint32 idObject = 0, - Valentina::Draws mode = Valentina::Calculation); + Draw mode = Draw::Calculation); VSpline &operator=(const VSpline &spl); VPointF GetP1 () const; QPointF GetP2 () const; diff --git a/src/app/geometry/vsplinepath.cpp b/src/app/geometry/vsplinepath.cpp index 78001fab5..003d7ea90 100644 --- a/src/app/geometry/vsplinepath.cpp +++ b/src/app/geometry/vsplinepath.cpp @@ -30,8 +30,8 @@ #include "../exception/vexception.h" //--------------------------------------------------------------------------------------------------------------------- -VSplinePath::VSplinePath(qreal kCurve, quint32 idObject, Valentina::Draws mode) - : VGObject(GObject::SplinePath, idObject, mode), path(QVector()), kCurve(kCurve), maxCountPoints(0) +VSplinePath::VSplinePath(qreal kCurve, quint32 idObject, Draw mode) + : VGObject(GOType::SplinePath, idObject, mode), path(QVector()), kCurve(kCurve), maxCountPoints(0) {} //--------------------------------------------------------------------------------------------------------------------- @@ -121,13 +121,13 @@ qreal VSplinePath::GetLength() const } //--------------------------------------------------------------------------------------------------------------------- -void VSplinePath::UpdatePoint(qint32 indexSpline, const SplinePoint::Position &pos, const VSplinePoint &point) +void VSplinePath::UpdatePoint(qint32 indexSpline, const SplinePointPosition &pos, const VSplinePoint &point) { if (indexSpline < 1 || indexSpline > Count()) { throw VException(tr("This spline does not exist.")); } - if (pos == SplinePoint::FirstPoint) + if (pos == SplinePointPosition::FirstPoint) { path[indexSpline-1] = point; } @@ -138,13 +138,13 @@ void VSplinePath::UpdatePoint(qint32 indexSpline, const SplinePoint::Position &p } //--------------------------------------------------------------------------------------------------------------------- -VSplinePoint VSplinePath::GetSplinePoint(qint32 indexSpline, SplinePoint::Position pos) const +VSplinePoint VSplinePath::GetSplinePoint(qint32 indexSpline, SplinePointPosition pos) const { if (indexSpline < 1 || indexSpline > Count()) { throw VException(tr("This spline does not exist.")); } - if (pos == SplinePoint::FirstPoint) + if (pos == SplinePointPosition::FirstPoint) { return path.at(indexSpline-1); } diff --git a/src/app/geometry/vsplinepath.h b/src/app/geometry/vsplinepath.h index 42a3fac0c..991799401 100644 --- a/src/app/geometry/vsplinepath.h +++ b/src/app/geometry/vsplinepath.h @@ -33,15 +33,7 @@ #include "vspline.h" #include "vsplinepoint.h" -namespace SplinePoint -{ - /** - * @brief The Position enum position in spline. - */ - enum Position { FirstPoint, LastPoint }; - Q_DECLARE_FLAGS(Positions, Position) -} -Q_DECLARE_OPERATORS_FOR_FLAGS( SplinePoint::Positions ) +enum class SplinePointPosition : char { FirstPoint, LastPoint }; /** * @brief The VSplinePath class keep information about splinePath. @@ -56,7 +48,7 @@ public: * @param idObject parent id. * @param mode mode creation spline path. */ - VSplinePath(qreal kCurve = 1, quint32 idObject = 0, Valentina::Draws mode = Valentina::Calculation); + VSplinePath(qreal kCurve = 1, quint32 idObject = 0, Draw mode = Draw::Calculation); /** * @brief VSplinePath copy constructor. * @param splPath spline path. @@ -109,14 +101,14 @@ public: * @param pos position point in spline. * @param point point. */ - void UpdatePoint(qint32 indexSpline, const SplinePoint::Position &pos, const VSplinePoint &point); + void UpdatePoint(qint32 indexSpline, const SplinePointPosition &pos, const VSplinePoint &point); /** * @brief GetSplinePoint return spline point from list. * @param indexSpline spline index in list. * @param pos position point in spline. * @return spline point. */ - VSplinePoint GetSplinePoint(qint32 indexSpline, SplinePoint::Position pos) const; + VSplinePoint GetSplinePoint(qint32 indexSpline, SplinePointPosition pos) const; /** * @brief Clear clear list of points. */ diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp index 5f1093561..4c2690c71 100644 --- a/src/app/mainwindow.cpp +++ b/src/app/mainwindow.cpp @@ -54,10 +54,10 @@ * @param parent parent widget. */ MainWindow::MainWindow(QWidget *parent) - :QMainWindow(parent), ui(new Ui::MainWindow), pattern(nullptr), doc(nullptr), tool(Valentina::ArrowTool), + :QMainWindow(parent), ui(new Ui::MainWindow), pattern(nullptr), doc(nullptr), tool(Tool::ArrowTool), currentScene(nullptr), sceneDraw(nullptr), sceneDetails(nullptr), mouseCoordinate(nullptr), helpLabel(nullptr), view(nullptr), isInitialized(false), dialogTable(0), dialogTool(nullptr), dialogHistory(nullptr), - comboBoxDraws(nullptr), curFile(QString()), mode(Valentina::Calculation), currentDrawIndex(0), + comboBoxDraws(nullptr), curFile(QString()), mode(Draw::Calculation), currentDrawIndex(0), currentToolBoxIndex(0), drawMode(true), recentFileActs{0, 0, 0, 0, 0}, separatorAct(nullptr), autoSaveTimer(nullptr) { @@ -122,9 +122,9 @@ void MainWindow::ActionNewPP() { return; } - if (measurements.type() == Measurements::Standard) + if (measurements.type() == MeasurementsType::Standard) { - qApp->setPatternType(Pattern::Standard); + qApp->setPatternType(MeasurementsType::Standard); DialogStandardMeasurements stMeasurements(pattern, patternPieceName, this); if (stMeasurements.exec() == QDialog::Accepted) { @@ -143,7 +143,7 @@ void MainWindow::ActionNewPP() } else { - qApp->setPatternType(Pattern::Individual); + qApp->setPatternType(MeasurementsType::Individual); DialogIndividualMeasurements indMeasurements(pattern, patternPieceName, this); if (indMeasurements.exec() == QDialog::Accepted) { @@ -180,14 +180,14 @@ void MainWindow::ActionNewPP() //Create single point const quint32 id = pattern->AddGObject(new VPointF(qApp->toPixel((10+comboBoxDraws->count()*5)), qApp->toPixel(10), "А", 5, 10)); - VToolSinglePoint *spoint = new VToolSinglePoint(doc, pattern, id, Valentina::FromGui, patternPieceName, path); + VToolSinglePoint *spoint = new VToolSinglePoint(doc, pattern, id, Source::FromGui, patternPieceName, path); sceneDraw->addItem(spoint); connect(spoint, &VToolPoint::ChoosedTool, sceneDraw, &VMainGraphicsScene::ChoosedItem); connect(sceneDraw, &VMainGraphicsScene::NewFactor, spoint, &VToolSinglePoint::SetFactor); QHash* tools = doc->getTools(); SCASSERT(tools != nullptr); tools->insert(id, spoint); - VDrawTool::AddRecord(id, Valentina::SinglePointTool, doc); + VDrawTool::AddRecord(id, Tool::SinglePointTool, doc); SetEnableTool(true); SetEnableWidgets(true); @@ -233,7 +233,7 @@ void MainWindow::OptionDraw() * @param closeDialogSlot function what handle after close dialog. */ template -void MainWindow::SetToolButton(bool checked, Valentina::Tools t, const QString &cursor, const QString &toolTip, +void MainWindow::SetToolButton(bool checked, Tool t, const QString &cursor, const QString &toolTip, Func closeDialogSlot) { if (checked) @@ -271,7 +271,7 @@ template * @param closeDialogSlot function to handle close of dialog. * @param applyDialogSlot function to handle apply in dialog. */ -void MainWindow::SetToolButtonWithApply(bool checked, Valentina::Tools t, const QString &cursor, const QString &toolTip, +void MainWindow::SetToolButtonWithApply(bool checked, Tool t, const QString &cursor, const QString &toolTip, Func closeDialogSlot, Func2 applyDialogSlot) { if (checked) @@ -374,7 +374,7 @@ void MainWindow::ApplyDialog() */ void MainWindow::ToolEndLine(bool checked) { - SetToolButtonWithApply(checked, Valentina::EndLineTool, ":/cursor/endline_cursor.png", tr("Select point"), + SetToolButtonWithApply(checked, Tool::EndLineTool, ":/cursor/endline_cursor.png", tr("Select point"), &MainWindow::ClosedDialogEndLine,&MainWindow::ApplyDialogEndLine); } @@ -404,7 +404,7 @@ void MainWindow::ClosedDialogEndLine(int result) */ void MainWindow::ToolLine(bool checked) { - SetToolButton(checked, Valentina::LineTool, ":/cursor/line_cursor.png", tr("Select first point"), + SetToolButton(checked, Tool::LineTool, ":/cursor/line_cursor.png", tr("Select first point"), &MainWindow::ClosedDialogLine); } @@ -425,7 +425,7 @@ void MainWindow::ClosedDialogLine(int result) */ void MainWindow::ToolAlongLine(bool checked) { - SetToolButtonWithApply(checked, Valentina::AlongLineTool, ":/cursor/alongline_cursor.png", + SetToolButtonWithApply(checked, Tool::AlongLineTool, ":/cursor/alongline_cursor.png", tr("Select point"), &MainWindow::ClosedDialogAlongLine, &MainWindow::ApplyDialogAlongLine); } @@ -455,7 +455,7 @@ void MainWindow::ClosedDialogAlongLine(int result) */ void MainWindow::ToolShoulderPoint(bool checked) { - SetToolButtonWithApply(checked, Valentina::ShoulderPointTool, ":/cursor/shoulder_cursor.png", + SetToolButtonWithApply(checked, Tool::ShoulderPointTool, ":/cursor/shoulder_cursor.png", tr("Select first point of line"), &MainWindow::ClosedDialogShoulderPoint, &MainWindow::ApplyDialogShoulderPoint); } @@ -486,7 +486,7 @@ void MainWindow::ClosedDialogShoulderPoint(int result) */ void MainWindow::ToolNormal(bool checked) { - SetToolButtonWithApply(checked, Valentina::NormalTool, ":/cursor/normal_cursor.png", + SetToolButtonWithApply(checked, Tool::NormalTool, ":/cursor/normal_cursor.png", tr("Select first point of line"), &MainWindow::ClosedDialogNormal, &MainWindow::ApplyDialogNormal); } @@ -517,7 +517,7 @@ void MainWindow::ClosedDialogNormal(int result) */ void MainWindow::ToolBisector(bool checked) { - SetToolButtonWithApply(checked, Valentina::BisectorTool, ":/cursor/bisector_cursor.png", + SetToolButtonWithApply(checked, Tool::BisectorTool, ":/cursor/bisector_cursor.png", tr("Select first point of angle"), &MainWindow::ClosedDialogBisector, &MainWindow::ApplyDialogBisector); } @@ -548,7 +548,7 @@ void MainWindow::ClosedDialogBisector(int result) */ void MainWindow::ToolLineIntersect(bool checked) { - SetToolButton(checked, Valentina::LineIntersectTool, ":/cursor/intersect_cursor.png", + SetToolButton(checked, Tool::LineIntersectTool, ":/cursor/intersect_cursor.png", tr("Select first point of first line"), &MainWindow::ClosedDialogLineIntersect); } @@ -569,7 +569,7 @@ void MainWindow::ClosedDialogLineIntersect(int result) */ void MainWindow::ToolSpline(bool checked) { - SetToolButton(checked, Valentina::SplineTool, ":/cursor/spline_cursor.png", + SetToolButton(checked, Tool::SplineTool, ":/cursor/spline_cursor.png", tr("Select first point curve"), &MainWindow::ClosedDialogSpline); } @@ -590,7 +590,7 @@ void MainWindow::ClosedDialogSpline(int result) */ void MainWindow::ToolCutSpline(bool checked) { - SetToolButton(checked, Valentina::CutSplineTool, ":/cursor/spline_cut_point_cursor.png", + SetToolButton(checked, Tool::CutSplineTool, ":/cursor/spline_cut_point_cursor.png", tr("Select simple curve"), &MainWindow::ClosedDialogCutSpline); } @@ -611,7 +611,7 @@ void MainWindow::ClosedDialogCutSpline(int result) */ void MainWindow::ToolArc(bool checked) { - SetToolButtonWithApply(checked, Valentina::ArcTool, ":/cursor/arc_cursor.png", + SetToolButtonWithApply(checked, Tool::ArcTool, ":/cursor/arc_cursor.png", tr("Select point of center of arc"), &MainWindow::ClosedDialogArc, &MainWindow::ApplyDialogArc); } @@ -642,7 +642,7 @@ void MainWindow::ClosedDialogArc(int result) */ void MainWindow::ToolSplinePath(bool checked) { - SetToolButton(checked, Valentina::SplinePathTool, ":/cursor/splinepath_cursor.png", + SetToolButton(checked, Tool::SplinePathTool, ":/cursor/splinepath_cursor.png", tr("Select point of curve path"), &MainWindow::ClosedDialogSplinePath); } @@ -663,7 +663,7 @@ void MainWindow::ClosedDialogSplinePath(int result) */ void MainWindow::ToolCutSplinePath(bool checked) { - SetToolButton(checked, Valentina::CutSplinePathTool, + SetToolButton(checked, Tool::CutSplinePathTool, ":/cursor/splinepath_cut_point_cursor.png", tr("Select curve path"), &MainWindow::ClosedDialogCutSplinePath); } @@ -685,7 +685,7 @@ void MainWindow::ClosedDialogCutSplinePath(int result) */ void MainWindow::ToolPointOfContact(bool checked) { - SetToolButtonWithApply(checked, Valentina::PointOfContact, ":/cursor/pointcontact_cursor.png", + SetToolButtonWithApply(checked, Tool::PointOfContact, ":/cursor/pointcontact_cursor.png", tr("Select first point of line"), &MainWindow::ClosedDialogPointOfContact, &MainWindow::ApplyDialogPointOfContact); } @@ -716,7 +716,7 @@ void MainWindow::ClosedDialogPointOfContact(int result) */ void MainWindow::ToolDetail(bool checked) { - SetToolButton(checked, Valentina::DetailTool, "://cursor/new_detail_cursor.png", + SetToolButton(checked, Tool::DetailTool, "://cursor/new_detail_cursor.png", tr("Select points, arcs, curves clockwise."), &MainWindow::ClosedDialogDetail); } @@ -742,7 +742,7 @@ void MainWindow::ClosedDialogDetail(int result) */ void MainWindow::ToolHeight(bool checked) { - SetToolButton(checked, Valentina::Height, ":/cursor/height_cursor.png", tr("Select base point"), + SetToolButton(checked, Tool::Height, ":/cursor/height_cursor.png", tr("Select base point"), &MainWindow::ClosedDialogHeight); } @@ -763,7 +763,7 @@ void MainWindow::ClosedDialogHeight(int result) */ void MainWindow::ToolTriangle(bool checked) { - SetToolButton(checked, Valentina::Triangle, ":/cursor/triangle_cursor.png", + SetToolButton(checked, Tool::Triangle, ":/cursor/triangle_cursor.png", tr("Select first point of axis"), &MainWindow::ClosedDialogTriangle); } @@ -784,7 +784,7 @@ void MainWindow::ClosedDialogTriangle(int result) */ void MainWindow::ToolPointOfIntersection(bool checked) { - SetToolButton(checked, Valentina::PointOfIntersection, + SetToolButton(checked, Tool::PointOfIntersection, ":/cursor/pointofintersect_cursor.png", tr("Select point vertically"), &MainWindow::ClosedDialogPointOfIntersection); } @@ -806,7 +806,7 @@ void MainWindow::ClosedDialogPointOfIntersection(int result) */ void MainWindow::ToolUnionDetails(bool checked) { - SetToolButton(checked, Valentina::UnionDetails, ":/cursor/union_cursor.png", + SetToolButton(checked, Tool::UnionDetails, ":/cursor/union_cursor.png", tr("Select detail"), &MainWindow::ClosedDialogUnionDetails); //Must disconnect this signal here. disconnect(doc, &VPattern::FullUpdateFromFile, dialogTool, &DialogTool::UpdateList); @@ -830,7 +830,7 @@ void MainWindow::ClosedDialogUnionDetails(int result) */ void MainWindow::ToolCutArc(bool checked) { - SetToolButtonWithApply(checked, Valentina::CutArcTool, ":/cursor/arc_cut_cursor.png", + SetToolButtonWithApply(checked, Tool::CutArcTool, ":/cursor/arc_cut_cursor.png", tr("Select arc"), &MainWindow::ClosedDialogCutArc, &MainWindow::ApplyDialogCutArc); } @@ -967,7 +967,7 @@ void MainWindow::closeEvent(QCloseEvent *event) */ void MainWindow::ToolBarOption() { - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { ui->toolBarOption->addWidget(new QLabel(tr("Height: "))); @@ -1120,107 +1120,111 @@ void MainWindow::CancelTool() dialogTool = nullptr; switch ( tool ) { - case Valentina::ArrowTool: + case Tool::ArrowTool: ui->actionArrowTool->setChecked(false); helpLabel->setText(""); break; - case Valentina::SinglePointTool: + case Tool::SinglePointTool: Q_UNREACHABLE(); //Nothing to do here because we can't create this tool from main window. break; - case Valentina::EndLineTool: + case Tool::EndLineTool: ui->toolButtonEndLine->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::LineTool: + case Tool::LineTool: ui->toolButtonLine->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearFocus(); break; - case Valentina::AlongLineTool: + case Tool::AlongLineTool: ui->toolButtonAlongLine->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::ShoulderPointTool: + case Tool::ShoulderPointTool: ui->toolButtonShoulderPoint->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::NormalTool: + case Tool::NormalTool: ui->toolButtonNormal->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::BisectorTool: + case Tool::BisectorTool: ui->toolButtonBisector->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::LineIntersectTool: + case Tool::LineIntersectTool: ui->toolButtonLineIntersect->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::SplineTool: + case Tool::SplineTool: ui->toolButtonSpline->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::ArcTool: + case Tool::ArcTool: ui->toolButtonArc->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::SplinePathTool: + case Tool::SplinePathTool: ui->toolButtonSplinePath->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::PointOfContact: + case Tool::PointOfContact: ui->toolButtonPointOfContact->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::DetailTool: + case Tool::DetailTool: ui->toolButtonNewDetail->setChecked(false); break; - case Valentina::Height: + case Tool::Height: ui->toolButtonHeight->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::Triangle: + case Tool::Triangle: ui->toolButtonTriangle->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::PointOfIntersection: + case Tool::PointOfIntersection: ui->toolButtonPointOfIntersection->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::CutSplineTool: + case Tool::CutSplineTool: ui->toolButtonSplineCutPoint->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::CutSplinePathTool: + case Tool::CutSplinePathTool: ui->toolButtonSplinePathCutPoint->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::UnionDetails: + case Tool::UnionDetails: ui->toolButtonUnionDetails->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; - case Valentina::CutArcTool: + case Tool::CutArcTool: ui->toolButtonArcCutPoint->setChecked(false); currentScene->setFocus(Qt::OtherFocusReason); currentScene->clearSelection(); break; + case Tool::NodePoint: + case Tool::NodeArc: + case Tool::NodeSpline: + case Tool::NodeSplinePath: default: qDebug()<<"Got wrong tool type. Ignored."; break; @@ -1235,7 +1239,7 @@ void MainWindow::ArrowTool() { CancelTool(); ui->actionArrowTool->setChecked(true); - tool = Valentina::ArrowTool; + tool = Tool::ArrowTool; QCursor cur(Qt::ArrowCursor); view->setCursor(cur); helpLabel->setText(""); @@ -1315,7 +1319,7 @@ void MainWindow::ActionDraw(bool checked) connect(view, &VMainGraphicsView::NewFactor, sceneDraw, &VMainGraphicsScene::SetFactor); RestoreCurrentScene(); - mode = Valentina::Calculation; + mode = Draw::Calculation; comboBoxDraws->setEnabled(true); comboBoxDraws->setCurrentIndex(currentDrawIndex);//restore current pattern peace drawMode = true; @@ -1358,7 +1362,7 @@ void MainWindow::ActionDetails(bool checked) comboBoxDraws->setEnabled(false); - mode = Valentina::Modeling; + mode = Draw::Modeling; SetEnableTool(true); currentToolBoxIndex = ui->toolBox->currentIndex(); ui->toolBox->setCurrentIndex(4); @@ -1506,8 +1510,8 @@ void MainWindow::Clear() ui->actionZoomIn->setEnabled(false); ui->actionZoomOut->setEnabled(false); SetEnableTool(false); - qApp->setPatternUnit(Valentina::Cm); - qApp->setPatternType(Pattern::Individual); + qApp->setPatternUnit(Unit::Cm); + qApp->setPatternType(MeasurementsType::Individual); ui->toolBarOption->clear(); #ifndef QT_NO_CURSOR QApplication::restoreOverrideCursor(); @@ -1666,7 +1670,7 @@ void MainWindow::SetEnableWidgets(bool enable) ui->actionHistory->setEnabled(enable); ui->actionPattern_properties->setEnabled(enable); ui->actionEdit_pattern_code->setEnabled(enable); - ui->actionZoomIn->setEnabled(enable); + ui->actionZoomIn->setEnabled(enable); ui->actionZoomOut->setEnabled(enable); } @@ -1763,7 +1767,7 @@ void MainWindow::SetEnableTool(bool enable) { bool drawTools = false; bool modelingTools = false; - if (mode == Valentina::Calculation) + if (mode == Draw::Calculation) { drawTools = enable; } @@ -2136,11 +2140,11 @@ void MainWindow::LoadPattern(const QString &fileName) QString text = tr("Measurements use different units than pattern. This pattern required measurements in %1") .arg(doc->UnitsToStr(qApp->patternUnit())); - if (qApp->patternType() == Pattern::Standard) + if (qApp->patternType() == MeasurementsType::Standard) { VStandardMeasurements m(pattern); m.setContent(path); - Valentina::Units mUnit = m.Unit(); + Unit mUnit = m.MUnit(); if (qApp->patternUnit() != mUnit) { QMessageBox::critical(this, tr("Wrong units."), text); @@ -2155,7 +2159,7 @@ void MainWindow::LoadPattern(const QString &fileName) { VIndividualMeasurements m(pattern); m.setContent(path); - Valentina::Units mUnit = m.Unit(); + Unit mUnit = m.MUnit(); if (qApp->patternUnit() != mUnit) { QMessageBox::critical(this, tr("Wrong units."), text); @@ -2184,7 +2188,7 @@ void MainWindow::LoadPattern(const QString &fileName) } //--------------------------------------------------------------------------------------------------------------------- -QString MainWindow::CheckPathToMeasurements(const QString &path, const Pattern::Measurements &patternType) +QString MainWindow::CheckPathToMeasurements(const QString &path, const MeasurementsType &patternType) { QFile table(path); if (table.exists() == false) @@ -2201,7 +2205,7 @@ QString MainWindow::CheckPathToMeasurements(const QString &path, const Pattern:: else { QString filter; - if (patternType == Pattern::Standard) + if (patternType == MeasurementsType::Standard) { filter = tr("Standard measurements (*.vst)"); } @@ -2217,7 +2221,7 @@ QString MainWindow::CheckPathToMeasurements(const QString &path, const Pattern:: } else { - if (patternType == Pattern::Standard) + if (patternType == MeasurementsType::Standard) { VDomDocument::ValidateXML("://schema/standard_measurements.xsd", mPath); } diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h index d8a17b4eb..7f16894c8 100644 --- a/src/app/mainwindow.h +++ b/src/app/mainwindow.h @@ -137,7 +137,7 @@ public slots: void ShowToolTip(const QString &toolTip); void OpenRecentFile(); void Clear(); - /** + /** * @brief Edit XML code of pattern */ void EditPatternCode(); @@ -165,7 +165,7 @@ private: VPattern *doc; /** @brief tool current tool */ - Valentina::Tools tool; + Tool tool; /** @brief currentScene pointer to current scene. */ VMainGraphicsScene *currentScene; @@ -199,7 +199,7 @@ private: QString curFile; /** @brief mode keep current draw mode. */ - Valentina::Draws mode; + Draw mode; /** @brief currentDrawIndex save current selected pattern peace. */ qint32 currentDrawIndex; @@ -227,10 +227,10 @@ private: void MinimumScrollBar(); template - void SetToolButton(bool checked, Valentina::Tools t, const QString &cursor, const QString &toolTip, + void SetToolButton(bool checked, Tool t, const QString &cursor, const QString &toolTip, Func closeDialogSlot); template - void SetToolButtonWithApply(bool checked, Valentina::Tools t, const QString &cursor, const QString &toolTip, + void SetToolButtonWithApply(bool checked, Tool t, const QString &cursor, const QString &toolTip, Func closeDialogSlot, Func2 applyDialogSlot); template void ClosedDialog(int result); @@ -250,7 +250,7 @@ private: void CreateActions(); void InitAutoSave(); QString PatternPieceName(const QString &text); - QString CheckPathToMeasurements(const QString &path, const Pattern::Measurements &patternType); + QString CheckPathToMeasurements(const QString &path, const MeasurementsType &patternType); }; #endif // MAINWINDOW_H diff --git a/src/app/options.h b/src/app/options.h index de38a59af..46a4011b1 100644 --- a/src/app/options.h +++ b/src/app/options.h @@ -29,7 +29,6 @@ #ifndef OPTIONS_H #define OPTIONS_H -#include #include #ifdef Q_OS_WIN32 @@ -40,81 +39,40 @@ class QString; #define SceneSize 50000 -namespace Valentina +enum class SceneObject : char { Point, Line, Spline, Arc, SplinePath, Detail }; +enum class Tool : char { - /** - * @brief The Scene enum - */ - enum Scene { Point, Line, Spline, Arc, SplinePath, Detail }; - Q_DECLARE_FLAGS(Scenes, Scene) + ArrowTool, + SinglePointTool, + EndLineTool, + LineTool, + AlongLineTool, + ShoulderPointTool, + NormalTool, + BisectorTool, + LineIntersectTool, + SplineTool, + CutSplineTool, + CutArcTool, + ArcTool, + SplinePathTool, + CutSplinePathTool, + PointOfContact, + DetailTool, + NodePoint, + NodeArc, + NodeSpline, + NodeSplinePath, + Height, + Triangle, + PointOfIntersection, + UnionDetails +}; - /** - * @brief The Tool enum - */ - enum Tool - { - ArrowTool, - SinglePointTool, - EndLineTool, - LineTool, - AlongLineTool, - ShoulderPointTool, - NormalTool, - BisectorTool, - LineIntersectTool, - SplineTool, - CutSplineTool, - CutArcTool, - ArcTool, - SplinePathTool, - CutSplinePathTool, - PointOfContact, - DetailTool, - NodePoint, - NodeArc, - NodeSpline, - NodeSplinePath, - Height, - Triangle, - PointOfIntersection, - UnionDetails - }; - Q_DECLARE_FLAGS(Tools, Tool) - - /** - * @brief The Source enum - */ - enum Source { FromGui, FromFile, FromTool }; - Q_DECLARE_FLAGS(Sources, Source) - - /** - * @brief The Draw enum - */ - enum Draw { Calculation, Modeling }; - Q_DECLARE_FLAGS(Draws, Draw) - - /** - * @brief The Unit enum - */ - enum Unit { Mm, Cm, Inch }; - Q_DECLARE_FLAGS(Units, Unit) -} -Q_DECLARE_OPERATORS_FOR_FLAGS( Valentina::Scenes ) -Q_DECLARE_OPERATORS_FOR_FLAGS( Valentina::Tools ) -Q_DECLARE_OPERATORS_FOR_FLAGS( Valentina::Sources ) -Q_DECLARE_OPERATORS_FOR_FLAGS( Valentina::Draws ) -Q_DECLARE_OPERATORS_FOR_FLAGS( Valentina::Units ) -Q_DECLARE_METATYPE(Valentina::Unit) - -namespace Pattern -{ - /** - * @brief The Scene enum - */ - enum Measurement { Standard, Individual }; - Q_DECLARE_FLAGS(Measurements, Measurement) -} -Q_DECLARE_OPERATORS_FOR_FLAGS( Pattern::Measurements ) +enum class Source : char { FromGui, FromFile, FromTool }; +enum class Draw : char { Calculation, Modeling }; +enum class Unit : char { Mm, Cm, Inch }; +enum class MeasurementsType : char { Standard, Individual }; // measurements extern const QString headGirth_M; diff --git a/src/app/tools/drawTools/vabstractspline.h b/src/app/tools/drawTools/vabstractspline.h index ac0424831..d16795474 100644 --- a/src/app/tools/drawTools/vabstractspline.h +++ b/src/app/tools/drawTools/vabstractspline.h @@ -52,7 +52,7 @@ signals: * @param controlPoint new position control point. * @param splinePoint new position spline point. */ - void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, + void RefreshLine(const qint32 &indexSpline, SplinePointPosition pos, const QPointF &controlPoint, const QPointF &splinePoint); /** * @brief setEnabledPoint disable control points. diff --git a/src/app/tools/drawTools/vtoolalongline.cpp b/src/app/tools/drawTools/vtoolalongline.cpp index bb9d8da92..c51a0b8be 100644 --- a/src/app/tools/drawTools/vtoolalongline.cpp +++ b/src/app/tools/drawTools/vtoolalongline.cpp @@ -37,12 +37,12 @@ const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); //--------------------------------------------------------------------------------------------------------------------- VToolAlongLine::VToolAlongLine(VPattern *doc, VContainer *data, quint32 id, const QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, - const QString &typeLine, const Valentina::Sources &typeCreation, + const QString &typeLine, const Source &typeCreation, QGraphicsItem *parent) :VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, 0, parent), secondPointId(secondPointId) { - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -170,7 +170,7 @@ VToolAlongLine* VToolAlongLine::Create(DialogTool *dialog, VMainGraphicsScene *s const QString pointName = dialogTool->getPointName(); VToolAlongLine *point=nullptr; point = Create(0, pointName, typeLine, formula, firstPointId, secondPointId, 5, 10, scene, doc, data, - Document::FullParse, Valentina::FromGui); + Document::FullParse, Source::FromGui); if (point != nullptr) { point->dialog=dialogTool; @@ -182,7 +182,7 @@ VToolAlongLine* VToolAlongLine::Create(DialogTool *dialog, VMainGraphicsScene *s VToolAlongLine* VToolAlongLine::Create(const quint32 _id, const QString &pointName, const QString &typeLine, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation) + const Document &parse, const Source &typeCreation) { const VPointF *firstPoint = data->GeometricObject(firstPointId); const VPointF *secondPoint = data->GeometricObject(secondPointId); @@ -191,7 +191,7 @@ VToolAlongLine* VToolAlongLine::Create(const quint32 _id, const QString &pointNa line.setLength(qApp->toPixel(CheckFormula(formula, data))); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject( new VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); data->AddLine(firstPointId, id); @@ -207,7 +207,7 @@ VToolAlongLine* VToolAlongLine::Create(const quint32 _id, const QString &pointNa doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::AlongLineTool, doc); + VDrawTool::AddRecord(id, Tool::AlongLineTool, doc); if (parse == Document::FullParse) { VToolAlongLine *point = new VToolAlongLine(doc, data, id, formula, firstPointId, diff --git a/src/app/tools/drawTools/vtoolalongline.h b/src/app/tools/drawTools/vtoolalongline.h index a5f9795bb..5cb61ad33 100644 --- a/src/app/tools/drawTools/vtoolalongline.h +++ b/src/app/tools/drawTools/vtoolalongline.h @@ -52,7 +52,7 @@ public: */ VToolAlongLine(VPattern *doc, VContainer *data, quint32 id, const QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const QString &typeLine, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -84,7 +84,7 @@ public: static VToolAlongLine* Create(const quint32 _id, const QString &pointName, const QString &typeLine, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation); + const Document &parse, const Source &typeCreation); static const QString ToolType; public slots: /** diff --git a/src/app/tools/drawTools/vtoolarc.cpp b/src/app/tools/drawTools/vtoolarc.cpp index 20f752e71..92f235a49 100644 --- a/src/app/tools/drawTools/vtoolarc.cpp +++ b/src/app/tools/drawTools/vtoolarc.cpp @@ -36,7 +36,7 @@ const QString VToolArc::TagName = QStringLiteral("arc"); const QString VToolArc::ToolType = QStringLiteral("simple"); //--------------------------------------------------------------------------------------------------------------------- -VToolArc::VToolArc(VPattern *doc, VContainer *data, quint32 id, const Valentina::Sources &typeCreation, +VToolArc::VToolArc(VPattern *doc, VContainer *data, quint32 id, const Source &typeCreation, QGraphicsItem *parent) :VDrawTool(doc, data, id), QGraphicsPathItem(parent) { @@ -50,7 +50,7 @@ VToolArc::VToolArc(VPattern *doc, VContainer *data, quint32 id, const Valentina: this->setFlag(QGraphicsItem::ItemIsFocusable, true); this->setAcceptHoverEvents(true); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -84,7 +84,7 @@ VToolArc* VToolArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPatte QString f1 = dialogTool->GetF1(); QString f2 = dialogTool->GetF2(); VToolArc* point = nullptr; - point=Create(0, center, radius, f1, f2, scene, doc, data, Document::FullParse, Valentina::FromGui); + point=Create(0, center, radius, f1, f2, scene, doc, data, Document::FullParse, Source::FromGui); if (point != nullptr) { point->dialog=dialogTool; @@ -94,8 +94,8 @@ VToolArc* VToolArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPatte //--------------------------------------------------------------------------------------------------------------------- VToolArc* VToolArc::Create(const quint32 _id, const quint32 ¢er, QString &radius, QString &f1, QString &f2, - VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation) + VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation) { qreal calcRadius = 0, calcF1 = 0, calcF2 = 0; @@ -107,7 +107,7 @@ VToolArc* VToolArc::Create(const quint32 _id, const quint32 ¢er, QString &ra VPointF c = *data->GeometricObject(center); VArc *arc = new VArc(c, calcRadius, radius, calcF1, f1, calcF2, f2 ); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(arc); } @@ -120,7 +120,7 @@ VToolArc* VToolArc::Create(const quint32 _id, const quint32 ¢er, QString &ra } } data->AddLengthArc(id); - VDrawTool::AddRecord(id, Valentina::ArcTool, doc); + VDrawTool::AddRecord(id, Tool::ArcTool, doc); if (parse == Document::FullParse) { VToolArc *toolArc = new VToolArc(doc, data, id, typeCreation); @@ -213,7 +213,7 @@ void VToolArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::Arc); + emit ChoosedTool(id, SceneObject::Arc); } QGraphicsItem::mouseReleaseEvent(event); } diff --git a/src/app/tools/drawTools/vtoolarc.h b/src/app/tools/drawTools/vtoolarc.h index 88e3ef809..c22f6c472 100644 --- a/src/app/tools/drawTools/vtoolarc.h +++ b/src/app/tools/drawTools/vtoolarc.h @@ -48,7 +48,7 @@ public: * @param typeCreation way we create this tool. * @param parent parent object */ - VToolArc(VPattern *doc, VContainer *data, quint32 id, const Valentina::Sources &typeCreation, + VToolArc(VPattern *doc, VContainer *data, quint32 id, const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. @@ -76,8 +76,8 @@ public: * @param typeCreation way we create this tool. */ static VToolArc* Create(const quint32 _id, const quint32 ¢er, QString &radius, QString &f1, QString &f2, - VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation); + VMainGraphicsScene *scene, VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation); static const QString TagName; static const QString ToolType; public slots: diff --git a/src/app/tools/drawTools/vtoolbisector.cpp b/src/app/tools/drawTools/vtoolbisector.cpp index 891444211..93d50c7ff 100644 --- a/src/app/tools/drawTools/vtoolbisector.cpp +++ b/src/app/tools/drawTools/vtoolbisector.cpp @@ -36,13 +36,13 @@ const QString VToolBisector::ToolType = QStringLiteral("bisector"); //--------------------------------------------------------------------------------------------------------------------- VToolBisector::VToolBisector(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, - const quint32 &thirdPointId, const Valentina::Sources &typeCreation, QGraphicsItem *parent) + const quint32 &thirdPointId, const Source &typeCreation, QGraphicsItem *parent) :VToolLinePoint(doc, data, id, typeLine, formula, secondPointId, 0, parent), firstPointId(0), thirdPointId(0) { this->firstPointId = firstPointId; this->thirdPointId = thirdPointId; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -102,7 +102,7 @@ VToolBisector* VToolBisector::Create(DialogTool *dialog, VMainGraphicsScene *sce const QString pointName = dialogTool->getPointName(); VToolBisector *point = nullptr; point=Create(0, formula, firstPointId, secondPointId, thirdPointId, typeLine, pointName, 5, 10, scene, doc, data, - Document::FullParse, Valentina::FromGui); + Document::FullParse, Source::FromGui); if (point != nullptr) { point->dialog=dialogTool; @@ -115,7 +115,7 @@ VToolBisector* VToolBisector::Create(const quint32 _id, QString &formula, const const quint32 &secondPointId, const quint32 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation) + const Document &parse, const Source &typeCreation) { const VPointF *firstPoint = data->GeometricObject(firstPointId); const VPointF *secondPoint = data->GeometricObject(secondPointId); @@ -126,7 +126,7 @@ VToolBisector* VToolBisector::Create(const quint32 _id, QString &formula, const QPointF fPoint = VToolBisector::FindPoint(firstPoint->toQPointF(), secondPoint->toQPointF(), thirdPoint->toQPointF(), qApp->toPixel(result)); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(new VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(firstPointId, id); @@ -140,7 +140,7 @@ VToolBisector* VToolBisector::Create(const quint32 _id, QString &formula, const doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::BisectorTool, doc); + VDrawTool::AddRecord(id, Tool::BisectorTool, doc); if (parse == Document::FullParse) { VToolBisector *point = new VToolBisector(doc, data, id, typeLine, formula, firstPointId, secondPointId, diff --git a/src/app/tools/drawTools/vtoolbisector.h b/src/app/tools/drawTools/vtoolbisector.h index 1640da520..81be3904d 100644 --- a/src/app/tools/drawTools/vtoolbisector.h +++ b/src/app/tools/drawTools/vtoolbisector.h @@ -52,7 +52,7 @@ public: */ VToolBisector(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, - const quint32 &thirdPointId, const Valentina::Sources &typeCreation, + const quint32 &thirdPointId, const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief FindPoint find bisector point. @@ -96,8 +96,8 @@ public: static VToolBisector* Create(const quint32 _id, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const quint32 &thirdPointId, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation); + VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation); static const QString ToolType; public slots: /** diff --git a/src/app/tools/drawTools/vtoolcutarc.cpp b/src/app/tools/drawTools/vtoolcutarc.cpp index 4a93a3dbd..0534752dc 100644 --- a/src/app/tools/drawTools/vtoolcutarc.cpp +++ b/src/app/tools/drawTools/vtoolcutarc.cpp @@ -38,7 +38,7 @@ const QString VToolCutArc::AttrArc = QStringLiteral("arc"); //--------------------------------------------------------------------------------------------------------------------- VToolCutArc::VToolCutArc(VPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &arcId, const quint32 &arc1id, const quint32 &arc2id, - const Valentina::Sources &typeCreation, QGraphicsItem * parent) + const Source &typeCreation, QGraphicsItem * parent) :VToolPoint(doc, data, id, parent), formula(formula), arcId(arcId), firstArc(), secondArc(), arc1id(arc1id), arc2id(arc2id) { @@ -47,16 +47,16 @@ VToolCutArc::VToolCutArc(VPattern *doc, VContainer *data, const quint32 &id, con Q_ASSERT_X(arc2id > 0, Q_FUNC_INFO, "arc2id <= 0"); firstArc = new VSimpleArc(arc1id, ¤tColor, &factor); - RefreshArc(firstArc, arc1id, SimpleArc::ForthPoint); + RefreshArc(firstArc, arc1id, SimpleArcPoint::ForthPoint); firstArc->setParentItem(this); connect(firstArc, &VSimpleArc::Choosed, this, &VToolCutArc::ArcChoosed); secondArc = new VSimpleArc(arc2id, ¤tColor, &factor); - RefreshArc(secondArc, arc2id, SimpleArc::FirstPoint); + RefreshArc(secondArc, arc2id, SimpleArcPoint::FirstPoint); secondArc->setParentItem(this); connect(secondArc, &VSimpleArc::Choosed, this, &VToolCutArc::ArcChoosed); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -89,7 +89,7 @@ VToolCutArc* VToolCutArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, QString formula = dialogTool->getFormula(); const quint32 arcId = dialogTool->getArcId(); VToolCutArc* point = nullptr; - point=Create(0, pointName, formula, arcId, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + point=Create(0, pointName, formula, arcId, 5, 10, scene, doc, data, Document::FullParse, Source::FromGui); if (point != nullptr) { point->dialog=dialogTool; @@ -100,7 +100,7 @@ VToolCutArc* VToolCutArc::Create(DialogTool *dialog, VMainGraphicsScene *scene, //--------------------------------------------------------------------------------------------------------------------- VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &arcId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, - VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) + VContainer *data, const Document &parse, const Source &typeCreation) { const VArc *arc = data->GeometricObject(arcId); @@ -113,7 +113,7 @@ VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QS quint32 id = _id; quint32 arc1id = 0; quint32 arc2id = 0; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { VPointF *p = new VPointF(point.x(), point.y(), pointName, mx, my); id = data->AddGObject(p); @@ -146,7 +146,7 @@ VToolCutArc* VToolCutArc::Create(const quint32 _id, const QString &pointName, QS data->AddLengthArc(arc1id); data->AddLengthArc(arc2id); - VDrawTool::AddRecord(id, Valentina::CutArcTool, doc); + VDrawTool::AddRecord(id, Tool::CutArcTool, doc); if (parse == Document::FullParse) { VToolCutArc *point = new VToolCutArc(doc, data, id, formula, arcId, arc1id, arc2id, typeCreation); @@ -177,7 +177,7 @@ void VToolCutArc::FullUpdateFromFile() //--------------------------------------------------------------------------------------------------------------------- void VToolCutArc::ArcChoosed(quint32 id) { - emit ChoosedTool(id, Valentina::Arc); + emit ChoosedTool(id, SceneObject::Arc); } //--------------------------------------------------------------------------------------------------------------------- @@ -252,8 +252,8 @@ void VToolCutArc::RefreshDataInFile() //--------------------------------------------------------------------------------------------------------------------- void VToolCutArc::RefreshGeometry() { - RefreshArc(firstArc, arc1id, SimpleArc::ForthPoint); - RefreshArc(secondArc, arc2id, SimpleArc::FirstPoint); + RefreshArc(firstArc, arc1id, SimpleArcPoint::ForthPoint); + RefreshArc(secondArc, arc2id, SimpleArcPoint::FirstPoint); VToolPoint::RefreshPointGeometry(*VDrawTool::data.GeometricObject(id)); } @@ -269,13 +269,13 @@ void VToolCutArc::SaveDialog(QDomElement &domElement) } //--------------------------------------------------------------------------------------------------------------------- -void VToolCutArc::RefreshArc(VSimpleArc *sArc, quint32 arcid, SimpleArc::Translation tr) +void VToolCutArc::RefreshArc(VSimpleArc *sArc, quint32 arcid, SimpleArcPoint tr) { const VArc *arc = VAbstractTool::data.GeometricObject(arcid); QPainterPath path; path.addPath(arc->GetPath()); path.setFillRule( Qt::WindingFill ); - if (tr == SimpleArc::FirstPoint) + if (tr == SimpleArcPoint::FirstPoint) { path.translate(-arc->GetP1().x(), -arc->GetP1().y()); } diff --git a/src/app/tools/drawTools/vtoolcutarc.h b/src/app/tools/drawTools/vtoolcutarc.h index f53e64523..dc623dc83 100644 --- a/src/app/tools/drawTools/vtoolcutarc.h +++ b/src/app/tools/drawTools/vtoolcutarc.h @@ -53,7 +53,7 @@ public: */ VToolCutArc(VPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &arcId, const quint32 &arc1id, const quint32 &arc2id, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -82,7 +82,7 @@ public: */ static VToolCutArc* Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &arcId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, - VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation); + VContainer *data, const Document &parse, const Source &typeCreation); static const QString ToolType; static const QString AttrArc; public slots: @@ -159,7 +159,7 @@ private: * @param arcid arc id. * @param tr arc type. */ - void RefreshArc(VSimpleArc *sArc, quint32 arcid, SimpleArc::Translation tr); + void RefreshArc(VSimpleArc *sArc, quint32 arcid, SimpleArcPoint tr); }; #endif // VTOOLCUTARC_H diff --git a/src/app/tools/drawTools/vtoolcutspline.cpp b/src/app/tools/drawTools/vtoolcutspline.cpp index ebb3ffc26..48e410fd1 100644 --- a/src/app/tools/drawTools/vtoolcutspline.cpp +++ b/src/app/tools/drawTools/vtoolcutspline.cpp @@ -39,7 +39,7 @@ const QString VToolCutSpline::AttrSpline = QStringLiteral("spline"); //--------------------------------------------------------------------------------------------------------------------- VToolCutSpline::VToolCutSpline(VPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &splineId, const quint32 &spl1id, const quint32 &spl2id, - const Valentina::Sources &typeCreation, QGraphicsItem *parent) + const Source &typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), formula(formula), splineId(splineId), firstSpline(), secondSpline(), spl1id(spl1id), spl2id(spl2id) { @@ -48,16 +48,16 @@ VToolCutSpline::VToolCutSpline(VPattern *doc, VContainer *data, const quint32 &i Q_ASSERT_X(spl2id > 0, Q_FUNC_INFO, "spl2id <= 0"); firstSpline = new VSimpleSpline(spl1id, ¤tColor, &factor); - RefreshSpline(firstSpline, spl1id, SimpleSpline::ForthPoint); + RefreshSpline(firstSpline, spl1id, SimpleSplinePoint::ForthPoint); firstSpline->setParentItem(this); connect(firstSpline, &VSimpleSpline::Choosed, this, &VToolCutSpline::SplineChoosed); secondSpline = new VSimpleSpline(spl2id, ¤tColor, &factor); - RefreshSpline(secondSpline, spl2id, SimpleSpline::FirstPoint); + RefreshSpline(secondSpline, spl2id, SimpleSplinePoint::FirstPoint); secondSpline->setParentItem(this); connect(secondSpline, &VSimpleSpline::Choosed, this, &VToolCutSpline::SplineChoosed); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -89,13 +89,13 @@ void VToolCutSpline::Create(DialogTool *dialog, VMainGraphicsScene *scene, const QString pointName = dialogTool->getPointName(); QString formula = dialogTool->getFormula(); const quint32 splineId = dialogTool->getSplineId(); - Create(0, pointName, formula, splineId, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + Create(0, pointName, formula, splineId, 5, 10, scene, doc, data, Document::FullParse, Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolCutSpline::Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &splineId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, - VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) + VContainer *data, const Document &parse, const Source &typeCreation) { const VSpline *spl = data->GeometricObject(splineId); @@ -107,7 +107,7 @@ void VToolCutSpline::Create(const quint32 _id, const QString &pointName, QString quint32 id = _id; quint32 spl1id = 0; quint32 spl2id = 0; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { VPointF *p = new VPointF(point.x(), point.y(), pointName, mx, my); id = data->AddGObject(p); @@ -141,7 +141,7 @@ void VToolCutSpline::Create(const quint32 _id, const QString &pointName, QString doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::CutSplineTool, doc); + VDrawTool::AddRecord(id, Tool::CutSplineTool, doc); if (parse == Document::FullParse) { VToolCutSpline *point = new VToolCutSpline(doc, data, id, formula, splineId, spl1id, spl2id, typeCreation); @@ -170,7 +170,7 @@ void VToolCutSpline::FullUpdateFromFile() //--------------------------------------------------------------------------------------------------------------------- void VToolCutSpline::SplineChoosed(quint32 id) { - emit ChoosedTool(id, Valentina::Spline); + emit ChoosedTool(id, SceneObject::Spline); } //--------------------------------------------------------------------------------------------------------------------- @@ -240,8 +240,8 @@ void VToolCutSpline::RefreshDataInFile() //--------------------------------------------------------------------------------------------------------------------- void VToolCutSpline::RefreshGeometry() { - RefreshSpline(firstSpline, spl1id, SimpleSpline::ForthPoint); - RefreshSpline(secondSpline, spl2id, SimpleSpline::FirstPoint); + RefreshSpline(firstSpline, spl1id, SimpleSplinePoint::ForthPoint); + RefreshSpline(secondSpline, spl2id, SimpleSplinePoint::FirstPoint); VToolPoint::RefreshPointGeometry(*VDrawTool::data.GeometricObject(id)); } @@ -263,13 +263,13 @@ void VToolCutSpline::SaveDialog(QDomElement &domElement) } //--------------------------------------------------------------------------------------------------------------------- -void VToolCutSpline::RefreshSpline(VSimpleSpline *spline, quint32 splid, SimpleSpline::Translation tr) +void VToolCutSpline::RefreshSpline(VSimpleSpline *spline, quint32 splid, SimpleSplinePoint tr) { const VSpline *spl = VAbstractTool::data.GeometricObject(splid); QPainterPath path; path.addPath(spl->GetPath()); path.setFillRule( Qt::WindingFill ); - if (tr == SimpleSpline::FirstPoint) + if (tr == SimpleSplinePoint::FirstPoint) { path.translate(-spl->GetP1().toQPointF().x(), -spl->GetP1().toQPointF().y()); } diff --git a/src/app/tools/drawTools/vtoolcutspline.h b/src/app/tools/drawTools/vtoolcutspline.h index b5cae8641..1960b92a7 100644 --- a/src/app/tools/drawTools/vtoolcutspline.h +++ b/src/app/tools/drawTools/vtoolcutspline.h @@ -51,7 +51,7 @@ public: */ VToolCutSpline(VPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &splineId, const quint32 &spl1id, const quint32 &spl2id, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -80,7 +80,7 @@ public: */ static void Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &splineId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation); + const Document &parse, const Source &typeCreation); static const QString ToolType; static const QString AttrSpline; public slots: @@ -161,7 +161,7 @@ private: * @param splid spline id. * @param tr spline type. */ - void RefreshSpline(VSimpleSpline *spline, quint32 splid, SimpleSpline::Translation tr); + void RefreshSpline(VSimpleSpline *spline, quint32 splid, SimpleSplinePoint tr); }; #endif // VTOOLCUTSPLINE_H diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.cpp b/src/app/tools/drawTools/vtoolcutsplinepath.cpp index f49a1f58e..9b0f75efe 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolcutsplinepath.cpp @@ -40,7 +40,7 @@ const QString VToolCutSplinePath::AttrSplinePath = QStringLiteral("splinePath"); VToolCutSplinePath::VToolCutSplinePath(VPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &splinePathId, const quint32 &splPath1id, const quint32 &splPath2id, - const Valentina::Sources &typeCreation, QGraphicsItem *parent) + const Source &typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), formula(formula), splinePathId(splinePathId), firstSpline(), secondSpline(), splPath1id (splPath1id), splPath2id(splPath2id) { @@ -49,16 +49,16 @@ VToolCutSplinePath::VToolCutSplinePath(VPattern *doc, VContainer *data, const qu Q_ASSERT_X(splPath2id > 0, Q_FUNC_INFO, "spl2id <= 0"); firstSpline = new VSimpleSpline(splPath1id, ¤tColor, &factor); - RefreshSpline(firstSpline, splPath1id, SimpleSpline::ForthPoint); + RefreshSpline(firstSpline, splPath1id, SimpleSplinePoint::ForthPoint); firstSpline->setParentItem(this); connect(firstSpline, &VSimpleSpline::Choosed, this, &VToolCutSplinePath::SplineChoosed); secondSpline = new VSimpleSpline(splPath2id, ¤tColor, &factor); - RefreshSpline(secondSpline, splPath2id, SimpleSpline::FirstPoint); + RefreshSpline(secondSpline, splPath2id, SimpleSplinePoint::FirstPoint); secondSpline->setParentItem(this); connect(secondSpline, &VSimpleSpline::Choosed, this, &VToolCutSplinePath::SplineChoosed); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -89,14 +89,14 @@ void VToolCutSplinePath::Create(DialogTool *dialog, VMainGraphicsScene *scene, V const QString pointName = dialogTool->getPointName(); QString formula = dialogTool->getFormula(); const quint32 splinePathId = dialogTool->getSplinePathId(); - Create(0, pointName, formula, splinePathId, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + Create(0, pointName, formula, splinePathId, 5, 10, scene, doc, data, Document::FullParse, Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolCutSplinePath::Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &splinePathId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation) + const Document &parse, const Source &typeCreation) { const VSplinePath *splPath = data->GeometricObject(splinePathId); SCASSERT(splPath != nullptr); @@ -109,7 +109,7 @@ void VToolCutSplinePath::Create(const quint32 _id, const QString &pointName, QSt const QPointF point = splPath->CutSplinePath(qApp->toPixel(result), p1, p2, spl1p2, spl1p3, spl2p2, spl2p3); VPointF *p = new VPointF(point.x(), point.y(), pointName, mx, my); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(p); } @@ -128,7 +128,7 @@ void VToolCutSplinePath::Create(const quint32 _id, const QString &pointName, QSt VSplinePath *splPath1 = new VSplinePath(); VSplinePath *splPath2 = new VSplinePath(); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { for (qint32 i = 0; i < splPath->CountPoint(); i++) { @@ -215,7 +215,7 @@ void VToolCutSplinePath::Create(const quint32 _id, const QString &pointName, QSt doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::CutSplinePathTool, doc); + VDrawTool::AddRecord(id, Tool::CutSplinePathTool, doc); if (parse == Document::FullParse) { VToolCutSplinePath *point = new VToolCutSplinePath(doc, data, id, formula, splinePathId, splPath1id, @@ -245,7 +245,7 @@ void VToolCutSplinePath::FullUpdateFromFile() //--------------------------------------------------------------------------------------------------------------------- void VToolCutSplinePath::SplineChoosed(quint32 id) { - emit ChoosedTool(id, Valentina::SplinePath); + emit ChoosedTool(id, SceneObject::SplinePath); } //--------------------------------------------------------------------------------------------------------------------- @@ -315,8 +315,8 @@ void VToolCutSplinePath::RefreshDataInFile() //--------------------------------------------------------------------------------------------------------------------- void VToolCutSplinePath::RefreshGeometry() { - RefreshSpline(firstSpline, splPath1id, SimpleSpline::ForthPoint); - RefreshSpline(secondSpline, splPath2id, SimpleSpline::FirstPoint); + RefreshSpline(firstSpline, splPath1id, SimpleSplinePoint::ForthPoint); + RefreshSpline(secondSpline, splPath2id, SimpleSplinePoint::FirstPoint); VToolPoint::RefreshPointGeometry(*VDrawTool::data.GeometricObject(id)); } @@ -338,13 +338,13 @@ void VToolCutSplinePath::SaveDialog(QDomElement &domElement) } //--------------------------------------------------------------------------------------------------------------------- -void VToolCutSplinePath::RefreshSpline(VSimpleSpline *spline, quint32 splPathid, SimpleSpline::Translation tr) +void VToolCutSplinePath::RefreshSpline(VSimpleSpline *spline, quint32 splPathid, SimpleSplinePoint tr) { const VSplinePath *splPath = VAbstractTool::data.GeometricObject(splPathid); QPainterPath path; path.addPath(splPath->GetPath()); path.setFillRule( Qt::WindingFill ); - if (tr == SimpleSpline::FirstPoint) + if (tr == SimpleSplinePoint::FirstPoint) { VSpline spl = splPath->GetSpline(1); path.translate(-spl.GetP1().toQPointF().x(), -spl.GetP1().toQPointF().y()); diff --git a/src/app/tools/drawTools/vtoolcutsplinepath.h b/src/app/tools/drawTools/vtoolcutsplinepath.h index 34f5007f2..a4ca90e46 100644 --- a/src/app/tools/drawTools/vtoolcutsplinepath.h +++ b/src/app/tools/drawTools/vtoolcutsplinepath.h @@ -54,7 +54,7 @@ public: */ VToolCutSplinePath(VPattern *doc, VContainer *data, const quint32 &id, const QString &formula, const quint32 &splinePathId, const quint32 &splPath1id, const quint32 &splPath2id, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -83,7 +83,7 @@ public: */ static void Create(const quint32 _id, const QString &pointName, QString &formula, const quint32 &splinePathId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation); + const Document &parse, const Source &typeCreation); static const QString ToolType; static const QString AttrSplinePath; public slots: @@ -164,7 +164,7 @@ private: * @param splPathid splinePath id. * @param tr splineType type. */ - void RefreshSpline(VSimpleSpline *spline, quint32 splPathid, SimpleSpline::Translation tr); + void RefreshSpline(VSimpleSpline *spline, quint32 splPathid, SimpleSplinePoint tr); }; #endif // VTOOLCUTSPLINEPATH_H diff --git a/src/app/tools/drawTools/vtoolendline.cpp b/src/app/tools/drawTools/vtoolendline.cpp index d14f1fb81..63d148032 100644 --- a/src/app/tools/drawTools/vtoolendline.cpp +++ b/src/app/tools/drawTools/vtoolendline.cpp @@ -38,11 +38,11 @@ const QString VToolEndLine::ToolType = QStringLiteral("endLine"); //--------------------------------------------------------------------------------------------------------------------- VToolEndLine::VToolEndLine(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &formula, const qreal &angle, const quint32 &basePointId, - const Valentina::Sources &typeCreation, QGraphicsItem *parent) + const Source &typeCreation, QGraphicsItem *parent) :VToolLinePoint(doc, data, id, typeLine, formula, basePointId, angle, parent) { - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -80,7 +80,7 @@ VToolEndLine* VToolEndLine::Create(DialogTool *dialog, VMainGraphicsScene *scene VToolEndLine *point = nullptr; point=Create(0, pointName, typeLine, formula, angle, basePointId, 5, 10, scene, doc, data, Document::FullParse, - Valentina::FromGui); + Source::FromGui); if (point != nullptr) { point->dialog=dialogTool; @@ -92,7 +92,7 @@ VToolEndLine* VToolEndLine::Create(DialogTool *dialog, VMainGraphicsScene *scene VToolEndLine* VToolEndLine::Create(const quint32 _id, const QString &pointName, const QString &typeLine, QString &formula, const qreal &angle, const quint32 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, - VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) + VContainer *data, const Document &parse, const Source &typeCreation) { const VPointF *basePoint = data->GeometricObject(basePointId); QLineF line = QLineF(basePoint->toQPointF(), QPointF(basePoint->x()+100, basePoint->y())); @@ -100,7 +100,7 @@ VToolEndLine* VToolEndLine::Create(const quint32 _id, const QString &pointName, line.setLength(qApp->toPixel(CheckFormula(formula, data))); line.setAngle(angle); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(new VPointF(line.p2().x(), line.p2().y(), pointName, mx, my)); data->AddLine(basePointId, id); @@ -114,7 +114,7 @@ VToolEndLine* VToolEndLine::Create(const quint32 _id, const QString &pointName, doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::EndLineTool, doc); + VDrawTool::AddRecord(id, Tool::EndLineTool, doc); if (parse == Document::FullParse) { VToolEndLine *point = new VToolEndLine(doc, data, id, typeLine, formula, angle, diff --git a/src/app/tools/drawTools/vtoolendline.h b/src/app/tools/drawTools/vtoolendline.h index 2e65d6e89..7c81d7187 100644 --- a/src/app/tools/drawTools/vtoolendline.h +++ b/src/app/tools/drawTools/vtoolendline.h @@ -52,7 +52,7 @@ public: */ VToolEndLine(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &formula, const qreal &angle, const quint32 &basePointId, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -86,7 +86,7 @@ public: static VToolEndLine *Create(const quint32 _id, const QString &pointName, const QString &typeLine, QString &formula, const qreal &angle, const quint32 &basePointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation); + const Document &parse, const Source &typeCreation); static const QString ToolType; public slots: /** diff --git a/src/app/tools/drawTools/vtoolheight.cpp b/src/app/tools/drawTools/vtoolheight.cpp index 3dcaecda7..430bdb5fe 100644 --- a/src/app/tools/drawTools/vtoolheight.cpp +++ b/src/app/tools/drawTools/vtoolheight.cpp @@ -35,11 +35,11 @@ const QString VToolHeight::ToolType = QStringLiteral("height"); //--------------------------------------------------------------------------------------------------------------------- VToolHeight::VToolHeight(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const quint32 &basePointId, const quint32 &p1LineId, const quint32 &p2LineId, - const Valentina::Sources &typeCreation, QGraphicsItem * parent) + const Source &typeCreation, QGraphicsItem * parent) :VToolLinePoint(doc, data, id, typeLine, QString(), basePointId, 0, parent), p1LineId(p1LineId), p2LineId(p2LineId) { ignoreFullUpdate = true; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -77,14 +77,14 @@ void VToolHeight::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern const quint32 p1LineId = dialogTool->getP1LineId(); const quint32 p2LineId = dialogTool->getP2LineId(); Create(0, pointName, typeLine, basePointId, p1LineId, p2LineId, 5, 10, scene, doc, data, - Document::FullParse, Valentina::FromGui); + Document::FullParse, Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolHeight::Create(const quint32 _id, const QString &pointName, const QString &typeLine, const quint32 &basePointId, const quint32 &p1LineId, const quint32 &p2LineId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, - VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) + VContainer *data, const Document &parse, const Source &typeCreation) { const VPointF *basePoint = data->GeometricObject(basePointId); const VPointF *p1Line = data->GeometricObject(p1LineId); @@ -92,7 +92,7 @@ void VToolHeight::Create(const quint32 _id, const QString &pointName, const QStr QPointF pHeight = FindPoint(QLineF(p1Line->toQPointF(), p2Line->toQPointF()), basePoint->toQPointF()); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(new VPointF(pHeight.x(), pHeight.y(), pointName, mx, my)); data->AddLine(basePointId, id); @@ -110,7 +110,7 @@ void VToolHeight::Create(const quint32 _id, const QString &pointName, const QStr doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::Height, doc); + VDrawTool::AddRecord(id, Tool::Height, doc); if (parse == Document::FullParse) { VToolHeight *point = new VToolHeight(doc, data, id, typeLine, basePointId, p1LineId, p2LineId, diff --git a/src/app/tools/drawTools/vtoolheight.h b/src/app/tools/drawTools/vtoolheight.h index 56d2160e1..c0d1a39c9 100644 --- a/src/app/tools/drawTools/vtoolheight.h +++ b/src/app/tools/drawTools/vtoolheight.h @@ -52,7 +52,7 @@ public: */ VToolHeight(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const quint32 &basePointId, const quint32 &p1LineId, const quint32 &p2LineId, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -84,7 +84,7 @@ public: static void Create(const quint32 _id, const QString &pointName, const QString &typeLine, const quint32 &basePointId, const quint32 &p1LineId, const quint32 &p2LineId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, - VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation); + VContainer *data, const Document &parse, const Source &typeCreation); /** * @brief FindPoint find projection base point onto line. * @param line line diff --git a/src/app/tools/drawTools/vtoolline.cpp b/src/app/tools/drawTools/vtoolline.cpp index a613c8e3b..5f8bcd8d9 100644 --- a/src/app/tools/drawTools/vtoolline.cpp +++ b/src/app/tools/drawTools/vtoolline.cpp @@ -36,7 +36,7 @@ const QString VToolLine::TagName = QStringLiteral("line"); //--------------------------------------------------------------------------------------------------------------------- VToolLine::VToolLine(VPattern *doc, VContainer *data, quint32 id, quint32 firstPoint, quint32 secondPoint, - const QString &typeLine, const Valentina::Sources &typeCreation, QGraphicsItem *parent) + const QString &typeLine, const Source &typeCreation, QGraphicsItem *parent) :VDrawTool(doc, data, id), QGraphicsLineItem(parent), firstPoint(firstPoint), secondPoint(secondPoint) { this->typeLine = typeLine; @@ -51,7 +51,7 @@ VToolLine::VToolLine(VPattern *doc, VContainer *data, quint32 id, quint32 firstP this->setAcceptHoverEvents(true); this->setPen(QPen(Qt::black, qApp->toPixel(qApp->widthHairLine())/factor, LineStyle())); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -81,19 +81,19 @@ void VToolLine::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern * const quint32 firstPoint = dialogTool->getFirstPoint(); const quint32 secondPoint = dialogTool->getSecondPoint(); const QString typeLine = dialogTool->getTypeLine(); - Create(0, firstPoint, secondPoint, typeLine, scene, doc, data, Document::FullParse, Valentina::FromGui); + Create(0, firstPoint, secondPoint, typeLine, scene, doc, data, Document::FullParse, Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, const quint32 &secondPoint, const QString &typeLine, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation) + const Document &parse, const Source &typeCreation) { SCASSERT(scene != nullptr); SCASSERT(doc != nullptr); SCASSERT(data != nullptr); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->getNextId(); data->AddLine(firstPoint, secondPoint); @@ -107,7 +107,7 @@ void VToolLine::Create(const quint32 &_id, const quint32 &firstPoint, const quin doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::LineTool, doc); + VDrawTool::AddRecord(id, Tool::LineTool, doc); if (parse == Document::FullParse) { VToolLine *line = new VToolLine(doc, data, id, firstPoint, secondPoint, typeLine, typeCreation); diff --git a/src/app/tools/drawTools/vtoolline.h b/src/app/tools/drawTools/vtoolline.h index 6c0ee309d..96174f245 100644 --- a/src/app/tools/drawTools/vtoolline.h +++ b/src/app/tools/drawTools/vtoolline.h @@ -51,7 +51,7 @@ public: * @param parent parent object. */ VToolLine(VPattern *doc, VContainer *data, quint32 id, quint32 firstPoint, - quint32 secondPoint, const QString &typeLine, const Valentina::Sources &typeCreation, + quint32 secondPoint, const QString &typeLine, const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. @@ -79,7 +79,7 @@ public: */ static void Create(const quint32 &_id, const quint32 &firstPoint, const quint32 &secondPoint, const QString &typeLine, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation); + const Document &parse, const Source &typeCreation); static const QString TagName; public slots: /** diff --git a/src/app/tools/drawTools/vtoollineintersect.cpp b/src/app/tools/drawTools/vtoollineintersect.cpp index 629120bcc..43a54b3d4 100644 --- a/src/app/tools/drawTools/vtoollineintersect.cpp +++ b/src/app/tools/drawTools/vtoollineintersect.cpp @@ -35,13 +35,13 @@ const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect"); //--------------------------------------------------------------------------------------------------------------------- VToolLineIntersect::VToolLineIntersect(VPattern *doc, VContainer *data, const quint32 &id, const quint32 &p1Line1, const quint32 &p2Line1, const quint32 &p1Line2, - const quint32 &p2Line2, const Valentina::Sources &typeCreation, + const quint32 &p2Line2, const Source &typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), p1Line1(p1Line1), p2Line1(p2Line1), p1Line2(p1Line2), p2Line2(p2Line2) { ignoreFullUpdate = true; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -77,15 +77,15 @@ void VToolLineIntersect::Create(DialogTool *dialog, VMainGraphicsScene *scene, V const quint32 p2Line2Id = dialogTool->getP2Line2(); const QString pointName = dialogTool->getPointName(); Create(0, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, pointName, 5, 10, scene, doc, data, - Document::FullParse, Valentina::FromGui); + Document::FullParse, Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolLineIntersect::Create(const quint32 _id, const quint32 &p1Line1Id, const quint32 &p2Line1Id, const quint32 &p1Line2Id, const quint32 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation) + VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation) { const VPointF *p1Line1 = data->GeometricObject(p1Line1Id); const VPointF *p2Line1 = data->GeometricObject(p2Line1Id); @@ -99,7 +99,7 @@ void VToolLineIntersect::Create(const quint32 _id, const quint32 &p1Line1Id, con if (intersect == QLineF::UnboundedIntersection || intersect == QLineF::BoundedIntersection) { quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(new VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(p1Line1Id, id); @@ -119,7 +119,7 @@ void VToolLineIntersect::Create(const quint32 _id, const quint32 &p1Line1Id, con doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::LineIntersectTool, doc); + VDrawTool::AddRecord(id, Tool::LineIntersectTool, doc); if (parse == Document::FullParse) { VToolLineIntersect *point = new VToolLineIntersect(doc, data, id, p1Line1Id, p2Line1Id, p1Line2Id, diff --git a/src/app/tools/drawTools/vtoollineintersect.h b/src/app/tools/drawTools/vtoollineintersect.h index 572142b36..8033902fd 100644 --- a/src/app/tools/drawTools/vtoollineintersect.h +++ b/src/app/tools/drawTools/vtoollineintersect.h @@ -52,7 +52,7 @@ public: */ VToolLineIntersect(VPattern *doc, VContainer *data, const quint32 &id, const quint32 &p1Line1, const quint32 &p2Line1, const quint32 &p1Line2, const quint32 &p2Line2, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -84,7 +84,7 @@ public: static void Create(const quint32 _id, const quint32 &p1Line1Id, const quint32 &p2Line1Id, const quint32 &p1Line2Id, const quint32 &p2Line2Id, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation); + const Document &parse, const Source &typeCreation); static const QString ToolType; public slots: /** diff --git a/src/app/tools/drawTools/vtoolnormal.cpp b/src/app/tools/drawTools/vtoolnormal.cpp index 0f8790662..0878c23fc 100644 --- a/src/app/tools/drawTools/vtoolnormal.cpp +++ b/src/app/tools/drawTools/vtoolnormal.cpp @@ -36,12 +36,12 @@ const QString VToolNormal::ToolType = QStringLiteral("normal"); //--------------------------------------------------------------------------------------------------------------------- VToolNormal::VToolNormal(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &formula, const qreal &angle, const quint32 &firstPointId, - const quint32 &secondPointId, const Valentina::Sources &typeCreation, QGraphicsItem *parent) + const quint32 &secondPointId, const Source &typeCreation, QGraphicsItem *parent) :VToolLinePoint(doc, data, id, typeLine, formula, firstPointId, angle, parent), secondPointId(secondPointId) { - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -80,7 +80,7 @@ VToolNormal* VToolNormal::Create(DialogTool *dialog, VMainGraphicsScene *scene, const qreal angle = dialogTool->getAngle(); VToolNormal *point = nullptr; point=Create(0, formula, firstPointId, secondPointId, typeLine, pointName, angle, 5, 10, scene, doc, data, - Document::FullParse, Valentina::FromGui); + Document::FullParse, Source::FromGui); if (point != nullptr) { point->dialog=dialogTool; @@ -92,8 +92,8 @@ VToolNormal* VToolNormal::Create(DialogTool *dialog, VMainGraphicsScene *scene, VToolNormal* VToolNormal::Create(const quint32 _id, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const QString &typeLine, const QString &pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation) + VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation) { const VPointF *firstPoint = data->GeometricObject(firstPointId); const VPointF *secondPoint = data->GeometricObject(secondPointId); @@ -103,7 +103,7 @@ VToolNormal* VToolNormal::Create(const quint32 _id, QString &formula, const quin QPointF fPoint = VToolNormal::FindPoint(firstPoint->toQPointF(), secondPoint->toQPointF(), qApp->toPixel(result), angle); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(new VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(firstPointId, id); @@ -117,7 +117,7 @@ VToolNormal* VToolNormal::Create(const quint32 _id, QString &formula, const quin doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::NormalTool, doc); + VDrawTool::AddRecord(id, Tool::NormalTool, doc); if (parse == Document::FullParse) { VToolNormal *point = new VToolNormal(doc, data, id, typeLine, formula, angle, diff --git a/src/app/tools/drawTools/vtoolnormal.h b/src/app/tools/drawTools/vtoolnormal.h index 16d84e471..8d084098f 100644 --- a/src/app/tools/drawTools/vtoolnormal.h +++ b/src/app/tools/drawTools/vtoolnormal.h @@ -53,7 +53,7 @@ public: */ VToolNormal(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &formula, const qreal &angle, const quint32 &firstPointId, - const quint32 &secondPointId, const Valentina::Sources &typeCreation, + const quint32 &secondPointId, const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. @@ -87,8 +87,8 @@ public: static VToolNormal* Create(const quint32 _id, QString &formula, const quint32 &firstPointId, const quint32 &secondPointId, const QString &typeLine, const QString &pointName, const qreal angle, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation); + VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation); /** * @brief FindPoint return normal point. * @param firstPoint first line point. diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp index 395eb45da..35d771917 100644 --- a/src/app/tools/drawTools/vtoolpoint.cpp +++ b/src/app/tools/drawTools/vtoolpoint.cpp @@ -127,7 +127,7 @@ void VToolPoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::Point); + emit ChoosedTool(id, SceneObject::Point); } QGraphicsItem::mouseReleaseEvent(event); } diff --git a/src/app/tools/drawTools/vtoolpointofcontact.cpp b/src/app/tools/drawTools/vtoolpointofcontact.cpp index 74fc8d18f..a3ed52dd0 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.cpp +++ b/src/app/tools/drawTools/vtoolpointofcontact.cpp @@ -37,11 +37,11 @@ const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); VToolPointOfContact::VToolPointOfContact(VPattern *doc, VContainer *data, const quint32 &id, const QString &radius, const quint32 ¢er, const quint32 &firstPointId, const quint32 &secondPointId, - const Valentina::Sources &typeCreation, QGraphicsItem *parent) + const Source &typeCreation, QGraphicsItem *parent) : VToolPoint(doc, data, id, parent), arcRadius(radius), center(center), firstPointId(firstPointId), secondPointId(secondPointId) { - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -105,7 +105,7 @@ VToolPointOfContact* VToolPointOfContact::Create(DialogTool *dialog, VMainGraphi const QString pointName = dialogTool->getPointName(); VToolPointOfContact *point = nullptr; point=Create(0, radius, center, firstPointId, secondPointId, pointName, 5, 10, scene, doc, data, - Document::FullParse, Valentina::FromGui); + Document::FullParse, Source::FromGui); if (point != nullptr) { point->dialog=dialogTool; @@ -117,7 +117,7 @@ VToolPointOfContact* VToolPointOfContact::Create(DialogTool *dialog, VMainGraphi VToolPointOfContact* VToolPointOfContact::Create(const quint32 _id, QString &radius, const quint32 ¢er, const quint32 &firstPointId, const quint32 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation) + const Document &parse, const Source &typeCreation) { const VPointF *centerP = data->GeometricObject(center); const VPointF *firstP = data->GeometricObject(firstPointId); @@ -128,7 +128,7 @@ VToolPointOfContact* VToolPointOfContact::Create(const quint32 _id, QString &rad QPointF fPoint = VToolPointOfContact::FindPoint(qApp->toPixel(result), centerP->toQPointF(), firstP->toQPointF(), secondP->toQPointF()); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(new VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(firstPointId, id); @@ -146,7 +146,7 @@ VToolPointOfContact* VToolPointOfContact::Create(const quint32 _id, QString &rad doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::PointOfContact, doc); + VDrawTool::AddRecord(id, Tool::PointOfContact, doc); if (parse == Document::FullParse) { VToolPointOfContact *point = new VToolPointOfContact(doc, data, id, radius, center, diff --git a/src/app/tools/drawTools/vtoolpointofcontact.h b/src/app/tools/drawTools/vtoolpointofcontact.h index 04670c7e2..b3ddc822b 100644 --- a/src/app/tools/drawTools/vtoolpointofcontact.h +++ b/src/app/tools/drawTools/vtoolpointofcontact.h @@ -52,7 +52,7 @@ public: VToolPointOfContact(VPattern *doc, VContainer *data, const quint32 &id, const QString &arcRadius, const quint32 ¢er, const quint32 &firstPointId, const quint32 &secondPointId, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -94,7 +94,7 @@ public: static VToolPointOfContact* Create(const quint32 _id, QString &arcRadius, const quint32 ¢er, const quint32 &firstPointId, const quint32 &secondPointId, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, - VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation); + VContainer *data, const Document &parse, const Source &typeCreation); static const QString ToolType; public slots: /** diff --git a/src/app/tools/drawTools/vtoolpointofintersection.cpp b/src/app/tools/drawTools/vtoolpointofintersection.cpp index b70231326..25bcb0109 100644 --- a/src/app/tools/drawTools/vtoolpointofintersection.cpp +++ b/src/app/tools/drawTools/vtoolpointofintersection.cpp @@ -35,11 +35,11 @@ const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfInters //--------------------------------------------------------------------------------------------------------------------- VToolPointOfIntersection::VToolPointOfIntersection(VPattern *doc, VContainer *data, const quint32 &id, const quint32 &firstPointId, const quint32 &secondPointId, - const Valentina::Sources &typeCreation, QGraphicsItem *parent) + const Source &typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), firstPointId(firstPointId), secondPointId(secondPointId) { ignoreFullUpdate = true; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -71,21 +71,21 @@ void VToolPointOfIntersection::Create(DialogTool *dialog, VMainGraphicsScene *sc const quint32 firstPointId = dialogTool->getFirstPointId(); const quint32 secondPointId = dialogTool->getSecondPointId(); const QString pointName = dialogTool->getPointName(); - Create(0, pointName, firstPointId, secondPointId, 5, 10, scene, doc, data, Document::FullParse, Valentina::FromGui); + Create(0, pointName, firstPointId, secondPointId, 5, 10, scene, doc, data, Document::FullParse, Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolPointOfIntersection::Create(const quint32 _id, const QString &pointName, const quint32 &firstPointId, const quint32 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation) + const Document &parse, const Source &typeCreation) { const VPointF *firstPoint = data->GeometricObject(firstPointId); const VPointF *secondPoint = data->GeometricObject(secondPointId); QPointF point(firstPoint->x(), secondPoint->y()); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(new VPointF(point.x(), point.y(), pointName, mx, my)); } @@ -97,7 +97,7 @@ void VToolPointOfIntersection::Create(const quint32 _id, const QString &pointNam doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::PointOfIntersection, doc); + VDrawTool::AddRecord(id, Tool::PointOfIntersection, doc); if (parse == Document::FullParse) { VToolPointOfIntersection *point = new VToolPointOfIntersection(doc, data, id, firstPointId, diff --git a/src/app/tools/drawTools/vtoolpointofintersection.h b/src/app/tools/drawTools/vtoolpointofintersection.h index 194d09395..41ca236c0 100644 --- a/src/app/tools/drawTools/vtoolpointofintersection.h +++ b/src/app/tools/drawTools/vtoolpointofintersection.h @@ -50,7 +50,7 @@ public: */ VToolPointOfIntersection(VPattern *doc, VContainer *data, const quint32 &id, const quint32 &firstPointId, const quint32 &secondPointId, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -79,8 +79,8 @@ public: */ static void Create(const quint32 _id, const QString &pointName, const quint32 &firstPointId, const quint32 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, - VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation); + VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation); static const QString ToolType; public slots: /** diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.cpp b/src/app/tools/drawTools/vtoolshoulderpoint.cpp index d20f0c60b..9cddfc34e 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.cpp +++ b/src/app/tools/drawTools/vtoolshoulderpoint.cpp @@ -36,11 +36,11 @@ const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); //--------------------------------------------------------------------------------------------------------------------- VToolShoulderPoint::VToolShoulderPoint(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &formula, const quint32 &p1Line, const quint32 &p2Line, - const quint32 &pShoulder, const Valentina::Sources &typeCreation, + const quint32 &pShoulder, const Source &typeCreation, QGraphicsItem * parent) :VToolLinePoint(doc, data, id, typeLine, formula, p1Line, 0, parent), p2Line(p2Line), pShoulder(pShoulder) { - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -108,7 +108,7 @@ VToolShoulderPoint* VToolShoulderPoint::Create(DialogTool *dialog, VMainGraphics const QString pointName = dialogTool->getPointName(); VToolShoulderPoint * point = nullptr; point=Create(0, formula, p1Line, p2Line, pShoulder, typeLine, pointName, 5, 10, scene, doc, data, - Document::FullParse, Valentina::FromGui); + Document::FullParse, Source::FromGui); if (point != nullptr) { point->dialog=dialogTool; @@ -121,7 +121,7 @@ VToolShoulderPoint* VToolShoulderPoint::Create(const quint32 _id, QString &formu const quint32 &p2Line, const quint32 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation) + const Document &parse, const Source &typeCreation) { const VPointF *firstPoint = data->GeometricObject(p1Line); const VPointF *secondPoint = data->GeometricObject(p2Line); @@ -132,7 +132,7 @@ VToolShoulderPoint* VToolShoulderPoint::Create(const quint32 _id, QString &formu QPointF fPoint = VToolShoulderPoint::FindPoint(firstPoint->toQPointF(), secondPoint->toQPointF(), shoulderPoint->toQPointF(), qApp->toPixel(result)); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(new VPointF(fPoint.x(), fPoint.y(), pointName, mx, my)); data->AddLine(p1Line, id); @@ -148,7 +148,7 @@ VToolShoulderPoint* VToolShoulderPoint::Create(const quint32 _id, QString &formu doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::ShoulderPointTool, doc); + VDrawTool::AddRecord(id, Tool::ShoulderPointTool, doc); if (parse == Document::FullParse) { VToolShoulderPoint *point = new VToolShoulderPoint(doc, data, id, typeLine, formula, diff --git a/src/app/tools/drawTools/vtoolshoulderpoint.h b/src/app/tools/drawTools/vtoolshoulderpoint.h index e9eec3e8a..b7d2c5a20 100644 --- a/src/app/tools/drawTools/vtoolshoulderpoint.h +++ b/src/app/tools/drawTools/vtoolshoulderpoint.h @@ -53,7 +53,7 @@ public: */ VToolShoulderPoint(VPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &formula, const quint32 &p1Line, const quint32 &p2Line, - const quint32 &pShoulder, const Valentina::Sources &typeCreation, + const quint32 &pShoulder, const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. @@ -97,7 +97,7 @@ public: static VToolShoulderPoint* Create(const quint32 _id, QString &formula, const quint32 &p1Line, const quint32 &p2Line, const quint32 &pShoulder, const QString &typeLine, const QString &pointName, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation); + const Document &parse, const Source &typeCreation); static const QString ToolType; public slots: /** diff --git a/src/app/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp index 5091c67f8..c2263d6e9 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/app/tools/drawTools/vtoolsinglepoint.cpp @@ -36,7 +36,7 @@ const QString VToolSinglePoint::ToolType = QStringLiteral("single"); //--------------------------------------------------------------------------------------------------------------------- -VToolSinglePoint::VToolSinglePoint (VPattern *doc, VContainer *data, quint32 id, const Valentina::Sources &typeCreation, +VToolSinglePoint::VToolSinglePoint (VPattern *doc, VContainer *data, quint32 id, const Source &typeCreation, const QString &namePP, const QString &mPath, QGraphicsItem * parent ) :VToolPoint(doc, data, id, parent), namePP(namePP), mPath(mPath) { @@ -48,7 +48,7 @@ VToolSinglePoint::VToolSinglePoint (VPattern *doc, VContainer *data, quint32 id, this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); this->setFlag(QGraphicsItem::ItemIsFocusable, false); setColorLabel(Qt::black); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } diff --git a/src/app/tools/drawTools/vtoolsinglepoint.h b/src/app/tools/drawTools/vtoolsinglepoint.h index e3ac971b1..0ec7b55de 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.h +++ b/src/app/tools/drawTools/vtoolsinglepoint.h @@ -47,7 +47,7 @@ public: * @param typeCreation way we create this tool. * @param parent parent object. */ - VToolSinglePoint (VPattern *doc, VContainer *data, quint32 id, const Valentina::Sources &typeCreation, + VToolSinglePoint (VPattern *doc, VContainer *data, quint32 id, const Source &typeCreation, const QString &namePP = QString(), const QString &mPath = QString(), QGraphicsItem * parent = nullptr ); /** diff --git a/src/app/tools/drawTools/vtoolspline.cpp b/src/app/tools/drawTools/vtoolspline.cpp index 7d14ea5ce..35035c4b9 100644 --- a/src/app/tools/drawTools/vtoolspline.cpp +++ b/src/app/tools/drawTools/vtoolspline.cpp @@ -34,7 +34,7 @@ const QString VToolSpline::ToolType = QStringLiteral("simple"); //--------------------------------------------------------------------------------------------------------------------- -VToolSpline::VToolSpline(VPattern *doc, VContainer *data, quint32 id, const Valentina::Sources &typeCreation, +VToolSpline::VToolSpline(VPattern *doc, VContainer *data, quint32 id, const Source &typeCreation, QGraphicsItem *parent) :VAbstractSpline(doc, data, id, parent) { const VSpline *spl = data->GeometricObject(id); @@ -47,7 +47,7 @@ VToolSpline::VToolSpline(VPattern *doc, VContainer *data, quint32 id, const Vale this->setFlag(QGraphicsItem::ItemIsFocusable, true); this->setAcceptHoverEvents(true); - VControlPointSpline *controlPoint1 = new VControlPointSpline(1, SplinePoint::FirstPoint, spl->GetP2(), + VControlPointSpline *controlPoint1 = new VControlPointSpline(1, SplinePointPosition::FirstPoint, spl->GetP2(), spl->GetP1().toQPointF(), this); connect(controlPoint1, &VControlPointSpline::ControlPointChangePosition, this, &VToolSpline::ControlPointChangePosition); @@ -55,7 +55,7 @@ VToolSpline::VToolSpline(VPattern *doc, VContainer *data, quint32 id, const Vale connect(this, &VToolSpline::setEnabledPoint, controlPoint1, &VControlPointSpline::setEnabledPoint); controlPoints.append(controlPoint1); - VControlPointSpline *controlPoint2 = new VControlPointSpline(1, SplinePoint::LastPoint, spl->GetP3(), + VControlPointSpline *controlPoint2 = new VControlPointSpline(1, SplinePointPosition::LastPoint, spl->GetP3(), spl->GetP4().toQPointF(), this); connect(controlPoint2, &VControlPointSpline::ControlPointChangePosition, this, &VToolSpline::ControlPointChangePosition); @@ -63,7 +63,7 @@ VToolSpline::VToolSpline(VPattern *doc, VContainer *data, quint32 id, const Vale connect(this, &VToolSpline::setEnabledPoint, controlPoint2, &VControlPointSpline::setEnabledPoint); controlPoints.append(controlPoint2); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -104,20 +104,20 @@ void VToolSpline::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern const qreal angle2 = dialogTool->getAngle2(); const qreal kCurve = dialogTool->getKCurve(); Create(0, p1, p4, kAsm1, kAsm2, angle1, angle2, kCurve, scene, doc, data, Document::FullParse, - Valentina::FromGui); + Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolSpline::Create(const quint32 _id, const quint32 &p1, const quint32 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation) + const Document &parse, const Source &typeCreation) { VPointF point1 = *data->GeometricObject(p1); VPointF point4 = *data->GeometricObject(p4); VSpline *spline = new VSpline(point1, point4, angle1, angle2, kAsm1, kAsm2, kCurve); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(spline); data->AddLengthSpline(spline->name(), qApp->fromPixel(spline->GetLength())); @@ -131,7 +131,7 @@ void VToolSpline::Create(const quint32 _id, const quint32 &p1, const quint32 &p4 doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::SplineTool, doc); + VDrawTool::AddRecord(id, Tool::SplineTool, doc); if (parse == Document::FullParse) { VToolSpline *spl = new VToolSpline(doc, data, id, typeCreation); @@ -145,13 +145,13 @@ void VToolSpline::Create(const quint32 _id, const quint32 &p1, const quint32 &p4 } //--------------------------------------------------------------------------------------------------------------------- -void VToolSpline::ControlPointChangePosition(const qint32 &indexSpline, const SplinePoint::Position &position, +void VToolSpline::ControlPointChangePosition(const qint32 &indexSpline, const SplinePointPosition &position, const QPointF &pos) { Q_UNUSED(indexSpline); const VSpline *spline = VAbstractTool::data.GeometricObject(id); VSpline spl; - if (position == SplinePoint::FirstPoint) + if (position == SplinePointPosition::FirstPoint) { spl = VSpline(spline->GetP1(), pos, spline->GetP3(), spline->GetP4(), spline->GetKcurve()); } @@ -211,7 +211,7 @@ void VToolSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::Spline); + emit ChoosedTool(id, SceneObject::Spline); } QGraphicsItem::mouseReleaseEvent(event); } @@ -269,10 +269,10 @@ void VToolSpline::RefreshGeometry() this->setPath(path); QPointF splinePoint = VAbstractTool::data.GeometricObject(spl->GetP1().id())->toQPointF(); QPointF controlPoint = spl->GetP2(); - emit RefreshLine(1, SplinePoint::FirstPoint, controlPoint, splinePoint); + emit RefreshLine(1, SplinePointPosition::FirstPoint, controlPoint, splinePoint); splinePoint = VAbstractTool::data.GeometricObject(spl->GetP4().id())->toQPointF(); controlPoint = spl->GetP3(); - emit RefreshLine(1, SplinePoint::LastPoint, controlPoint, splinePoint); + emit RefreshLine(1, SplinePointPosition::LastPoint, controlPoint, splinePoint); disconnect(controlPoints[0], &VControlPointSpline::ControlPointChangePosition, this, &VToolSpline::ControlPointChangePosition); diff --git a/src/app/tools/drawTools/vtoolspline.h b/src/app/tools/drawTools/vtoolspline.h index 025f8cb95..5a5d4898d 100644 --- a/src/app/tools/drawTools/vtoolspline.h +++ b/src/app/tools/drawTools/vtoolspline.h @@ -46,7 +46,7 @@ public: * @param typeCreation way we create this tool. * @param parent parent object. */ - VToolSpline (VPattern *doc, VContainer *data, quint32 id, const Valentina::Sources &typeCreation, + VToolSpline (VPattern *doc, VContainer *data, quint32 id, const Source &typeCreation, QGraphicsItem * parent = nullptr ); /** * @brief setDialog set dialog when user want change tool option. @@ -79,7 +79,7 @@ public: static void Create(const quint32 _id, const quint32 &p1, const quint32 &p4, const qreal &kAsm1, const qreal kAsm2, const qreal &angle1, const qreal &angle2, const qreal &kCurve, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation); + const Document &parse, const Source &typeCreation); static const QString ToolType; public slots: /** @@ -88,7 +88,7 @@ public slots: * @param position position point in spline. * @param pos new position. */ - void ControlPointChangePosition (const qint32 &indexSpline, const SplinePoint::Position &position, + void ControlPointChangePosition (const qint32 &indexSpline, const SplinePointPosition &position, const QPointF &pos); protected: /** diff --git a/src/app/tools/drawTools/vtoolsplinepath.cpp b/src/app/tools/drawTools/vtoolsplinepath.cpp index 961b70629..26ac90118 100644 --- a/src/app/tools/drawTools/vtoolsplinepath.cpp +++ b/src/app/tools/drawTools/vtoolsplinepath.cpp @@ -33,7 +33,7 @@ const QString VToolSplinePath::ToolType = QStringLiteral("path"); //--------------------------------------------------------------------------------------------------------------------- -VToolSplinePath::VToolSplinePath(VPattern *doc, VContainer *data, quint32 id, const Valentina::Sources &typeCreation, +VToolSplinePath::VToolSplinePath(VPattern *doc, VContainer *data, quint32 id, const Source &typeCreation, QGraphicsItem *parent) :VAbstractSpline(doc, data, id, parent) { const VSplinePath *splPath = data->GeometricObject(id); @@ -49,7 +49,7 @@ VToolSplinePath::VToolSplinePath(VPattern *doc, VContainer *data, quint32 id, co for (qint32 i = 1; i<=splPath->Count(); ++i) { VSpline spl = splPath->GetSpline(i); - VControlPointSpline *controlPoint = new VControlPointSpline(i, SplinePoint::FirstPoint, spl.GetP2(), + VControlPointSpline *controlPoint = new VControlPointSpline(i, SplinePointPosition::FirstPoint, spl.GetP2(), spl.GetP1().toQPointF(), this); connect(controlPoint, &VControlPointSpline::ControlPointChangePosition, this, &VToolSplinePath::ControlPointChangePosition); @@ -57,14 +57,14 @@ VToolSplinePath::VToolSplinePath(VPattern *doc, VContainer *data, quint32 id, co connect(this, &VToolSplinePath::setEnabledPoint, controlPoint, &VControlPointSpline::setEnabledPoint); controlPoints.append(controlPoint); - controlPoint = new VControlPointSpline(i, SplinePoint::LastPoint, spl.GetP3(), spl.GetP4().toQPointF(), this); + controlPoint = new VControlPointSpline(i, SplinePointPosition::LastPoint, spl.GetP3(), spl.GetP4().toQPointF(), this); connect(controlPoint, &VControlPointSpline::ControlPointChangePosition, this, &VToolSplinePath::ControlPointChangePosition); connect(this, &VToolSplinePath::RefreshLine, controlPoint, &VControlPointSpline::RefreshLine); connect(this, &VToolSplinePath::setEnabledPoint, controlPoint, &VControlPointSpline::setEnabledPoint); controlPoints.append(controlPoint); } - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -95,16 +95,16 @@ void VToolSplinePath::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPat { doc->IncrementReferens((*path)[i].P().id()); } - Create(0, path, scene, doc, data, Document::FullParse, Valentina::FromGui); + Create(0, path, scene, doc, data, Document::FullParse, Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolSplinePath::Create(const quint32 _id, VSplinePath *path, VMainGraphicsScene *scene, - VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation) + VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation) { quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(path); data->AddLengthSpline(path->name(), qApp->fromPixel(path->GetLength())); @@ -118,7 +118,7 @@ void VToolSplinePath::Create(const quint32 _id, VSplinePath *path, VMainGraphics doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::SplinePathTool, doc); + VDrawTool::AddRecord(id, Tool::SplinePathTool, doc); if (parse == Document::FullParse) { VToolSplinePath *spl = new VToolSplinePath(doc, data, id, typeCreation); @@ -130,13 +130,13 @@ void VToolSplinePath::Create(const quint32 _id, VSplinePath *path, VMainGraphics } //--------------------------------------------------------------------------------------------------------------------- -void VToolSplinePath::ControlPointChangePosition(const qint32 &indexSpline, const SplinePoint::Position &position, +void VToolSplinePath::ControlPointChangePosition(const qint32 &indexSpline, const SplinePointPosition &position, const QPointF &pos) { VSplinePath oldSplPath = *VAbstractTool::data.GeometricObject(id); VSplinePath newSplPath = oldSplPath; VSpline spl = newSplPath.GetSpline(indexSpline); - if (position == SplinePoint::FirstPoint) + if (position == SplinePointPosition::FirstPoint) { spl = VSpline(spl.GetP1(), pos, spl.GetP3(), spl.GetP4(), spl.GetKcurve()); } @@ -155,15 +155,15 @@ void VToolSplinePath::ControlPointChangePosition(const qint32 &indexSpline, cons //--------------------------------------------------------------------------------------------------------------------- void VToolSplinePath::UpdateControlPoints(const VSpline &spl, VSplinePath &splPath, const qint32 &indexSpline) const { - VSplinePoint p = splPath.GetSplinePoint(indexSpline, SplinePoint::FirstPoint); + VSplinePoint p = splPath.GetSplinePoint(indexSpline, SplinePointPosition::FirstPoint); p.SetAngle2(spl.GetAngle1()); p.SetKAsm2(spl.GetKasm1()); - splPath.UpdatePoint(indexSpline, SplinePoint::FirstPoint, p); + splPath.UpdatePoint(indexSpline, SplinePointPosition::FirstPoint, p); - p = splPath.GetSplinePoint(indexSpline, SplinePoint::LastPoint); + p = splPath.GetSplinePoint(indexSpline, SplinePointPosition::LastPoint); p.SetAngle2(spl.GetAngle2()-180); p.SetKAsm1(spl.GetKasm2()); - splPath.UpdatePoint(indexSpline, SplinePoint::LastPoint, p); + splPath.UpdatePoint(indexSpline, SplinePointPosition::LastPoint, p); } //--------------------------------------------------------------------------------------------------------------------- @@ -267,7 +267,7 @@ void VToolSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::SplinePath); + emit ChoosedTool(id, SceneObject::SplinePath); } QGraphicsItem::mouseReleaseEvent(event); } @@ -309,10 +309,10 @@ void VToolSplinePath::RefreshGeometry() VSpline spl = splPath->GetSpline(i); QPointF splinePoint = spl.GetP1().toQPointF(); QPointF controlPoint = spl.GetP2(); - emit RefreshLine(i, SplinePoint::FirstPoint, controlPoint, splinePoint); + emit RefreshLine(i, SplinePointPosition::FirstPoint, controlPoint, splinePoint); splinePoint = spl.GetP4().toQPointF(); controlPoint = spl.GetP3(); - emit RefreshLine(i, SplinePoint::LastPoint, controlPoint, splinePoint); + emit RefreshLine(i, SplinePointPosition::LastPoint, controlPoint, splinePoint); qint32 j = i*2; disconnect(controlPoints[j-2], &VControlPointSpline::ControlPointChangePosition, this, diff --git a/src/app/tools/drawTools/vtoolsplinepath.h b/src/app/tools/drawTools/vtoolsplinepath.h index 2556bb41f..311fb9b15 100644 --- a/src/app/tools/drawTools/vtoolsplinepath.h +++ b/src/app/tools/drawTools/vtoolsplinepath.h @@ -46,7 +46,7 @@ public: * @param typeCreation way we create this tool. * @param parent parent object. */ - VToolSplinePath(VPattern *doc, VContainer *data, quint32 id, const Valentina::Sources &typeCreation, + VToolSplinePath(VPattern *doc, VContainer *data, quint32 id, const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. @@ -71,8 +71,8 @@ public: * @param typeCreation way we create this tool. */ static void Create(const quint32 _id, VSplinePath *path, VMainGraphicsScene *scene, - VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation); + VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation); static const QString ToolType; /** * @brief UpdatePathPoint update spline path in pattern file. @@ -89,7 +89,7 @@ signals: * @param controlPoint new position control point. * @param splinePoint new position spline point. */ - void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, + void RefreshLine(const qint32 &indexSpline, SplinePointPosition pos, const QPointF &controlPoint, const QPointF &splinePoint); /** * @brief setEnabledPoint disable control points. @@ -103,7 +103,7 @@ public slots: * @param position position point in spline. * @param pos new position. */ - void ControlPointChangePosition(const qint32 &indexSpline, const SplinePoint::Position &position, + void ControlPointChangePosition(const qint32 &indexSpline, const SplinePointPosition &position, const QPointF &pos); protected: /** diff --git a/src/app/tools/drawTools/vtooltriangle.cpp b/src/app/tools/drawTools/vtooltriangle.cpp index 22b7a29bf..bbe592e60 100644 --- a/src/app/tools/drawTools/vtooltriangle.cpp +++ b/src/app/tools/drawTools/vtooltriangle.cpp @@ -35,12 +35,12 @@ const QString VToolTriangle::ToolType = QStringLiteral("triangle"); //--------------------------------------------------------------------------------------------------------------------- VToolTriangle::VToolTriangle(VPattern *doc, VContainer *data, const quint32 &id, const quint32 &axisP1Id, const quint32 &axisP2Id, const quint32 &firstPointId, const quint32 &secondPointId, - const Valentina::Sources &typeCreation, QGraphicsItem *parent) + const Source &typeCreation, QGraphicsItem *parent) :VToolPoint(doc, data, id, parent), axisP1Id(axisP1Id), axisP2Id(axisP2Id), firstPointId(firstPointId), secondPointId(secondPointId) { ignoreFullUpdate = true; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -77,14 +77,14 @@ void VToolTriangle::Create(DialogTool *dialog, VMainGraphicsScene *scene, const quint32 secondPointId = dialogTool->getSecondPointId(); const QString pointName = dialogTool->getPointName(); Create(0, pointName, axisP1Id, axisP2Id, firstPointId, secondPointId, 5, 10, scene, doc, data, - Document::FullParse, Valentina::FromGui); + Document::FullParse, Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolTriangle::Create(const quint32 _id, const QString &pointName, const quint32 &axisP1Id, const quint32 &axisP2Id, const quint32 &firstPointId, const quint32 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, - VContainer *data, const Document::Documents &parse, const Valentina::Sources &typeCreation) + VContainer *data, const Document &parse, const Source &typeCreation) { const VPointF *axisP1 = data->GeometricObject(axisP1Id); const VPointF *axisP2 = data->GeometricObject(axisP2Id); @@ -94,7 +94,7 @@ void VToolTriangle::Create(const quint32 _id, const QString &pointName, const qu QPointF point = FindPoint(axisP1->toQPointF(), axisP2->toQPointF(), firstPoint->toQPointF(), secondPoint->toQPointF()); quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->AddGObject(new VPointF(point.x(), point.y(), pointName, mx, my)); } @@ -106,7 +106,7 @@ void VToolTriangle::Create(const quint32 _id, const QString &pointName, const qu doc->UpdateToolData(id, data); } } - VDrawTool::AddRecord(id, Valentina::Triangle, doc); + VDrawTool::AddRecord(id, Tool::Triangle, doc); if (parse == Document::FullParse) { VToolTriangle *point = new VToolTriangle(doc, data, id, axisP1Id, axisP2Id, firstPointId, diff --git a/src/app/tools/drawTools/vtooltriangle.h b/src/app/tools/drawTools/vtooltriangle.h index 0a6e12f8a..5ef89d7bf 100644 --- a/src/app/tools/drawTools/vtooltriangle.h +++ b/src/app/tools/drawTools/vtooltriangle.h @@ -52,7 +52,7 @@ public: */ VToolTriangle(VPattern *doc, VContainer *data, const quint32 &id, const quint32 &axisP1Id, const quint32 &axisP2Id, const quint32 &firstPointId, const quint32 &secondPointId, - const Valentina::Sources &typeCreation, QGraphicsItem * parent = nullptr); + const Source &typeCreation, QGraphicsItem * parent = nullptr); /** * @brief setDialog set dialog when user want change tool option. */ @@ -84,7 +84,7 @@ public: static void Create(const quint32 _id, const QString &pointName, const quint32 &axisP1Id, const quint32 &axisP2Id, const quint32 &firstPointId, const quint32 &secondPointId, const qreal &mx, const qreal &my, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation); + const Document &parse, const Source &typeCreation); /** * @brief FindPoint find point intersection two foots right triangle. * @param axisP1 first axis point. diff --git a/src/app/tools/nodeDetails/vnodearc.cpp b/src/app/tools/nodeDetails/vnodearc.cpp index a4e84b312..a7c55148c 100644 --- a/src/app/tools/nodeDetails/vnodearc.cpp +++ b/src/app/tools/nodeDetails/vnodearc.cpp @@ -35,14 +35,14 @@ const QString VNodeArc::TagName = QStringLiteral("arc"); const QString VNodeArc::ToolType = QStringLiteral("modeling"); //--------------------------------------------------------------------------------------------------------------------- -VNodeArc::VNodeArc(VPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Valentina::Sources &typeCreation, +VNodeArc::VNodeArc(VPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Source &typeCreation, const quint32 &idTool, QObject *qoParent, QGraphicsItem *parent) :VAbstractNode(doc, data, id, idArc, idTool, qoParent), QGraphicsPathItem(parent) { RefreshGeometry(); this->setPen(QPen(baseColor, qApp->toPixel(qApp->widthHairLine()))); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -53,10 +53,10 @@ VNodeArc::VNodeArc(VPattern *doc, VContainer *data, quint32 id, quint32 idArc, c } //--------------------------------------------------------------------------------------------------------------------- -void VNodeArc::Create(VPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Document::Documents &parse, - const Valentina::Sources &typeCreation, const quint32 &idTool, QObject *parent) +void VNodeArc::Create(VPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Document &parse, + const Source &typeCreation, const quint32 &idTool, QObject *parent) { - VAbstractTool::AddRecord(id, Valentina::NodeArc, doc); + VAbstractTool::AddRecord(id, Tool::NodeArc, doc); if (parse == Document::FullParse) { VNodeArc *arc = new VNodeArc(doc, data, id, idArc, typeCreation, idTool, parent); @@ -128,7 +128,7 @@ void VNodeArc::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::Arc); + emit ChoosedTool(id, SceneObject::Arc); } QGraphicsItem::mouseReleaseEvent(event); } diff --git a/src/app/tools/nodeDetails/vnodearc.h b/src/app/tools/nodeDetails/vnodearc.h index 4c931ec29..1c69b2f35 100644 --- a/src/app/tools/nodeDetails/vnodearc.h +++ b/src/app/tools/nodeDetails/vnodearc.h @@ -52,7 +52,7 @@ public: * @param parent parent object. */ VNodeArc(VPattern *doc, VContainer *data, quint32 id, quint32 idArc, - const Valentina::Sources &typeCreation, const quint32 &idTool = 0, + const Source &typeCreation, const quint32 &idTool = 0, QObject *qoParent = nullptr, QGraphicsItem * parent = nullptr); /** * @brief Create help create tool. @@ -65,8 +65,8 @@ public: * @param idTool tool id. * @param parent QObject parent */ - static void Create(VPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Document::Documents &parse, - const Valentina::Sources &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); + static void Create(VPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Document &parse, + const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); static const QString TagName; static const QString ToolType; /** diff --git a/src/app/tools/nodeDetails/vnodepoint.cpp b/src/app/tools/nodeDetails/vnodepoint.cpp index 4401bfc73..9b5d20134 100644 --- a/src/app/tools/nodeDetails/vnodepoint.cpp +++ b/src/app/tools/nodeDetails/vnodepoint.cpp @@ -37,7 +37,7 @@ const QString VNodePoint::ToolType = QStringLiteral("modeling"); //--------------------------------------------------------------------------------------------------------------------- VNodePoint::VNodePoint(VPattern *doc, VContainer *data, quint32 id, quint32 idPoint, - const Valentina::Sources &typeCreation, const quint32 &idTool, QObject *qoParent, + const Source &typeCreation, const quint32 &idTool, QObject *qoParent, QGraphicsItem *parent) :VAbstractNode(doc, data, id, idPoint, idTool, qoParent), QGraphicsEllipseItem(parent), radius(0), namePoint(nullptr), lineName(nullptr) @@ -52,7 +52,7 @@ VNodePoint::VNodePoint(VPattern *doc, VContainer *data, quint32 id, quint32 idPo this->setFlag(QGraphicsItem::ItemIsSelectable, true); this->setAcceptHoverEvents(true); RefreshPointGeometry(*VAbstractTool::data.GeometricObject(id)); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -64,10 +64,10 @@ VNodePoint::VNodePoint(VPattern *doc, VContainer *data, quint32 id, quint32 idPo //--------------------------------------------------------------------------------------------------------------------- void VNodePoint::Create(VPattern *doc, VContainer *data, quint32 id, quint32 idPoint, - const Document::Documents &parse, const Valentina::Sources &typeCreation, const quint32 &idTool, + const Document &parse, const Source &typeCreation, const quint32 &idTool, QObject *parent) { - VAbstractTool::AddRecord(id, Valentina::NodePoint, doc); + VAbstractTool::AddRecord(id, Tool::NodePoint, doc); if (parse == Document::FullParse) { //TODO Need create garbage collector and remove all nodes, what we don't use. @@ -147,7 +147,7 @@ void VNodePoint::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::Point); + emit ChoosedTool(id, SceneObject::Point); } QGraphicsItem::mouseReleaseEvent(event); } diff --git a/src/app/tools/nodeDetails/vnodepoint.h b/src/app/tools/nodeDetails/vnodepoint.h index dbb7c33a9..934f60aa1 100644 --- a/src/app/tools/nodeDetails/vnodepoint.h +++ b/src/app/tools/nodeDetails/vnodepoint.h @@ -31,9 +31,12 @@ #include "vabstractnode.h" #include "../../xml/vpattern.h" +#include class VPointF; class VGraphicsSimpleTextItem; +class QGraphicsLineItem; +class QGraphicsItem; /** * @brief The VNodePoint class point detail node. @@ -53,7 +56,7 @@ public: * @param qoParent QObject parent * @param parent parent object. */ - VNodePoint(VPattern *doc, VContainer *data, quint32 id, quint32 idPoint, const Valentina::Sources &typeCreation, + VNodePoint(VPattern *doc, VContainer *data, quint32 id, quint32 idPoint, const Source &typeCreation, const quint32 &idTool = 0, QObject *qoParent = nullptr, QGraphicsItem * parent = nullptr ); /** * @brief Create help create tool. @@ -66,8 +69,8 @@ public: * @param idTool tool id. * @param parent QObject parent */ - static void Create(VPattern *doc, VContainer *data, quint32 id, quint32 idPoint, const Document::Documents &parse, - const Valentina::Sources &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); + static void Create(VPattern *doc, VContainer *data, quint32 id, quint32 idPoint, const Document &parse, + const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); static const QString TagName; static const QString ToolType; /** diff --git a/src/app/tools/nodeDetails/vnodespline.cpp b/src/app/tools/nodeDetails/vnodespline.cpp index c0704f5eb..4180384ac 100644 --- a/src/app/tools/nodeDetails/vnodespline.cpp +++ b/src/app/tools/nodeDetails/vnodespline.cpp @@ -36,14 +36,14 @@ const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline"); //--------------------------------------------------------------------------------------------------------------------- VNodeSpline::VNodeSpline(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, - const Valentina::Sources &typeCreation, const quint32 &idTool, QObject *qoParent, + const Source &typeCreation, const quint32 &idTool, QObject *qoParent, QGraphicsItem * parent) :VAbstractNode(doc, data, id, idSpline, idTool, qoParent), QGraphicsPathItem(parent) { RefreshGeometry(); this->setPen(QPen(baseColor, qApp->toPixel(qApp->widthHairLine()))); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -55,10 +55,10 @@ VNodeSpline::VNodeSpline(VPattern *doc, VContainer *data, quint32 id, quint32 id //--------------------------------------------------------------------------------------------------------------------- VNodeSpline *VNodeSpline::Create(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, - const Document::Documents &parse, const Valentina::Sources &typeCreation, + const Document &parse, const Source &typeCreation, const quint32 &idTool, QObject *parent) { - VAbstractTool::AddRecord(id, Valentina::NodeSpline, doc); + VAbstractTool::AddRecord(id, Tool::NodeSpline, doc); VNodeSpline *spl = nullptr; if (parse == Document::FullParse) { @@ -132,7 +132,7 @@ void VNodeSpline::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::Spline); + emit ChoosedTool(id, SceneObject::Spline); } QGraphicsItem::mouseReleaseEvent(event); } diff --git a/src/app/tools/nodeDetails/vnodespline.h b/src/app/tools/nodeDetails/vnodespline.h index 872bf6cd5..30b7873ac 100644 --- a/src/app/tools/nodeDetails/vnodespline.h +++ b/src/app/tools/nodeDetails/vnodespline.h @@ -51,7 +51,7 @@ public: * @param qoParent QObject parent. * @param parent QGraphicsItem parent. */ - VNodeSpline(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Valentina::Sources &typeCreation, + VNodeSpline(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Source &typeCreation, const quint32 &idTool = 0, QObject *qoParent = nullptr, QGraphicsItem * parent = nullptr); /** * @brief Create help create tool. @@ -65,7 +65,7 @@ public: * @return pointer to node. */ static VNodeSpline *Create(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, - const Document::Documents &parse, const Valentina::Sources &typeCreation, + const Document &parse, const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = nullptr); static const QString TagName; static const QString ToolType; diff --git a/src/app/tools/nodeDetails/vnodesplinepath.cpp b/src/app/tools/nodeDetails/vnodesplinepath.cpp index 6ab7cbc33..bf59facf5 100644 --- a/src/app/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/app/tools/nodeDetails/vnodesplinepath.cpp @@ -36,14 +36,14 @@ const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); //--------------------------------------------------------------------------------------------------------------------- VNodeSplinePath::VNodeSplinePath(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, - const Valentina::Sources &typeCreation, const quint32 &idTool, QObject *qoParent, + const Source &typeCreation, const quint32 &idTool, QObject *qoParent, QGraphicsItem * parent) :VAbstractNode(doc, data, id, idSpline, idTool, qoParent), QGraphicsPathItem(parent) { RefreshGeometry(); this->setPen(QPen(baseColor, qApp->toPixel(qApp->widthHairLine()))); - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -55,10 +55,10 @@ VNodeSplinePath::VNodeSplinePath(VPattern *doc, VContainer *data, quint32 id, qu //--------------------------------------------------------------------------------------------------------------------- void VNodeSplinePath::Create(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, - const Document::Documents &parse, const Valentina::Sources &typeCreation, + const Document &parse, const Source &typeCreation, const quint32 &idTool, QObject *parent) { - VAbstractTool::AddRecord(id, Valentina::NodeSplinePath, doc); + VAbstractTool::AddRecord(id, Tool::NodeSplinePath, doc); if (parse == Document::FullParse) { VNodeSplinePath *splPath = new VNodeSplinePath(doc, data, id, idSpline, typeCreation, idTool, parent); @@ -135,7 +135,7 @@ void VNodeSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::SplinePath); + emit ChoosedTool(id, SceneObject::SplinePath); } QGraphicsItem::mouseReleaseEvent(event); } diff --git a/src/app/tools/nodeDetails/vnodesplinepath.h b/src/app/tools/nodeDetails/vnodesplinepath.h index d83738b0d..7c739392d 100644 --- a/src/app/tools/nodeDetails/vnodesplinepath.h +++ b/src/app/tools/nodeDetails/vnodesplinepath.h @@ -52,7 +52,7 @@ public: * @param parent parent object. */ VNodeSplinePath(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, - const Valentina::Sources &typeCreation, const quint32 &idTool = 0, + const Source &typeCreation, const quint32 &idTool = 0, QObject *qoParent = nullptr, QGraphicsItem * parent = nullptr); /** * @brief Create help create tool. @@ -65,8 +65,8 @@ public: * @param idTool tool id. * @param parent QObject parent. */ - static void Create(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Document::Documents &parse, - const Valentina::Sources &typeCreation, const quint32 &idTool = 0, QObject *parent = 0); + static void Create(VPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Document &parse, + const Source &typeCreation, const quint32 &idTool = 0, QObject *parent = 0); static const QString TagName; static const QString ToolType; /** diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp index bd9c50c19..a6970b64d 100644 --- a/src/app/tools/vabstracttool.cpp +++ b/src/app/tools/vabstracttool.cpp @@ -315,7 +315,7 @@ const QStringList VAbstractTool::Styles() } //--------------------------------------------------------------------------------------------------------------------- -void VAbstractTool::AddRecord(const quint32 id, const Valentina::Tools &toolType, VPattern *doc) +void VAbstractTool::AddRecord(const quint32 id, const Tool &toolType, VPattern *doc) { quint32 cursor = doc->getCursor(); QVector *history = doc->getHistory(); diff --git a/src/app/tools/vabstracttool.h b/src/app/tools/vabstracttool.h index fd1524a42..4796da443 100644 --- a/src/app/tools/vabstracttool.h +++ b/src/app/tools/vabstracttool.h @@ -143,7 +143,7 @@ public: * @param toolType tool type * @param doc dom document container */ - static void AddRecord(const quint32 id, const Valentina::Tools &toolType, VPattern *doc); + static void AddRecord(const quint32 id, const Tool &toolType, VPattern *doc); public slots: /** * @brief FullUpdateFromFile update tool data form file. @@ -159,7 +159,7 @@ signals: * @param id object id in container. * @param type type of scene object. */ - void ChoosedTool(quint32 id, Valentina::Scenes type); + void ChoosedTool(quint32 id, SceneObject type); /** * @brief FullUpdateTree emit if need reparse pattern file. */ diff --git a/src/app/tools/vtooldetail.cpp b/src/app/tools/vtooldetail.cpp index 439c7e246..5a10bc363 100644 --- a/src/app/tools/vtooldetail.cpp +++ b/src/app/tools/vtooldetail.cpp @@ -57,7 +57,7 @@ const QString VToolDetail::NodeSpline = QStringLiteral("NodeSpline"); const QString VToolDetail::NodeSplinePath = QStringLiteral("NodeSplinePath"); //--------------------------------------------------------------------------------------------------------------------- -VToolDetail::VToolDetail(VPattern *doc, VContainer *data, const quint32 &id, const Valentina::Sources &typeCreation, +VToolDetail::VToolDetail(VPattern *doc, VContainer *data, const quint32 &id, const Source &typeCreation, VMainGraphicsScene *scene, QGraphicsItem *parent) :VAbstractTool(doc, data, id), QGraphicsPathItem(parent), dialog(nullptr), sceneDetails(scene) { @@ -66,18 +66,39 @@ VToolDetail::VToolDetail(VPattern *doc, VContainer *data, const quint32 &id, con { switch (detail.at(i).getTypeTool()) { - case (Valentina::NodePoint): + case (Tool::NodePoint): InitTool(scene, detail.at(i)); break; - case (Valentina::NodeArc): + case (Tool::NodeArc): InitTool(scene, detail.at(i)); break; - case (Valentina::NodeSpline): + case (Tool::NodeSpline): InitTool(scene, detail.at(i)); break; - case (Valentina::NodeSplinePath): + case (Tool::NodeSplinePath): InitTool(scene, detail.at(i)); break; + case (Tool::ArrowTool): + case (Tool::SinglePointTool): + case (Tool::EndLineTool): + case (Tool::LineTool): + case (Tool::AlongLineTool): + case (Tool::ShoulderPointTool): + case (Tool::NormalTool): + case (Tool::BisectorTool): + case (Tool::LineIntersectTool): + case (Tool::SplineTool): + case (Tool::CutSplineTool): + case (Tool::CutArcTool): + case (Tool::ArcTool): + case (Tool::SplinePathTool): + case (Tool::CutSplinePathTool): + case (Tool::PointOfContact): + case (Tool::DetailTool): + case (Tool::Height): + case (Tool::Triangle): + case (Tool::PointOfIntersection): + case (Tool::UnionDetails): default: qDebug()<<"Get wrong tool type. Ignore."; break; @@ -90,7 +111,7 @@ VToolDetail::VToolDetail(VPattern *doc, VContainer *data, const quint32 &id, con this->setPos(detail.getMx(), detail.getMy()); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); this->setFlag(QGraphicsItem::ItemIsFocusable, true); - if (typeCreation == Valentina::FromGui || typeCreation == Valentina::FromTool) + if (typeCreation == Source::FromGui || typeCreation == Source::FromTool) { AddToFile(); } @@ -125,30 +146,51 @@ void VToolDetail::Create(DialogTool *dialog, VMainGraphicsScene *scene, VPattern quint32 id = 0; switch (detail.at(i).getTypeTool()) { - case (Valentina::NodePoint): + case (Tool::NodePoint): { id = CreateNode(data, detail.at(i).getId()); - VNodePoint::Create(doc, data, id, detail.at(i).getId(), Document::FullParse, Valentina::FromGui); + VNodePoint::Create(doc, data, id, detail.at(i).getId(), Document::FullParse, Source::FromGui); } break; - case (Valentina::NodeArc): + case (Tool::NodeArc): { id = CreateNode(data, detail.at(i).getId()); - VNodeArc::Create(doc, data, id, detail.at(i).getId(), Document::FullParse, Valentina::FromGui); + VNodeArc::Create(doc, data, id, detail.at(i).getId(), Document::FullParse, Source::FromGui); } break; - case (Valentina::NodeSpline): + case (Tool::NodeSpline): { id = CreateNode(data, detail.at(i).getId()); - VNodeSpline::Create(doc, data, id, detail.at(i).getId(), Document::FullParse, Valentina::FromGui); + VNodeSpline::Create(doc, data, id, detail.at(i).getId(), Document::FullParse, Source::FromGui); } break; - case (Valentina::NodeSplinePath): + case (Tool::NodeSplinePath): { id = CreateNode(data, detail.at(i).getId()); - VNodeSplinePath::Create(doc, data, id, detail.at(i).getId(), Document::FullParse, Valentina::FromGui); + VNodeSplinePath::Create(doc, data, id, detail.at(i).getId(), Document::FullParse, Source::FromGui); } break; + case (Tool::ArrowTool): + case (Tool::SinglePointTool): + case (Tool::EndLineTool): + case (Tool::LineTool): + case (Tool::AlongLineTool): + case (Tool::ShoulderPointTool): + case (Tool::NormalTool): + case (Tool::BisectorTool): + case (Tool::LineIntersectTool): + case (Tool::SplineTool): + case (Tool::CutSplineTool): + case (Tool::CutArcTool): + case (Tool::ArcTool): + case (Tool::SplinePathTool): + case (Tool::CutSplinePathTool): + case (Tool::PointOfContact): + case (Tool::DetailTool): + case (Tool::Height): + case (Tool::Triangle): + case (Tool::PointOfIntersection): + case (Tool::UnionDetails): default: qDebug()<<"May be wrong tool type!!! Ignoring."<AddDetail(newDetail); } @@ -177,7 +219,7 @@ void VToolDetail::Create(const quint32 &_id, const VDetail &newDetail, VMainGrap doc->UpdateToolData(id, data); } } - VAbstractTool::AddRecord(id, Valentina::DetailTool, doc); + VAbstractTool::AddRecord(id, Tool::DetailTool, doc); if (parse == Document::FullParse) { VToolDetail *detail = new VToolDetail(doc, data, id, typeCreation, scene); @@ -237,7 +279,7 @@ void VToolDetail::FullUpdateFromGuiOk(int result) } } delete dialog; - dialog = 0; + dialog = nullptr; } //--------------------------------------------------------------------------------------------------------------------- @@ -342,7 +384,7 @@ void VToolDetail::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::Detail); + emit ChoosedTool(id, SceneObject::Detail); } QGraphicsItem::mouseReleaseEvent(event); } @@ -407,18 +449,39 @@ void VToolDetail::AddNode(QDomElement &domElement, const VNodeDetail &node) } switch (node.getTypeTool()) { - case (Valentina::NodeArc): + case (Tool::NodeArc): doc->SetAttribute(nod, AttrType, NodeArc); break; - case (Valentina::NodePoint): + case (Tool::NodePoint): doc->SetAttribute(nod, AttrType, NodePoint); break; - case (Valentina::NodeSpline): + case (Tool::NodeSpline): doc->SetAttribute(nod, AttrType, NodeSpline); break; - case (Valentina::NodeSplinePath): + case (Tool::NodeSplinePath): doc->SetAttribute(nod, AttrType, NodeSplinePath); break; + case (Tool::ArrowTool): + case (Tool::SinglePointTool): + case (Tool::EndLineTool): + case (Tool::LineTool): + case (Tool::AlongLineTool): + case (Tool::ShoulderPointTool): + case (Tool::NormalTool): + case (Tool::BisectorTool): + case (Tool::LineIntersectTool): + case (Tool::SplineTool): + case (Tool::CutSplineTool): + case (Tool::CutArcTool): + case (Tool::ArcTool): + case (Tool::SplinePathTool): + case (Tool::CutSplinePathTool): + case (Tool::PointOfContact): + case (Tool::DetailTool): + case (Tool::Height): + case (Tool::Triangle): + case (Tool::PointOfIntersection): + case (Tool::UnionDetails): default: qDebug()<<"May be wrong tool type!!! Ignoring."<GeometricObject(id)); - node->setMode(Valentina::Modeling); + node->setMode(Draw::Modeling); return data->AddGObject(node); } @@ -93,8 +93,8 @@ public: * @param typeCreation way we create this tool. */ static void Create(const quint32 &_id, const VDetail &newDetail, VMainGraphicsScene *scene, - VPattern *doc, VContainer *data, const Document::Documents &parse, - const Valentina::Sources &typeCreation); + VPattern *doc, VContainer *data, const Document &parse, + const Source &typeCreation); static const QString TagName; static const QString TagNode; static const QString AttrSupplement; diff --git a/src/app/tools/vtooluniondetails.cpp b/src/app/tools/vtooluniondetails.cpp index dc288b177..d60b3e135 100644 --- a/src/app/tools/vtooluniondetails.cpp +++ b/src/app/tools/vtooluniondetails.cpp @@ -48,10 +48,10 @@ const QString VToolUnionDetails::NodeTypeModeling = QStringLiteral("Modeling"); //--------------------------------------------------------------------------------------------------------------------- VToolUnionDetails::VToolUnionDetails(VPattern *doc, VContainer *data, const quint32 &id, const VDetail &d1, const VDetail &d2, const quint32 &indexD1, const quint32 &indexD2, - const Valentina::Sources &typeCreation, QObject *parent) + const Source &typeCreation, QObject *parent) :VAbstractTool(doc, data, id, parent), d1(d1), d2(d2), indexD1(indexD1), indexD2(indexD2) { - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { AddToFile(); } @@ -69,7 +69,7 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VPattern *doc, VContainer quint32 id = 0, idObject = 0; switch (det.at(i).getTypeTool()) { - case (Valentina::NodePoint): + case (Tool::NodePoint): { if ( qFuzzyCompare(dx+1, 1) && qFuzzyCompare(dy+1, 1) && (pRotate == 0)) { @@ -78,18 +78,18 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VPattern *doc, VContainer else { VPointF *point = new VPointF(*data->GeometricObject(det.at(i).getId())); - point->setMode(Valentina::Modeling); + point->setMode(Draw::Modeling); BiasRotatePoint(point, dx, dy, data->GeometricObject(pRotate)->toQPointF(), angle); idObject = data->AddGObject(point); VPointF *point1 = new VPointF(*point); - point1->setMode(Valentina::Modeling); + point1->setMode(Draw::Modeling); id = data->AddGObject(point1); - VNodePoint::Create(doc, data, id, idObject, Document::FullParse, Valentina::FromGui, idTool, tool); + VNodePoint::Create(doc, data, id, idObject, Document::FullParse, Source::FromGui, idTool, tool); } } break; - case (Valentina::NodeArc): + case (Tool::NodeArc): { if (qFuzzyCompare(dx+1, 1) && qFuzzyCompare(dy+1, 1) && pRotate == 0) { @@ -108,24 +108,24 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VPattern *doc, VContainer QLineF l1(center->toQPointF(), p1.toQPointF()); QLineF l2(center->toQPointF(), p2.toQPointF()); - center->setMode(Valentina::Modeling); + center->setMode(Draw::Modeling); quint32 idCenter = data->AddGObject(center); Q_UNUSED(idCenter); VArc *arc1 = new VArc(*center, arc->GetRadius(), arc->GetFormulaRadius(), l1.angle(), QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle())); - arc1->setMode(Valentina::Modeling); + arc1->setMode(Draw::Modeling); idObject = data->AddGObject(arc1); VArc *arc2 = new VArc(*arc1); - arc2->setMode(Valentina::Modeling); + arc2->setMode(Draw::Modeling); id = data->AddGObject(arc2); - VNodeArc::Create(doc, data, id, idObject, Document::FullParse, Valentina::FromGui, idTool, tool); + VNodeArc::Create(doc, data, id, idObject, Document::FullParse, Source::FromGui, idTool, tool); } } break; - case (Valentina::NodeSpline): + case (Tool::NodeSpline): { if (qFuzzyCompare(dx+1, 1) && qFuzzyCompare(dy+1, 1) && pRotate == 0) { @@ -150,17 +150,17 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VPattern *doc, VContainer //quint32 idP4 = data->AddGObject(p4); VSpline *spl = new VSpline(*p1, p2.toQPointF(), p3.toQPointF(), *p4, spline->GetKcurve(), 0, - Valentina::Modeling); + Draw::Modeling); idObject = data->AddGObject(spl); VSpline *spl1 = new VSpline(*spl); - spl1->setMode(Valentina::Modeling); + spl1->setMode(Draw::Modeling); id = data->AddGObject(spl1); - VNodeSpline::Create(doc, data, id, idObject, Document::FullParse, Valentina::FromGui, idTool, tool); + VNodeSpline::Create(doc, data, id, idObject, Document::FullParse, Source::FromGui, idTool, tool); } } break; - case (Valentina::NodeSplinePath): + case (Tool::NodeSplinePath): { if (qFuzzyCompare(dx+1, 1) && qFuzzyCompare(dy+1, 1) && pRotate == 0) { @@ -169,7 +169,7 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VPattern *doc, VContainer else { VSplinePath *path = new VSplinePath(); - path->setMode(Valentina::Modeling); + path->setMode(Draw::Modeling); const VSplinePath *splinePath = data->GeometricObject(det.at(i).getId()); qint32 k = splinePath->getMaxCountPoints(); for (qint32 i = 1; i <= splinePath->Count(); ++i) @@ -215,12 +215,33 @@ void VToolUnionDetails::AddToNewDetail(QObject *tool, VPattern *doc, VContainer idObject = data->AddGObject(path); VSplinePath *path1 = new VSplinePath(*path); - path1->setMode(Valentina::Modeling); + path1->setMode(Draw::Modeling); id = data->AddGObject(path1); - VNodeSplinePath::Create(doc, data, id, idObject, Document::FullParse, Valentina::FromGui, idTool, tool); + VNodeSplinePath::Create(doc, data, id, idObject, Document::FullParse, Source::FromGui, idTool, tool); } } break; + case (Tool::ArrowTool): + case (Tool::SinglePointTool): + case (Tool::EndLineTool): + case (Tool::LineTool): + case (Tool::AlongLineTool): + case (Tool::ShoulderPointTool): + case (Tool::NormalTool): + case (Tool::BisectorTool): + case (Tool::LineIntersectTool): + case (Tool::SplineTool): + case (Tool::CutSplineTool): + case (Tool::CutArcTool): + case (Tool::ArcTool): + case (Tool::SplinePathTool): + case (Tool::CutSplinePathTool): + case (Tool::PointOfContact): + case (Tool::DetailTool): + case (Tool::Height): + case (Tool::Triangle): + case (Tool::PointOfIntersection): + case (Tool::UnionDetails): default: qDebug()<<"May be wrong tool type!!! Ignoring."<GeometricObject(det.at(i).getId())); - point->setMode(Valentina::Modeling); + point->setMode(Draw::Modeling); BiasRotatePoint(point, dx, dy, data->GeometricObject(pRotate)->toQPointF(), angle); ++idCount; data->UpdateGObject(idDetail+idCount, point); @@ -249,7 +270,7 @@ void VToolUnionDetails::UpdatePoints(const quint32 &idDetail, VContainer *data, } } break; - case (Valentina::NodeArc): + case (Tool::NodeArc): { if (qFuzzyCompare(dx+1, 1) == false || qFuzzyCompare(dy+1, 1) == false || pRotate != 0) { @@ -265,11 +286,11 @@ void VToolUnionDetails::UpdatePoints(const quint32 &idDetail, VContainer *data, QLineF l1(center->toQPointF(), p1.toQPointF()); QLineF l2(center->toQPointF(), p2.toQPointF()); ++idCount; - center->setMode(Valentina::Modeling); + center->setMode(Draw::Modeling); data->UpdateGObject(idDetail+idCount, center); VArc *arc1 = new VArc(*center, arc->GetRadius(), arc->GetFormulaRadius(), l1.angle(), QString().setNum(l1.angle()), l2.angle(), QString().setNum(l2.angle())); - arc1->setMode(Valentina::Modeling); + arc1->setMode(Draw::Modeling); ++idCount; data->UpdateGObject(idDetail+idCount, arc1); @@ -277,7 +298,7 @@ void VToolUnionDetails::UpdatePoints(const quint32 &idDetail, VContainer *data, } } break; - case (Valentina::NodeSpline): + case (Tool::NodeSpline): { if (qFuzzyCompare(dx+1, 1) == false || qFuzzyCompare(dy+1, 1) == false || pRotate != 0) { @@ -300,7 +321,7 @@ void VToolUnionDetails::UpdatePoints(const quint32 &idDetail, VContainer *data, data->UpdateGObject(idDetail+idCount, p4); VSpline *spl = new VSpline(*p1, p2.toQPointF(), p3.toQPointF(), *p4, spline->GetKcurve(), 0, - Valentina::Modeling); + Draw::Modeling); ++idCount; data->UpdateGObject(idDetail+idCount, spl); @@ -309,12 +330,12 @@ void VToolUnionDetails::UpdatePoints(const quint32 &idDetail, VContainer *data, } } break; - case (Valentina::NodeSplinePath): + case (Tool::NodeSplinePath): { if (qFuzzyCompare(dx+1, 1) == false || qFuzzyCompare(dy+1, 1) == false || pRotate != 0) { VSplinePath *path = new VSplinePath(); - path->setMode(Valentina::Modeling); + path->setMode(Draw::Modeling); const VSplinePath *splinePath = data->GeometricObject(det.at(i).getId()); SCASSERT(splinePath != nullptr); qint32 k = splinePath->getMaxCountPoints(); @@ -370,6 +391,27 @@ void VToolUnionDetails::UpdatePoints(const quint32 &idDetail, VContainer *data, } } break; + case (Tool::ArrowTool): + case (Tool::SinglePointTool): + case (Tool::EndLineTool): + case (Tool::LineTool): + case (Tool::AlongLineTool): + case (Tool::ShoulderPointTool): + case (Tool::NormalTool): + case (Tool::BisectorTool): + case (Tool::LineIntersectTool): + case (Tool::SplineTool): + case (Tool::CutSplineTool): + case (Tool::CutArcTool): + case (Tool::ArcTool): + case (Tool::SplinePathTool): + case (Tool::CutSplinePathTool): + case (Tool::PointOfContact): + case (Tool::DetailTool): + case (Tool::Height): + case (Tool::Triangle): + case (Tool::PointOfIntersection): + case (Tool::UnionDetails): default: qDebug()<<"May be wrong tool type!!! Ignoring."<(dialogTool->getIndexD1()); quint32 indexD2 = static_cast(dialogTool->getIndexD2()); Create(0, d1, d2, dialogTool->getD1(), dialogTool->getD2(), indexD1, indexD2, scene, doc, data, Document::FullParse, - Valentina::FromGui); + Source::FromGui); } //--------------------------------------------------------------------------------------------------------------------- void VToolUnionDetails::Create(const quint32 _id, const VDetail &d1, const VDetail &d2, const quint32 &d1id, const quint32 &d2id, const quint32 &indexD1, const quint32 &indexD2, VMainGraphicsScene *scene, VPattern *doc, VContainer *data, - const Document::Documents &parse, const Valentina::Sources &typeCreation) + const Document &parse, const Source &typeCreation) { VToolUnionDetails *unionDetails = 0; quint32 id = _id; - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { id = data->getNextId(); } @@ -421,7 +463,7 @@ void VToolUnionDetails::Create(const quint32 _id, const VDetail &d1, const VDeta doc->UpdateToolData(id, data); } } - VAbstractTool::AddRecord(id, Valentina::UnionDetails, doc); + VAbstractTool::AddRecord(id, Tool::UnionDetails, doc); if (parse == Document::FullParse) { //Scene doesn't show this tool, so doc will destroy this object. @@ -464,7 +506,7 @@ void VToolUnionDetails::Create(const quint32 _id, const VDetail &d1, const VDeta point2.toQPointF())); qint32 pointsD2 = 0; //Keeps count points second detail, what we already add. - if (typeCreation == Valentina::FromGui) + if (typeCreation == Source::FromGui) { qint32 j = 0, i = 0; VDetail newDetail; @@ -494,7 +536,7 @@ void VToolUnionDetails::Create(const quint32 _id, const VDetail &d1, const VDeta } while (i < d1.RemoveEdge(indexD1).CountNode()); newDetail.setName("Detail"); - VToolDetail::Create(0, newDetail, scene, doc, data, parse, Valentina::FromTool); + VToolDetail::Create(0, newDetail, scene, doc, data, parse, Source::FromTool); QHash* tools = doc->getTools(); SCASSERT(tools != nullptr); @@ -594,24 +636,24 @@ QVector VToolUnionDetails::GetDetailFromFile(VPattern *doc, const QDomE quint32 id = doc->GetParametrUInt(element, VToolDetail::AttrIdObject, "0"); qreal mx = qApp->toPixel(doc->GetParametrDouble(element, VAbstractTool::AttrMx, "0.0")); qreal my = qApp->toPixel(doc->GetParametrDouble(element, VAbstractTool::AttrMy, "0.0")); - Valentina::Tools tool; - NodeDetail::NodeDetails nodeType = NodeDetail::Contour; + Tool tool; + NodeDetail nodeType = NodeDetail::Contour; QString t = doc->GetParametrString(element, "type", "NodePoint"); if (t == "NodePoint") { - tool = Valentina::NodePoint; + tool = Tool::NodePoint; } else if (t == "NodeArc") { - tool = Valentina::NodeArc; + tool = Tool::NodeArc; } else if (t == "NodeSpline") { - tool = Valentina::NodeSpline; + tool = Tool::NodeSpline; } else if (t == "NodeSplinePath") { - tool = Valentina::NodeSplinePath; + tool = Tool::NodeSplinePath; } d.append(VNodeDetail(id, tool, nodeType, mx, my)); } @@ -686,18 +728,39 @@ void VToolUnionDetails::AddNode(QDomElement &domElement, const VNodeDetail &node } switch (node.getTypeTool()) { - case (Valentina::NodeArc): + case (Tool::NodeArc): doc->SetAttribute(nod, AttrType, QStringLiteral("NodeArc")); break; - case (Valentina::NodePoint): + case (Tool::NodePoint): doc->SetAttribute(nod, AttrType, QStringLiteral("NodePoint")); break; - case (Valentina::NodeSpline): + case (Tool::NodeSpline): doc->SetAttribute(nod, AttrType, QStringLiteral("NodeSpline")); break; - case (Valentina::NodeSplinePath): + case (Tool::NodeSplinePath): doc->SetAttribute(nod, AttrType, QStringLiteral("NodeSplinePath")); break; + case (Tool::ArrowTool): + case (Tool::SinglePointTool): + case (Tool::EndLineTool): + case (Tool::LineTool): + case (Tool::AlongLineTool): + case (Tool::ShoulderPointTool): + case (Tool::NormalTool): + case (Tool::BisectorTool): + case (Tool::LineIntersectTool): + case (Tool::SplineTool): + case (Tool::CutSplineTool): + case (Tool::CutArcTool): + case (Tool::ArcTool): + case (Tool::SplinePathTool): + case (Tool::CutSplinePathTool): + case (Tool::PointOfContact): + case (Tool::DetailTool): + case (Tool::Height): + case (Tool::Triangle): + case (Tool::PointOfIntersection): + case (Tool::UnionDetails): default: qDebug()<<"May be wrong tool type!!! Ignoring."<()), guiTexts(QMap()), descriptions(QMap()), variables(QMap()), functions(QMap()), @@ -116,13 +116,13 @@ double VApplication::toPixel(double unit) const double result = 0; switch (_patternUnit) { - case Valentina::Mm: + case Unit::Mm: result = (unit / 25.4) * PrintDPI; break; - case Valentina::Cm: + case Unit::Cm: result = ((unit * 10.0) / 25.4) * PrintDPI; break; - case Valentina::Inch: + case Unit::Inch: result = unit * PrintDPI; break; default: @@ -137,13 +137,13 @@ double VApplication::fromPixel(double pix) const double result = 0; switch (_patternUnit) { - case Valentina::Mm: + case Unit::Mm: result = (pix / PrintDPI) * 25.4; break; - case Valentina::Cm: + case Unit::Cm: result = ((pix / PrintDPI) * 25.4) / 10.0; break; - case Valentina::Inch: + case Unit::Inch: result = pix / PrintDPI; break; default: @@ -155,7 +155,7 @@ double VApplication::fromPixel(double pix) const //--------------------------------------------------------------------------------------------------------------------- QString VApplication::pathToTables() const { - if (_patternType == Pattern::Individual) + if (_patternType == MeasurementsType::Individual) { return QStringLiteral("://tables/individual/individual.vit"); } @@ -208,13 +208,13 @@ void VApplication::InitLineWidth() { switch (_patternUnit) { - case Valentina::Mm: + case Unit::Mm: _widthMainLine = DefWidth; break; - case Valentina::Cm: + case Unit::Cm: _widthMainLine = DefWidth/10.0; break; - case Valentina::Inch: + case Unit::Inch: _widthMainLine = DefWidth/25.4; break; default: @@ -1633,7 +1633,7 @@ void VApplication::BiasTokens(int position, int bias, QMap &tokens } //--------------------------------------------------------------------------------------------------------------------- -void VApplication::setPatternUnit(const Valentina::Units &patternUnit) +void VApplication::setPatternUnit(const Unit &patternUnit) { _patternUnit = patternUnit; InitLineWidth(); diff --git a/src/app/widgets/vapplication.h b/src/app/widgets/vapplication.h index a923b3968..eea6c9b00 100644 --- a/src/app/widgets/vapplication.h +++ b/src/app/widgets/vapplication.h @@ -63,10 +63,10 @@ public: * @return value that is returned from the receiver's event handler. */ virtual bool notify(QObject * receiver, QEvent * event); - Valentina::Units patternUnit() const; - void setPatternUnit(const Valentina::Units &patternUnit); - Pattern::Measurements patternType() const; - void setPatternType(const Pattern::Measurements &patternType); + Unit patternUnit() const; + void setPatternUnit(const Unit &patternUnit); + MeasurementsType patternType() const; + void setPatternType(const MeasurementsType &patternType); double toPixel(double unit) const; double fromPixel(double pix) const; static const qreal PrintDPI; @@ -90,8 +90,8 @@ public: void setAutoSaveTimer(QTimer *value); private: Q_DISABLE_COPY(VApplication) - Valentina::Units _patternUnit; - Pattern::Measurements _patternType; + Unit _patternUnit; + MeasurementsType _patternType; qreal _widthMainLine; qreal _widthHairLine; QMap measurements; @@ -121,19 +121,19 @@ private: }; //--------------------------------------------------------------------------------------------------------------------- -inline Valentina::Units VApplication::patternUnit() const +inline Unit VApplication::patternUnit() const { return _patternUnit; } //--------------------------------------------------------------------------------------------------------------------- -inline Pattern::Measurements VApplication::patternType() const +inline MeasurementsType VApplication::patternType() const { return _patternType; } //--------------------------------------------------------------------------------------------------------------------- -inline void VApplication::setPatternType(const Pattern::Measurements &patternType) +inline void VApplication::setPatternType(const MeasurementsType &patternType) { _patternType = patternType; } diff --git a/src/app/widgets/vcontrolpointspline.cpp b/src/app/widgets/vcontrolpointspline.cpp index 505e50b82..11d196732 100644 --- a/src/app/widgets/vcontrolpointspline.cpp +++ b/src/app/widgets/vcontrolpointspline.cpp @@ -33,7 +33,7 @@ #include "../widgets/vapplication.h" //--------------------------------------------------------------------------------------------------------------------- -VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position, +VControlPointSpline::VControlPointSpline(const qint32 &indexSpline, SplinePointPosition position, const QPointF &controlPoint, const QPointF &splinePoint, QGraphicsItem *parent) :QGraphicsEllipseItem(parent), radius(0), controlLine(nullptr), indexSpline(indexSpline), position(position) @@ -85,7 +85,7 @@ QVariant VControlPointSpline::itemChange(QGraphicsItem::GraphicsItemChange chang } //--------------------------------------------------------------------------------------------------------------------- -void VControlPointSpline::RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, +void VControlPointSpline::RefreshLine(const qint32 &indexSpline, SplinePointPosition pos, const QPointF &controlPoint, const QPointF &splinePoint) { if (this->indexSpline == indexSpline && this->position == pos) diff --git a/src/app/widgets/vcontrolpointspline.h b/src/app/widgets/vcontrolpointspline.h index 9a6745b59..936da0ba0 100644 --- a/src/app/widgets/vcontrolpointspline.h +++ b/src/app/widgets/vcontrolpointspline.h @@ -48,7 +48,7 @@ public: * @param splinePoint spline point. * @param parent parent object. */ - VControlPointSpline(const qint32 &indexSpline, SplinePoint::Position position, + VControlPointSpline(const qint32 &indexSpline, SplinePointPosition position, const QPointF &controlPoint, const QPointF &splinePoint, QGraphicsItem * parent = nullptr); signals: @@ -58,7 +58,7 @@ signals: * @param position position point in spline. * @param pos new posotion. */ - void ControlPointChangePosition(const qint32 &indexSpline, SplinePoint::Position position, + void ControlPointChangePosition(const qint32 &indexSpline, SplinePointPosition position, const QPointF pos); public slots: /** @@ -68,7 +68,7 @@ public slots: * @param controlPoint control point. * @param splinePoint spline point. */ - void RefreshLine(const qint32 &indexSpline, SplinePoint::Position pos, const QPointF &controlPoint, + void RefreshLine(const qint32 &indexSpline, SplinePointPosition pos, const QPointF &controlPoint, const QPointF &splinePoint); /** * @brief setEnabledPoint disable or enable control point. @@ -110,7 +110,7 @@ private: /** * @brief position position point in spline. */ - SplinePoint::Position position; + SplinePointPosition position; }; #endif // VCONTROLPOINTSPLINE_H diff --git a/src/app/widgets/vmaingraphicsscene.cpp b/src/app/widgets/vmaingraphicsscene.cpp index 839ef2fea..dbfbf1864 100644 --- a/src/app/widgets/vmaingraphicsscene.cpp +++ b/src/app/widgets/vmaingraphicsscene.cpp @@ -65,7 +65,7 @@ void VMainGraphicsScene::setTransform(const QTransform &transform) } //--------------------------------------------------------------------------------------------------------------------- -void VMainGraphicsScene::ChoosedItem(quint32 id, const Valentina::Scenes &type) +void VMainGraphicsScene::ChoosedItem(quint32 id, const SceneObject &type) { emit ChoosedObject(id, type); } diff --git a/src/app/widgets/vmaingraphicsscene.h b/src/app/widgets/vmaingraphicsscene.h index b32ab8470..eee8bb77f 100644 --- a/src/app/widgets/vmaingraphicsscene.h +++ b/src/app/widgets/vmaingraphicsscene.h @@ -85,7 +85,7 @@ public slots: * @param id object id. * @param type object scene type. */ - void ChoosedItem(quint32 id, const Valentina::Scenes &type); + void ChoosedItem(quint32 id, const SceneObject &type); /** * @brief SetFactor set current scale factor of scene. * @param factor scene scale factor. scene scale factor. @@ -118,7 +118,7 @@ signals: * @param id object id. * @param type object scene type. */ - void ChoosedObject(quint32 id, Valentina::Scenes type); + void ChoosedObject(quint32 id, SceneObject type); /** * @brief NewFactor send new scale factor. * @param factor scene scale factor. diff --git a/src/app/widgets/vsimplearc.h b/src/app/widgets/vsimplearc.h index fcbfe2d90..cfcd08be5 100644 --- a/src/app/widgets/vsimplearc.h +++ b/src/app/widgets/vsimplearc.h @@ -31,15 +31,7 @@ #include -namespace SimpleArc -{ - /** - * @brief The Translation enum position point. - */ - enum Translation { FirstPoint, ForthPoint }; - Q_DECLARE_FLAGS(Translations, Translation) -} -Q_DECLARE_OPERATORS_FOR_FLAGS( SimpleArc::Translations ) +enum class SimpleArcPoint : char { FirstPoint, ForthPoint }; /** * @brief The VSimpleArc class for simple arc. This object used when we cut arc and want show peaces. diff --git a/src/app/widgets/vsimplespline.h b/src/app/widgets/vsimplespline.h index eb77e1b6e..ba6d48e42 100644 --- a/src/app/widgets/vsimplespline.h +++ b/src/app/widgets/vsimplespline.h @@ -31,15 +31,7 @@ #include -namespace SimpleSpline -{ - /** - * @brief The Translation enum position point. - */ - enum Translation { FirstPoint, ForthPoint }; - Q_DECLARE_FLAGS(Translations, Translation) -} -Q_DECLARE_OPERATORS_FOR_FLAGS( SimpleSpline::Translations ) +enum class SimpleSplinePoint : char { FirstPoint, ForthPoint }; /** * @brief The VSimpleSpline class for simple spline. This object used when we cut spline and want show peaces. diff --git a/src/app/widgets/vsimplesplinepath.cpp b/src/app/widgets/vsimplesplinepath.cpp index 6decd6d2f..4a308f1d2 100644 --- a/src/app/widgets/vsimplesplinepath.cpp +++ b/src/app/widgets/vsimplesplinepath.cpp @@ -40,7 +40,7 @@ void VSimpleSplinePath::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { if (event->button() == Qt::LeftButton) { - emit ChoosedTool(id, Valentina::SplinePath); + emit ChoosedTool(id, SceneObject::SplinePath); } QGraphicsItem::mouseReleaseEvent(event); } diff --git a/src/app/xml/vdomdocument.cpp b/src/app/xml/vdomdocument.cpp index db5c76302..20610ceea 100644 --- a/src/app/xml/vdomdocument.cpp +++ b/src/app/xml/vdomdocument.cpp @@ -344,41 +344,41 @@ void VDomDocument::setContent(const QString &fileName) } //--------------------------------------------------------------------------------------------------------------------- -Valentina::Units VDomDocument::StrToUnits(const QString &unit) +Unit VDomDocument::StrToUnits(const QString &unit) { QStringList units{UnitMM, UnitCM, UnitINCH}; - Valentina::Units result = Valentina::Cm; + Unit result = Unit::Cm; switch (units.indexOf(unit)) { case 0:// mm - result = Valentina::Mm; + result = Unit::Mm; break; case 1:// cm - result = Valentina::Cm; + result = Unit::Cm; break; case 2:// inch - result = Valentina::Inch; + result = Unit::Inch; break; default: - result = Valentina::Cm; + result = Unit::Cm; break; } return result; } //--------------------------------------------------------------------------------------------------------------------- -QString VDomDocument::UnitsToStr(const Valentina::Units &unit) +QString VDomDocument::UnitsToStr(const Unit &unit) { QString result; switch (unit) { - case Valentina::Mm: + case Unit::Mm: result = "mm"; break; - case Valentina::Cm: + case Unit::Cm: result = "cm"; break; - case Valentina::Inch: + case Unit::Inch: result = "inch"; break; default: diff --git a/src/app/xml/vdomdocument.h b/src/app/xml/vdomdocument.h index 261fec73c..e2c427739 100644 --- a/src/app/xml/vdomdocument.h +++ b/src/app/xml/vdomdocument.h @@ -140,8 +140,8 @@ public: */ static void ValidateXML(const QString &schema, const QString &fileName); void setContent(const QString &fileName); - static Valentina::Units StrToUnits(const QString &unit); - static QString UnitsToStr(const Valentina::Units &unit); + static Unit StrToUnits(const QString &unit); + static QString UnitsToStr(const Unit &unit); virtual bool SaveDocument(const QString &fileName); QString Major() const; QString Minor() const; @@ -177,10 +177,10 @@ inline void VDomDocument::SetAttribute(QDomElement &domElement, const Q } template <> -inline void VDomDocument::SetAttribute(QDomElement &domElement, const QString &name, - const Pattern::Measurements &value) const +inline void VDomDocument::SetAttribute(QDomElement &domElement, const QString &name, + const MeasurementsType &value) const { - if (value == Pattern::Standard) + if (value == MeasurementsType::Standard) { domElement.setAttribute(name, "standard"); } diff --git a/src/app/xml/vindividualmeasurements.cpp b/src/app/xml/vindividualmeasurements.cpp index 6ff524afe..b0217e0c8 100644 --- a/src/app/xml/vindividualmeasurements.cpp +++ b/src/app/xml/vindividualmeasurements.cpp @@ -48,14 +48,14 @@ VIndividualMeasurements::~VIndividualMeasurements() {} //--------------------------------------------------------------------------------------------------------------------- -Valentina::Units VIndividualMeasurements::Unit() const +Unit VIndividualMeasurements::MUnit() const { const QString unit = UniqueTagText(TagUnit, UnitCM); return VDomDocument::StrToUnits(unit); } //--------------------------------------------------------------------------------------------------------------------- -void VIndividualMeasurements::setUnit(const Valentina::Units &unit) +void VIndividualMeasurements::setUnit(const Unit &unit) { setTagText(TagUnit, UnitsToStr(unit)); } @@ -221,7 +221,7 @@ void VIndividualMeasurements::Measurement(const QString &tag) { qreal value = GetParametrDouble(domElement, AttrValue, "0.0"); - if (Unit() == Valentina::Mm)//Convert to Cm. + if (MUnit() == Unit::Mm)//Convert to Cm. { value = value / 10.0; } @@ -269,13 +269,13 @@ void VIndividualMeasurements::setBirthDate(const QDate &date) } //--------------------------------------------------------------------------------------------------------------------- -VIndividualMeasurements::Genders VIndividualMeasurements::Sex() const +SexType VIndividualMeasurements::Sex() const { return StrToGender(UniqueTagText(TagSex, "")); } //--------------------------------------------------------------------------------------------------------------------- -void VIndividualMeasurements::setSex(const VIndividualMeasurements::Genders &sex) +void VIndividualMeasurements::setSex(const SexType &sex) { setTagText(TagSex, GenderToStr(sex)); } @@ -293,13 +293,13 @@ void VIndividualMeasurements::setMail(const QString &text) } //--------------------------------------------------------------------------------------------------------------------- -QString VIndividualMeasurements::GenderToStr(const VIndividualMeasurements::Genders &sex) +QString VIndividualMeasurements::GenderToStr(const SexType &sex) { switch (sex) { - case Male: + case SexType::Male: return SexMale; - case Female: + case SexType::Female: return SexFemale; default: return SexMale; @@ -307,16 +307,16 @@ QString VIndividualMeasurements::GenderToStr(const VIndividualMeasurements::Gend } //--------------------------------------------------------------------------------------------------------------------- -VIndividualMeasurements::Genders VIndividualMeasurements::StrToGender(const QString &sex) +SexType VIndividualMeasurements::StrToGender(const QString &sex) { QStringList genders{SexMale, SexFemale}; switch (genders.indexOf(sex)) { case 0: // SexMale - return Male; + return SexType::Male; case 1: // SexFemale - return Female; + return SexType::Female; default: - return Male; + return SexType::Male; } } diff --git a/src/app/xml/vindividualmeasurements.h b/src/app/xml/vindividualmeasurements.h index 46d2be660..ced9a7b43 100644 --- a/src/app/xml/vindividualmeasurements.h +++ b/src/app/xml/vindividualmeasurements.h @@ -39,27 +39,26 @@ // max support version of format #define VIT_VERSION 0x000100 +enum class SexType : char { Male, Female }; + class VIndividualMeasurements:public VDomDocument { public: - enum Sex { Male, Female }; - Q_DECLARE_FLAGS(Genders, Sex) - VIndividualMeasurements(VContainer *data); virtual ~VIndividualMeasurements(); - Valentina::Units Unit() const; - void setUnit(const Valentina::Units &unit); - void Measurements(); - QString FamilyName() const; - void setFamilyName(const QString &text); - QString GivenName() const; - void setGivenName(const QString &text); - QDate BirthDate() const; - void setBirthDate(const QDate &date); - VIndividualMeasurements::Genders Sex() const; - void setSex(const VIndividualMeasurements::Genders &sex); - QString Mail() const; - void setMail(const QString &text); + Unit MUnit() const; + void setUnit(const Unit &unit); + void Measurements(); + QString FamilyName() const; + void setFamilyName(const QString &text); + QString GivenName() const; + void setGivenName(const QString &text); + QDate BirthDate() const; + void setBirthDate(const QDate &date); + SexType Sex() const; + void setSex(const SexType &sex); + QString Mail() const; + void setMail(const QString &text); static const QString AttrValue; static const QString TagFamily_name; static const QString TagGiven_name; @@ -70,13 +69,11 @@ public: static const QString SexMale; static const QString SexFemale; - static QString GenderToStr(const VIndividualMeasurements::Genders &sex); - static VIndividualMeasurements::Genders StrToGender(const QString &sex); + static QString GenderToStr(const SexType &sex); + static SexType StrToGender(const QString &sex); private: Q_DISABLE_COPY(VIndividualMeasurements) void Measurement(const QString &tag); }; -Q_DECLARE_OPERATORS_FOR_FLAGS( VIndividualMeasurements::Genders ) - #endif // VINDIVIDUALMEASUREMENTS_H diff --git a/src/app/xml/vpattern.cpp b/src/app/xml/vpattern.cpp index 1994ff5c4..a2ef41579 100644 --- a/src/app/xml/vpattern.cpp +++ b/src/app/xml/vpattern.cpp @@ -70,7 +70,7 @@ const QString VPattern::IncrementKgrowth = QStringLiteral("kgrowth"); const QString VPattern::IncrementDescription = QStringLiteral("description"); //--------------------------------------------------------------------------------------------------------------------- -VPattern::VPattern(VContainer *data, Valentina::Draws *mode, VMainGraphicsScene *sceneDraw, +VPattern::VPattern(VContainer *data, Draw *mode, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, QObject *parent) : QObject(parent), VDomDocument(data), nameActivDraw(QString()), tools(QHash()), history(QVector()), cursor(0), patternPieces(QStringList()), mode(mode), sceneDraw(sceneDraw), @@ -123,7 +123,7 @@ void VPattern::CreateEmptyFile(const QString &tablePath) * @param name new name. * @param parse parser file mode. */ -void VPattern::ChangeActivPP(const QString &name, const Document::Documents &parse) +void VPattern::ChangeActivPP(const QString &name, const Document &parse) { Q_ASSERT_X(name.isEmpty() == false, "ChangeActivPP", "name pattern piece is empty"); if (this->nameActivDraw != name) @@ -234,7 +234,7 @@ bool VPattern::SetNameDraw(const QString &name) * @param sceneDraw pointer to draw scene. * @param sceneDetail pointer to details scene. */ -void VPattern::Parse(const Document::Documents &parse) +void VPattern::Parse(const Document &parse) { SCASSERT(sceneDraw != nullptr); SCASSERT(sceneDetail != nullptr); @@ -336,7 +336,7 @@ void VPattern::setCursor(const quint32 &value) */ void VPattern::setCurrentData() { - if (*mode == Valentina::Calculation) + if (*mode == Draw::Calculation) { if (patternPieces.size() > 1)//don't need upadate data if we have only one pattern piece { @@ -569,7 +569,7 @@ void VPattern::SetPath(const QString &path) } //--------------------------------------------------------------------------------------------------------------------- -Valentina::Units VPattern::MUnit() const +Unit VPattern::MUnit() const { QDomNodeList list = elementsByTagName(VPattern::TagMeasurements); QDomElement element = list.at(0).toElement(); @@ -580,27 +580,27 @@ Valentina::Units VPattern::MUnit() const switch (units.indexOf(unit)) { case 0:// mm - return Valentina::Mm; + return Unit::Mm; break; case 1:// cm - return Valentina::Cm; + return Unit::Cm; break; case 2:// in - return Valentina::Inch; + return Unit::Inch; break; default: - return Valentina::Cm; + return Unit::Cm; break; } } else { - return Valentina::Cm; + return Unit::Cm; } } //--------------------------------------------------------------------------------------------------------------------- -Pattern::Measurements VPattern::MType() const +MeasurementsType VPattern::MType() const { QDomNodeList list = elementsByTagName(VPattern::TagMeasurements); QDomElement element = list.at(0).toElement(); @@ -611,19 +611,19 @@ Pattern::Measurements VPattern::MType() const switch (types.indexOf(type)) { case 0:// standard - return Pattern::Standard; + return MeasurementsType::Standard; break; case 1:// individual - return Pattern::Individual; + return MeasurementsType::Individual; break; default: - return Pattern::Individual; + return MeasurementsType::Individual; break; } } else { - return Pattern::Individual; + return MeasurementsType::Individual; } } @@ -748,7 +748,7 @@ void VPattern::ClearScene() * @param parse parser file mode. */ void VPattern::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, const QDomNode &node, - const Document::Documents &parse) + const Document &parse) { QStringList tags{TagCalculation, TagModeling, TagDetails}; QDomNode domNode = node.firstChild(); @@ -763,10 +763,10 @@ void VPattern::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScen { case 0: // TagCalculation data->ClearCalculationGObjects(); - ParseDrawMode(sceneDraw, sceneDetail, domElement, parse, Valentina::Calculation); + ParseDrawMode(sceneDraw, sceneDetail, domElement, parse, Draw::Calculation); break; case 1: // TagModeling - ParseDrawMode(sceneDraw, sceneDetail, domElement, parse, Valentina::Modeling); + ParseDrawMode(sceneDraw, sceneDetail, domElement, parse, Draw::Modeling); break; case 2: // TagDetails ParseDetails(sceneDetail, domElement, parse); @@ -791,12 +791,12 @@ void VPattern::ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScen * @param mode draw mode. */ void VPattern::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, const QDomNode &node, - const Document::Documents &parse, const Valentina::Draws &mode) + const Document &parse, const Draw &mode) { SCASSERT(sceneDraw != nullptr); SCASSERT(sceneDetail != nullptr); VMainGraphicsScene *scene = nullptr; - if (mode == Valentina::Calculation) + if (mode == Draw::Calculation) { scene = sceneDraw; } @@ -845,7 +845,7 @@ void VPattern::ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene * * @param parse parser file mode. */ void VPattern::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, - const Document::Documents &parse) + const Document &parse) { SCASSERT(sceneDetail != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); @@ -874,24 +874,24 @@ void VPattern::ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomEle const quint32 id = GetParametrUInt(element, VToolDetail::AttrIdObject, "0"); const qreal mx = qApp->toPixel(GetParametrDouble(element, VAbstractTool::AttrMx, "0.0")); const qreal my = qApp->toPixel(GetParametrDouble(element, VAbstractTool::AttrMy, "0.0")); - const NodeDetail::NodeDetails nodeType = NodeDetail::Contour; + const NodeDetail nodeType = NodeDetail::Contour; const QString t = GetParametrString(element, AttrType, "NodePoint"); - Valentina::Tools tool; + Tool tool; switch (types.indexOf(t)) { case 0: // VToolDetail::NodePoint - tool = Valentina::NodePoint; + tool = Tool::NodePoint; break; case 1: // VToolDetail::NodeArc - tool = Valentina::NodeArc; + tool = Tool::NodeArc; break; case 2: // VToolDetail::NodeSpline - tool = Valentina::NodeSpline; + tool = Tool::NodeSpline; break; case 3: // VToolDetail::NodeSplinePath - tool = Valentina::NodeSplinePath; + tool = Tool::NodeSplinePath; break; default: qDebug()<<"Wrong node type."<toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0")); data->UpdateGObject(id, new VPointF(x, y, name, mx, my)); - VDrawTool::AddRecord(id, Valentina::SinglePointTool, this); + VDrawTool::AddRecord(id, Tool::SinglePointTool, this); if (parse != Document::FullParse) { UpdateToolData(id, data); } if (parse == Document::FullParse) { - spoint = new VToolSinglePoint(this, data, id, Valentina::FromFile); + spoint = new VToolSinglePoint(this, data, id, Source::FromFile); scene->addItem(spoint); connect(spoint, &VToolSinglePoint::ChoosedTool, scene, &VMainGraphicsScene::ChoosedItem); connect(scene, &VMainGraphicsScene::NewFactor, spoint, &VToolSinglePoint::SetFactor); @@ -1017,7 +1017,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const qreal angle = GetParametrDouble(domElement, VAbstractTool::AttrAngle, "0.0"); VToolEndLine::Create(id, name, typeLine, f, angle, basePointId, - mx, my, scene, this, data, parse, Valentina::FromFile); + mx, my, scene, this, data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (f != formula) { @@ -1055,7 +1055,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); VToolAlongLine::Create(id, name, typeLine, f, firstPointId, secondPointId, mx, my, scene, this, - data, parse, Valentina::FromFile); + data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (f != formula) { @@ -1094,7 +1094,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const quint32 pShoulder = GetParametrUInt(domElement, VAbstractTool::AttrPShoulder, "0"); VToolShoulderPoint::Create(id, f, p1Line, p2Line, pShoulder, typeLine, name, mx, my, scene, this, - data, parse, Valentina::FromFile); + data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (f != formula) { @@ -1133,7 +1133,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const qreal angle = GetParametrDouble(domElement, VAbstractTool::AttrAngle, "0.0"); VToolNormal::Create(id, f, firstPointId, secondPointId, typeLine, name, angle, mx, my, scene, - this, data, parse, Valentina::FromFile); + this, data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (f != formula) { @@ -1172,7 +1172,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const quint32 thirdPointId = GetParametrUInt(domElement, VAbstractTool::AttrThirdPoint, "0"); VToolBisector::Create(id, f, firstPointId, secondPointId, thirdPointId, - typeLine, name, mx, my, scene, this, data, parse, Valentina::FromFile); + typeLine, name, mx, my, scene, this, data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (f != formula) { @@ -1208,7 +1208,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const quint32 p2Line2Id = GetParametrUInt(domElement, VAbstractTool::AttrP2Line2, "0"); VToolLineIntersect::Create(id, p1Line1Id, p2Line1Id, p1Line2Id, p2Line2Id, name, - mx, my, scene, this, data, parse, Valentina::FromFile); + mx, my, scene, this, data, parse, Source::FromFile); } catch (const VExceptionBadId &e) { @@ -1231,7 +1231,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); VToolPointOfContact::Create(id, f, center, firstPointId, secondPointId, name, mx, my, scene, this, - data, parse, Valentina::FromFile); + data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (f != radius) { @@ -1264,8 +1264,8 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const qreal mx = qApp->toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMx, "10.0")); const qreal my = qApp->toPixel(GetParametrDouble(domElement, VAbstractTool::AttrMy, "15.0")); data->UpdateGObject(id, new VPointF(point->x(), point->y(), point->name(), mx, my, idObject, - Valentina::Modeling)); - VNodePoint::Create(this, data, id, idObject, parse, Valentina::FromFile, idTool); + Draw::Modeling)); + VNodePoint::Create(this, data, id, idObject, parse, Source::FromFile, idTool); } catch (const VExceptionBadId &e) { @@ -1288,7 +1288,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const quint32 p2LineId = GetParametrUInt(domElement, VAbstractTool::AttrP2Line, "0"); VToolHeight::Create(id, name, typeLine, basePointId, p1LineId, p2LineId, - mx, my, scene, this, data, parse, Valentina::FromFile); + mx, my, scene, this, data, parse, Source::FromFile); } catch (const VExceptionBadId &e) { @@ -1310,7 +1310,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); VToolTriangle::Create(id, name, axisP1Id, axisP2Id, firstPointId, secondPointId, mx, my, scene, this, - data, parse, Valentina::FromFile); + data, parse, Source::FromFile); } catch (const VExceptionBadId &e) { @@ -1330,7 +1330,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const quint32 secondPointId = GetParametrUInt(domElement, VAbstractTool::AttrSecondPoint, "0"); VToolPointOfIntersection::Create(id, name, firstPointId, secondPointId, mx, my, scene, this, data, - parse, Valentina::FromFile); + parse, Source::FromFile); } catch (const VExceptionBadId &e) { @@ -1350,7 +1350,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem QString f = formula;//need for saving fixed formula; const quint32 splineId = GetParametrUInt(domElement, VToolCutSpline::AttrSpline, "0"); - VToolCutSpline::Create(id, name, f, splineId, mx, my, scene, this, data, parse, Valentina::FromFile); + VToolCutSpline::Create(id, name, f, splineId, mx, my, scene, this, data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (f != formula) { @@ -1385,7 +1385,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem const quint32 splinePathId = GetParametrUInt(domElement, VToolCutSplinePath::AttrSplinePath, "0"); VToolCutSplinePath::Create(id, name, f, splinePathId, mx, my, scene, this, data, parse, - Valentina::FromFile); + Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (f != formula) { @@ -1419,7 +1419,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem QString f = formula;//need for saving fixed formula; const quint32 arcId = GetParametrUInt(domElement, VToolCutArc::AttrArc, "0"); - VToolCutArc::Create(id, name, f, arcId, mx, my, scene, this, data, parse, Valentina::FromFile); + VToolCutArc::Create(id, name, f, arcId, mx, my, scene, this, data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (f != formula) { @@ -1456,7 +1456,7 @@ void VPattern::ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElem * @param parse parser file mode. */ void VPattern::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &domElement, - const Document::Documents &parse) + const Document &parse) { SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); @@ -1468,7 +1468,7 @@ void VPattern::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &do const QString typeLine = GetParametrString(domElement, VAbstractTool::AttrTypeLine, VAbstractTool::TypeLineLine); - VToolLine::Create(id, firstPoint, secondPoint, typeLine, scene, this, data, parse, Valentina::FromFile); + VToolLine::Create(id, firstPoint, secondPoint, typeLine, scene, this, data, parse, Source::FromFile); } catch (const VExceptionBadId &e) { @@ -1487,7 +1487,7 @@ void VPattern::ParseLineElement(VMainGraphicsScene *scene, const QDomElement &do * @param type type of spline. */ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement &domElement, - const Document::Documents &parse, const QString &type) + const Document &parse, const QString &type) { SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); @@ -1510,7 +1510,7 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement & const qreal kCurve = GetParametrDouble(domElement, VAbstractTool::AttrKCurve, "1.0"); VToolSpline::Create(id, point1, point4, kAsm1, kAsm2, angle1, angle2, kCurve, scene, this, data, parse, - Valentina::FromFile); + Source::FromFile); } catch (const VExceptionBadId &e) { @@ -1554,7 +1554,7 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement & } } - VToolSplinePath::Create(id, path, scene, this, data, parse, Valentina::FromFile); + VToolSplinePath::Create(id, path, scene, this, data, parse, Source::FromFile); } catch (const VExceptionBadId &e) { @@ -1571,9 +1571,9 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement & const quint32 idTool = GetParametrUInt(domElement, VAbstractNode::AttrIdTool, "0"); VSpline *spl = new VSpline(*data->GeometricObject(idObject)); spl->setIdObject(idObject); - spl->setMode(Valentina::Modeling); + spl->setMode(Draw::Modeling); data->UpdateGObject(id, spl); - VNodeSpline::Create(this, data, id, idObject, parse, Valentina::FromFile, idTool); + VNodeSpline::Create(this, data, id, idObject, parse, Source::FromFile, idTool); } catch (const VExceptionBadId &e) { @@ -1590,9 +1590,9 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement & const quint32 idTool = GetParametrUInt(domElement, VAbstractNode::AttrIdTool, "0"); VSplinePath *path = new VSplinePath(*data->GeometricObject(idObject)); path->setIdObject(idObject); - path->setMode(Valentina::Modeling); + path->setMode(Draw::Modeling); data->UpdateGObject(id, path); - VNodeSplinePath::Create(this, data, id, idObject, parse, Valentina::FromFile, idTool); + VNodeSplinePath::Create(this, data, id, idObject, parse, Source::FromFile, idTool); } catch (const VExceptionBadId &e) { @@ -1615,7 +1615,7 @@ void VPattern::ParseSplineElement(VMainGraphicsScene *scene, const QDomElement & * @param parse parser file mode. * @param type type of spline. */ -void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElement, const Document::Documents &parse, +void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElement, const Document &parse, const QString &type) { SCASSERT(scene != nullptr); @@ -1638,7 +1638,7 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElemen const QString f2 = GetParametrString(domElement, VAbstractTool::AttrAngle2, "270"); QString f2Fix = f2;//need for saving fixed formula; - VToolArc::Create(id, center, r, f1Fix, f2Fix, scene, this, data, parse, Valentina::FromFile); + VToolArc::Create(id, center, r, f1Fix, f2Fix, scene, this, data, parse, Source::FromFile); //Rewrite attribute formula. Need for situation when we have wrong formula. if (r != radius || f1Fix != f1 || f2Fix != f2) { @@ -1671,9 +1671,9 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElemen const quint32 idTool = GetParametrUInt(domElement, VAbstractNode::AttrIdTool, "0"); VArc *arc = new VArc(*data->GeometricObject(idObject)); arc->setIdObject(idObject); - arc->setMode(Valentina::Modeling); + arc->setMode(Draw::Modeling); data->UpdateGObject(id, arc); - VNodeArc::Create(this, data, id, idObject, parse, Valentina::FromFile, idTool); + VNodeArc::Create(this, data, id, idObject, parse, Source::FromFile, idTool); } catch (const VExceptionBadId &e) { @@ -1697,7 +1697,7 @@ void VPattern::ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElemen * @param type type of spline. */ void VPattern::ParseToolsElement(VMainGraphicsScene *scene, const QDomElement &domElement, - const Document::Documents &parse, const QString &type) + const Document &parse, const QString &type) { SCASSERT(scene != nullptr); Q_ASSERT_X(domElement.isNull() == false, Q_FUNC_INFO, "domElement is null"); @@ -1717,7 +1717,7 @@ void VPattern::ParseToolsElement(VMainGraphicsScene *scene, const QDomElement &d const QVector vector = VToolUnionDetails::GetDetailFromFile(this, domElement); VToolUnionDetails::Create(id, vector[0], vector[1], 0, 0, indexD1, indexD2, scene, this, data, parse, - Valentina::FromFile); + Source::FromFile); } catch (const VExceptionBadId &e) { @@ -1823,7 +1823,7 @@ void VPattern::CollectId(const QDomElement &node, QVector &vector) cons } //--------------------------------------------------------------------------------------------------------------------- -void VPattern::PrepareForParse(const Document::Documents &parse) +void VPattern::PrepareForParse(const Document &parse) { SCASSERT(sceneDraw != nullptr); SCASSERT(sceneDetail != nullptr); @@ -1851,7 +1851,7 @@ void VPattern::PrepareForParse(const Document::Documents &parse) void VPattern::UpdateMeasurements() { const QString path = MPath(); - if (MType() == Pattern::Standard) + if (MType() == MeasurementsType::Standard) { VStandardMeasurements m(data); m.setContent(path); diff --git a/src/app/xml/vpattern.h b/src/app/xml/vpattern.h index 2cbe9a839..ecc655101 100644 --- a/src/app/xml/vpattern.h +++ b/src/app/xml/vpattern.h @@ -35,15 +35,7 @@ class VDataTool; class VMainGraphicsScene; -namespace Document -{ - /** - * @brief The Document enum parse types. - */ - enum Document { LiteParse, FullParse}; - Q_DECLARE_FLAGS(Documents, Document) -} -Q_DECLARE_OPERATORS_FOR_FLAGS(Document::Documents) +enum class Document : char { LiteParse, FullParse}; /* VAL_VERSION is (major << 16) + (minor << 8) + patch. @@ -62,15 +54,15 @@ class VPattern : public QObject, public VDomDocument { Q_OBJECT public: - VPattern(VContainer *data, Valentina::Draws *mode, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, + VPattern(VContainer *data, Draw *mode, VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, QObject *parent = nullptr); void CreateEmptyFile(const QString &tablePath); - void ChangeActivPP(const QString& name, const Document::Documents &parse = Document::FullParse); + void ChangeActivPP(const QString& name, const Document &parse = Document::FullParse); QString GetNameActivDraw() const; bool GetActivDrawElement(QDomElement &element) const; bool appendPP(const QString& name); bool SetNameDraw(const QString& name); - void Parse(const Document::Documents &parse); + void Parse(const Document &parse); QHash* getTools(); VDataTool* getTool(const quint32 &id); QVector *getHistory(); @@ -88,8 +80,8 @@ public: bool GetActivNodeElement(const QString& name, QDomElement& element) const; QString MPath() const; void SetPath(const QString &path); - Valentina::Units MUnit() const; - Pattern::Measurements MType() const; + Unit MUnit() const; + MeasurementsType MType() const; static const QString TagPattern; static const QString TagCalculation; static const QString TagModeling; @@ -175,7 +167,7 @@ private: QStringList patternPieces; /** @brief mode current draw mode. */ - Valentina::Draws *mode; + Draw *mode; VMainGraphicsScene *sceneDraw; VMainGraphicsScene *sceneDetail; @@ -183,27 +175,27 @@ private: bool CheckNamePP(const QString& name) const; void SetActivPP(const QString& name); void ParseDrawElement(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, - const QDomNode& node, const Document::Documents &parse); + const QDomNode& node, const Document &parse); void ParseDrawMode(VMainGraphicsScene *sceneDraw, VMainGraphicsScene *sceneDetail, - const QDomNode& node, const Document::Documents &parse, const Valentina::Draws &mode); + const QDomNode& node, const Document &parse, const Draw &mode); void ParseDetailElement(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, - const Document::Documents &parse); + const Document &parse); void ParseDetails(VMainGraphicsScene *sceneDetail, const QDomElement &domElement, - const Document::Documents &parse); + const Document &parse); void ParsePointElement(VMainGraphicsScene *scene, QDomElement &domElement, - const Document::Documents &parse, const QString &type); + const Document &parse, const QString &type); void ParseLineElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse); + const Document &parse); void ParseSplineElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, const QString& type); + const Document &parse, const QString& type); void ParseArcElement(VMainGraphicsScene *scene, QDomElement &domElement, - const Document::Documents &parse, const QString& type); + const Document &parse, const QString& type); void ParseToolsElement(VMainGraphicsScene *scene, const QDomElement& domElement, - const Document::Documents &parse, const QString& type); + const Document &parse, const QString& type); void ParseIncrementsElement(const QDomNode& node); quint32 GetParametrId(const QDomElement& domElement) const; void CollectId(const QDomElement &node, QVector &vector)const; - void PrepareForParse(const Document::Documents &parse); + void PrepareForParse(const Document &parse); void UpdateMeasurements(); }; diff --git a/src/app/xml/vstandardmeasurements.cpp b/src/app/xml/vstandardmeasurements.cpp index fa096b1dd..82f10b09e 100644 --- a/src/app/xml/vstandardmeasurements.cpp +++ b/src/app/xml/vstandardmeasurements.cpp @@ -46,7 +46,7 @@ VStandardMeasurements::~VStandardMeasurements() {} //--------------------------------------------------------------------------------------------------------------------- -Valentina::Units VStandardMeasurements::Unit() +Unit VStandardMeasurements::MUnit() { const QString unit = UniqueTagText(AttrUnit, UnitCM); return VDomDocument::StrToUnits(unit); @@ -224,7 +224,7 @@ void VStandardMeasurements::Measurement(const QString &tag) const qreal size_increase = GetParametrDouble(domElement, AttrSize_increase, "0.0"); const qreal height_increase = GetParametrDouble(domElement, AttrHeight_increase, "0.0"); - if (Unit() == Valentina::Mm)// Convert to Cm. + if (MUnit() == Unit::Mm)// Convert to Cm. { data->AddMeasurement(tag, VMeasurement(value/10.0, size_increase/10.0, height_increase/10.0, qApp->GuiText(tag), qApp->Description(tag), tag)); @@ -257,7 +257,7 @@ void VStandardMeasurements::SetSize() if (domElement.isNull() == false) { qreal value = GetParametrDouble(domElement, AttrValue, "50.0"); - if (Unit() == Valentina::Mm)// Convert to Cm. + if (MUnit() == Unit::Mm)// Convert to Cm. { value = value/10.0; } @@ -286,7 +286,7 @@ void VStandardMeasurements::SetHeight() if (domElement.isNull() == false) { qreal value = GetParametrDouble(domElement, AttrValue, "176.0"); - if (Unit() == Valentina::Mm)// Convert to Cm. + if (MUnit() == Unit::Mm)// Convert to Cm. { value = value / 10.0; } diff --git a/src/app/xml/vstandardmeasurements.h b/src/app/xml/vstandardmeasurements.h index f124165f1..92b50a430 100644 --- a/src/app/xml/vstandardmeasurements.h +++ b/src/app/xml/vstandardmeasurements.h @@ -44,7 +44,7 @@ class VStandardMeasurements:public VDomDocument public: VStandardMeasurements(VContainer *data); virtual ~VStandardMeasurements(); - Valentina::Units Unit(); + Unit MUnit(); QString Description(); void Measurements(); void SetSize(); diff --git a/src/app/xml/vtoolrecord.cpp b/src/app/xml/vtoolrecord.cpp index 4ea39a243..b31a10386 100644 --- a/src/app/xml/vtoolrecord.cpp +++ b/src/app/xml/vtoolrecord.cpp @@ -30,10 +30,10 @@ //--------------------------------------------------------------------------------------------------------------------- VToolRecord::VToolRecord() - :id(0), typeTool(Valentina::ArrowTool), nameDraw(QString()) + :id(0), typeTool(Tool::ArrowTool), nameDraw(QString()) {} //--------------------------------------------------------------------------------------------------------------------- -VToolRecord::VToolRecord(const quint32 &id, const Valentina::Tools &typeTool, const QString &nameDraw) +VToolRecord::VToolRecord(const quint32 &id, const Tool &typeTool, const QString &nameDraw) :id(id), typeTool(typeTool), nameDraw(nameDraw) {} diff --git a/src/app/xml/vtoolrecord.h b/src/app/xml/vtoolrecord.h index 52dd16603..c08abd424 100644 --- a/src/app/xml/vtoolrecord.h +++ b/src/app/xml/vtoolrecord.h @@ -49,7 +49,7 @@ public: * @param typeTool tool type. * @param nameDraw pattern peace name. */ - VToolRecord(const quint32 &id, const Valentina::Tools &typeTool, const QString &nameDraw); + VToolRecord(const quint32 &id, const Tool &typeTool, const QString &nameDraw); /** * @brief getId return tool id. * @return id. @@ -64,12 +64,12 @@ public: * @brief getTypeTool return tool type. * @return tool type. */ - Valentina::Tools getTypeTool() const; + Tool getTypeTool() const; /** * @brief setTypeTool set tool type. * @param value tool type. */ - void setTypeTool(const Valentina::Tools &value); + void setTypeTool(const Tool &value); /** * @brief getNameDraw return pattern peace name. * @return pattern peace name. @@ -88,7 +88,7 @@ private: /** * @brief typeTool tool type. */ - Valentina::Tools typeTool; + Tool typeTool; /** * @brief nameDraw pattern peace name. */ @@ -105,12 +105,12 @@ inline void VToolRecord::setId(const quint32 &value) id = value; } -inline Valentina::Tools VToolRecord::getTypeTool() const +inline Tool VToolRecord::getTypeTool() const { return typeTool; } -inline void VToolRecord::setTypeTool(const Valentina::Tools &value) +inline void VToolRecord::setTypeTool(const Tool &value) { typeTool = value; }