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

Fixed missing code changes related to previous commit

Browse Source
This commit is contained in:
Magne Sjaastad 2015-08-27 11:56:52 +02:00
parent 492bf96598
commit dc7735a67d
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteEclipseCasesFeature.cpp
View File

@ -148,7 +148,7 @@ void RicPasteEclipseCasesFeature::addCasesToGridCaseGroup(PdmObjectGroup& object
for (size_t i = 0; i < insertedCases.size(); i++)
{
RimEclipseResultCase* rimResultReservoir = insertedCases[i];
caf::PdmDocument::initAfterReadTraversal(rimResultReservoir);
rimResultReservoir->initAfterReadRecursively();
}
// Load stuff

2
ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteEclipseViewsFeature.cpp
View File

@ -96,7 +96,7 @@ void RicPasteEclipseViewsFeature::onActionTriggered(bool isChecked)
// Delete all wells to be able to copy/paste between cases, as the wells differ between cases
rimReservoirView->wellCollection()->wells().deleteAllChildObjects();
caf::PdmDocument::initAfterReadTraversal(rimReservoirView);
rimReservoirView->initAfterReadRecursively();
rimReservoirView->setEclipseCase(eclipseCase);
caf::PdmDocument::updateUiIconStateRecursively(rimReservoirView);

2
ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteGeoMechViewsFeature.cpp
View File

@ -87,7 +87,7 @@ void RicPasteGeoMechViewsFeature::onActionTriggered(bool isChecked)
rimReservoirView->name = nameOfCopy;
geomCase->geoMechViews().push_back(rimReservoirView);
caf::PdmDocument::initAfterReadTraversal(rimReservoirView);
rimReservoirView->initAfterReadRecursively();
rimReservoirView->setGeoMechCase(geomCase);
caf::PdmDocument::updateUiIconStateRecursively(rimReservoirView);

2
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -121,7 +121,7 @@ void RicDeleteItemExec::undo()
listField->insertAt(m_commandData->m_indexToObject, obj);
PdmDocument::initAfterReadTraversal(obj);
obj->xmlCapability()->initAfterReadRecursively();
listField->uiCapability()->updateConnectedEditors();
listField->ownerObject()->uiCapability()->updateConnectedEditors();

29
Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp
View File

@ -128,6 +128,35 @@ void PdmDocument::writeFile(QIODevice* xmlFile)
xmlStream.writeEndDocument();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmDocument::updateUiIconStateRecursively(PdmObjectHandle* object)
{
if (object == NULL) return;
std::vector<PdmFieldHandle*> fields;
object->fields(fields);
std::vector<PdmObjectHandle*> children;
size_t fIdx;
for (fIdx = 0; fIdx < fields.size(); ++fIdx)
{
if (fields[fIdx]) fields[fIdx]->childObjects(&children);
}
size_t cIdx;
for (cIdx = 0; cIdx < children.size(); ++cIdx)
{
PdmDocument::updateUiIconStateRecursively(children[cIdx]);
}
PdmUiObjectHandle* uiObjectHandle = uiObj(object);
if (uiObjectHandle)
{
uiObjectHandle->updateUiIconFromToggleField();
}
}
} //End of namespace caf