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

Update icon state for range filters as part of loading project, not from initAfterRead

Browse Source
This commit is contained in:
Magne Sjaastad 2015-10-28 12:23:24 +01:00
parent ad6e17a5d9
commit 09a2579c49
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/Application/RiaApplication.cpp
View File

@ -399,6 +399,9 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
riv->loadDataAndUpdate(); riv->loadDataAndUpdate();
this->setActiveReservoirView(riv); this->setActiveReservoirView(riv);
riv->rangeFilterCollection()->updateIconState();
viewProgress.incrementProgress(); viewProgress.incrementProgress();
} }

20
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.cpp
View File

@ -176,20 +176,6 @@ RimEclipseView* RimCellRangeFilterCollection::eclipseView() const
return dynamic_cast<RimEclipseView*>(baseView()); return dynamic_cast<RimEclipseView*>(baseView());
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCellRangeFilterCollection::initAfterRead()
{
for (size_t i = 0; i < rangeFilters.size(); i++)
{
RimCellRangeFilter* rangeFilter = rangeFilters[i];
rangeFilter->updateIconState();
}
updateIconState();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -346,5 +332,11 @@ void RimCellRangeFilterCollection::updateIconState()
updateUiIconFromState(activeIcon); updateUiIconFromState(activeIcon);
uiCapability()->updateConnectedEditors(); uiCapability()->updateConnectedEditors();
for (size_t i = 0; i < rangeFilters.size(); i++)
{
RimCellRangeFilter* rangeFilter = rangeFilters[i];
rangeFilter->updateIconState();
}
} }

4
ApplicationCode/ProjectDataModel/RimCellRangeFilterCollection.h
View File

@ -60,10 +60,6 @@ public:
virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ); virtual void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );
virtual caf::PdmFieldHandle* objectToggleField(); virtual caf::PdmFieldHandle* objectToggleField();
protected:
// Overridden methods
virtual void initAfterRead();
private: private:
RimView* baseView() const; RimView* baseView() const;