diff --git a/src/app/dialogs/app/dialoghistory.h b/src/app/dialogs/app/dialoghistory.h
index d3c5aea69..eaad3b37d 100644
--- a/src/app/dialogs/app/dialoghistory.h
+++ b/src/app/dialogs/app/dialoghistory.h
@@ -57,6 +57,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
/**
* @brief cellClicked changed history record
* @param row number row in table
diff --git a/src/app/dialogs/app/dialogincrements.h b/src/app/dialogs/app/dialogincrements.h
index f7e8e6fa3..685aae20c 100644
--- a/src/app/dialogs/app/dialogincrements.h
+++ b/src/app/dialogs/app/dialogincrements.h
@@ -54,6 +54,10 @@ public:
DialogIncrements(VContainer *data, VPattern *doc, QWidget *parent = nullptr);
~DialogIncrements();
public slots:
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
/**
* @brief clickedToolButtonAdd create new row in table
*/
diff --git a/src/app/dialogs/tools/dialogalongline.cpp b/src/app/dialogs/tools/dialogalongline.cpp
index c6f643d9d..d83ce620e 100644
--- a/src/app/dialogs/tools/dialogalongline.cpp
+++ b/src/app/dialogs/tools/dialogalongline.cpp
@@ -43,7 +43,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, QWidget *parent)
flagFormula = false;
flagName = false;
- InitOkCansel(ui);
+ InitOkCancel(ui);
CheckState();
FillComboBoxTypeLine(ui->comboBoxLineType);
diff --git a/src/app/dialogs/tools/dialogalongline.h b/src/app/dialogs/tools/dialogalongline.h
index 947c31793..0d22f2e65 100644
--- a/src/app/dialogs/tools/dialogalongline.h
+++ b/src/app/dialogs/tools/dialogalongline.h
@@ -113,6 +113,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogAlongLine)
/**
diff --git a/src/app/dialogs/tools/dialogarc.cpp b/src/app/dialogs/tools/dialogarc.cpp
index bbb17d47b..7a79c6448 100644
--- a/src/app/dialogs/tools/dialogarc.cpp
+++ b/src/app/dialogs/tools/dialogarc.cpp
@@ -48,7 +48,7 @@ DialogArc::DialogArc(const VContainer *data, QWidget *parent)
timerF2 = new QTimer(this);
connect(timerF2, &QTimer::timeout, this, &DialogArc::EvalF2);
- InitOkCansel(ui);
+ InitOkCancel(ui);
FillComboBoxPoints(ui->comboBoxBasePoint);
diff --git a/src/app/dialogs/tools/dialogarc.h b/src/app/dialogs/tools/dialogarc.h
index 24840e2f2..dda31681b 100644
--- a/src/app/dialogs/tools/dialogarc.h
+++ b/src/app/dialogs/tools/dialogarc.h
@@ -101,6 +101,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
/**
* @brief ValChenged show description angles of lines
* @param row number of row
diff --git a/src/app/dialogs/tools/dialogbisector.cpp b/src/app/dialogs/tools/dialogbisector.cpp
index 35050a844..cc2d49581 100644
--- a/src/app/dialogs/tools/dialogbisector.cpp
+++ b/src/app/dialogs/tools/dialogbisector.cpp
@@ -42,7 +42,7 @@ DialogBisector::DialogBisector(const VContainer *data, QWidget *parent)
lineEditFormula = ui->lineEditFormula;
labelEditFormula = ui->labelEditFormula;
labelEditNamePoint = ui->labelEditNamePoint;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagFormula = false;
flagName = false;
CheckState();
diff --git a/src/app/dialogs/tools/dialogbisector.h b/src/app/dialogs/tools/dialogbisector.h
index 89fab7a10..e428a3f0a 100644
--- a/src/app/dialogs/tools/dialogbisector.h
+++ b/src/app/dialogs/tools/dialogbisector.h
@@ -124,6 +124,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogBisector)
/**
diff --git a/src/app/dialogs/tools/dialogcutarc.cpp b/src/app/dialogs/tools/dialogcutarc.cpp
index 55844e496..1dabfc556 100644
--- a/src/app/dialogs/tools/dialogcutarc.cpp
+++ b/src/app/dialogs/tools/dialogcutarc.cpp
@@ -40,7 +40,7 @@ DialogCutArc::DialogCutArc(const VContainer *data, QWidget *parent) :
labelEditFormula = ui->labelEditFormula;
labelEditNamePoint = ui->labelEditNamePoint;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagFormula = false;
flagName = false;
CheckState();
diff --git a/src/app/dialogs/tools/dialogcutarc.h b/src/app/dialogs/tools/dialogcutarc.h
index 8f9d93ed7..2005f245e 100644
--- a/src/app/dialogs/tools/dialogcutarc.h
+++ b/src/app/dialogs/tools/dialogcutarc.h
@@ -92,6 +92,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogCutArc)
/**
diff --git a/src/app/dialogs/tools/dialogcutspline.cpp b/src/app/dialogs/tools/dialogcutspline.cpp
index 1730ba10e..ff3026fac 100644
--- a/src/app/dialogs/tools/dialogcutspline.cpp
+++ b/src/app/dialogs/tools/dialogcutspline.cpp
@@ -39,7 +39,7 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, QWidget *parent)
lineEditFormula = ui->lineEditFormula;
labelEditFormula = ui->labelEditFormula;
labelEditNamePoint = ui->labelEditNamePoint;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagFormula = false;
flagName = false;
diff --git a/src/app/dialogs/tools/dialogcutspline.h b/src/app/dialogs/tools/dialogcutspline.h
index 35041872f..9bcff379e 100644
--- a/src/app/dialogs/tools/dialogcutspline.h
+++ b/src/app/dialogs/tools/dialogcutspline.h
@@ -92,6 +92,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogCutSpline)
/**
diff --git a/src/app/dialogs/tools/dialogcutsplinepath.cpp b/src/app/dialogs/tools/dialogcutsplinepath.cpp
index fee2d8f04..35d707aa7 100644
--- a/src/app/dialogs/tools/dialogcutsplinepath.cpp
+++ b/src/app/dialogs/tools/dialogcutsplinepath.cpp
@@ -41,7 +41,7 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, QWidget *parent
labelEditFormula = ui->labelEditFormula;
labelEditNamePoint = ui->labelEditNamePoint;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagFormula = false;
flagName = false;
CheckState();
diff --git a/src/app/dialogs/tools/dialogcutsplinepath.h b/src/app/dialogs/tools/dialogcutsplinepath.h
index 417e85d94..6614d5b42 100644
--- a/src/app/dialogs/tools/dialogcutsplinepath.h
+++ b/src/app/dialogs/tools/dialogcutsplinepath.h
@@ -92,6 +92,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogCutSplinePath)
/**
diff --git a/src/app/dialogs/tools/dialogdetail.h b/src/app/dialogs/tools/dialogdetail.h
index b2edce30b..f76b0ddb0 100644
--- a/src/app/dialogs/tools/dialogdetail.h
+++ b/src/app/dialogs/tools/dialogdetail.h
@@ -66,6 +66,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
/**
* @brief BiasXChanged changed value of offset for object respect to x
* @param d value in mm
diff --git a/src/app/dialogs/tools/dialogendline.cpp b/src/app/dialogs/tools/dialogendline.cpp
index 5d938aae6..f143d9fb9 100644
--- a/src/app/dialogs/tools/dialogendline.cpp
+++ b/src/app/dialogs/tools/dialogendline.cpp
@@ -46,7 +46,7 @@ DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent)
// TODO : auto extend height on first value length.
this->formulaBaseHeight=ui->plainTextEditFormula->height();
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagFormula = false;
flagName = false;
CheckState();
@@ -56,12 +56,14 @@ DialogEndLine::DialogEndLine(const VContainer *data, QWidget *parent)
InitArrow(ui);
+
connect(ui->toolButtonPutHere, &QPushButton::clicked, this, &DialogEndLine::PutHere);
connect(ui->listWidget, &QListWidget::itemDoubleClicked, this, &DialogEndLine::PutVal);
connect(ui->toolButtonEqual, &QPushButton::clicked, this, &DialogEndLine::EvalFormula);
connect(ui->lineEditNamePoint, &QLineEdit::textChanged, this, &DialogEndLine::NamePointChanged);
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEndLine::FormulaTextChanged);
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogEndLine::DeployFormulaTextEdit);
+ //ui->
}
//---------------------------------------------------------------------------------------------------------------------
@@ -75,9 +77,9 @@ void DialogEndLine::FormulaTextChanged()
//---------------------------------------------------------------------------------------------------------------------
void DialogEndLine::DeployFormulaTextEdit()
{
- if (ui->plainTextEditFormula->height() < 64)
+ if (ui->plainTextEditFormula->height() < DIALOGENDLINE_MAX_FORMULA_HEIGHT)
{
- ui->plainTextEditFormula->setFixedHeight(64);
+ ui->plainTextEditFormula->setFixedHeight(DIALOGENDLINE_MAX_FORMULA_HEIGHT);
}
else
{
@@ -115,6 +117,12 @@ void DialogEndLine::setTypeLine(const QString &value)
void DialogEndLine::setFormula(const QString &value)
{
formula = value;
+ // increase height if needed. TODO : see if I can get the max number of caracters in one line
+ // of this PlainTextEdit to change 80 to this value
+ if (formula.length() > 80)
+ {
+ this->DeployFormulaTextEdit();
+ }
ui->plainTextEditFormula->setPlainText(value);
//QTextCursor cursor = ui->plainTextEditFormula->textCursor();
//cursor.insertText(value);
@@ -136,6 +144,19 @@ void DialogEndLine::setBasePointId(const quint32 &value, const quint32 &id)
//---------------------------------------------------------------------------------------------------------------------
void DialogEndLine::DialogAccepted()
+{
+ this->SaveData();
+ emit DialogClosed(QDialog::Accepted);
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogEndLine::DialogApply()
+{
+ this->SaveData();
+ emit DialogApplied();
+}
+//---------------------------------------------------------------------------------------------------------------------
+void DialogEndLine::SaveData()
{
pointName = ui->lineEditNamePoint->text();
typeLine = GetTypeLine(ui->comboBoxLineType);
@@ -143,7 +164,6 @@ void DialogEndLine::DialogAccepted()
formula.replace("\n"," ");
angle = ui->doubleSpinBoxAngle->value();
basePointId = getCurrentObjectId(ui->comboBoxBasePoint);
- emit DialogClosed(QDialog::Accepted);
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/dialogs/tools/dialogendline.h b/src/app/dialogs/tools/dialogendline.h
index 9765d6cbb..38a4a6ba1 100644
--- a/src/app/dialogs/tools/dialogendline.h
+++ b/src/app/dialogs/tools/dialogendline.h
@@ -31,6 +31,8 @@
#include "dialogtool.h"
+
+#define DIALOGENDLINE_MAX_FORMULA_HEIGHT 64
namespace Ui
{
class DialogEndLine;
@@ -112,6 +114,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /**
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply();
/**
* @brief DeployFormulaTextEdit grow or shrink formula input
*/
@@ -122,6 +128,10 @@ public slots:
void FormulaTextChanged();
private:
Q_DISABLE_COPY(DialogEndLine)
+ /**
+ * @brief SaveData Put dialog data in local variables
+ */
+ void SaveData();
/**
* @brief ui keeps information about user interface
*/
diff --git a/src/app/dialogs/tools/dialogendline.ui b/src/app/dialogs/tools/dialogendline.ui
index 797078a5a..fe66d84b3 100644
--- a/src/app/dialogs/tools/dialogendline.ui
+++ b/src/app/dialogs/tools/dialogendline.ui
@@ -593,7 +593,7 @@
Qt::Horizontal
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+ QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok
diff --git a/src/app/dialogs/tools/dialogheight.cpp b/src/app/dialogs/tools/dialogheight.cpp
index 455479962..a07e09a11 100644
--- a/src/app/dialogs/tools/dialogheight.cpp
+++ b/src/app/dialogs/tools/dialogheight.cpp
@@ -38,7 +38,7 @@ DialogHeight::DialogHeight(const VContainer *data, QWidget *parent)
{
ui->setupUi(this);
labelEditNamePoint = ui->labelEditNamePoint;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagName = false;
CheckState();
diff --git a/src/app/dialogs/tools/dialogheight.h b/src/app/dialogs/tools/dialogheight.h
index 63ebbf5bb..241e609e5 100644
--- a/src/app/dialogs/tools/dialogheight.h
+++ b/src/app/dialogs/tools/dialogheight.h
@@ -114,6 +114,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogHeight)
/**
diff --git a/src/app/dialogs/tools/dialogline.cpp b/src/app/dialogs/tools/dialogline.cpp
index a87a5410c..0e7512024 100644
--- a/src/app/dialogs/tools/dialogline.cpp
+++ b/src/app/dialogs/tools/dialogline.cpp
@@ -36,7 +36,7 @@ DialogLine::DialogLine(const VContainer *data, QWidget *parent)
:DialogTool(data, parent), ui(new Ui::DialogLine), number(0), firstPoint(0), secondPoint(0), typeLine(QString())
{
ui->setupUi(this);
- InitOkCansel(ui);
+ InitOkCancel(ui);
FillComboBoxPoints(ui->comboBoxFirstPoint);
FillComboBoxPoints(ui->comboBoxSecondPoint);
diff --git a/src/app/dialogs/tools/dialogline.h b/src/app/dialogs/tools/dialogline.h
index 2978b6d1a..f04a5a3bc 100644
--- a/src/app/dialogs/tools/dialogline.h
+++ b/src/app/dialogs/tools/dialogline.h
@@ -91,6 +91,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogLine)
/**
diff --git a/src/app/dialogs/tools/dialoglineintersect.cpp b/src/app/dialogs/tools/dialoglineintersect.cpp
index 9951ee884..a28468175 100644
--- a/src/app/dialogs/tools/dialoglineintersect.cpp
+++ b/src/app/dialogs/tools/dialoglineintersect.cpp
@@ -38,7 +38,7 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, QWidget *parent
{
ui->setupUi(this);
number = 0;
- InitOkCansel(ui);
+ InitOkCancel(ui);
labelEditNamePoint = ui->labelEditNamePoint;
flagName = false;
diff --git a/src/app/dialogs/tools/dialoglineintersect.h b/src/app/dialogs/tools/dialoglineintersect.h
index 3196210f7..7fd400520 100644
--- a/src/app/dialogs/tools/dialoglineintersect.h
+++ b/src/app/dialogs/tools/dialoglineintersect.h
@@ -111,6 +111,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
/**
* @brief P1Line1Changed changed first point of first line
* @param index index in list
diff --git a/src/app/dialogs/tools/dialognormal.cpp b/src/app/dialogs/tools/dialognormal.cpp
index 81ebf9dd3..9cfc40b89 100644
--- a/src/app/dialogs/tools/dialognormal.cpp
+++ b/src/app/dialogs/tools/dialognormal.cpp
@@ -42,7 +42,7 @@ DialogNormal::DialogNormal(const VContainer *data, QWidget *parent)
lineEditFormula = ui->lineEditFormula;
labelEditFormula = ui->labelEditFormula;
labelEditNamePoint = ui->labelEditNamePoint;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagFormula = false;
flagName = false;
diff --git a/src/app/dialogs/tools/dialognormal.h b/src/app/dialogs/tools/dialognormal.h
index a47aae457..ad0658afe 100644
--- a/src/app/dialogs/tools/dialognormal.h
+++ b/src/app/dialogs/tools/dialognormal.h
@@ -123,6 +123,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogNormal)
/**
diff --git a/src/app/dialogs/tools/dialogpointofcontact.h b/src/app/dialogs/tools/dialogpointofcontact.h
index d99ae957d..acde2b352 100644
--- a/src/app/dialogs/tools/dialogpointofcontact.h
+++ b/src/app/dialogs/tools/dialogpointofcontact.h
@@ -109,6 +109,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogPointOfContact)
/**
diff --git a/src/app/dialogs/tools/dialogpointofintersection.cpp b/src/app/dialogs/tools/dialogpointofintersection.cpp
index 82538e73c..a5e09ef40 100644
--- a/src/app/dialogs/tools/dialogpointofintersection.cpp
+++ b/src/app/dialogs/tools/dialogpointofintersection.cpp
@@ -38,7 +38,7 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, QWi
{
ui->setupUi(this);
labelEditNamePoint = ui->labelEditNamePoint;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagName = false;
CheckState();
diff --git a/src/app/dialogs/tools/dialogpointofintersection.h b/src/app/dialogs/tools/dialogpointofintersection.h
index 8c8b98c2a..fac2f9ec4 100644
--- a/src/app/dialogs/tools/dialogpointofintersection.h
+++ b/src/app/dialogs/tools/dialogpointofintersection.h
@@ -93,6 +93,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogPointOfIntersection)
/**
diff --git a/src/app/dialogs/tools/dialogshoulderpoint.cpp b/src/app/dialogs/tools/dialogshoulderpoint.cpp
index 65fb7f069..5d5d00d92 100644
--- a/src/app/dialogs/tools/dialogshoulderpoint.cpp
+++ b/src/app/dialogs/tools/dialogshoulderpoint.cpp
@@ -43,7 +43,7 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, QWidget *parent
lineEditFormula = ui->lineEditFormula;
labelEditFormula = ui->labelEditFormula;
labelEditNamePoint = ui->labelEditNamePoint;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagFormula = false;
flagName = false;
diff --git a/src/app/dialogs/tools/dialogshoulderpoint.h b/src/app/dialogs/tools/dialogshoulderpoint.h
index 9d9130eb6..ba9f57454 100644
--- a/src/app/dialogs/tools/dialogshoulderpoint.h
+++ b/src/app/dialogs/tools/dialogshoulderpoint.h
@@ -124,6 +124,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogShoulderPoint)
/**
diff --git a/src/app/dialogs/tools/dialogsinglepoint.cpp b/src/app/dialogs/tools/dialogsinglepoint.cpp
index 80d5c8fb0..6e929ee23 100644
--- a/src/app/dialogs/tools/dialogsinglepoint.cpp
+++ b/src/app/dialogs/tools/dialogsinglepoint.cpp
@@ -40,7 +40,7 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, QWidget *parent)
ui->doubleSpinBoxX->setRange(0, qApp->fromPixel(SceneSize));
ui->doubleSpinBoxY->setRange(0, qApp->fromPixel(SceneSize));
labelEditNamePoint = ui->labelEditName;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagName = false;
CheckState();
diff --git a/src/app/dialogs/tools/dialogsinglepoint.h b/src/app/dialogs/tools/dialogsinglepoint.h
index f0da08178..b7b3754a9 100644
--- a/src/app/dialogs/tools/dialogsinglepoint.h
+++ b/src/app/dialogs/tools/dialogsinglepoint.h
@@ -76,6 +76,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogSinglePoint)
/**
diff --git a/src/app/dialogs/tools/dialogspline.cpp b/src/app/dialogs/tools/dialogspline.cpp
index 1030aea47..b76e06f3b 100644
--- a/src/app/dialogs/tools/dialogspline.cpp
+++ b/src/app/dialogs/tools/dialogspline.cpp
@@ -37,7 +37,7 @@ DialogSpline::DialogSpline(const VContainer *data, QWidget *parent)
kAsm1(1), kAsm2(1), kCurve(1)
{
ui->setupUi(this);
- InitOkCansel(ui);
+ InitOkCancel(ui);
FillComboBoxPoints(ui->comboBoxP1);
FillComboBoxPoints(ui->comboBoxP4);
diff --git a/src/app/dialogs/tools/dialogspline.h b/src/app/dialogs/tools/dialogspline.h
index 47aa5a5c5..5fa0dd978 100644
--- a/src/app/dialogs/tools/dialogspline.h
+++ b/src/app/dialogs/tools/dialogspline.h
@@ -131,6 +131,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogSpline)
/**
diff --git a/src/app/dialogs/tools/dialogsplinepath.cpp b/src/app/dialogs/tools/dialogsplinepath.cpp
index 67b732663..9ac242a42 100644
--- a/src/app/dialogs/tools/dialogsplinepath.cpp
+++ b/src/app/dialogs/tools/dialogsplinepath.cpp
@@ -37,7 +37,7 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, QWidget *parent)
:DialogTool(data, parent), ui(new Ui::DialogSplinePath), path(VSplinePath())
{
ui->setupUi(this);
- InitOkCansel(ui);
+ InitOkCancel(ui);
bOk->setEnabled(false);
FillComboBoxPoints(ui->comboBoxPoint);
diff --git a/src/app/dialogs/tools/dialogsplinepath.h b/src/app/dialogs/tools/dialogsplinepath.h
index 8e1ddca4a..040bcb5b5 100644
--- a/src/app/dialogs/tools/dialogsplinepath.h
+++ b/src/app/dialogs/tools/dialogsplinepath.h
@@ -76,6 +76,10 @@ public slots:
* @brief PointChanged selected another point in list
* @param row number of row
*/
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
void PointChanged(int row);
/**
* @brief currentPointChanged changed point in combo box
diff --git a/src/app/dialogs/tools/dialogtool.cpp b/src/app/dialogs/tools/dialogtool.cpp
index ada3d1e16..543f63a05 100644
--- a/src/app/dialogs/tools/dialogtool.cpp
+++ b/src/app/dialogs/tools/dialogtool.cpp
@@ -855,3 +855,9 @@ void DialogTool::ShowVariable(const QHash *var)
connect(listWidget, &QListWidget::currentRowChanged, this, &DialogTool::ValChenged);
listWidget->setCurrentRow (0);
}
+
+//---------------------------------------------------------------------------------------------------------------------
+void DialogTool::DialogApply()
+{
+
+}
diff --git a/src/app/dialogs/tools/dialogtool.h b/src/app/dialogs/tools/dialogtool.h
index dc8eed65b..1231dd919 100644
--- a/src/app/dialogs/tools/dialogtool.h
+++ b/src/app/dialogs/tools/dialogtool.h
@@ -75,6 +75,10 @@ signals:
* @param result keep result
*/
void DialogClosed(int result);
+ /**
+ * @brief DialogApplied emit signal dialog apply changes
+ */
+ void DialogApplied();
/**
* @brief ToolTip emit tooltipe for tool
* @param toolTip text tooltipe
@@ -95,6 +99,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /**
+ * @brief DialogApply save data and emit signal DialogApplied.
+ */
+ virtual void DialogApply();
/**
* @brief DialogRejected emit signal dialog rejected
*/
@@ -453,15 +461,19 @@ protected:
connect(radioButtonLengthCurve, &QRadioButton::clicked, this, &DialogTool::LengthCurves);
}
template
- void InitOkCansel(T *ui)
+ void InitOkCancel(T *ui)
{
bOk = ui->buttonBox->button(QDialogButtonBox::Ok);
Q_CHECK_PTR(bOk);
connect(bOk, &QPushButton::clicked, this, &DialogTool::DialogAccepted);
- QPushButton *bCansel = ui->buttonBox->button(QDialogButtonBox::Cancel);
- Q_CHECK_PTR(bCansel);
- connect(bCansel, &QPushButton::clicked, this, &DialogTool::DialogRejected);
+ QPushButton *bCancel = ui->buttonBox->button(QDialogButtonBox::Cancel);
+ Q_CHECK_PTR(bCancel);
+ connect(bCancel, &QPushButton::clicked, this, &DialogTool::DialogRejected);
+ // TODO issue #79
+ QPushButton *bApply = ui->buttonBox->button(QDialogButtonBox::Apply);
+ Q_CHECK_PTR(bApply);
+ connect(bApply, &QPushButton::clicked, this, &DialogTool::DialogApply);
}
private:
/**
diff --git a/src/app/dialogs/tools/dialogtriangle.cpp b/src/app/dialogs/tools/dialogtriangle.cpp
index 9a1ebb5ce..63da15c19 100644
--- a/src/app/dialogs/tools/dialogtriangle.cpp
+++ b/src/app/dialogs/tools/dialogtriangle.cpp
@@ -38,7 +38,7 @@ DialogTriangle::DialogTriangle(const VContainer *data, QWidget *parent)
{
ui->setupUi(this);
labelEditNamePoint = ui->labelEditNamePoint;
- InitOkCansel(ui);
+ InitOkCancel(ui);
flagName = false;
CheckState();
diff --git a/src/app/dialogs/tools/dialogtriangle.h b/src/app/dialogs/tools/dialogtriangle.h
index 609e94cea..1756f55bf 100644
--- a/src/app/dialogs/tools/dialogtriangle.h
+++ b/src/app/dialogs/tools/dialogtriangle.h
@@ -115,6 +115,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogTriangle)
/**
diff --git a/src/app/dialogs/tools/dialoguniondetails.cpp b/src/app/dialogs/tools/dialoguniondetails.cpp
index d9a7135ce..7c430437f 100644
--- a/src/app/dialogs/tools/dialoguniondetails.cpp
+++ b/src/app/dialogs/tools/dialoguniondetails.cpp
@@ -35,7 +35,7 @@ DialogUnionDetails::DialogUnionDetails(const VContainer *data, QWidget *parent)
numberP(0), p1(0), p2(0)
{
ui->setupUi(this);
- InitOkCansel(ui);
+ InitOkCancel(ui);
}
//---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/dialogs/tools/dialoguniondetails.h b/src/app/dialogs/tools/dialoguniondetails.h
index b38dcbdfa..93a4a18f9 100644
--- a/src/app/dialogs/tools/dialoguniondetails.h
+++ b/src/app/dialogs/tools/dialoguniondetails.h
@@ -81,6 +81,10 @@ public slots:
* @brief DialogAccepted save data and emit signal about closed dialog.
*/
virtual void DialogAccepted();
+ /** TODO ISSUE 79 : create real function
+ * @brief DialogApply apply data and emit signal about applied dialog.
+ */
+ virtual void DialogApply(){}
private:
Q_DISABLE_COPY(DialogUnionDetails)
/**
diff --git a/src/app/tools/drawTools/vdrawtool.cpp b/src/app/tools/drawTools/vdrawtool.cpp
index 25f329719..9b654a862 100644
--- a/src/app/tools/drawTools/vdrawtool.cpp
+++ b/src/app/tools/drawTools/vdrawtool.cpp
@@ -94,6 +94,19 @@ void VDrawTool::FullUpdateFromGui(int result)
dialog = nullptr;
}
+//---------------------------------------------------------------------------------------------------------------------
+void VDrawTool::FullUpdateFromGuiApply()
+{
+ QDomElement domElement = doc->elementById(QString().setNum(id));
+ if (domElement.isElement())
+ {
+ SaveDialog(domElement);
+
+ emit FullUpdateTree();
+ emit toolhaveChange();
+ }
+}
+
//---------------------------------------------------------------------------------------------------------------------
void VDrawTool::SetFactor(qreal factor)
{
diff --git a/src/app/tools/drawTools/vdrawtool.h b/src/app/tools/drawTools/vdrawtool.h
index af389a880..b00a23c13 100644
--- a/src/app/tools/drawTools/vdrawtool.h
+++ b/src/app/tools/drawTools/vdrawtool.h
@@ -84,6 +84,10 @@ public slots:
* @param result keep result working dialog.
*/
virtual void FullUpdateFromGui(int result);
+ /**
+ * @brief FullUpdateFromGuiApply refresh tool data after change in options but do not delete dialog
+ */
+ virtual void FullUpdateFromGuiApply();
/**
* @brief SetFactor set current scale factor of scene.
* @param factor scene scale factor.
@@ -157,6 +161,7 @@ protected:
connect(qobject_cast< VMainGraphicsScene * >(tool->scene()),
&VMainGraphicsScene::ChoosedObject, dialog, &DialogTool::ChoosedObject);
connect(dialog, &DialogTool::DialogClosed, tool, &Tool::FullUpdateFromGui);
+ connect(dialog, &DialogTool::DialogApplied, tool, &Tool::FullUpdateFromGuiApply);
if (ignoreFullUpdate == false)
{
connect(doc, &VPattern::FullUpdateFromFile, dialog, &DialogTool::UpdateList);