Improve Formula Wizard.
Improve support for multi line expressions. --HG-- branch : develop
This commit is contained in:
parent
54d3ae7561
commit
615decb625
|
@ -94,7 +94,6 @@ DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, const qui
|
||||||
connect(ui->tableWidget, &QTableWidget::itemDoubleClicked, this, &DialogEditWrongFormula::PutVal);
|
connect(ui->tableWidget, &QTableWidget::itemDoubleClicked, this, &DialogEditWrongFormula::PutVal);
|
||||||
|
|
||||||
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEditWrongFormula::FormulaChanged);
|
connect(ui->plainTextEditFormula, &QPlainTextEdit::textChanged, this, &DialogEditWrongFormula::FormulaChanged);
|
||||||
connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogEditWrongFormula::DeployFormulaTextEdit);
|
|
||||||
|
|
||||||
//Disable Qt::WaitCursor
|
//Disable Qt::WaitCursor
|
||||||
#ifndef QT_NO_CURSOR
|
#ifndef QT_NO_CURSOR
|
||||||
|
@ -140,12 +139,6 @@ void DialogEditWrongFormula::DialogRejected()
|
||||||
rejected();
|
rejected();
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
|
||||||
void DialogEditWrongFormula::DeployFormulaTextEdit()
|
|
||||||
{
|
|
||||||
DeployFormula(ui->plainTextEditFormula, ui->pushButtonGrowLength, formulaBaseHeight);
|
|
||||||
}
|
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogEditWrongFormula::EvalFormula()
|
void DialogEditWrongFormula::EvalFormula()
|
||||||
{
|
{
|
||||||
|
|
|
@ -73,10 +73,6 @@ public:
|
||||||
public slots:
|
public slots:
|
||||||
virtual void DialogAccepted() Q_DECL_OVERRIDE;
|
virtual void DialogAccepted() Q_DECL_OVERRIDE;
|
||||||
virtual void DialogRejected() Q_DECL_OVERRIDE;
|
virtual void DialogRejected() Q_DECL_OVERRIDE;
|
||||||
/**
|
|
||||||
* @brief DeployFormulaTextEdit grow or shrink formula input
|
|
||||||
*/
|
|
||||||
void DeployFormulaTextEdit();
|
|
||||||
virtual void EvalFormula() Q_DECL_OVERRIDE;
|
virtual void EvalFormula() Q_DECL_OVERRIDE;
|
||||||
void ValChanged(int row);
|
void ValChanged(int row);
|
||||||
void PutHere();
|
void PutHere();
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>448</width>
|
<width>448</width>
|
||||||
<height>526</height>
|
<height>478</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
@ -147,8 +147,10 @@
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
<widget class="QSplitter" name="splitter">
|
||||||
<item>
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
<widget class="VPlainTextEdit" name="plainTextEditFormula">
|
<widget class="VPlainTextEdit" name="plainTextEditFormula">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||||
|
@ -156,10 +158,10 @@
|
||||||
<verstretch>0</verstretch>
|
<verstretch>0</verstretch>
|
||||||
</sizepolicy>
|
</sizepolicy>
|
||||||
</property>
|
</property>
|
||||||
<property name="maximumSize">
|
<property name="baseSize">
|
||||||
<size>
|
<size>
|
||||||
<width>16777215</width>
|
<width>0</width>
|
||||||
<height>28</height>
|
<height>0</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
|
@ -169,45 +171,7 @@
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
<widget class="QWidget" name="">
|
||||||
<item>
|
|
||||||
<widget class="QPushButton" name="pushButtonGrowLength">
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>18</width>
|
|
||||||
<height>18</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="sizeIncrement">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="toolTip">
|
|
||||||
<string><html><head/><body><p>Show full calculation in message box</p></body></html></string>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string notr="true"/>
|
|
||||||
</property>
|
|
||||||
<property name="icon">
|
|
||||||
<iconset theme="go-down">
|
|
||||||
<normaloff>.</normaloff>.</iconset>
|
|
||||||
</property>
|
|
||||||
<property name="iconSize">
|
|
||||||
<size>
|
|
||||||
<width>16</width>
|
|
||||||
<height>16</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="flat">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||||
|
@ -405,6 +369,8 @@
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="labelDescription">
|
<widget class="QLabel" name="labelDescription">
|
||||||
|
@ -436,9 +402,7 @@
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>plainTextEditFormula</tabstop>
|
|
||||||
<tabstop>toolButtonPutHere</tabstop>
|
<tabstop>toolButtonPutHere</tabstop>
|
||||||
<tabstop>pushButtonGrowLength</tabstop>
|
|
||||||
<tabstop>radioButtonStandardTable</tabstop>
|
<tabstop>radioButtonStandardTable</tabstop>
|
||||||
<tabstop>radioButtonIncrements</tabstop>
|
<tabstop>radioButtonIncrements</tabstop>
|
||||||
<tabstop>radioButtonLengthLine</tabstop>
|
<tabstop>radioButtonLengthLine</tabstop>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user