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

(#483) Gray out icon for overridden cell results

Browse Source
This commit is contained in:
Magne Sjaastad 2015-09-23 13:48:25 +02:00
parent af75f513f9
commit 4ee8929d91
6 changed files with 99 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
View File

@ -20,10 +20,13 @@
#include "RimEclipseCellColors.h"
#include "RimEclipseFaultColors.h"
#include "RimEclipseView.h"
#include "RimTernaryLegendConfig.h"
#include "RimViewLink.h"
#include "RimViewLinker.h"
#include "RiuMainWindow.h"
#include "RimEclipseFaultColors.h"
CAF_PDM_SOURCE_INIT(RimEclipseCellColors, "ResultSlot");
@ -174,6 +177,8 @@ void RimEclipseCellColors::initAfterRead()
}
changeLegendConfig(this->resultVariable());
updateIconState();
}
//--------------------------------------------------------------------------------------------------
@ -219,3 +224,21 @@ RimLegendConfig* RimEclipseCellColors::legendConfig()
return m_legendConfigPtrField;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseCellColors::updateIconState()
{
RimViewLink* viewLink = RimViewLinker::viewLinkForView(m_reservoirView);
if (viewLink && viewLink->syncCellResult())
{
updateUiIconFromState(false);
}
else
{
updateUiIconFromState(true);
}
uiCapability()->updateConnectedEditors();
}

3
ApplicationCode/ProjectDataModel/RimEclipseCellColors.h
View File

@ -48,6 +48,9 @@ public:
caf::PdmChildField<RimTernaryLegendConfig*> ternaryLegendConfig;
virtual void setResultVariable(const QString& resultName);
void updateIconState();
protected:
// Overridden methods
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);

32
ApplicationCode/ProjectDataModel/RimGeoMechCellColors.cpp
View File

@ -18,8 +18,11 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RimGeoMechCellColors.h"
#include "RimLegendConfig.h"
#include "RimView.h"
#include "RimViewLink.h"
#include "RimViewLinker.h"
CAF_PDM_SOURCE_INIT(RimGeoMechCellColors, "GeoMechResultSlot");
@ -41,3 +44,32 @@ RimGeoMechCellColors::RimGeoMechCellColors(void)
RimGeoMechCellColors::~RimGeoMechCellColors(void)
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechCellColors::updateIconState()
{
RimView* rimView = NULL;
this->firstAnchestorOrThisOfType(rimView);
RimViewLink* viewLink = RimViewLinker::viewLinkForView(rimView);
if (viewLink && viewLink->syncCellResult())
{
updateUiIconFromState(false);
}
else
{
updateUiIconFromState(true);
}
uiCapability()->updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechCellColors::initAfterRead()
{
updateIconState();
}

3
ApplicationCode/ProjectDataModel/RimGeoMechCellColors.h
View File

@ -40,4 +40,7 @@ public:
virtual ~RimGeoMechCellColors(void);
caf::PdmChildField<RimLegendConfig*> legendConfig;
void updateIconState();
virtual void initAfterRead();
};

34
ApplicationCode/ProjectDataModel/RimViewLink.cpp
View File

@ -21,10 +21,19 @@
#include "RiaApplication.h"
#include "RigCaseData.h"
#include "RigCaseToCaseCellMapper.h"
#include "RigFemPartCollection.h"
#include "RigGeoMechCaseData.h"
#include "RimCase.h"
#include "RimCellRangeFilterCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseCellColors.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseView.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechCellColors.h"
#include "RimGeoMechPropertyFilterCollection.h"
#include "RimGeoMechView.h"
#include "RimProject.h"
@ -35,13 +44,6 @@
#include "RiuViewer.h"
#include "cafPdmUiTreeOrdering.h"
#include "RimEclipseCase.h"
#include "RigCaseData.h"
#include "RimGeoMechCase.h"
#include "RigGeoMechCaseData.h"
#include "RigFemPartCollection.h"
#include "RigCaseToCaseCellMapper.h"
CAF_PDM_SOURCE_INIT(RimViewLink, "RimViewLink");
//--------------------------------------------------------------------------------------------------
@ -159,9 +161,23 @@ void RimViewLink::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
{
doSyncTimeStep();
}
else if (changedField == &syncCellResult && syncCellResult())
else if (changedField == &syncCellResult)
{
doSyncCellResult();
if (syncCellResult())
{
doSyncCellResult();
}
else
{
if (managedEclipseView())
{
managedEclipseView()->cellResult()->updateIconState();
}
else if (managedGeoView())
{
managedGeoView()->cellResult()->updateIconState();
}
}
}
else if (changedField == &syncRangeFilters)
{

20
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@ -141,17 +141,19 @@ void RimViewLinker::updateCellResult()
if (viewLink->managedView())
{
if (viewLink->syncCellResult())
RimView* rimView = viewLink->managedView();
RimEclipseView* eclipeView = dynamic_cast<RimEclipseView*>(rimView);
if (eclipeView)
{
RimView* rimView = viewLink->managedView();
RimEclipseView* eclipeView = dynamic_cast<RimEclipseView*>(rimView);
if (eclipeView)
if (viewLink->syncCellResult())
{
eclipeView->cellResult()->setPorosityModel(eclipseCellResultDefinition->porosityModel());
eclipeView->cellResult()->setResultType(eclipseCellResultDefinition->resultType());
eclipeView->cellResult()->setResultVariable(eclipseCellResultDefinition->resultVariable());
eclipeView->scheduleCreateDisplayModelAndRedraw();
}
eclipeView->cellResult()->updateIconState();
}
}
}
@ -169,15 +171,17 @@ void RimViewLinker::updateCellResult()
if (viewLink->managedView())
{
if (viewLink->syncCellResult())
RimView* rimView = viewLink->managedView();
RimGeoMechView* geoView = dynamic_cast<RimGeoMechView*>(rimView);
if (geoView)
{
RimView* rimView = viewLink->managedView();
RimGeoMechView* geoView = dynamic_cast<RimGeoMechView*>(rimView);
if (geoView)
if (viewLink->syncCellResult())
{
geoView->cellResult()->setResultAddress(geoMechResultDefinition->resultAddress());
geoView->scheduleCreateDisplayModelAndRedraw();
}
geoView->cellResult()->updateIconState();
}
}
}