From ccbdff7fb5fa1ac2fdcc869c24e7c21e0a892050 Mon Sep 17 00:00:00 2001 From: dismine Date: Fri, 25 Jul 2014 14:22:25 +0300 Subject: [PATCH] Use in dialog tool's container with data after creation tool with Apply button. --HG-- branch : develop --- src/app/dialogs/tools/dialogshoulderpoint.ui | 12 +++++++++--- src/app/dialogs/tools/dialogtool.cpp | 13 +++++++------ src/app/dialogs/tools/dialogtool.h | 9 +-------- src/app/tools/drawTools/vtoolpoint.cpp | 4 ++-- src/app/tools/vabstracttool.h | 2 +- src/app/tools/vdatatool.cpp | 3 ++- 6 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/app/dialogs/tools/dialogshoulderpoint.ui b/src/app/dialogs/tools/dialogshoulderpoint.ui index c19369ab4..f0628a48e 100644 --- a/src/app/dialogs/tools/dialogshoulderpoint.ui +++ b/src/app/dialogs/tools/dialogshoulderpoint.ui @@ -272,7 +272,7 @@ - + 0 0 @@ -338,7 +338,7 @@ - + 0 0 @@ -383,6 +383,12 @@ + + + 0 + 0 + + Show line from first point to our point @@ -469,7 +475,7 @@ - Length of lines + Length of arcs diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp index b9d6146c3..f56e87bf3 100644 --- a/src/app/dialogs/tools/dialogtool.cpp +++ b/src/app/dialogs/tools/dialogtool.cpp @@ -1075,12 +1075,6 @@ void DialogTool::ShowVariable(const QHash *var) listWidget->setCurrentRow (0); } -//--------------------------------------------------------------------------------------------------------------------- -void DialogTool::DialogApply() -{ - -} - //--------------------------------------------------------------------------------------------------------------------- void DialogTool::ShowVisToolTip(const QString &toolTip) { @@ -1092,3 +1086,10 @@ void DialogTool::ShowDialog(bool click) { Q_UNUSED(click); } + +//--------------------------------------------------------------------------------------------------------------------- +void DialogTool::SetAssociatedTool(VAbstractTool *tool) +{ + this->associatedTool=tool; + this->data = tool->getData(); +} diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h index dd73ec852..182ea4dd8 100644 --- a/src/app/dialogs/tools/dialogtool.h +++ b/src/app/dialogs/tools/dialogtool.h @@ -83,7 +83,7 @@ public slots: /** * @brief DialogApply save data and emit signal DialogApplied. */ - virtual void DialogApply(); + virtual void DialogApply(){} virtual void DialogRejected(); void FormulaChanged(); /** @@ -110,7 +110,6 @@ public slots: virtual void ValChenged(int row); virtual void UpdateList(); virtual void PointNameChanged(){} - protected: Q_DISABLE_COPY(DialogTool) @@ -318,10 +317,4 @@ inline VAbstractTool *DialogTool::GetAssociatedTool() return this->associatedTool; } -//--------------------------------------------------------------------------------------------------------------------- -inline void DialogTool::SetAssociatedTool(VAbstractTool *tool) -{ - this->associatedTool=tool; -} - #endif // DIALOGTOOL_H diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp index 362b83440..24316191c 100644 --- a/src/app/tools/drawTools/vtoolpoint.cpp +++ b/src/app/tools/drawTools/vtoolpoint.cpp @@ -41,8 +41,8 @@ const QString VToolPoint::TagName = QStringLiteral("point"); * @param id object id in container. * @param parent parent object. */ -VToolPoint::VToolPoint(VPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent):VDrawTool(doc, data, id), - QGraphicsEllipseItem(parent), radius(DefPointRadius), namePoint(0), lineName(0) +VToolPoint::VToolPoint(VPattern *doc, VContainer *data, quint32 id, QGraphicsItem *parent) + :VDrawTool(doc, data, id), QGraphicsEllipseItem(parent), radius(DefPointRadius), namePoint(0), lineName(0) { radius = qApp->toPixel(DefPointRadius/*mm*/, Unit::Mm); namePoint = new VGraphicsSimpleTextItem(this); diff --git a/src/app/tools/vabstracttool.h b/src/app/tools/vabstracttool.h index 7f6a36afd..cf36e851b 100644 --- a/src/app/tools/vabstracttool.h +++ b/src/app/tools/vabstracttool.h @@ -99,6 +99,7 @@ public: static const QStringList Styles(); static void AddRecord(const quint32 id, const Tool &toolType, VPattern *doc); static Qt::PenStyle LineStyle(const QString &typeLine); + const VContainer *getData() const; public slots: /** * @brief FullUpdateFromFile update tool data form file. @@ -142,7 +143,6 @@ protected: * @brief RefreshDataInFile refresh attributes in file. If attributes don't exist create them. */ virtual void RefreshDataInFile()=0; - const VContainer *getData() const; /** * @brief RemoveReferens decrement value of reference. */ diff --git a/src/app/tools/vdatatool.cpp b/src/app/tools/vdatatool.cpp index f7dbff9cf..c88ea6d35 100644 --- a/src/app/tools/vdatatool.cpp +++ b/src/app/tools/vdatatool.cpp @@ -34,7 +34,8 @@ * @param data container with variables * @param parent parent object */ -VDataTool::VDataTool(VContainer *data, QObject *parent): QObject(parent), data(*data), _referens(1) +VDataTool::VDataTool(VContainer *data, QObject *parent) + : QObject(parent), data(*data), _referens(1) { SCASSERT(data != nullptr); }