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

#2053 Curve calc. Resove ptr field and fix a bug

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-11-06 11:35:34 +01:00
parent d5a3b319b8
commit c6f3638dad
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp
View File

@ -86,11 +86,12 @@ RimSummaryCalculation* RimSummaryCalculationCollection::addCalculationCopy(const
expression.replace(currVarName, newVarName);
calcCopy->setExpression(expression);
calcCopy->parseExpression();
m_calcuations.push_back(calcCopy);
calcCopy->resolveReferencesRecursively();
rebuildCaseMetaData();
calcCopy->parseExpression();
return calcCopy;
}

20
ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.cpp
View File

@ -31,9 +31,8 @@ void RiuCalculationsContextMenuManager::attachWidget(QWidget* widget, RicSummary
QObject::connect(widget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotMenuItems(QPoint)));
m_widget = widget;
m_curveCalc = std::unique_ptr<RicSummaryCurveCalculator>(curveCalc);
m_curveCalc = curveCalc;
}
}
//--------------------------------------------------------------------------------------------------
@ -45,15 +44,14 @@ void RiuCalculationsContextMenuManager::slotMenuItems(QPoint point)
QAction action("Create copy", this);
connect(&action, SIGNAL(triggered()), SLOT(slotCreateCalculationCopy()));
menu.addAction(&action);
action.setEnabled(m_curveCalc->currentCalculation() != nullptr);
menu.addAction(&action);
QPoint globalPoint = point;
if (m_widget)
{
globalPoint = m_widget->mapToGlobal(point);
//m_textPosition = m_widget->textCursor().position();
}
menu.exec(globalPoint);
@ -71,17 +69,5 @@ void RiuCalculationsContextMenuManager::slotCreateCalculationCopy()
RimSummaryCalculationCollection* coll = RicSummaryCurveCalculator::calculationCollection();
coll->addCalculationCopy(currCalculation);
m_curveCalc->updateConnectedEditors();
//QAction* action = qobject_cast<QAction *>(sender());
//if (action)
//{
// QTextCursor cursor = m_textEdit->textCursor();
// cursor.setPosition(m_textPosition);
// m_textEdit->setTextCursor(cursor);
// m_textEdit->insertPlainText(action->text());
//}
}
}

2
ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.h
View File

@ -52,7 +52,7 @@ private slots:
private:
QPointer<QWidget> m_widget;
std::unique_ptr<RicSummaryCurveCalculator> m_curveCalc;
RicSummaryCurveCalculator* m_curveCalc;
int m_textPosition;
std::map<QString, std::unique_ptr<QAction>> m_actionCache;
};