diff --git a/src/app/valentina/xml/vpattern.cpp b/src/app/valentina/xml/vpattern.cpp index 1ceff1a82..3ba2781e5 100644 --- a/src/app/valentina/xml/vpattern.cpp +++ b/src/app/valentina/xml/vpattern.cpp @@ -3268,7 +3268,7 @@ void VPattern::ParseToolFlippingByLine(VMainGraphicsScene *scene, QDomElement &d initData.parse = parse; initData.typeCreation = Source::FromFile; - ToolsCommonAttributes(domElement, initData.id); + DrawToolsCommonAttributes(domElement, initData.id, initData.notes); initData.firstLinePointId = GetParametrUInt(domElement, AttrP1Line, NULL_ID_STR); initData.secondLinePointId = GetParametrUInt(domElement, AttrP2Line, NULL_ID_STR); initData.suffix = GetParametrString(domElement, AttrSuffix, QString()); @@ -3300,7 +3300,7 @@ void VPattern::ParseToolFlippingByAxis(VMainGraphicsScene *scene, QDomElement &d initData.parse = parse; initData.typeCreation = Source::FromFile; - ToolsCommonAttributes(domElement, initData.id); + DrawToolsCommonAttributes(domElement, initData.id, initData.notes); initData.originPointId = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR); initData.axisType = static_cast(GetParametrUInt(domElement, AttrAxisType, QChar('1'))); initData.suffix = GetParametrString(domElement, AttrSuffix, QString()); diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp index 7a3da95c7..0c178813f 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp @@ -113,6 +113,9 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, quint32 toolId, QWidget // Call after initialization vis!!!! SetTypeLine(TypeLineNone);//By default don't show line + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -294,7 +297,19 @@ void DialogAlongLine::SetSecondPointId(quint32 value) VisToolAlongLine *line = qobject_cast(vis); SCASSERT(line != nullptr) - line->setObject2Id(value); + line->setObject2Id(value); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogAlongLine::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogAlongLine::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.h b/src/libs/vtools/dialogs/tools/dialogalongline.h index d8473f88a..74f498126 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.h +++ b/src/libs/vtools/dialogs/tools/dialogalongline.h @@ -71,6 +71,9 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(quint32 value); + void SetNotes(const QString ¬es); + QString GetNotes() const; + virtual void Build(const Tool &type) override; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.ui b/src/libs/vtools/dialogs/tools/dialogalongline.ui index ff7bf85c0..0867dc0b4 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.ui +++ b/src/libs/vtools/dialogs/tools/dialogalongline.ui @@ -6,8 +6,8 @@ 0 0 - 412 - 288 + 446 + 365 @@ -20,317 +20,354 @@ - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - - 0 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - Point label: - - - - - - - First point: - - - - - - - - 0 - 0 - - - - First point of the line - - - - - - - Second point: - - - - - - - - 0 - 0 - - - - Second point of the line - - - - - - - Type of line: - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - - - - 80 - 14 - - - - - - - - Line color: - - - - - - - - 0 - 0 - - - - - - - - - - - Unique label - - - Choose unique label. - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + + 0 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + Point label: + + + + + + + First point: + + + + + + + + 0 + 0 + + + + First point of the line + + + + + + + Second point: + + + + + + + + 0 + 0 + + + + Second point of the line + + + + + + + Type of line: + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + + + + 80 + 14 + + + + + + + + Line color: + + + + + + + + 0 + 0 + + + + + + + + + + + Unique label + + + Choose unique label. + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogarc.cpp b/src/libs/vtools/dialogs/tools/dialogarc.cpp index b69adf174..bad33739d 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarc.cpp @@ -123,6 +123,9 @@ DialogArc::DialogArc(const VContainer *data, quint32 toolId, QWidget *parent) connect(ui->pushButtonGrowLengthF2, &QPushButton::clicked, this, &DialogArc::DeployF2TextEdit); vis = new VisToolArc(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -219,7 +222,19 @@ void DialogArc::SetApproximationScale(qreal value) VisToolArc *path = qobject_cast(vis); SCASSERT(path != nullptr) - path->setApproximationScale(value); + path->setApproximationScale(value); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogArc::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogArc::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogarc.h b/src/libs/vtools/dialogs/tools/dialogarc.h index 10de58807..09c1d30a3 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.h +++ b/src/libs/vtools/dialogs/tools/dialogarc.h @@ -73,6 +73,9 @@ public: qreal GetApproximationScale() const; void SetApproximationScale(qreal value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialogarc.ui b/src/libs/vtools/dialogs/tools/dialogarc.ui index 9aa1e466d..4e953e4dd 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.ui +++ b/src/libs/vtools/dialogs/tools/dialogarc.ui @@ -6,8 +6,8 @@ 0 0 - 425 - 395 + 407 + 456 @@ -20,639 +20,676 @@ - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Radius: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - First angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Second angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Center point: - - - - - - - Select center point of the arc - - - - - - - Pen style: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Color: - - - - - - - - - - - - - - Approximation scale: - - - - - - - Set approximation scale for this curve, 0 - use global value - - - 1 - - - 10.000000000000000 - - - 0.100000000000000 - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Radius: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + First angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Second angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Center point: + + + + + + + Select center point of the arc + + + + + + + Pen style: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Color: + + + + + + + + + + + + + + Approximation scale: + + + + + + + Set approximation scale for this curve, 0 - use global value + + + 1 + + + 10.000000000000000 + + + 0.100000000000000 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp index 36c8f9126..84c8d25f0 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp @@ -116,6 +116,9 @@ DialogArcWithLength::DialogArcWithLength(const VContainer *data, quint32 toolId, connect(ui->pushButtonGrowLengthArcLength, &QPushButton::clicked, this, &DialogArcWithLength::DeployLengthTextEdit); vis = new VisToolArcWithLength(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -245,7 +248,19 @@ void DialogArcWithLength::SetApproximationScale(qreal value) VisToolArcWithLength *path = qobject_cast(vis); SCASSERT(path != nullptr) - path->setApproximationScale(value); + path->setApproximationScale(value); +} + +//--------------------------------------------------------------------------------------------------------------------- +void DialogArcWithLength::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogArcWithLength::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h index edbe8f461..27fa4b967 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h @@ -71,6 +71,9 @@ public: qreal GetApproximationScale() const; void SetApproximationScale(qreal value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.ui b/src/libs/vtools/dialogs/tools/dialogarcwithlength.ui index 77cd6a763..f8b26604b 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.ui +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.ui @@ -6,8 +6,8 @@ 0 0 - 339 - 395 + 370 + 458 @@ -17,631 +17,668 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Radius: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - First angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Center point: - - - - - - - - - - - - - Color: - - - - - - - Pen style: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Approximation scale: - - - - - - - Set approximation scale for this curve, 0 - use global value - - - 1 - - - 10.000000000000000 - - - 0.100000000000000 - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Radius: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + First angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Center point: + + + + + + + + + + + + + Color: + + + + + + + Pen style: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Approximation scale: + + + + + + + Set approximation scale for this curve, 0 - use global value + + + 1 + + + 10.000000000000000 + + + 0.100000000000000 + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp index 02149eb73..64a3c8ada 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp +++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp @@ -106,6 +106,9 @@ DialogBisector::DialogBisector(const VContainer *data, quint32 toolId, QWidget * this, &DialogBisector::PointNameChanged); vis = new VisToolBisector(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -345,6 +348,18 @@ void DialogBisector::SetLineColor(const QString &value) ChangeCurrentData(ui->comboBoxLineColor, value); } +//--------------------------------------------------------------------------------------------------------------------- +void DialogBisector::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogBisector::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} + //--------------------------------------------------------------------------------------------------------------------- void DialogBisector::SaveData() { diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.h b/src/libs/vtools/dialogs/tools/dialogbisector.h index a6092c585..bf2ca4f99 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.h +++ b/src/libs/vtools/dialogs/tools/dialogbisector.h @@ -74,6 +74,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.ui b/src/libs/vtools/dialogs/tools/dialogbisector.ui index 361c69dfc..29e9dce4a 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.ui +++ b/src/libs/vtools/dialogs/tools/dialogbisector.ui @@ -6,8 +6,8 @@ 0 0 - 428 - 321 + 405 + 358 @@ -17,306 +17,343 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - First point: - - - - - - - - - - - 0 - 0 - - - - Second point: - - - - - - - - - - - 0 - 0 - - - - Third point: - - - - - - - - - - Type of line: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Line color: - - - - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + First point: + + + + + + + + + + + 0 + 0 + + + + Second point: + + + + + + + + + + + 0 + 0 + + + + Third point: + + + + + + + + + + Type of line: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Line color: + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp index b60e668a6..1079e54e6 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp @@ -73,6 +73,9 @@ DialogCubicBezier::DialogCubicBezier(const VContainer *data, quint32 toolId, QWi this, &DialogCubicBezier::PointNameChanged); vis = new VisToolCubicBezier(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -276,3 +279,15 @@ const QSharedPointer DialogCubicBezier::GetP4() const { return data->GeometricObject(getCurrentObjectId(ui->comboBoxP4)); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogCubicBezier::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogCubicBezier::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h index ccd495ef3..62ef7a925 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h @@ -55,6 +55,9 @@ public: VCubicBezier GetSpline() const; void SetSpline(const VCubicBezier &spline); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void PointNameChanged() override; diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.ui b/src/libs/vtools/dialogs/tools/dialogcubicbezier.ui index ef69856d3..3a4c725a9 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.ui +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.ui @@ -6,8 +6,8 @@ 0 0 - 387 - 294 + 479 + 362 @@ -19,134 +19,154 @@ - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - Color: + + + Tool + + + + QFormLayout::ExpandingFieldsGrow - - - - - - - 0 - 0 - - - - - - - - Name: - - - - - - - true - - - - - - - First point: - - - - - - - - - - Second point: - - - - - - - - - - Third point: - - - - - - - - - - Fourth point: - - - - - - - - - - Pen Style: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Approximation Scale: - - - - - - - Set approximation scale for this curve, 0 - use global value - - - 1 - - - 10.000000000000000 - - - 0.100000000000000 - - - - + + + + First point: + + + + + + + + + + Second point: + + + + + + + + + + Third point: + + + + + + + + + + Fourth point: + + + + + + + + + + Pen Style: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Color: + + + + + + + + 0 + 0 + + + + + + + + Approximation Scale: + + + + + + + Set approximation scale for this curve, 0 - use global value + + + 1 + + + 10.000000000000000 + + + 0.100000000000000 + + + + + + + Name: + + + + + + + true + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp index 47d30cdaa..a734d8fa3 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp @@ -81,6 +81,9 @@ DialogCubicBezierPath::DialogCubicBezierPath(const VContainer *data, quint32 too this, &DialogCubicBezierPath::currentPointChanged); vis = new VisToolCubicBezierPath(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -360,3 +363,15 @@ void DialogCubicBezierPath::ValidatePath() ChangeColor(ui->labelName, color); ChangeColor(ui->labelPoint, color); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogCubicBezierPath::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogCubicBezierPath::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h index 00c9e946b..e59f3c156 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h @@ -56,6 +56,9 @@ public: VCubicBezierPath GetPath() const; void SetPath(const VCubicBezierPath &value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void ShowDialog(bool click) override; diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.ui b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.ui index c529b16f3..da939fe8b 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.ui +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.ui @@ -6,8 +6,8 @@ 0 0 - 324 - 327 + 375 + 439 @@ -17,118 +17,155 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - + + + 0 + + + + Tool + + - + - - - Point: + + + + + + + Point: + + + + + + + + + + + + + + List of points - - + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + Color: + + + + + + + + + + Name: + + + + + + + true + + + + + + + Pen style: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Approximation scale: + + + + + + + Set approximation scale for this curve, 0 - use global value + + + 1 + + + 10.000000000000000 + + + 0.100000000000000 + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - - - List of points - - - - - - - - - QFormLayout::ExpandingFieldsGrow - - - - - Color: - - - - - - - - - - Name: - - - - - - - true - - - - - - - Pen style: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Approximation scale: - - - - - - - Set approximation scale for this curve, 0 - use global value - - - 1 - - - 10.000000000000000 - - - 0.100000000000000 - - - - + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp index 1468624fe..2dadef0f5 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp @@ -96,6 +96,9 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, quint connect(timerFormula, &QTimer::timeout, this, &DialogCurveIntersectAxis::EvalAngle); vis = new VisToolCurveIntersectAxis(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -343,3 +346,15 @@ void DialogCurveIntersectAxis::closeEvent(QCloseEvent *event) ui->plainTextEditFormula->blockSignals(true); DialogTool::closeEvent(event); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogCurveIntersectAxis::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogCurveIntersectAxis::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h index a1550b337..6bb117784 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h @@ -69,6 +69,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); + void SetNotes(const QString ¬es); + QString GetNotes() const; + virtual void ShowDialog(bool click) override; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui index 2e3a4e44e..42d222f6c 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.ui @@ -6,8 +6,8 @@ 0 0 - 419 - 288 + 335 + 331 @@ -17,300 +17,337 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - - 4 - 0 - - - - Calculation - - - true - - - QPlainTextEdit::NoWrap - - - - - - - - 16 - 16 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Axis point: - - - - - - - - - - - - - - - 0 - 0 - - - - Curve: - - - - - - - - - - - 0 - 0 - - - - Point label: - - - - - - - - 0 - 0 - - - - Unique label - - - Choose unique label. - - - - - - - Type of line: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Line color: - - - - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + + 4 + 0 + + + + Calculation + + + true + + + QPlainTextEdit::NoWrap + + + + + + + + 16 + 16 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Axis point: + + + + + + + + + + + + + + + 0 + 0 + + + + Curve: + + + + + + + + + + + 0 + 0 + + + + Point label: + + + + + + + + 0 + 0 + + + + Unique label + + + Choose unique label. + + + + + + + Type of line: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Line color: + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp index 58a4e1132..4c9ae5de1 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp @@ -94,6 +94,9 @@ DialogCutArc::DialogCutArc(const VContainer *data, quint32 toolId, QWidget *pare connect(ui->comboBoxArc, &QComboBox::currentTextChanged, this, &DialogCutArc::ArcChanged); vis = new VisToolCutArc(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -264,3 +267,15 @@ quint32 DialogCutArc::getArcId() const { return getCurrentObjectId(ui->comboBoxArc); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutArc::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogCutArc::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.h b/src/libs/vtools/dialogs/tools/dialogcutarc.h index cb39ec10a..ec88a1598 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.h +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.h @@ -62,6 +62,9 @@ public: quint32 getArcId() const; void setArcId(quint32 value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.ui b/src/libs/vtools/dialogs/tools/dialogcutarc.ui index f348d1a0f..b50e73564 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.ui +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.ui @@ -6,8 +6,8 @@ 0 0 - 412 - 189 + 334 + 247 @@ -17,235 +17,272 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Arc: - - - - - - - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Arc: + + + + + + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp index 57eca1a02..5834b2ecd 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp @@ -93,6 +93,9 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, quint32 toolId, QWidget connect(ui->comboBoxSpline, &QComboBox::currentTextChanged, this, &DialogCutSpline::SplineChanged); vis = new VisToolCutSpline(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -264,3 +267,15 @@ quint32 DialogCutSpline::getSplineId() const { return getCurrentObjectId(ui->comboBoxSpline); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutSpline::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogCutSpline::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.h b/src/libs/vtools/dialogs/tools/dialogcutspline.h index 6d728b5f3..004baa916 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.h +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.h @@ -61,6 +61,9 @@ public: quint32 getSplineId() const; void setSplineId(quint32 value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.ui b/src/libs/vtools/dialogs/tools/dialogcutspline.ui index 50093ca7f..eb70a1e36 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.ui +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.ui @@ -6,8 +6,8 @@ 0 0 - 412 - 189 + 324 + 240 @@ -17,235 +17,272 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Curve: - - - - - - - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Curve: + + + + + + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp index 500c44bd4..2dadb3746 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp @@ -93,6 +93,9 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, quint32 toolId, connect(ui->comboBoxSplinePath, &QComboBox::currentTextChanged, this, &DialogCutSplinePath::SplinePathChanged); vis = new VisToolCutSplinePath(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -264,3 +267,15 @@ quint32 DialogCutSplinePath::getSplinePathId() const { return getCurrentObjectId(ui->comboBoxSplinePath); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogCutSplinePath::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogCutSplinePath::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h index 2d08739b6..b6f26b3c0 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h @@ -61,6 +61,9 @@ public: quint32 getSplinePathId() const; void setSplinePathId(quint32 value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui index b17074fdf..bf2d6bf5f 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.ui @@ -6,8 +6,8 @@ 0 0 - 412 - 189 + 326 + 245 @@ -17,235 +17,272 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Curve: - - - - - - - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Curve: + + + + + + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp b/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp index 6c5a409a6..ba5ad6d2e 100644 --- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp @@ -155,6 +155,9 @@ DialogEllipticalArc::DialogEllipticalArc(const VContainer *data, quint32 toolId, this, &DialogEllipticalArc::DeployRotationAngleTextEdit); vis = new VisToolEllipticalArc(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -588,3 +591,15 @@ void DialogEllipticalArc::closeEvent(QCloseEvent *event) ui->plainTextEditRotationAngle->blockSignals(true); DialogTool::closeEvent(event); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogEllipticalArc::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogEllipticalArc::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.h b/src/libs/vtools/dialogs/tools/dialogellipticalarc.h index 29f79bfd0..5fe122093 100644 --- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.h +++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.h @@ -74,6 +74,9 @@ public: QString GetColor() const; void SetColor(const QString &value); + void SetNotes(const QString ¬es); + QString GetNotes() const; + public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.ui b/src/libs/vtools/dialogs/tools/dialogellipticalarc.ui index e9ac6f4a6..3d2594f93 100644 --- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.ui +++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.ui @@ -6,8 +6,8 @@ 0 0 - 425 - 530 + 396 + 575 @@ -17,10 +17,16 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - + + + 0 + + + + Tool + @@ -1022,19 +1028,42 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - - - Qt::Horizontal - - - QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - + + + + Notes + + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index 89f1e4801..f500fcbb6 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -123,6 +123,9 @@ DialogEndLine::DialogEndLine(const VContainer *data, quint32 toolId, QWidget *pa connect(timerFormulaAngle, &QTimer::timeout, this, &DialogEndLine::EvalAngle); vis = new VisToolEndLine(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -440,3 +443,15 @@ quint32 DialogEndLine::GetBasePointId() const { return getCurrentObjectId(ui->comboBoxBasePoint); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogEndLine::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogEndLine::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogendline.h b/src/libs/vtools/dialogs/tools/dialogendline.h index 0bea4593c..8dc68fb60 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.h +++ b/src/libs/vtools/dialogs/tools/dialogendline.h @@ -71,6 +71,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); + void SetNotes(const QString ¬es); + QString GetNotes() const; + virtual void ShowDialog(bool click) override; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; diff --git a/src/libs/vtools/dialogs/tools/dialogendline.ui b/src/libs/vtools/dialogs/tools/dialogendline.ui index a7692854c..ac58763eb 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.ui +++ b/src/libs/vtools/dialogs/tools/dialogendline.ui @@ -6,8 +6,8 @@ 0 0 - 358 - 331 + 326 + 376 @@ -26,496 +26,533 @@ - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - 0 - 0 - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 60 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - - 4 - 0 - - - - Calculation - - - true - - - QPlainTextEdit::NoWrap - - - - - - - - 16 - 16 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - 0 - 0 - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 60 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - - 4 - 0 - - - - Calculation - - - true - - - QPlainTextEdit::NoWrap - - - - - - - - 16 - 16 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Base point: - - - - - - - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - Type of line: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - - 0 - 0 - - - - Line color: - - - - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + 0 + 0 + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + + 4 + 0 + + + + Calculation + + + true + + + QPlainTextEdit::NoWrap + + + + + + + + 16 + 16 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + 0 + 0 + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 60 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + + 4 + 0 + + + + Calculation + + + true + + + QPlainTextEdit::NoWrap + + + + + + + + 16 + 16 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Base point: + + + + + + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + Type of line: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + + 0 + 0 + + + + Line color: + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp index e370fc820..0f5d6d7d6 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp @@ -88,6 +88,9 @@ DialogFlippingByAxis::DialogFlippingByAxis(const VContainer *data, quint32 toolI this, &DialogFlippingByAxis::PointChanged); vis = new VisToolFlippingByAxis(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -402,3 +405,15 @@ void DialogFlippingByAxis::FillComboBoxAxisType(QComboBox *box) box->addItem(tr("Vertical axis"), QVariant(static_cast(AxisType::VerticalAxis))); box->addItem(tr("Horizontal axis"), QVariant(static_cast(AxisType::HorizontalAxis))); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogFlippingByAxis::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogFlippingByAxis::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h index 234261fe0..4f62e5004 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h @@ -74,6 +74,9 @@ public: void SetVisibilityGroupTags(const QStringList &tags); QStringList GetVisibilityGroupTags() const; + void SetNotes(const QString ¬es); + QString GetNotes() const; + virtual void SetGroupCategories(const QStringList &categories) override; virtual void ShowDialog(bool click) override; diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui index 9ebf2e47f..df35b0448 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.ui @@ -7,100 +7,141 @@ 0 0 304 - 237 + 296 Flipping by axis - + + + :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png + + - - - - - Origin point: - - - - - - - - - - Suffix: - - - - - - - - - - Axis type: - - - - - - - - - - - - Enable to create a visibility gropup from original objects + + + 0 - - Visibility Group - - - true - - - false - - - - - - Name: - - - - - - - Flipping by axis - - - true - - - - - - - Tags: - - - - - - - Separate each tag with comma. - - - Add tags - - - true - - - - + + + Tool + + + + + + + + Origin point: + + + + + + + + + + Suffix: + + + + + + + + + + Axis type: + + + + + + + + + + + + Enable to create a visibility gropup from original objects + + + Visibility Group + + + true + + + false + + + + + + Name: + + + + + + + Flipping by axis + + + true + + + + + + + Tags: + + + + + + + Separate each tag with comma. + + + Add tags + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + @@ -122,7 +163,9 @@
vlineedit.h
- + + + buttonBox diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp index 9532bd364..6c050756a 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp @@ -88,6 +88,9 @@ DialogFlippingByLine::DialogFlippingByLine(const VContainer *data, quint32 toolI this, &DialogFlippingByLine::PointChanged); vis = new VisToolFlippingByLine(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -430,3 +433,15 @@ void DialogFlippingByLine::PointChanged() CheckState(); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogFlippingByLine::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogFlippingByLine::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h index 27a4314a2..a00139c81 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h @@ -74,6 +74,9 @@ public: void SetVisibilityGroupTags(const QStringList &tags); QStringList GetVisibilityGroupTags() const; + void SetNotes(const QString ¬es); + QString GetNotes() const; + virtual void SetGroupCategories(const QStringList &categories) override; virtual void ShowDialog(bool click) override; diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui b/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui index 788368f5c..41d39c969 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.ui @@ -6,8 +6,8 @@ 0 0 - 304 - 237 + 319 + 301 @@ -17,94 +17,131 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - First line point: - - - - - - - - - - Suffix: - - - - - - - - - - Second line point: - - - - - - - - - - - - Enable to create a visibility gropup from original objects + + + 0 - - Visibility Group - - - true - - - false - - - - - - Name: - - - - - - - Flipping by line - - - true - - - - - - - Tags: - - - - - - - Separate each tag with comma. - - - Add tags - - - true - - - - + + + Tool + + + + + + + + First line point: + + + + + + + + + + Suffix: + + + + + + + + + + Second line point: + + + + + + + + + + + + Enable to create a visibility gropup from original objects + + + Visibility Group + + + true + + + false + + + + + + Name: + + + + + + + Flipping by line + + + true + + + + + + + Tags: + + + + + + + Separate each tag with comma. + + + Add tags + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp index 21f676a06..de5fca452 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.cpp +++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp @@ -90,6 +90,9 @@ DialogHeight::DialogHeight(const VContainer *data, quint32 toolId, QWidget *pare this, &DialogHeight::PointNameChanged); vis = new VisToolHeight(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -344,3 +347,15 @@ quint32 DialogHeight::GetP2LineId() const { return getCurrentObjectId(ui->comboBoxP2Line); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogHeight::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogHeight::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogheight.h b/src/libs/vtools/dialogs/tools/dialogheight.h index c1f3fec5f..21e799fc5 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.h +++ b/src/libs/vtools/dialogs/tools/dialogheight.h @@ -70,6 +70,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void PointNameChanged() override; diff --git a/src/libs/vtools/dialogs/tools/dialogheight.ui b/src/libs/vtools/dialogs/tools/dialogheight.ui index 064eca26b..1b59e11f5 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.ui +++ b/src/libs/vtools/dialogs/tools/dialogheight.ui @@ -6,8 +6,8 @@ 0 0 - 355 - 245 + 384 + 281 @@ -22,124 +22,141 @@ - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 0 - 0 - + + + Tool + + + + QFormLayout::ExpandingFieldsGrow - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - Base point: - - - - - - - - - - - 0 - 0 - - - - First point of line: - - - - - - - - - - - 0 - 0 - - - - Second point of line: - - - - - - - - - - Type of line: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Line color: - - - - - - - + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + Base point: + + + + + + + + + + + 0 + 0 + + + + First point of line: + + + + + + + + + + + 0 + 0 + + + + Second point of line: + + + + + + + + + + Type of line: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Line color: + + + + + + + + + + + Notes + + + + + + + + @@ -154,11 +171,6 @@ - lineEditNamePoint - comboBoxBasePoint - comboBoxP1Line - comboBoxP2Line - comboBoxLineType buttonBox diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp index 35bc9fb18..4bc9dec78 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogline.cpp @@ -72,6 +72,9 @@ DialogLine::DialogLine(const VContainer *data, quint32 toolId, QWidget *parent) this, &DialogLine::PointNameChanged); vis = new VisToolLine(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -239,3 +242,15 @@ QString DialogLine::GetTypeLine() const { return GetComboBoxCurrentData(ui->comboBoxLineType, TypeLineLine); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogLine::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogLine::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogline.h b/src/libs/vtools/dialogs/tools/dialogline.h index e4c08695c..5eef73b11 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.h +++ b/src/libs/vtools/dialogs/tools/dialogline.h @@ -64,6 +64,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void PointNameChanged() override; diff --git a/src/libs/vtools/dialogs/tools/dialogline.ui b/src/libs/vtools/dialogs/tools/dialogline.ui index 203ad8e17..b23272f76 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.ui +++ b/src/libs/vtools/dialogs/tools/dialogline.ui @@ -9,8 +9,8 @@ 0 0 - 300 - 179 + 350 + 213 @@ -28,120 +28,140 @@ - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 90 - 0 - + + + Tool + + + + QFormLayout::ExpandingFieldsGrow - - First point: - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - - 90 - 0 - - - - Second point: - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - - - - - 90 - 0 - - - - Type of line: - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Line color: - - - - - - - + + + + + 90 + 0 + + + + First point: + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + + 90 + 0 + + + + Second point: + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + + 90 + 0 + + + + Type of line: + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Line color: + + + + + + + + + + + Notes + + + + + + + + @@ -156,9 +176,6 @@ - comboBoxFirstPoint - comboBoxSecondPoint - comboBoxLineType buttonBox diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index 75c552583..39cfb0750 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -93,6 +93,9 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, quint32 toolId, this, &DialogLineIntersect::PointNameChanged); vis = new VisToolLineIntersect(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -403,3 +406,15 @@ quint32 DialogLineIntersect::GetP2Line2() const { return getCurrentObjectId(ui->comboBoxP2Line2); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogLineIntersect::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogLineIntersect::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.h b/src/libs/vtools/dialogs/tools/dialoglineintersect.h index fcfbfa218..7c4b88bec 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.h @@ -67,6 +67,9 @@ public: QString GetPointName() const; void SetPointName(const QString &value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; void PointChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.ui b/src/libs/vtools/dialogs/tools/dialoglineintersect.ui index 54fb74999..0916be51d 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.ui +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.ui @@ -6,8 +6,8 @@ 0 0 - 375 - 196 + 401 + 280 @@ -20,108 +20,149 @@ - + - - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - - First line + + + 0 + + + Tool + + + + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + + First line + + + + + + + + + 0 + 0 + + + + First point: + + + + + + + + + + Second point: + + + + + + + + + + + + + + + Second line + + + + + + + + + 0 + 0 + + + + First point: + + + + + + + + + + Second point: + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + - - - - - - - 0 - 0 - - - - First point: - - - - - - - - - - Second point: - - - - - - - - - - - - Second line - - - - - - - - - - 0 - 0 - - - - First point: - - - - - - - - - - Second point: - - - - - - - - diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index bca3559d8..d5c6593e6 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -109,6 +109,9 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, quint32 this, &DialogLineIntersectAxis::PointNameChanged); vis = new VisToolLineIntersectAxis(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -412,3 +415,15 @@ void DialogLineIntersectAxis::closeEvent(QCloseEvent *event) ui->plainTextEditFormula->blockSignals(true); DialogTool::closeEvent(event); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogLineIntersectAxis::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogLineIntersectAxis::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h index 7dce34f0e..524d17d40 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h @@ -72,6 +72,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); + void SetNotes(const QString ¬es); + QString GetNotes() const; + virtual void ShowDialog(bool click) override; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui index 894a72187..6b4ca5976 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.ui @@ -6,8 +6,8 @@ 0 0 - 457 - 321 + 340 + 357 @@ -17,327 +17,364 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - - 4 - 0 - - - - Calculation - - - true - - - QPlainTextEdit::NoWrap - - - - - - - - 16 - 16 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Axis point: - - - - - - - Axis Point - - - - - - - - 0 - 0 - - - - First line point: - - - - - - - First point of line - - - - - - - - 0 - 0 - - - - Second line point: - - - - - - - Second point of line - - - - - - - - 0 - 0 - - - - Point label: - - - - - - - - 0 - 0 - - - - Unique label - - - Choose unique label. - - - - - - - Type of line: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - Show line from first point to this point - - - - 80 - 14 - - - - - - - - Line color: - - - - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + + 4 + 0 + + + + Calculation + + + true + + + QPlainTextEdit::NoWrap + + + + + + + + 16 + 16 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Axis point: + + + + + + + Axis Point + + + + + + + + 0 + 0 + + + + First line point: + + + + + + + First point of line + + + + + + + + 0 + 0 + + + + Second line point: + + + + + + + Second point of line + + + + + + + + 0 + 0 + + + + Point label: + + + + + + + + 0 + 0 + + + + Unique label + + + Choose unique label. + + + + + + + Type of line: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + Show line from first point to this point + + + + 80 + 14 + + + + + + + + Line color: + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogmove.cpp b/src/libs/vtools/dialogs/tools/dialogmove.cpp index 0105f8e4b..43bcd90ec 100644 --- a/src/libs/vtools/dialogs/tools/dialogmove.cpp +++ b/src/libs/vtools/dialogs/tools/dialogmove.cpp @@ -146,6 +146,9 @@ DialogMove::DialogMove(const VContainer *data, quint32 toolId, QWidget *parent) vis = new VisToolMove(data); SetRotationOrigPointId(NULL_ID); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -634,3 +637,15 @@ void DialogMove::EvalLength() Eval(formulaData, flagLength); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogMove::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogMove::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogmove.h b/src/libs/vtools/dialogs/tools/dialogmove.h index 741d8d144..c67a4669e 100644 --- a/src/libs/vtools/dialogs/tools/dialogmove.h +++ b/src/libs/vtools/dialogs/tools/dialogmove.h @@ -79,6 +79,9 @@ public: void SetVisibilityGroupTags(const QStringList &tags); QStringList GetVisibilityGroupTags() const; + void SetNotes(const QString ¬es); + QString GetNotes() const; + virtual void SetGroupCategories(const QStringList &categories) override; virtual void ShowDialog(bool click) override; diff --git a/src/libs/vtools/dialogs/tools/dialogmove.ui b/src/libs/vtools/dialogs/tools/dialogmove.ui index defd52ef1..c8bb1b2d0 100644 --- a/src/libs/vtools/dialogs/tools/dialogmove.ui +++ b/src/libs/vtools/dialogs/tools/dialogmove.ui @@ -6,8 +6,8 @@ 0 0 - 424 - 432 + 411 + 498 @@ -17,633 +17,670 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Rotation angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Suffix: - - - - - - - - - - Rotation origin point: - - - - - - - - - - - - Enable to create a visibility gropup from original objects - - - Visibility Group - - - true - - - false - - - - - - Name: - - - - - - - Move - - - true - - - - - - - Tags: - - - - - - - Separate each tag with comma. - - - Add tags - - - true - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Rotation angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Suffix: + + + + + + + + + + Rotation origin point: + + + + + + + + + + + + Enable to create a visibility gropup from original objects + + + Visibility Group + + + true + + + false + + + + + + Name: + + + + + + + Move + + + true + + + + + + + Tags: + + + + + + + Separate each tag with comma. + + + Add tags + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + @@ -659,16 +696,16 @@ - - VCompleterLineEdit - QLineEdit -
vlineedit.h
- VPlainTextEdit QPlainTextEdit
vplaintextedit.h
 + + VCompleterLineEdit + QLineEdit +
vlineedit.h
+ diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp index 3c727291f..0e58b189d 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.cpp +++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp @@ -114,6 +114,9 @@ DialogNormal::DialogNormal(const VContainer *data, quint32 toolId, QWidget *pare this, &DialogNormal::PointNameChanged); vis = new VisToolNormal(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -403,3 +406,15 @@ quint32 DialogNormal::GetSecondPointId() const { return getCurrentObjectId(ui->comboBoxSecondPoint); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogNormal::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogNormal::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialognormal.h b/src/libs/vtools/dialogs/tools/dialognormal.h index c13eff2f2..4d558f401 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.h +++ b/src/libs/vtools/dialogs/tools/dialognormal.h @@ -73,6 +73,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialognormal.ui b/src/libs/vtools/dialogs/tools/dialognormal.ui index bbb31fb48..154d3a852 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.ui +++ b/src/libs/vtools/dialogs/tools/dialognormal.ui @@ -6,8 +6,8 @@ 0 0 - 517 - 432 + 354 + 466 @@ -20,497 +20,534 @@ - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - First point: - - - - - - - - - - - 0 - 0 - - - - Second point: - - - - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Additional angle degrees: - - - true - - - - - - - QLayout::SetMinimumSize - - - 29 - - - 6 - - - - - ... - - - - :/icon/32x32/arrowRight.png:/icon/32x32/arrowRight.png - - - - 32 - 32 - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + - - - - - 0 - 0 - - - - - 56 - 0 - - - - -360.000000000000000 - - - 360.000000000000000 - - + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + - - - - ... + + + + QFormLayout::ExpandingFieldsGrow - - - :/icon/32x32/arrowLeftUp.png:/icon/32x32/arrowLeftUp.png - - - - 32 - 32 - - - + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + First point: + + + + + + + + + + + 0 + 0 + + + + Second point: + + + + + + + - - - - ... - - - - :/icon/32x32/arrowRightUp.png:/icon/32x32/arrowRightUp.png - - - - 32 - 32 - - - + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Additional angle degrees: + + + true + + + + + + + QLayout::SetMinimumSize + + + 29 + + + 6 + + + + + ... + + + + :/icon/32x32/arrowRight.png:/icon/32x32/arrowRight.png + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + + 56 + 0 + + + + -360.000000000000000 + + + 360.000000000000000 + + + + + + + ... + + + + :/icon/32x32/arrowLeftUp.png:/icon/32x32/arrowLeftUp.png + + + + 32 + 32 + + + + + + + + ... + + + + :/icon/32x32/arrowRightUp.png:/icon/32x32/arrowRightUp.png + + + + 32 + 32 + + + + + + + + + 0 + 0 + + + + ... + + + + :/icon/32x32/arrowUp.png:/icon/32x32/arrowUp.png + + + + 32 + 32 + + + + + + + + ... + + + + :/icon/32x32/arrowLeft.png:/icon/32x32/arrowLeft.png + + + + 32 + 32 + + + + + + + + ... + + + + :/icon/32x32/arrowLeftDown.png:/icon/32x32/arrowLeftDown.png + + + + 32 + 32 + + + + + + + + ... + + + + :/icon/32x32/arrowDown.png:/icon/32x32/arrowDown.png + + + + 32 + 32 + + + + + + + + ... + + + + :/icon/32x32/arrowRightDown.png:/icon/32x32/arrowRightDown.png + + + + 32 + 32 + + + + + + + - - - - - 0 - 0 - + + + + QFormLayout::ExpandingFieldsGrow - - ... - - - - :/icon/32x32/arrowUp.png:/icon/32x32/arrowUp.png - - - - 32 - 32 - - - + + + + Type of line: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + + + + Line color: + + + + - - - - ... + + + + Qt::Vertical - - - :/icon/32x32/arrowLeft.png:/icon/32x32/arrowLeft.png - - + - 32 - 32 + 20 + 40 - - - - - - ... - - - - :/icon/32x32/arrowLeftDown.png:/icon/32x32/arrowLeftDown.png - - - - 32 - 32 - - - - - - - - ... - - - - :/icon/32x32/arrowDown.png:/icon/32x32/arrowDown.png - - - - 32 - 32 - - - - - - - - ... - - - - :/icon/32x32/arrowRightDown.png:/icon/32x32/arrowRightDown.png - - - - 32 - 32 - - - + - - - - - - - QFormLayout::ExpandingFieldsGrow - - - - - Type of line: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - - - - Line color: - - - - + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index 56b4316cc..40688c97f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -64,6 +64,9 @@ DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *dat }); vis = new VisToolPointFromArcAndTangent(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -198,3 +201,15 @@ void DialogPointFromArcAndTangent::SaveData() point->setCrossPoint(GetCrossCirclesPoint()); point->RefreshGeometry(); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointFromArcAndTangent::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogPointFromArcAndTangent::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h index 2f0c9ebcd..dc8fd5274 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h @@ -64,6 +64,9 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(CrossCirclesPoint p); + void SetNotes(const QString ¬es); + QString GetNotes() const; + public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui index 3a3d120a2..50f250570 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.ui @@ -6,8 +6,8 @@ 0 0 - 370 - 179 + 304 + 215 @@ -19,102 +19,122 @@ - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - + + + Tool + + + + QFormLayout::ExpandingFieldsGrow - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - Tangent point: - - - - - - - - 0 - 0 - - - - - 143 - 0 - - - - - - - - - 0 - 0 - - - - Arc: - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - - - - - Take: - - - - - - - + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + Tangent point: + + + + + + + + 0 + 0 + + + + + 143 + 0 + + + + + + + + + 0 + 0 + + + + Arc: + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + + + + + Take: + + + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp index cf7e656c1..ea86e1709 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp @@ -103,6 +103,9 @@ DialogPointFromCircleAndTangent::DialogPointFromCircleAndTangent(const VContaine &DialogPointFromCircleAndTangent::DeployCircleRadiusTextEdit); vis = new VisToolPointFromCircleAndTangent(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -330,3 +333,15 @@ void DialogPointFromCircleAndTangent::closeEvent(QCloseEvent *event) ui->plainTextEditRadius->blockSignals(true); DialogTool::closeEvent(event); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointFromCircleAndTangent::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogPointFromCircleAndTangent::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h index 59ce26b5a..4783cb864 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h @@ -67,6 +67,9 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(const CrossCirclesPoint &p); + void SetNotes(const QString ¬es); + QString GetNotes() const; + public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; void PointChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui index f4fc8f5d1..cf91ae0d1 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.ui @@ -6,8 +6,8 @@ 0 0 - 430 - 255 + 365 + 298 @@ -17,284 +17,321 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Radius: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - Center of the circle: - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - - - - - - 0 - 0 - - - - Tangent point: - - - - - - - - 0 - 0 - - - - - 143 - 0 - - - - - - - - Take: - - - - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Radius: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + Center of the circle: + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + + + + + + 0 + 0 + + + + Tangent point: + + + + + + + + 0 + 0 + + + + + 143 + 0 + + + + + + + + Take: + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp index 36f303936..697708617 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp @@ -104,6 +104,9 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, quint32 toolI this, &DialogPointOfContact::PointNameChanged); vis = new VisToolPointOfContact(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -381,3 +384,15 @@ quint32 DialogPointOfContact::GetSecondPoint() const { return getCurrentObjectId(ui->comboBoxSecondPoint); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfContact::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogPointOfContact::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h index 984be1a42..290f6812d 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h @@ -68,6 +68,9 @@ public: quint32 GetSecondPoint() const; void SetSecondPoint(quint32 value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui b/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui index 7a5977d59..8808f4299 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.ui @@ -6,8 +6,8 @@ 0 0 - 498 - 255 + 348 + 295 @@ -20,315 +20,352 @@ - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Radius: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - Center of arc: - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - - - - - - 0 - 0 - - - - Top of the line: - - - - - - - - 0 - 0 - - - - - 143 - 0 - - - - - - - - - 0 - 0 - - - - End of the line: - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Radius: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + Center of arc: + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + + + + + + 0 + 0 + + + + Top of the line: + + + + + + + + 0 + 0 + + + + + 143 + 0 + + + + + + + + + 0 + 0 + + + + End of the line: + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp index 089d9f224..4a44fcef3 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp @@ -78,6 +78,9 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, qui vis = new VisToolPointOfIntersection(data); vis->VisualMode(NULL_ID);//Show vertical axis + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -232,3 +235,15 @@ quint32 DialogPointOfIntersection::GetSecondPointId() const { return getCurrentObjectId(ui->comboBoxSecondPoint); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfIntersection::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogPointOfIntersection::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h index b347a02f3..c978c5380 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h @@ -61,6 +61,9 @@ public: quint32 GetSecondPointId() const; void SetSecondPointId(quint32 value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void PointNameChanged() override; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui index ce231b260..921a63f46 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.ui @@ -6,8 +6,8 @@ 0 0 - 340 - 146 + 304 + 194 @@ -19,78 +19,98 @@ - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - + + + Tool + + + + QFormLayout::ExpandingFieldsGrow - - Point label: - - - - - - - - 0 - 0 - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - X: vertical point: - - - - - - - - - - - 0 - 0 - - - - Y: horizontal point: - - - - - - - + + + + + 0 + 0 + + + + Point label: + + + + + + + + 0 + 0 + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + X: vertical point: + + + + + + + + + + + 0 + 0 + + + + Y: horizontal point: + + + + + + + + + + + Notes + + + + + + + + @@ -105,9 +125,6 @@ - lineEditNamePoint - comboBoxFirstPoint - comboBoxSecondPoint buttonBox diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index 01772e7d8..ff52a4d5f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -71,6 +71,9 @@ DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *d this, &DialogPointOfIntersectionArcs::ArcChanged); vis = new VisToolPointOfIntersectionArcs(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -221,3 +224,15 @@ void DialogPointOfIntersectionArcs::SaveData() point->setCrossPoint(GetCrossArcPoint()); point->RefreshGeometry(); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfIntersectionArcs::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogPointOfIntersectionArcs::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h index 833ec6d16..fdc244e78 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h @@ -64,6 +64,9 @@ public: CrossCirclesPoint GetCrossArcPoint() const; void SetCrossArcPoint(CrossCirclesPoint p); + void SetNotes(const QString ¬es); + QString GetNotes() const; + public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void ArcChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui index fa91fe168..bb6b99281 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.ui @@ -6,8 +6,8 @@ 0 0 - 300 - 179 + 304 + 212 @@ -19,76 +19,96 @@ - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - + + + Tool + + + + QFormLayout::ExpandingFieldsGrow - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - First arc: - - - - - - - - - - - 0 - 0 - - - - Second arc: - - - - - - - - - - Take: - - - - - - - + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + First arc: + + + + + + + + + + + 0 + 0 + + + + Second arc: + + + + + + + + + + Take: + + + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp index ee63bcc80..22abed150 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp @@ -123,6 +123,9 @@ DialogPointOfIntersectionCircles::DialogPointOfIntersectionCircles(const VContai &DialogPointOfIntersectionCircles::DeployCircle2RadiusTextEdit); vis = new VisToolPointOfIntersectionCircles(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -420,3 +423,15 @@ void DialogPointOfIntersectionCircles::closeEvent(QCloseEvent *event) ui->plainTextEditCircle2Radius->blockSignals(true); DialogTool::closeEvent(event); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfIntersectionCircles::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogPointOfIntersectionCircles::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h index 4bdc8f8e9..0ae691ecf 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h @@ -70,6 +70,9 @@ public: CrossCirclesPoint GetCrossCirclesPoint() const; void SetCrossCirclesPoint(const CrossCirclesPoint &p); + void SetNotes(const QString ¬es); + QString GetNotes() const; + public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; void PointChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui index c0f453079..64db825df 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.ui @@ -6,8 +6,8 @@ 0 0 - 401 - 331 + 417 + 370 @@ -17,464 +17,501 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Radius of the first circle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Radius of the second circle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - Center of the first circle: - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - - - - - - 0 - 0 - - - - Center of the second circle: - - - - - - - - 0 - 0 - - - - - 143 - 0 - - - - - - - - Take: - - - - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Radius of the first circle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Radius of the second circle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + Center of the first circle: + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + + + + + + 0 + 0 + + + + Center of the second circle: + + + + + + + + 0 + 0 + + + + + 143 + 0 + + + + + + + + Take: + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp index 2e9c751bf..c82a21d75 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp @@ -74,6 +74,9 @@ DialogPointOfIntersectionCurves::DialogPointOfIntersectionCurves(const VContaine this, &DialogPointOfIntersectionCurves::CurveChanged); vis = new VisToolPointOfIntersectionCurves(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -248,3 +251,15 @@ void DialogPointOfIntersectionCurves::CurveChanged() ChangeColor(ui->labelCurve2, color); CheckState(); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogPointOfIntersectionCurves::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogPointOfIntersectionCurves::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h index 903e9fa3d..734a4a35f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h @@ -66,6 +66,9 @@ public: HCrossCurvesPoint GetHCrossPoint() const; void SetHCrossPoint(HCrossCurvesPoint hP); + void SetNotes(const QString ¬es); + QString GetNotes() const; + public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.ui b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.ui index 4fb60acd9..202dce314 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.ui +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.ui @@ -6,8 +6,8 @@ 0 0 - 285 - 212 + 304 + 242 @@ -19,96 +19,116 @@ - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - + + + Tool + + + + QFormLayout::ExpandingFieldsGrow - - First curve: - - - - - - - - - - - - - - - 0 - 0 - - - - Second curve: - - - - - - - - - - - 0 - 0 - - - - Point label: - - - - - - - - 0 - 0 - - - - Unique label - - - Choose unique label. - - - - - - - Vertical correction: - - - - - - - - - - Horizontal correction: - - - - - - - + + + + + 0 + 0 + + + + First curve: + + + + + + + + + + + + + + + 0 + 0 + + + + Second curve: + + + + + + + + + + + 0 + 0 + + + + Point label: + + + + + + + + 0 + 0 + + + + Unique label + + + Choose unique label. + + + + + + + Vertical correction: + + + + + + + + + + Horizontal correction: + + + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index 306477be9..4d64cb5a1 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -107,6 +107,9 @@ DialogRotation::DialogRotation(const VContainer *data, quint32 toolId, QWidget * this, &DialogRotation::PointChanged); vis = new VisToolRotation(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -504,3 +507,15 @@ void DialogRotation::EvalAngle() Eval(formulaData, flagAngle); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogRotation::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogRotation::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.h b/src/libs/vtools/dialogs/tools/dialogrotation.h index 89b1221d5..087736055 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.h +++ b/src/libs/vtools/dialogs/tools/dialogrotation.h @@ -72,6 +72,9 @@ public: void SetVisibilityGroupTags(const QStringList &tags); QStringList GetVisibilityGroupTags() const; + void SetNotes(const QString ¬es); + QString GetNotes() const; + virtual void SetGroupCategories(const QStringList &categories) override; virtual void ShowDialog(bool click) override; diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.ui b/src/libs/vtools/dialogs/tools/dialogrotation.ui index 84bc08968..238755e7f 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.ui +++ b/src/libs/vtools/dialogs/tools/dialogrotation.ui @@ -6,8 +6,8 @@ 0 0 - 392 - 282 + 304 + 338 @@ -17,264 +17,301 @@ :/icon/64x64/icon64x64.png:/icon/64x64/icon64x64.png - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - Origin Point: - - - - - - - - - - Suffix: - - - - - - - - - - - - Enable to create a visibility gropup from original objects + + + 0 - - Visibility Group - - - true - - - false - - - - - - Tags: - - - - - - - Rotation - - - true - - - - - - - Name: - - - - - - - Separate each tag with comma. - - - Add tags - - - true - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + Origin Point: + + + + + + + + + + Suffix: + + + + + + + + + + + + Enable to create a visibility gropup from original objects + + + Visibility Group + + + true + + + false + + + + + + Tags: + + + + + + + Rotation + + + true + + + + + + + Name: + + + + + + + Separate each tag with comma. + + + Add tags + + + true + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + @@ -290,16 +327,16 @@ - - VCompleterLineEdit - QLineEdit -
vlineedit.h
- VPlainTextEdit QPlainTextEdit
vplaintextedit.h
 + + VCompleterLineEdit + QLineEdit +
vlineedit.h
+ diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp index 8c8d6b5d4..b57ed59e0 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp @@ -106,6 +106,9 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, quint32 toolId, this, &DialogShoulderPoint::PointNameChanged); vis = new VisToolShoulderPoint(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -416,3 +419,15 @@ quint32 DialogShoulderPoint::GetP3() const { return getCurrentObjectId(ui->comboBoxP3); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogShoulderPoint::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogShoulderPoint::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h index 0cbab3ea9..95d0f9fda 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h @@ -73,6 +73,9 @@ public: QString GetLineColor() const; void SetLineColor(const QString &value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; /** diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui index 7d95924c4..9e06473b0 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.ui @@ -6,8 +6,8 @@ 0 0 - 488 - 321 + 304 + 356 @@ -20,354 +20,391 @@ - + - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - - - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - First point: - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - - - - - - 0 - 0 - - - - Second point: - - - - - - - - 0 - 0 - - - - - 143 - 0 - - - - - - - - - 0 - 0 - - - - Third point: - - - - - - - - 0 - 0 - - - - - 145 - 0 - - - - - - - - - 0 - 0 - - - - Type of line: - - - - - - - - 0 - 0 - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Line color: - - - - - - - + + + Tool + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + First point: + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + + + + + + 0 + 0 + + + + Second point: + + + + + + + + 0 + 0 + + + + + 143 + 0 + + + + + + + + + 0 + 0 + + + + Third point: + + + + + + + + 0 + 0 + + + + + 145 + 0 + + + + + + + + + 0 + 0 + + + + Type of line: + + + + + + + + 0 + 0 + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Line color: + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index 0cda9f9da..a9abdb46e 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -156,6 +156,9 @@ DialogSpline::DialogSpline(const VContainer *data, quint32 toolId, QWidget *pare SCASSERT(scene != nullptr) connect(scene, &VMainGraphicsScene::MouseLeftPressed, path, &VisToolSpline::MouseLeftPressed); connect(scene, &VMainGraphicsScene::MouseLeftReleased, path, &VisToolSpline::MouseLeftReleased); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -597,3 +600,15 @@ void DialogSpline::SetSpline(const VSpline &spline) path->SetKCurve(spl.GetKcurve()); path->setApproximationScale(spl.GetApproximationScale()); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogSpline::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogSpline::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h index 75126bc06..214e26d39 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -58,6 +58,9 @@ public: VSpline GetSpline() const; void SetSpline(const VSpline &spline); + void SetNotes(const QString ¬es); + QString GetNotes() const; + public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void PointNameChanged() override; diff --git a/src/libs/vtools/dialogs/tools/dialogspline.ui b/src/libs/vtools/dialogs/tools/dialogspline.ui index 93693be1a..9a16011a9 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.ui +++ b/src/libs/vtools/dialogs/tools/dialogspline.ui @@ -6,8 +6,8 @@ 0 0 - 524 - 403 + 532 + 452 @@ -20,902 +20,939 @@ - + - - - + + + 0 + + + + Tool + + - + - + + + + + + + + 89 + 0 + + + + First point: + + + + + + + + 0 + 0 + + + + + + + + + + Control point + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + + + + + + + + + Second point: + + + + + + + + 0 + 0 + + + + + + + + + + Control point + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + + + + + + + QFormLayout::ExpandingFieldsGrow + + + + + Color: + + + + + + + + 0 + 0 + + + + + + + + Name: + + + + + + + true + + + + + + + Pen style: + + + + + - 89 + 80 0 - - First point: + + + 110 + 16777215 + + + + + 80 + 14 + - - - - - 0 - 0 - + + + + Approximation scale: + + + + + + + Set approximation scale for this curve, 0 - use global value + + + 1 + + + 10.000000000000000 + + + 0.100000000000000 - - - Control point + + + Qt::Vertical - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - + + + 20 + 0 + + + - - - + + + + Notes + + - - - - - Second point: - - - - - - - - 0 - 0 - - - - - - - - - - Control point - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - + - - - - - - - QFormLayout::ExpandingFieldsGrow - - - - - Color: - - - - - - - - 0 - 0 - - - - - - - - Name: - - - - - - - true - - - - - - - Pen style: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Approximation scale: - - - - - - - Set approximation scale for this curve, 0 - use global value - - - 1 - - - 10.000000000000000 - - - 0.100000000000000 - - - - + + diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 232e2c6c3..8df77ebd6 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -133,6 +133,9 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, quint32 toolId, QWidg SCASSERT(scene != nullptr) connect(scene, &VMainGraphicsScene::MouseLeftPressed, path, &VisToolSplinePath::MouseLeftPressed); connect(scene, &VMainGraphicsScene::MouseLeftReleased, path, &VisToolSplinePath::MouseLeftReleased); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -944,3 +947,15 @@ bool DialogSplinePath::IsValid() const return fAngle1 && fAngle2 && fLength1 && fLength2 && flagError; } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogSplinePath::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogSplinePath::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.h b/src/libs/vtools/dialogs/tools/dialogsplinepath.h index fd1c16f34..ebd4b806b 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h @@ -58,6 +58,9 @@ public: VSplinePath GetPath() const; void SetPath(const VSplinePath &value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void ShowDialog(bool click) override; diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui index 4a8b461c7..8aabfe949 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.ui +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.ui @@ -6,8 +6,8 @@ 0 0 - 456 - 599 + 460 + 647 @@ -20,864 +20,901 @@ - + - - - + + + 0 + + + + Tool + + - + - - - Point: - - + + + + + + + Point: + + + + + + + + + + + + First control point + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + + + Second control point + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Length: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 255 + 0 + 0 + + + + + + + + + 159 + 158 + 158 + + + + + + + + Angle: + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Formula wizard + + + ... + + + + :/icon/24x24/fx.png:/icon/24x24/fx.png + + + + 24 + 24 + + + + + + + + + + + :/icon/24x24/equal.png + + + + + + + + 0 + 0 + + + + + 87 + 0 + + + + Value + + + _ + + + + + + + + + + + + 0 + 0 + + + + + 16777215 + 28 + + + + Calculation + + + true + + + + + + + + 18 + 18 + + + + + 0 + 0 + + + + <html><head/><body><p>Show full calculation in message box</p></body></html> + + + + + + + .. + + + + 16 + 16 + + + + true + + + + + + + + + + + - + + + List of points + + - - - First control point + + + QFormLayout::ExpandingFieldsGrow - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - + + + + Color: + + + + + + + + + + Name: + + + + + + + true + + + + + + + Pen style: + + + + + + + + 80 + 0 + + + + + 110 + 16777215 + + + + + 80 + 14 + + + + + + + + Approximation scale: + + + + + + + Set approximation scale for this curve, 0 - use global value + + + 1 + + + 10.000000000000000 + + + 0.100000000000000 + + + + - - - Second control point + + + Qt::Vertical - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Length: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - - - - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 159 - 158 - 158 - - - - - - - - Angle: - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Formula wizard - - - ... - - - - :/icon/24x24/fx.png:/icon/24x24/fx.png - - - - 24 - 24 - - - - - - - - - - - :/icon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value - - - _ - - - - - - - - - - - - 0 - 0 - - - - - 16777215 - 28 - - - - Calculation - - - true - - - - - - - - 18 - 18 - - - - - 0 - 0 - - - - <html><head/><body><p>Show full calculation in message box</p></body></html> - - - - - - - .. - - - - 16 - 16 - - - - true - - - - - - - - - + + + 20 + 40 + + + - - - - - List of points - - - - - - - - - QFormLayout::ExpandingFieldsGrow - - - - - Color: - - - - - - - - - - Name: - - - - - - - true - - - - - - - Pen style: - - - - - - - - 80 - 0 - - - - - 110 - 16777215 - - - - - 80 - 14 - - - - - - - - Approximation scale: - - - - - - - Set approximation scale for this curve, 0 - use global value - - - 1 - - - 10.000000000000000 - - - 0.100000000000000 - - - - + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp index 4f2470c64..ecbbf3dbb 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp @@ -83,6 +83,9 @@ DialogTriangle::DialogTriangle(const VContainer *data, quint32 toolId, QWidget * this, &DialogTriangle::PointNameChanged); vis = new VisToolTriangle(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -331,3 +334,15 @@ quint32 DialogTriangle::GetSecondPointId() const { return getCurrentObjectId(ui->comboBoxSecondPoint); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogTriangle::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogTriangle::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.h b/src/libs/vtools/dialogs/tools/dialogtriangle.h index 598b55add..f9930b00b 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.h +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.h @@ -67,6 +67,9 @@ public: QString GetPointName() const; void SetPointName(const QString &value); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void PointNameChanged() override; diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.ui b/src/libs/vtools/dialogs/tools/dialogtriangle.ui index 532db8b6c..b98798636 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.ui +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.ui @@ -6,8 +6,8 @@ 0 0 - 348 - 212 + 304 + 242 @@ -22,98 +22,118 @@ - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - + + + Tool + + + + QFormLayout::ExpandingFieldsGrow - - Point label: - - - - - - - Unique label - - - Choose unique label. - - - - - - - - 0 - 0 - - - - First point of axis: - - - - - - - - - - - 0 - 0 - - - - Second point of axis: - - - - - - - - - - - 0 - 0 - - - - First point: - - - - - - - - - - - 0 - 0 - - - - Second point: - - - - - - - + + + + + 0 + 0 + + + + Point label: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + 0 + 0 + + + + First point of axis: + + + + + + + + + + + 0 + 0 + + + + Second point of axis: + + + + + + + + + + + 0 + 0 + + + + First point: + + + + + + + + + + + 0 + 0 + + + + Second point: + + + + + + + + + + + Notes + + + + + + + + @@ -128,11 +148,6 @@ - lineEditNamePoint - comboBoxAxisP1 - comboBoxAxisP2 - comboBoxFirstPoint - comboBoxSecondPoint buttonBox diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp index db01cc06a..bab4f1658 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp @@ -89,6 +89,9 @@ DialogTrueDarts::DialogTrueDarts(const VContainer *data, quint32 toolId, QWidget this, &DialogTrueDarts::PointNameChanged); vis = new VisToolTrueDarts(data); + + ui->tabWidget->setCurrentIndex(0); + SetTabStopDistance(ui->plainTextEditToolNotes); } //--------------------------------------------------------------------------------------------------------------------- @@ -426,3 +429,15 @@ void DialogTrueDarts::CheckName(QLineEdit *edit, QLabel *labelEditNamePoint, con ChangeColor(labelEditNamePoint, OkColor(this)); } } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogTrueDarts::SetNotes(const QString ¬es) +{ + ui->plainTextEditToolNotes->setPlainText(notes); +} + +//--------------------------------------------------------------------------------------------------------------------- +QString DialogTrueDarts::GetNotes() const +{ + return ui->plainTextEditToolNotes->toPlainText(); +} diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.h b/src/libs/vtools/dialogs/tools/dialogtruedarts.h index bed49f8fb..6843b740c 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.h +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.h @@ -71,6 +71,9 @@ public: void SetThirdDartPointId(const quint32 &value); void SetChildrenId(const quint32 &ch1, const quint32 &ch2); + + void SetNotes(const QString ¬es); + QString GetNotes() const; public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) override; virtual void PointNameChanged() override; diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.ui b/src/libs/vtools/dialogs/tools/dialogtruedarts.ui index 9c94a1761..134d9c913 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.ui +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.ui @@ -6,8 +6,8 @@ 0 0 - 372 - 278 + 304 + 308 @@ -19,138 +19,158 @@ - - - QFormLayout::ExpandingFieldsGrow + + + 0 - - - - - 0 - 0 - + + + Tool + + + + QFormLayout::ExpandingFieldsGrow - - First base point: - - - - - - - - - - - 0 - 0 - - - - Second base point: - - - - - - - - - - - 0 - 0 - - - - First dart point: - - - - - - - - - - Second dart point: - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 80 - 14 - - - - - - - - Third dart point: - - - - - - - - - - - 0 - 0 - - - - First new dart point: - - - - - - - Unique label - - - Choose unique label. - - - - - - - Second new dart point: - - - - - - - Unique label - - - Choose unique label. - - - - + + + + + 0 + 0 + + + + First base point: + + + + + + + + + + + 0 + 0 + + + + Second base point: + + + + + + + + + + + 0 + 0 + + + + First dart point: + + + + + + + + + + Second dart point: + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 80 + 14 + + + + + + + + Third dart point: + + + + + + + + + + + 0 + 0 + + + + First new dart point: + + + + + + + Unique label + + + Choose unique label. + + + + + + + Second new dart point: + + + + + + + Unique label + + + Choose unique label. + + + + + + + + Notes + + + + + + + + diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.cpp index ad59a898f..bf3f542ea 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.cpp @@ -40,8 +40,8 @@ //--------------------------------------------------------------------------------------------------------------------- VAbstractFlipping::VAbstractFlipping(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &suffix, const QVector &source, const QVector &destination, - QGraphicsItem *parent) - : VAbstractOperation(doc, data, id, suffix, source, destination, parent) + const QString ¬es, QGraphicsItem *parent) + : VAbstractOperation(doc, data, id, suffix, source, destination, notes, parent) { } diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h b/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h index dcee6bbdc..7af3b971a 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vabstractflipping.h @@ -40,7 +40,7 @@ public: virtual ~VAbstractFlipping() Q_DECL_EQ_DEFAULT; protected: VAbstractFlipping(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &suffix, - const QVector &source, const QVector &destination, + const QVector &source, const QVector &destination, const QString ¬es, QGraphicsItem *parent = nullptr); static void CreateDestination(VAbstractOperationInitData &initData, const QPointF &fPoint, const QPointF &sPoint); diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp index fb95ac1f3..bcac26423 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyaxis.cpp @@ -74,6 +74,7 @@ void VToolFlippingByAxis::setDialog() dialogTool->SetOriginPointId(m_originPointId); dialogTool->SetAxisType(m_axisType); dialogTool->SetSuffix(suffix); + dialogTool->SetNotes(m_notes); SetDialogVisibilityGroupData(dialogTool); } @@ -99,6 +100,7 @@ VToolFlippingByAxis *VToolFlippingByAxis::Create(const QPointer &dia initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolFlippingByAxis* operation = Create(initData); if (operation != nullptr) @@ -226,6 +228,9 @@ void VToolFlippingByAxis::SaveDialog(QDomElement &domElement, QList &ol doc->SetAttribute(domElement, AttrAxisType, QString().setNum(static_cast(dialogTool->GetAxisType()))); doc->SetAttribute(domElement, AttrSuffix, dialogTool->GetSuffix()); + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); + // Save visibility data for later use SaveVisibilityGroupData(dialogTool); } @@ -265,7 +270,7 @@ QString VToolFlippingByAxis::MakeToolTip() const //--------------------------------------------------------------------------------------------------------------------- VToolFlippingByAxis::VToolFlippingByAxis(const VToolFlippingByAxisInitData &initData, QGraphicsItem *parent) : VAbstractFlipping(initData.doc, initData.data, initData.id, initData.suffix, initData.source, - initData.destination, parent), + initData.destination, initData.notes, parent), m_originPointId(initData.originPointId), m_axisType(initData.axisType) { diff --git a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp index e21bd8093..5c70ec11b 100644 --- a/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp +++ b/src/libs/vtools/tools/drawTools/operation/flipping/vtoolflippingbyline.cpp @@ -74,6 +74,7 @@ void VToolFlippingByLine::setDialog() dialogTool->SetFirstLinePointId(m_firstLinePointId); dialogTool->SetSecondLinePointId(m_secondLinePointId); dialogTool->SetSuffix(suffix); + dialogTool->SetNotes(m_notes); SetDialogVisibilityGroupData(dialogTool); } @@ -99,6 +100,7 @@ VToolFlippingByLine *VToolFlippingByLine::Create(const QPointer &dia initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolFlippingByLine* operation = Create(initData); if (operation != nullptr) @@ -213,6 +215,9 @@ void VToolFlippingByLine::SaveDialog(QDomElement &domElement, QList &ol doc->SetAttribute(domElement, AttrP2Line, QString().setNum(dialogTool->GetSecondLinePointId())); doc->SetAttribute(domElement, AttrSuffix, dialogTool->GetSuffix()); + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); + // Save visibility data for later use SaveVisibilityGroupData(dialogTool); } @@ -254,7 +259,7 @@ QString VToolFlippingByLine::MakeToolTip() const //--------------------------------------------------------------------------------------------------------------------- VToolFlippingByLine::VToolFlippingByLine(const VToolFlippingByLineInitData &initData, QGraphicsItem *parent) : VAbstractFlipping(initData.doc, initData.data, initData.id, initData.suffix, initData.source, - initData.destination, parent), + initData.destination, initData.notes, parent), m_firstLinePointId(initData.firstLinePointId), m_secondLinePointId(initData.secondLinePointId) { diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp index 434741545..0a284f22b 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.cpp @@ -522,8 +522,8 @@ void VAbstractOperation::LabelChangePosition(const QPointF &pos, quint32 labelId //--------------------------------------------------------------------------------------------------------------------- VAbstractOperation::VAbstractOperation(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &suffix, const QVector &source, const QVector &destination, - QGraphicsItem *parent) - : VDrawTool(doc, data, id), + const QString ¬es, QGraphicsItem *parent) + : VDrawTool(doc, data, id, notes), QGraphicsLineItem(parent), suffix(suffix), source(source), diff --git a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h index fe352a7f8..57eb6ff06 100644 --- a/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h +++ b/src/libs/vtools/tools/drawTools/operation/vabstractoperation.h @@ -139,7 +139,7 @@ protected: VAbstractOperation(VAbstractPattern *doc, VContainer *data, quint32 id, const QString &suffix, const QVector &source, const QVector &destination, - QGraphicsItem *parent = nullptr); + const QString ¬es, QGraphicsItem *parent = nullptr); virtual void AddToFile() override; virtual void ChangeLabelVisibility(quint32 id, bool visible) override; diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp index 2298c35c4..df6489f4e 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolmove.cpp @@ -128,6 +128,7 @@ void VToolMove::setDialog() dialogTool->SetLength(formulaLength); dialogTool->SetSuffix(suffix); dialogTool->SetRotationOrigPointId(origPointId); + dialogTool->SetNotes(m_notes); SetDialogVisibilityGroupData(dialogTool); } @@ -155,6 +156,7 @@ VToolMove *VToolMove::Create(const QPointer &dialog, VMainGraphicsSc initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolMove* operation = Create(initData); if (operation != nullptr) @@ -482,6 +484,9 @@ void VToolMove::SaveDialog(QDomElement &domElement, QList &oldDependenc doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->GetRotationOrigPointId())); doc->SetAttribute(domElement, AttrRotationAngle, dialogTool->GetRotationAngle()); + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); + // Save visibility data for later use SaveVisibilityGroupData(dialogTool); } @@ -536,7 +541,7 @@ QString VToolMove::MakeToolTip() const //--------------------------------------------------------------------------------------------------------------------- VToolMove::VToolMove(const VToolMoveInitData &initData, QGraphicsItem *parent) : VAbstractOperation(initData.doc, initData.data, initData.id, initData.suffix, initData.source, - initData.destination, parent), + initData.destination, initData.notes, parent), formulaAngle(initData.formulaAngle), formulaRotationAngle(initData.formulaRotationAngle), formulaLength(initData.formulaLength), diff --git a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp index c689a78a0..7506c7077 100644 --- a/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp +++ b/src/libs/vtools/tools/drawTools/operation/vtoolrotation.cpp @@ -81,7 +81,7 @@ const QString VToolRotation::ToolType = QStringLiteral("rotation"); //--------------------------------------------------------------------------------------------------------------------- VToolRotation::VToolRotation(const VToolRotationInitData &initData, QGraphicsItem *parent) : VAbstractOperation(initData.doc, initData.data, initData.id, initData.suffix, initData.source, - initData.destination, parent), + initData.destination, initData.notes, parent), origPointId(initData.origin), formulaAngle(initData.angle) { @@ -98,6 +98,7 @@ void VToolRotation::setDialog() dialogTool->SetOrigPointId(origPointId); dialogTool->SetAngle(formulaAngle); dialogTool->SetSuffix(suffix); + dialogTool->SetNotes(m_notes); SetDialogVisibilityGroupData(dialogTool); } @@ -123,6 +124,7 @@ VToolRotation *VToolRotation::Create(const QPointer &dialog, VMainGr initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolRotation* operation = Create(initData); if (operation != nullptr) @@ -362,6 +364,9 @@ void VToolRotation::SaveDialog(QDomElement &domElement, QList &oldDepen doc->SetAttribute(domElement, AttrAngle, dialogTool->GetAngle()); doc->SetAttribute(domElement, AttrSuffix, dialogTool->GetSuffix()); + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); + // Save visibility data for later use SaveVisibilityGroupData(dialogTool); } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp index 26ea19822..155b055d3 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.cpp @@ -55,8 +55,9 @@ #include "../vdrawtool.h" //--------------------------------------------------------------------------------------------------------------------- -VAbstractSpline::VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent) - :VDrawTool(doc, data, id), +VAbstractSpline::VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, + QGraphicsItem *parent) + :VDrawTool(doc, data, id, notes), QGraphicsPathItem(parent), controlPoints(), sceneType(SceneObject::Unknown), @@ -502,8 +503,9 @@ void VAbstractSpline::GroupVisibility(quint32 object, bool visible) // VToolAbstractArc //--------------------------------------------------------------------------------------------------------------------- -VToolAbstractArc::VToolAbstractArc(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent) - : VAbstractSpline(doc, data, id, parent) +VToolAbstractArc::VToolAbstractArc(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, + QGraphicsItem *parent) + : VAbstractSpline(doc, data, id, notes, parent) {} //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h index 62aa088a3..83b8ddf99 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h +++ b/src/libs/vtools/tools/drawTools/toolcurve/vabstractspline.h @@ -72,7 +72,8 @@ class VAbstractSpline:public VDrawTool, public QGraphicsPathItem { Q_OBJECT public: - VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); + VAbstractSpline(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, + QGraphicsItem * parent = nullptr); virtual ~VAbstractSpline() Q_DECL_EQ_DEFAULT; virtual QPainterPath shape() const override; @@ -249,7 +250,8 @@ void VAbstractSpline::InitElArcToolConnections(VMainGraphicsScene *scene, T *too class VToolAbstractArc:public VAbstractSpline { public: - VToolAbstractArc(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent = nullptr); + VToolAbstractArc(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, + QGraphicsItem *parent = nullptr); virtual ~VToolAbstractArc() = default; QString CenterPointName() const; diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp index 801137749..c18d7d323 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarc.cpp @@ -64,7 +64,7 @@ const QString VToolArc::ToolType = QStringLiteral("simple"); * @param initData init data */ VToolArc::VToolArc(const VToolArcInitData &initData, QGraphicsItem *parent) - : VToolAbstractArc(initData.doc, initData.data, initData.id, parent) + : VToolAbstractArc(initData.doc, initData.data, initData.id, initData.notes, parent) { sceneType = SceneObject::Arc; @@ -90,6 +90,7 @@ void VToolArc::setDialog() dialogTool->SetColor(arc->GetColor()); dialogTool->SetPenStyle(arc->GetPenStyle()); dialogTool->SetApproximationScale(arc->GetApproximationScale()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -120,6 +121,7 @@ VToolArc* VToolArc::Create(const QPointer &dialog, VMainGraphicsScen initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; initData.approximationScale = dialogTool->GetApproximationScale(); + initData.notes = dialogTool->GetNotes(); VToolArc* point = Create(initData); if (point != nullptr) @@ -336,6 +338,9 @@ void VToolArc::SaveDialog(QDomElement &domElement, QList &oldDependenci doc->SetAttribute(domElement, AttrColor, dialogTool->GetColor()); doc->SetAttribute(domElement, AttrPenStyle, dialogTool->GetPenStyle()); doc->SetAttribute(domElement, AttrAScale, dialogTool->GetApproximationScale()); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp index dfa297148..46014c9a2 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolarcwithlength.cpp @@ -60,7 +60,7 @@ const QString VToolArcWithLength::ToolType = QStringLiteral("arcWithLength"); //--------------------------------------------------------------------------------------------------------------------- VToolArcWithLength::VToolArcWithLength(const VToolArcWithLengthInitData &initData, QGraphicsItem *parent) - :VToolAbstractArc(initData.doc, initData.data, initData.id, parent) + :VToolAbstractArc(initData.doc, initData.data, initData.id, initData.notes, parent) { sceneType = SceneObject::Arc; @@ -83,6 +83,7 @@ void VToolArcWithLength::setDialog() dialogTool->SetColor(arc->GetColor()); dialogTool->SetPenStyle(arc->GetPenStyle()); dialogTool->SetApproximationScale(arc->GetApproximationScale()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -106,6 +107,7 @@ VToolArcWithLength *VToolArcWithLength::Create(const QPointer &dialo initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolArcWithLength* point = Create(initData); if (point != nullptr) @@ -315,6 +317,9 @@ void VToolArcWithLength::SaveDialog(QDomElement &domElement, QList &old doc->SetAttribute(domElement, AttrColor, dialogTool->GetColor()); doc->SetAttribute(domElement, AttrPenStyle, dialogTool->GetPenStyle()); doc->SetAttribute(domElement, AttrAScale, dialogTool->GetApproximationScale()); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp index 32eb7958f..61456c494 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezier.cpp @@ -58,7 +58,7 @@ const QString VToolCubicBezier::ToolType = QStringLiteral("cubicBezier"); //--------------------------------------------------------------------------------------------------------------------- VToolCubicBezier::VToolCubicBezier(const VToolCubicBezierInitData &initData, QGraphicsItem *parent) - :VAbstractSpline(initData.doc, initData.data, initData.id, parent) + :VAbstractSpline(initData.doc, initData.data, initData.id, initData.notes, parent) { sceneType = SceneObject::Spline; @@ -75,6 +75,7 @@ void VToolCubicBezier::setDialog() SCASSERT(dialogTool != nullptr) const auto spl = VAbstractTool::data.GeometricObject(m_id); dialogTool->SetSpline(*spl); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -92,6 +93,7 @@ VToolCubicBezier *VToolCubicBezier::Create(const QPointer &dialog, V initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; initData.spline = new VCubicBezier(dialogTool->GetSpline()); + initData.notes = dialogTool->GetNotes(); auto* spl = Create(initData); @@ -231,6 +233,9 @@ void VToolCubicBezier::SaveDialog(QDomElement &domElement, QList &oldDe AddDependence(newDependencies, spl.GetP3().id()); AddDependence(newDependencies, spl.GetP4().id()); + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); + SetSplineAttributes(domElement, spl); } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp index e0b57f1a0..174717407 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolcubicbezierpath.cpp @@ -60,7 +60,7 @@ const QString VToolCubicBezierPath::ToolType = QStringLiteral("cubicBezierPath") //--------------------------------------------------------------------------------------------------------------------- VToolCubicBezierPath::VToolCubicBezierPath(const VToolCubicBezierPathInitData &initData, QGraphicsItem *parent) - : VAbstractSpline(initData.doc, initData.data, initData.id, parent) + : VAbstractSpline(initData.doc, initData.data, initData.id, initData.notes, parent) { sceneType = SceneObject::SplinePath; @@ -77,6 +77,7 @@ void VToolCubicBezierPath::setDialog() SCASSERT(dialogTool != nullptr) const QSharedPointer splPath = VAbstractTool::data.GeometricObject(m_id); dialogTool->SetPath(*splPath); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -93,6 +94,7 @@ VToolCubicBezierPath *VToolCubicBezierPath::Create(const QPointer &d initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); initData.path = new VCubicBezierPath(dialogTool->GetPath()); for (qint32 i = 0; i < initData.path->CountPoints(); ++i) @@ -217,6 +219,9 @@ void VToolCubicBezierPath::SaveDialog(QDomElement &domElement, QList &o AddDependence(newDependencies, splPath.at(i).id()); } + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); + SetSplinePathAttributes(domElement, splPath); } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp index 556faf696..00be5b2b8 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolellipticalarc.cpp @@ -65,7 +65,7 @@ const QString VToolEllipticalArc::ToolType = QStringLiteral("simple"); * @param parent parent object */ VToolEllipticalArc::VToolEllipticalArc(const VToolEllipticalArcInitData &initData, QGraphicsItem *parent) - :VToolAbstractArc(initData.doc, initData.data, initData.id, parent) + :VToolAbstractArc(initData.doc, initData.data, initData.id, initData.notes, parent) { sceneType = SceneObject::ElArc; @@ -92,6 +92,7 @@ void VToolEllipticalArc::setDialog() dialogTool->SetRotationAngle(elArc->GetFormulaRotationAngle()); dialogTool->SetColor(elArc->GetColor()); dialogTool->SetPenStyle(elArc->GetPenStyle()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -123,6 +124,7 @@ VToolEllipticalArc* VToolEllipticalArc::Create(const QPointer &dialo initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); //initData.approximationScale = dialogTool->GetApproximationScale(); // For future use VToolEllipticalArc* point = Create(initData); @@ -383,6 +385,9 @@ void VToolEllipticalArc::SaveDialog(QDomElement &domElement, QList &old doc->SetAttribute(domElement, AttrRotationAngle, dialogTool->GetRotationAngle()); doc->SetAttribute(domElement, AttrColor, dialogTool->GetColor()); doc->SetAttribute(domElement, AttrPenStyle, dialogTool->GetPenStyle()); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index 1dc7a3407..60d6abf7b 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -77,7 +77,7 @@ const QString VToolSpline::OldToolType = QStringLiteral("simple"); * @param parent parent object. */ VToolSpline::VToolSpline(const VToolSplineInitData &initData, QGraphicsItem *parent) - : VAbstractSpline(initData.doc, initData.data, initData.id, parent), + : VAbstractSpline(initData.doc, initData.data, initData.id, initData.notes, parent), oldPosition(), moved(false), oldMoveSpline(), @@ -131,6 +131,7 @@ void VToolSpline::setDialog() SCASSERT(not dialogTool.isNull()) const auto spl = VAbstractTool::data.GeometricObject(m_id); dialogTool->SetSpline(*spl); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -155,6 +156,7 @@ VToolSpline* VToolSpline::Create(const QPointer &dialog, VMainGraphi initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); auto spl = Create(initData, new VSpline(dialogTool->GetSpline())); @@ -338,6 +340,9 @@ void VToolSpline::SaveDialog(QDomElement &domElement, QList &oldDepende controlPoints[0]->blockSignals(false); controlPoints[1]->blockSignals(false); + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); + SetSplineAttributes(domElement, spl); } diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index ebdab5e21..ffccde2eb 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -83,7 +83,7 @@ const QString VToolSplinePath::OldToolType = QStringLiteral("path"); * @param parent parent object. */ VToolSplinePath::VToolSplinePath(const VToolSplinePathInitData &initData, QGraphicsItem *parent) - : VAbstractSpline(initData.doc, initData.data, initData.id, parent), + : VAbstractSpline(initData.doc, initData.data, initData.id, initData.notes, parent), oldPosition(), splIndex(-1), moved(false), @@ -166,6 +166,7 @@ void VToolSplinePath::setDialog() SCASSERT(not dialogTool.isNull()) const QSharedPointer splPath = VAbstractTool::data.GeometricObject(m_id); dialogTool->SetPath(*splPath); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -189,6 +190,7 @@ VToolSplinePath* VToolSplinePath::Create(const QPointer &dialog, VMa initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VSplinePath *path = new VSplinePath(dialogTool->GetPath()); for (qint32 i = 0; i < path->CountPoints(); ++i) @@ -536,6 +538,9 @@ void VToolSplinePath::SaveDialog(QDomElement &domElement, QList &oldDep controlPoints[j-1]->blockSignals(false); } + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); + SetSplinePathAttributes(domElement, splPath); } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp index e4100d3d0..1192a5037 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.cpp @@ -55,8 +55,8 @@ //--------------------------------------------------------------------------------------------------------------------- VToolDoublePoint::VToolDoublePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 p1id, quint32 p2id, - QGraphicsItem *parent) - :VAbstractPoint(doc, data, id), + const QString ¬es, QGraphicsItem *parent) + :VAbstractPoint(doc, data, id, notes), QGraphicsPathItem(parent), firstPoint(nullptr), secondPoint(nullptr), diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h index 708ab4471..e3fe3f8c9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooldoublepoint.h @@ -49,7 +49,7 @@ class VToolDoublePoint: public VAbstractPoint, public QGraphicsPathItem Q_OBJECT public: VToolDoublePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 p1id, quint32 p2id, - QGraphicsItem * parent = nullptr); + const QString ¬es, QGraphicsItem * parent = nullptr); virtual ~VToolDoublePoint() Q_DECL_EQ_DEFAULT; virtual int type() const override {return Type;} diff --git a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp index f19f5df6a..74fa8a91e 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/tooldoublepoint/vtooltruedarts.cpp @@ -57,7 +57,7 @@ const QString VToolTrueDarts::ToolType = QStringLiteral("trueDarts"); //--------------------------------------------------------------------------------------------------------------------- VToolTrueDarts::VToolTrueDarts(const VToolTrueDartsInitData &initData, QGraphicsItem *parent) - :VToolDoublePoint(initData.doc, initData.data, initData.id, initData.p1id, initData.p2id, parent), + :VToolDoublePoint(initData.doc, initData.data, initData.id, initData.p1id, initData.p2id, initData.notes, parent), baseLineP1Id (initData.baseLineP1Id), baseLineP2Id(initData.baseLineP2Id), dartP1Id(initData.dartP1Id), @@ -108,6 +108,7 @@ void VToolTrueDarts::setDialog() dialogTool->SetFirstDartPointId(dartP1Id); dialogTool->SetSecondDartPointId(dartP2Id); dialogTool->SetThirdDartPointId(dartP3Id); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -131,6 +132,7 @@ VToolTrueDarts *VToolTrueDarts::Create(const QPointer &dialog, VMain initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolTrueDarts *point = Create(initData); if (point != nullptr) @@ -288,6 +290,9 @@ void VToolTrueDarts::SaveDialog(QDomElement &domElement, QList &oldDepe doc->SetAttribute(domElement, AttrDartP1, QString().setNum(dialogTool->GetFirstDartPointId())); doc->SetAttribute(domElement, AttrDartP2, QString().setNum(dialogTool->GetSecondDartPointId())); doc->SetAttribute(domElement, AttrDartP3, QString().setNum(dialogTool->GetThirdDartPointId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp index 250bd5122..d20aac17c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp @@ -45,8 +45,8 @@ //--------------------------------------------------------------------------------------------------------------------- VToolCut::VToolCut(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula, - const quint32 &curveCutId, QGraphicsItem *parent) - : VToolSinglePoint(doc, data, id, parent), + const quint32 &curveCutId, const QString ¬es, QGraphicsItem *parent) + : VToolSinglePoint(doc, data, id, notes, parent), formula(formula), curveCutId(curveCutId), detailsMode(qApp->Settings()->IsShowCurveDetails()) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h index 88c36d5e7..7dfff48e6 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.h @@ -50,7 +50,7 @@ class VToolCut : public VToolSinglePoint Q_OBJECT public: VToolCut(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula, - const quint32 &curveCutId, QGraphicsItem * parent = nullptr); + const quint32 &curveCutId, const QString ¬es, QGraphicsItem * parent = nullptr); virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::Cut)}; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp index 97441ad9b..6fa112a1b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp @@ -63,7 +63,7 @@ const QString VToolCutArc::ToolType = QStringLiteral("cutArc"); * @param parent parent object. */ VToolCutArc::VToolCutArc(const VToolCutArcInitData &initData, QGraphicsItem * parent) - :VToolCut(initData.doc, initData.data, initData.id, initData.formula, initData.arcId, parent) + :VToolCut(initData.doc, initData.data, initData.id, initData.formula, initData.arcId, initData.notes, parent) { ToolCreation(initData.typeCreation); } @@ -81,6 +81,7 @@ void VToolCutArc::setDialog() dialogTool->SetFormula(formula); dialogTool->setArcId(curveCutId); dialogTool->SetPointName(point->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -107,6 +108,7 @@ VToolCutArc* VToolCutArc::Create(const QPointer &dialog, VMainGraphi initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolCutArc* point = Create(initData); if (point != nullptr) @@ -216,6 +218,9 @@ void VToolCutArc::SaveDialog(QDomElement &domElement, QList &oldDepende doc->SetAttribute(domElement, AttrName, dialogTool->GetPointName()); doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula()); doc->SetAttribute(domElement, AttrArc, QString().setNum(dialogTool->getArcId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp index d187d095f..3c7308148 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp @@ -66,7 +66,7 @@ const QString VToolCutSpline::AttrSpline = QStringLiteral("spline"); * @param parent parent object. */ VToolCutSpline::VToolCutSpline(const VToolCutSplineInitData &initData, QGraphicsItem *parent) - :VToolCut(initData.doc, initData.data, initData.id, initData.formula, initData.splineId, parent) + :VToolCut(initData.doc, initData.data, initData.id, initData.formula, initData.splineId, initData.notes, parent) { ToolCreation(initData.typeCreation); } @@ -84,6 +84,7 @@ void VToolCutSpline::setDialog() dialogTool->SetFormula(formula); dialogTool->setSplineId(curveCutId); dialogTool->SetPointName(point->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -110,6 +111,7 @@ VToolCutSpline* VToolCutSpline::Create(const QPointer &dialog, VMain initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolCutSpline* point = Create(initData); if (point != nullptr) @@ -215,6 +217,9 @@ void VToolCutSpline::SaveDialog(QDomElement &domElement, QList &oldDepe doc->SetAttribute(domElement, AttrName, dialogTool->GetPointName()); doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula()); doc->SetAttribute(domElement, AttrSpline, QString().setNum(dialogTool->getSplineId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp index 21cb37257..f184679cc 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp @@ -69,7 +69,7 @@ const QString VToolCutSplinePath::AttrSplinePath = QStringLiteral("splinePath"); * @param parent parent object. */ VToolCutSplinePath::VToolCutSplinePath(const VToolCutSplinePathInitData &initData, QGraphicsItem *parent) - :VToolCut(initData.doc, initData.data, initData.id, initData.formula, initData.splinePathId, parent) + :VToolCut(initData.doc, initData.data, initData.id, initData.formula, initData.splinePathId, initData.notes, parent) { ToolCreation(initData.typeCreation); } @@ -87,6 +87,7 @@ void VToolCutSplinePath::setDialog() dialogTool->SetFormula(formula); dialogTool->setSplinePathId(curveCutId); dialogTool->SetPointName(point->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -113,6 +114,7 @@ VToolCutSplinePath* VToolCutSplinePath::Create(const QPointer &dialo initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolCutSplinePath* point = Create(initData); if (point != nullptr) @@ -306,6 +308,9 @@ void VToolCutSplinePath::SaveDialog(QDomElement &domElement, QList &old doc->SetAttribute(domElement, AttrName, dialogTool->GetPointName()); doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula()); doc->SetAttribute(domElement, AttrSplinePath, QString().setNum(dialogTool->getSplinePathId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp index a239186f3..6d2da01ac 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp @@ -66,7 +66,7 @@ const QString VToolAlongLine::ToolType = QStringLiteral("alongLine"); */ VToolAlongLine::VToolAlongLine(const VToolAlongLineInitData &initData, QGraphicsItem *parent) :VToolLinePoint(initData.doc, initData.data, initData.id, initData.typeLine, initData.lineColor, initData.formula, - initData.firstPointId, 0, parent), + initData.firstPointId, 0, initData.notes, parent), secondPointId(initData.secondPointId) { ToolCreation(initData.typeCreation); @@ -105,6 +105,9 @@ void VToolAlongLine::SaveDialog(QDomElement &domElement, QList &oldDepe doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula()); doc->SetAttribute(domElement, AttrFirstPoint, dialogTool->GetFirstPointId()); doc->SetAttribute(domElement, AttrSecondPoint, dialogTool->GetSecondPointId()); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- @@ -209,6 +212,7 @@ void VToolAlongLine::setDialog() dialogTool->SetFirstPointId(basePointId); dialogTool->SetSecondPointId(secondPointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -238,6 +242,7 @@ VToolAlongLine* VToolAlongLine::Create(const QPointer &dialog, VMain initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolAlongLine *point = Create(initData); if (point != nullptr) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp index 93528d70a..c3a2597f0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp @@ -63,7 +63,7 @@ const QString VToolBisector::ToolType = QStringLiteral("bisector"); */ VToolBisector::VToolBisector(const VToolBisectorInitData &initData, QGraphicsItem *parent) :VToolLinePoint(initData.doc, initData.data, initData.id, initData.typeLine, initData.lineColor, initData.formula, - initData.secondPointId, 0, parent), + initData.secondPointId, 0, initData.notes, parent), firstPointId(initData.firstPointId), thirdPointId(initData.thirdPointId) { @@ -122,6 +122,7 @@ void VToolBisector::setDialog() dialogTool->SetSecondPointId(basePointId); dialogTool->SetThirdPointId(thirdPointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -152,6 +153,7 @@ VToolBisector* VToolBisector::Create(const QPointer &dialog, VMainGr initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolBisector *point = Create(initData); if (point != nullptr) @@ -261,6 +263,9 @@ void VToolBisector::SaveDialog(QDomElement &domElement, QList &oldDepen doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPointId())); doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPointId())); doc->SetAttribute(domElement, AttrThirdPoint, QString().setNum(dialogTool->GetThirdPointId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp index 5a38f665d..b8f4b6cb6 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp @@ -74,7 +74,7 @@ const QString VToolCurveIntersectAxis::ToolType = QStringLiteral("curveIntersect VToolCurveIntersectAxis::VToolCurveIntersectAxis(const VToolCurveIntersectAxisInitData &initData, QGraphicsItem *parent) :VToolLinePoint(initData.doc, initData.data, initData.id, initData.typeLine, initData.lineColor, QString(), - initData.basePointId, 0, parent), + initData.basePointId, 0, initData.notes, parent), formulaAngle(initData.formulaAngle), curveId(initData.curveId) { @@ -95,6 +95,7 @@ void VToolCurveIntersectAxis::setDialog() dialogTool->SetBasePointId(basePointId); dialogTool->setCurveId(curveId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -118,6 +119,7 @@ VToolCurveIntersectAxis *VToolCurveIntersectAxis::Create(const QPointerGetNotes(); VToolCurveIntersectAxis *point = Create(initData); if (point != nullptr) @@ -262,6 +264,9 @@ void VToolCurveIntersectAxis::SaveDialog(QDomElement &domElement, QList doc->SetAttribute(domElement, AttrAngle, dialogTool->GetAngle()); doc->SetAttribute(domElement, AttrBasePoint, QString().setNum(dialogTool->GetBasePointId())); doc->SetAttribute(domElement, AttrCurve, QString().setNum(dialogTool->getCurveId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp index f738f2267..a937939c9 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp @@ -64,7 +64,7 @@ const QString VToolEndLine::ToolType = QStringLiteral("endLine"); */ VToolEndLine::VToolEndLine(const VToolEndLineInitData &initData, QGraphicsItem *parent) :VToolLinePoint(initData.doc, initData.data, initData.id, initData.typeLine, initData.lineColor, - initData.formulaLength, initData.basePointId, 0, parent), + initData.formulaLength, initData.basePointId, 0, initData.notes, parent), formulaAngle(initData.formulaAngle) { ToolCreation(initData.typeCreation); @@ -87,6 +87,7 @@ void VToolEndLine::setDialog() dialogTool->SetAngle(formulaAngle); dialogTool->SetBasePointId(basePointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -117,6 +118,7 @@ VToolEndLine* VToolEndLine::Create(const QPointer &dialog, VMainGrap initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolEndLine *point = Create(initData); if (point != nullptr) @@ -190,6 +192,9 @@ void VToolEndLine::SaveDialog(QDomElement &domElement, QList &oldDepend doc->SetAttribute(domElement, AttrLength, dialogTool->GetFormula()); doc->SetAttribute(domElement, AttrAngle, dialogTool->GetAngle()); doc->SetAttribute(domElement, AttrBasePoint, QString().setNum(dialogTool->GetBasePointId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp index 2a12a584e..71deadfa3 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolheight.cpp @@ -60,7 +60,7 @@ const QString VToolHeight::ToolType = QStringLiteral("height"); */ VToolHeight::VToolHeight(const VToolHeightInitData &initData, QGraphicsItem * parent) :VToolLinePoint(initData.doc, initData.data, initData.id, initData.typeLine, initData.lineColor, QString(), - initData.basePointId, 0, parent), + initData.basePointId, 0, initData.notes, parent), p1LineId(initData.p1LineId), p2LineId(initData.p2LineId) { @@ -83,6 +83,7 @@ void VToolHeight::setDialog() dialogTool->SetP1LineId(p1LineId); dialogTool->SetP2LineId(p2LineId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -113,6 +114,7 @@ VToolHeight* VToolHeight::Create(const QPointer &dialog, VMainGraphi initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolHeight *point = Create(initData); if (point != nullptr) @@ -221,6 +223,9 @@ void VToolHeight::SaveDialog(QDomElement &domElement, QList &oldDepende doc->SetAttribute(domElement, AttrBasePoint, QString().setNum(dialogTool->GetBasePointId())); doc->SetAttribute(domElement, AttrP1Line, QString().setNum(dialogTool->GetP1LineId())); doc->SetAttribute(domElement, AttrP2Line, QString().setNum(dialogTool->GetP2LineId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp index 2f742d71f..84d8b3830 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp @@ -60,7 +60,7 @@ const QString VToolLineIntersectAxis::ToolType = QStringLiteral("lineIntersectAx //--------------------------------------------------------------------------------------------------------------------- VToolLineIntersectAxis::VToolLineIntersectAxis(const VToolLineIntersectAxisInitData &initData, QGraphicsItem *parent) :VToolLinePoint(initData.doc, initData.data, initData.id, initData.typeLine, initData.lineColor, QString(), - initData.basePointId, 0, parent), + initData.basePointId, 0, initData.notes, parent), formulaAngle(initData.formulaAngle), firstPointId(initData.firstPointId), secondPointId(initData.secondPointId) @@ -83,6 +83,7 @@ void VToolLineIntersectAxis::setDialog() dialogTool->SetFirstPointId(firstPointId); dialogTool->SetSecondPointId(secondPointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -106,6 +107,7 @@ VToolLineIntersectAxis *VToolLineIntersectAxis::Create(const QPointerGetNotes(); VToolLineIntersectAxis *point = Create(initData); if (point != nullptr) @@ -279,6 +281,9 @@ void VToolLineIntersectAxis::SaveDialog(QDomElement &domElement, QList doc->SetAttribute(domElement, AttrBasePoint, QString().setNum(dialogTool->GetBasePointId())); doc->SetAttribute(domElement, AttrP1Line, QString().setNum(dialogTool->GetFirstPointId())); doc->SetAttribute(domElement, AttrP2Line, QString().setNum(dialogTool->GetSecondPointId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp index eff502941..6725ad7cc 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp @@ -67,8 +67,8 @@ template class QSharedPointer; */ VToolLinePoint::VToolLinePoint(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &lineColor, const QString &formula, const quint32 &basePointId, - const qreal &angle, QGraphicsItem *parent) - :VToolSinglePoint(doc, data, id, parent), formulaLength(formula), angle(angle), basePointId(basePointId), + const qreal &angle, const QString ¬es, QGraphicsItem *parent) + :VToolSinglePoint(doc, data, id, notes, parent), formulaLength(formula), angle(angle), basePointId(basePointId), mainLine(nullptr), lineColor(lineColor) { this->m_lineType = typeLine; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h index e30241bd7..ba1f7ae37 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.h @@ -63,7 +63,7 @@ class VToolLinePoint : public VToolSinglePoint public: VToolLinePoint(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &typeLine, const QString &lineColor, const QString &formula, const quint32 &basePointId, const qreal &angle, - QGraphicsItem * parent = nullptr); + const QString ¬es, QGraphicsItem * parent = nullptr); virtual ~VToolLinePoint() override; virtual int type() const override {return Type;} enum { Type = UserType + static_cast(Tool::LinePoint)}; diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp index 5b1c7e7b6..ff2bf7437 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp @@ -64,7 +64,7 @@ const QString VToolNormal::ToolType = QStringLiteral("normal"); */ VToolNormal::VToolNormal(const VToolNormalInitData &initData, QGraphicsItem *parent) :VToolLinePoint(initData.doc, initData.data, initData.id, initData.typeLine, initData.lineColor, initData.formula, - initData.firstPointId, initData.angle, parent), + initData.firstPointId, initData.angle, initData.notes, parent), secondPointId(initData.secondPointId) { @@ -88,6 +88,7 @@ void VToolNormal::setDialog() dialogTool->SetFirstPointId(basePointId); dialogTool->SetSecondPointId(secondPointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -118,6 +119,7 @@ VToolNormal* VToolNormal::Create(const QPointer &dialog, VMainGraphi initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolNormal *point = Create(initData); if (point != nullptr) @@ -232,6 +234,9 @@ void VToolNormal::SaveDialog(QDomElement &domElement, QList &oldDepende doc->SetAttribute(domElement, AttrAngle, QString().setNum(dialogTool->GetAngle())); doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPointId())); doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPointId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index 6c299c998..895f95edb 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -66,7 +66,7 @@ const QString VToolShoulderPoint::ToolType = QStringLiteral("shoulder"); */ VToolShoulderPoint::VToolShoulderPoint(const VToolShoulderPointInitData &initData, QGraphicsItem * parent) :VToolLinePoint(initData.doc, initData.data, initData.id, initData.typeLine, initData.lineColor, initData.formula, - initData.p1Line, 0, parent), + initData.p1Line, 0, initData.notes, parent), p2Line(initData.p2Line), pShoulder(initData.pShoulder) { @@ -90,6 +90,7 @@ void VToolShoulderPoint::setDialog() dialogTool->SetP2Line(p2Line); dialogTool->SetP3(pShoulder); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -166,6 +167,7 @@ VToolShoulderPoint* VToolShoulderPoint::Create(const QPointer &dialo initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolShoulderPoint * point = Create(initData); if (point != nullptr) @@ -279,6 +281,9 @@ void VToolShoulderPoint::SaveDialog(QDomElement &domElement, QList &old doc->SetAttribute(domElement, AttrP1Line, QString().setNum(dialogTool->GetP1Line())); doc->SetAttribute(domElement, AttrP2Line, QString().setNum(dialogTool->GetP2Line())); doc->SetAttribute(domElement, AttrPShoulder, QString().setNum(dialogTool->GetP3())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp index ec7834a0f..f2bd56923 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.cpp @@ -76,9 +76,9 @@ const QString VToolBasePoint::ToolType = QStringLiteral("single"); * @param parent parent object. */ VToolBasePoint::VToolBasePoint (const VToolBasePointInitData &initData, QGraphicsItem * parent ) - :VToolSinglePoint(initData.doc, initData.data, initData.id, parent), namePP(initData.nameActivPP) + :VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), + namePP(initData.nameActivPP) { - m_notes = initData.notes; m_baseColor = Qt::red; this->setFlag(QGraphicsItem::ItemIsMovable, true); this->setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp index 78be9fbb5..995acdaa5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoollineintersect.cpp @@ -64,7 +64,7 @@ const QString VToolLineIntersect::ToolType = QStringLiteral("lineIntersect"); * @param parent parent object. */ VToolLineIntersect::VToolLineIntersect(const VToolLineIntersectInitData &initData, QGraphicsItem *parent) - :VToolSinglePoint(initData.doc, initData.data, initData.id, parent), + :VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), p1Line1(initData.p1Line1Id), p2Line1(initData.p2Line1Id), p1Line2(initData.p1Line2Id), @@ -88,6 +88,7 @@ void VToolLineIntersect::setDialog() dialogTool->SetP1Line2(p1Line2); dialogTool->SetP2Line2(p2Line2); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -117,6 +118,7 @@ VToolLineIntersect* VToolLineIntersect::Create(const QPointer &dialo initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolLineIntersect* point = Create(initData); if (point != nullptr) @@ -259,6 +261,9 @@ void VToolLineIntersect::SaveDialog(QDomElement &domElement, QList &old doc->SetAttribute(domElement, AttrP2Line1, QString().setNum(dialogTool->GetP2Line1())); doc->SetAttribute(domElement, AttrP1Line2, QString().setNum(dialogTool->GetP1Line2())); doc->SetAttribute(domElement, AttrP2Line2, QString().setNum(dialogTool->GetP2Line2())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index 4b1d305d8..e4004777c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -58,7 +58,7 @@ const QString VToolPointFromArcAndTangent::ToolType = QStringLiteral("pointFromA //--------------------------------------------------------------------------------------------------------------------- VToolPointFromArcAndTangent::VToolPointFromArcAndTangent(const VToolPointFromArcAndTangentInitData &initData, QGraphicsItem *parent) - :VToolSinglePoint(initData.doc, initData.data, initData.id, parent), + :VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), arcId(initData.arcId), tangentPointId(initData.tangentPointId), crossPoint(initData.crossPoint) @@ -77,6 +77,7 @@ void VToolPointFromArcAndTangent::setDialog() dialogTool->SetCrossCirclesPoint(crossPoint); dialogTool->SetTangentPointId(tangentPointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -98,6 +99,7 @@ VToolPointFromArcAndTangent *VToolPointFromArcAndTangent::Create(const QPointer< initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolPointFromArcAndTangent *point = Create(initData); if (point != nullptr) @@ -298,6 +300,9 @@ void VToolPointFromArcAndTangent::SaveDialog(QDomElement &domElement, QListSetAttribute(domElement, AttrTangent, QString().setNum(dialogTool->GetTangentPointId())); doc->SetAttribute(domElement, AttrCrossPoint, QString().setNum(static_cast(dialogTool->GetCrossCirclesPoint()))); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp index db8ce5c4f..19fb58a80 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp @@ -59,7 +59,7 @@ const QString VToolPointFromCircleAndTangent::ToolType = QStringLiteral("pointFr //--------------------------------------------------------------------------------------------------------------------- VToolPointFromCircleAndTangent::VToolPointFromCircleAndTangent(const VToolPointFromCircleAndTangentInitData &initData, QGraphicsItem *parent) - :VToolSinglePoint(initData.doc, initData.data, initData.id, parent), + :VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), circleCenterId(initData.circleCenterId), tangentPointId(initData.tangentPointId), circleRadius(initData.circleRadius), @@ -81,6 +81,7 @@ void VToolPointFromCircleAndTangent::setDialog() dialogTool->SetCrossCirclesPoint(crossPoint); dialogTool->SetTangentPointId(tangentPointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -104,6 +105,7 @@ VToolPointFromCircleAndTangent *VToolPointFromCircleAndTangent::Create(const QPo initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolPointFromCircleAndTangent *point = Create(initData); if (point != nullptr) @@ -290,6 +292,9 @@ void VToolPointFromCircleAndTangent::SaveDialog(QDomElement &domElement, QListSetAttribute(domElement, AttrCRadius, dialogTool->GetCircleRadius()); doc->SetAttribute(domElement, AttrCrossPoint, QString().setNum(static_cast(dialogTool->GetCrossCirclesPoint()))); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index 3b938047f..56d0f0aa5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -68,7 +68,7 @@ const QString VToolPointOfContact::ToolType = QStringLiteral("pointOfContact"); * @param parent parent object. */ VToolPointOfContact::VToolPointOfContact(const VToolPointOfContactInitData &initData, QGraphicsItem *parent) - : VToolSinglePoint(initData.doc, initData.data, initData.id, parent), + : VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), arcRadius(initData.radius), center(initData.center), firstPointId(initData.firstPointId), @@ -92,6 +92,7 @@ void VToolPointOfContact::setDialog() dialogTool->SetFirstPoint(firstPointId); dialogTool->SetSecondPoint(secondPointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -184,6 +185,7 @@ VToolPointOfContact* VToolPointOfContact::Create(const QPointer &dia initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolPointOfContact *point = Create(initData); if (point != nullptr) @@ -313,6 +315,9 @@ void VToolPointOfContact::SaveDialog(QDomElement &domElement, QList &ol doc->SetAttribute(domElement, AttrCenter, QString().setNum(dialogTool->getCenter())); doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPoint())); doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPoint())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp index 921d372bb..c6c1d6c4f 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersection.cpp @@ -61,7 +61,7 @@ const QString VToolPointOfIntersection::ToolType = QStringLiteral("pointOfInters */ VToolPointOfIntersection::VToolPointOfIntersection(const VToolPointOfIntersectionInitData &initData, QGraphicsItem *parent) - :VToolSinglePoint(initData.doc, initData.data, initData.id, parent), + :VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), firstPointId(initData.firstPointId), secondPointId(initData.secondPointId) { @@ -81,6 +81,7 @@ void VToolPointOfIntersection::setDialog() dialogTool->SetFirstPointId(firstPointId); dialogTool->SetSecondPointId(secondPointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -109,6 +110,7 @@ VToolPointOfIntersection *VToolPointOfIntersection::Create(const QPointerGetNotes(); VToolPointOfIntersection *point = Create(initData); if (point != nullptr) @@ -205,6 +207,9 @@ void VToolPointOfIntersection::SaveDialog(QDomElement &domElement, QListSetAttribute(domElement, AttrName, dialogTool->GetPointName()); doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPointId())); doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPointId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index 4b350a804..36b830b2d 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -58,7 +58,7 @@ const QString VToolPointOfIntersectionArcs::ToolType = QStringLiteral("pointOfIn //--------------------------------------------------------------------------------------------------------------------- VToolPointOfIntersectionArcs::VToolPointOfIntersectionArcs(const VToolPointOfIntersectionArcsInitData &initData, QGraphicsItem *parent) - :VToolSinglePoint(initData.doc, initData.data, initData.id, parent), + :VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), firstArcId(initData.firstArcId), secondArcId(initData.secondArcId), crossPoint(initData.pType) @@ -77,6 +77,7 @@ void VToolPointOfIntersectionArcs::setDialog() dialogTool->SetSecondArcId(secondArcId); dialogTool->SetCrossArcPoint(crossPoint); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -98,6 +99,7 @@ VToolPointOfIntersectionArcs *VToolPointOfIntersectionArcs::Create(const QPointe initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolPointOfIntersectionArcs *point = Create(initData); if (point != nullptr) @@ -319,6 +321,9 @@ void VToolPointOfIntersectionArcs::SaveDialog(QDomElement &domElement, QListSetAttribute(domElement, AttrFirstArc, QString().setNum(dialogTool->GetFirstArcId())); doc->SetAttribute(domElement, AttrSecondArc, QString().setNum(dialogTool->GetSecondArcId())); doc->SetAttribute(domElement, AttrCrossPoint, QString().setNum(static_cast(dialogTool->GetCrossArcPoint()))); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index c1a091609..164031486 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp @@ -59,7 +59,7 @@ const QString VToolPointOfIntersectionCircles::ToolType = QStringLiteral("pointO //--------------------------------------------------------------------------------------------------------------------- VToolPointOfIntersectionCircles::VToolPointOfIntersectionCircles( const VToolPointOfIntersectionCirclesInitData &initData, QGraphicsItem *parent) - :VToolSinglePoint(initData.doc, initData.data, initData.id, parent), + :VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), firstCircleCenterId(initData.firstCircleCenterId), secondCircleCenterId(initData.secondCircleCenterId), firstCircleRadius(initData.firstCircleRadius), @@ -83,6 +83,7 @@ void VToolPointOfIntersectionCircles::setDialog() dialogTool->SetSecondCircleRadius(secondCircleRadius); dialogTool->SetCrossCirclesPoint(crossPoint); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -107,6 +108,7 @@ VToolPointOfIntersectionCircles *VToolPointOfIntersectionCircles::Create(const Q initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolPointOfIntersectionCircles *point = Create(initData); if (point != nullptr) @@ -329,6 +331,9 @@ void VToolPointOfIntersectionCircles::SaveDialog(QDomElement &domElement, QList< doc->SetAttribute(domElement, AttrC2Radius, dialogTool->GetSecondCircleRadius()); doc->SetAttribute(domElement, AttrCrossPoint, QString().setNum(static_cast(dialogTool->GetCrossCirclesPoint()))); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp index 2548945d3..c9178c162 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncurves.cpp @@ -58,7 +58,7 @@ const QString VToolPointOfIntersectionCurves::ToolType = QStringLiteral("pointOf //--------------------------------------------------------------------------------------------------------------------- VToolPointOfIntersectionCurves::VToolPointOfIntersectionCurves(const VToolPointOfIntersectionCurvesInitData &initData, QGraphicsItem *parent) - :VToolSinglePoint(initData.doc, initData.data, initData.id, parent), + :VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), firstCurveId(initData.firstCurveId), secondCurveId(initData.secondCurveId), vCrossPoint(initData.vCrossPoint), @@ -79,6 +79,7 @@ void VToolPointOfIntersectionCurves::setDialog() dialogTool->SetVCrossPoint(vCrossPoint); dialogTool->SetHCrossPoint(hCrossPoint); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -102,6 +103,7 @@ VToolPointOfIntersectionCurves *VToolPointOfIntersectionCurves::Create(const QPo initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolPointOfIntersectionCurves *point = Create(initData); if (point != nullptr) @@ -368,6 +370,9 @@ void VToolPointOfIntersectionCurves::SaveDialog(QDomElement &domElement, QListSetAttribute(domElement, AttrCurve2, QString().setNum(dialogTool->GetSecondCurveId())); doc->SetAttribute(domElement, AttrVCrossPoint, QString().setNum(static_cast(dialogTool->GetVCrossPoint()))); doc->SetAttribute(domElement, AttrHCrossPoint, QString().setNum(static_cast(dialogTool->GetHCrossPoint()))); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp index 143d97d42..2fec444b5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.cpp @@ -76,8 +76,9 @@ QT_WARNING_POP * @param id object id in container. * @param parent parent object. */ -VToolSinglePoint::VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent) - : VAbstractPoint(doc, data, id), +VToolSinglePoint::VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, + QGraphicsItem *parent) + : VAbstractPoint(doc, data, id, notes), VScenePoint(parent) { connect(m_namePoint, &VGraphicsSimpleTextItem::ShowContextMenu, this, &VToolSinglePoint::contextMenuEvent); diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h index 9a6f460fe..8a14e8cb0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolsinglepoint.h @@ -67,7 +67,8 @@ class VToolSinglePoint: public VAbstractPoint, public VScenePoint { Q_OBJECT public: - VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quint32 id, QGraphicsItem * parent = nullptr); + VToolSinglePoint(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, + QGraphicsItem * parent = nullptr); virtual ~VToolSinglePoint() Q_DECL_EQ_DEFAULT; virtual int type() const override {return Type;} diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index fb7aaf5cc..12d8073fc 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -64,7 +64,7 @@ const QString VToolTriangle::ToolType = QStringLiteral("triangle"); * @param parent parent object. */ VToolTriangle::VToolTriangle(const VToolTriangleInitData &initData, QGraphicsItem *parent) - :VToolSinglePoint(initData.doc, initData.data, initData.id, parent), + :VToolSinglePoint(initData.doc, initData.data, initData.id, initData.notes, parent), axisP1Id(initData.axisP1Id), axisP2Id(initData.axisP2Id), firstPointId(initData.firstPointId), @@ -88,6 +88,7 @@ void VToolTriangle::setDialog() dialogTool->SetFirstPointId(firstPointId); dialogTool->SetSecondPointId(secondPointId); dialogTool->SetPointName(p->name()); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -117,6 +118,7 @@ VToolTriangle* VToolTriangle::Create(const QPointer &dialog, VMainGr initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolTriangle* point = Create(initData); if (point != nullptr) @@ -302,6 +304,9 @@ void VToolTriangle::SaveDialog(QDomElement &domElement, QList &oldDepen doc->SetAttribute(domElement, AttrAxisP2, QString().setNum(dialogTool->GetAxisP2Id())); doc->SetAttribute(domElement, AttrFirstPoint, QString().setNum(dialogTool->GetFirstPointId())); doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPointId())); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp index 6fa93514d..b65b5a6aa 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.cpp @@ -36,8 +36,8 @@ #include "../vdrawtool.h" //--------------------------------------------------------------------------------------------------------------------- -VAbstractPoint::VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id) - :VDrawTool(doc, data, id) +VAbstractPoint::VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es) + :VDrawTool(doc, data, id, notes) {} //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h index dd106fd96..e78ac1799 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/vabstractpoint.h @@ -53,7 +53,7 @@ class VAbstractPoint: public VDrawTool { Q_OBJECT public: - VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id); + VAbstractPoint(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es); virtual ~VAbstractPoint() Q_DECL_EQ_DEFAULT; virtual QString getTagName() const override; diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.cpp b/src/libs/vtools/tools/drawTools/vdrawtool.cpp index d401e33fc..9da4faddb 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.cpp +++ b/src/libs/vtools/tools/drawTools/vdrawtool.cpp @@ -56,10 +56,11 @@ template class QSharedPointer; * @param data container with variables. * @param id object id in container. */ -VDrawTool::VDrawTool(VAbstractPattern *doc, VContainer *data, quint32 id, QObject *parent) +VDrawTool::VDrawTool(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, QObject *parent) : VInteractiveTool(doc, data, id, parent), nameActivDraw(doc->GetNameActivPP()), - m_lineType(TypeLineLine) + m_lineType(TypeLineLine), + m_notes(notes) { connect(this->doc, &VAbstractPattern::ChangedActivPP, this, &VDrawTool::ChangedActivDraw); connect(this->doc, &VAbstractPattern::ChangedNameDraw, this, &VDrawTool::ChangedNameDraw); diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index f3e9b0ae5..95b32081a 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -71,7 +71,7 @@ class VDrawTool : public VInteractiveTool Q_OBJECT public: - VDrawTool(VAbstractPattern *doc, VContainer *data, quint32 id, QObject *parent = nullptr); + VDrawTool(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, QObject *parent = nullptr); virtual ~VDrawTool() Q_DECL_EQ_DEFAULT; QString getLineType() const; diff --git a/src/libs/vtools/tools/drawTools/vtoolline.cpp b/src/libs/vtools/tools/drawTools/vtoolline.cpp index d1b3a837e..78aa29b2a 100644 --- a/src/libs/vtools/tools/drawTools/vtoolline.cpp +++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp @@ -61,7 +61,7 @@ template class QSharedPointer; * @param parent parent object. */ VToolLine::VToolLine(const VToolLineInitData &initData, QGraphicsItem *parent) - :VDrawTool(initData.doc, initData.data, initData.id), + :VDrawTool(initData.doc, initData.data, initData.id, initData.notes), VScaledLine(parent), firstPoint(initData.firstPoint), secondPoint(initData.secondPoint), @@ -92,6 +92,7 @@ void VToolLine::setDialog() dialogTool->SetSecondPoint(secondPoint); dialogTool->SetTypeLine(m_lineType); dialogTool->SetLineColor(lineColor); + dialogTool->SetNotes(m_notes); } //--------------------------------------------------------------------------------------------------------------------- @@ -119,6 +120,7 @@ VToolLine *VToolLine::Create(const QPointer &dialog, VMainGraphicsSc initData.data = data; initData.parse = Document::FullParse; initData.typeCreation = Source::FromGui; + initData.notes = dialogTool->GetNotes(); VToolLine *line = Create(initData); if (line != nullptr) @@ -391,6 +393,9 @@ void VToolLine::SaveDialog(QDomElement &domElement, QList &oldDependenc doc->SetAttribute(domElement, AttrSecondPoint, QString().setNum(dialogTool->GetSecondPoint())); doc->SetAttribute(domElement, AttrTypeLine, dialogTool->GetTypeLine()); doc->SetAttribute(domElement, AttrLineColor, dialogTool->GetLineColor()); + + const QString notes = dialogTool->GetNotes(); + doc->SetAttributeOrRemoveIf(domElement, AttrNotes, notes, notes.isEmpty()); } //---------------------------------------------------------------------------------------------------------------------