Merge branch '2018.01.01-patch' into dev. #2229

This commit is contained in:
Bjørn Erik Jensen
2018-01-31 08:33:51 +01:00
2 changed files with 8 additions and 2 deletions

View File

@@ -36,6 +36,7 @@
#include "cafUtils.h"
#include "cafPdmSettings.h"
#include "cafPdmUiPropertyViewDialog.h"
#include "cafPdmUiObjectEditorHandle.h"
#include <QFile>
@@ -67,6 +68,7 @@ RimObservedDataCollection::~RimObservedDataCollection()
void RimObservedDataCollection::removeObservedData(RimObservedData* observedData)
{
m_observedDataArray.removeChildObject(observedData);
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
}
//--------------------------------------------------------------------------------------------------
@@ -136,7 +138,7 @@ RimObservedData* RimObservedDataCollection::createAndAddRsmObservedDataFromFile(
}
this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
return observedData;
}
@@ -198,5 +200,6 @@ RimObservedData* RimObservedDataCollection::createAndAddCvsObservedDataFromFile(
}
this->updateConnectedEditors();
caf::PdmUiObjectEditorHandle::updateUiAllObjectEditors();
return observedData;
}