OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1977 Curve Calculator : Use smaller and right aligned buttons

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-13 16:22:39 +02:00
parent 9819fe946e
commit ccd839c182
5 changed files with 79 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp
View File

@@ -48,18 +48,6 @@ RicSummaryCurveCalculator::RicSummaryCurveCalculator()
CAF_PDM_InitFieldNoDefault(&m_deleteCalculation, "DeleteCalculation", "Delete Calculation", "", "", "");
RicSummaryCurveCalculator::assignPushButtonEditor(&m_deleteCalculation);
CAF_PDM_InitFieldNoDefault(&m_parseExpression, "ParseExpression", "Parse", "", "", "");
RicSummaryCurveCalculator::assignPushButtonEditor(&m_parseExpression);
CAF_PDM_InitFieldNoDefault(&m_calculateExpression, "CalculateExpression", "Calculate", "", "", "");
RicSummaryCurveCalculator::assignPushButtonEditor(&m_calculateExpression);
CAF_PDM_InitFieldNoDefault(&m_newVariable, "NewVariable", "New Variable", "", "", "");
RicSummaryCurveCalculator::assignPushButtonEditor(&m_newVariable);
CAF_PDM_InitFieldNoDefault(&m_deleteVariable, "DeleteVariable", "Delete Variable", "", "", "");
RicSummaryCurveCalculator::assignPushButtonEditor(&m_deleteVariable);
}
//--------------------------------------------------------------------------------------------------
@@ -86,6 +74,19 @@ RimCalculation* RicSummaryCurveCalculator::currentCalculation() const
return m_currentCalculation();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::parseExpression()
{
if (m_currentCalculation())
{
m_currentCalculation()->parseExpression();
this->updateConnectedEditors();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -112,41 +113,6 @@ void RicSummaryCurveCalculator::fieldChangedByUi(const caf::PdmFieldHandle* chan
this->updateConnectedEditors();
}
}
else if (changedField == &m_parseExpression)
{
m_parseExpression = false;
if (m_currentCalculation())
{
m_currentCalculation()->parseExpression();
this->updateConnectedEditors();
}
}
else if (changedField == &m_calculateExpression)
{
m_calculateExpression = false;
if (m_currentCalculation())
{
m_currentCalculation()->calculate();
}
}
else if (changedField == &m_newVariable)
{
m_newVariable = false;
if (m_currentCalculation())
{
m_currentCalculation()->addVariable();
this->updateConnectedEditors();
}
}
else if (changedField == &m_deleteVariable)
{
m_deleteVariable = false;
}
}
//--------------------------------------------------------------------------------------------------
@@ -175,14 +141,7 @@ void RicSummaryCurveCalculator::defineUiOrdering(QString uiConfigName, caf::PdmU
{
m_currentCalculation->uiOrdering(uiConfigName, *group);
}
group->add(&m_parseExpression);
group->add(&m_calculateExpression);
// group->add(&m_newVariable);
// group->add(&m_deleteVariable);
}
}
//--------------------------------------------------------------------------------------------------
@@ -240,6 +199,17 @@ void RicSummaryCurveCalculator::assignPushButtonEditorText(caf::PdmUiEditorAttri
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculator::calculate() const
{
if (m_currentCalculation())
{
m_currentCalculation()->calculate();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -253,20 +223,4 @@ void RicSummaryCurveCalculator::defineEditorAttribute(const caf::PdmFieldHandle*
{
RicSummaryCurveCalculator::assignPushButtonEditorText(attribute, "Delete Calculation");
}
else if (&m_newVariable == field)
{
RicSummaryCurveCalculator::assignPushButtonEditorText(attribute, "New Variable");
}
else if (&m_deleteVariable == field)
{
RicSummaryCurveCalculator::assignPushButtonEditorText(attribute, "Delete Variable");
}
else if (&m_parseExpression == field)
{
RicSummaryCurveCalculator::assignPushButtonEditorText(attribute, "Parse Expression");
}
else if (&m_calculateExpression == field)
{
RicSummaryCurveCalculator::assignPushButtonEditorText(attribute, "Calculate");
}
}