OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-08 23:23:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2370 Elm Props: Reload selected files. Prop filters etc not updated

Browse Source
This commit is contained in:
Rebecca Cox 2018-01-14 09:10:23 +01:00
parent a8039b8569
commit 673ad12dee
2 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@ -430,6 +430,12 @@ void RimGeoMechCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
}
}
}
else if (changedField == &m_reloadElementPropertyFileCommand)
{
m_reloadElementPropertyFileCommand = false;
reloadSelectedElementPropertyFiles();
updateConnectedEditors();
}
else if (changedField == &m_closeElementPropertyFileCommand)
{
m_closeElementPropertyFileCommand = false;
@ -548,6 +554,7 @@ void RimGeoMechCase::closeSelectedElementPropertyFiles()
filesToClose.push_back(m_elementPropertyFileNames.v().at(idx).path());
m_elementPropertyFileNames.v().erase(m_elementPropertyFileNames.v().begin() + idx);
}
m_elementPropertyFileNameIndexUiSelection.v().clear();
if (m_geoMechCaseData.notNull())
@ -555,6 +562,33 @@ void RimGeoMechCase::closeSelectedElementPropertyFiles()
geoMechData()->femPartResults()->removeElementPropertyFiles(filesToClose);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechCase::reloadSelectedElementPropertyFiles()
{
std::vector<QString> filesToReload;
for (size_t idx : m_elementPropertyFileNameIndexUiSelection.v())
{
filesToReload.push_back(m_elementPropertyFileNames.v().at(idx).path());
}
m_elementPropertyFileNameIndexUiSelection.v().clear();
if (m_geoMechCaseData.notNull())
{
geoMechData()->femPartResults()->removeElementPropertyFiles(filesToReload);
geoMechData()->femPartResults()->addElementPropertyFiles(filesToReload);
}
for (auto view : views())
{
view->scheduleCreateDisplayModelAndRedraw();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -571,6 +605,7 @@ void RimGeoMechCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
caf::PdmUiGroup* elmPropGroup = uiOrdering.addNewGroup("Element Properties");
elmPropGroup->add(&m_elementPropertyFileNameIndexUiSelection);
elmPropGroup->add(&m_reloadElementPropertyFileCommand);
elmPropGroup->add(&m_closeElementPropertyFileCommand);
}
@ -579,6 +614,10 @@ void RimGeoMechCase::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
//--------------------------------------------------------------------------------------------------
void RimGeoMechCase::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
{
if (field == &m_reloadElementPropertyFileCommand)
{
dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute)->m_buttonText = "Reload Case(s)";
}
if (field == &m_closeElementPropertyFileCommand)
{
dynamic_cast<caf::PdmUiPushButtonEditorAttribute*> (attribute)->m_buttonText = "Close Case(s)";

2
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@ -90,6 +90,8 @@ private:
static QString subStringOfDigits(const QString& timeStepString, int numberOfDigitsToFind);
void closeSelectedElementPropertyFiles();
void reloadSelectedElementPropertyFiles();
private:
cvf::ref<RigGeoMechCaseData> m_geoMechCaseData;
caf::PdmField<QString> m_caseFileName;