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

Renamed class RimFaultResultSlot to RimEclipseFaultColors

Browse Source
This commit is contained in:
Pål Hagen 2015-06-25 12:06:43 +02:00
parent 87744fb8c4
commit b8d425a010
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
View File

@ -142,7 +142,7 @@ void RivReservoirFaultsPartMgr::appendPartsToModel(cvf::ModelBasicList* model)
}
// Parts that is not overridden by the grid settings
RimFaultResultSlot* faultResultSlot = m_reservoirView->faultResultSettings();
RimEclipseFaultColors* faultResultSlot = m_reservoirView->faultResultSettings();
RimEclipseCellColors* cellResultSlot = m_reservoirView->cellResult();
if (rimFault->showFault() && faultCollection->showFaultCollection())

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -84,7 +84,7 @@ RimEclipseView::RimEclipseView()
cellEdgeResult = new RimCellEdgeResultSlot();
CAF_PDM_InitFieldNoDefault(&faultResultSettings, "FaultResultSettings", "Separate Fault Result", "", "", "");
faultResultSettings = new RimFaultResultSlot();
faultResultSettings = new RimEclipseFaultColors();
CAF_PDM_InitFieldNoDefault(&wellCollection, "WellCollection", "Simulation Wells", "", "", "");

4
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -47,7 +47,7 @@ class RimEclipsePropertyFilterCollection;
class RimCellRangeFilter;
class RimCellRangeFilterCollection;
class RimFaultCollection;
class RimFaultResultSlot;
class RimEclipseFaultColors;
class RimReservoirCellResultsStorage;
class RimReservoirCellResultsStorage;
class RimEclipseCellColors;
@ -86,7 +86,7 @@ public:
caf::PdmField<RimEclipseCellColors*> cellResult;
caf::PdmField<RimCellEdgeResultSlot*> cellEdgeResult;
caf::PdmField<RimFaultResultSlot*> faultResultSettings;
caf::PdmField<RimEclipseFaultColors*> faultResultSettings;
caf::PdmField<RimEclipsePropertyFilterCollection*> propertyFilterCollection;

24
ApplicationCode/ProjectDataModel/RimFaultResultSlot.cpp
View File

@ -30,12 +30,12 @@
CAF_PDM_SOURCE_INIT(RimFaultResultSlot, "RimFaultResultSlot");
CAF_PDM_SOURCE_INIT(RimEclipseFaultColors, "RimFaultResultSlot");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFaultResultSlot::RimFaultResultSlot()
RimEclipseFaultColors::RimEclipseFaultColors()
{
CAF_PDM_InitObject("Fault Result Slot", ":/draw_style_faults_24x24.png", "", "");
@ -59,14 +59,14 @@ RimFaultResultSlot::RimFaultResultSlot()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFaultResultSlot::~RimFaultResultSlot()
RimEclipseFaultColors::~RimEclipseFaultColors()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultResultSlot::setReservoirView(RimEclipseView* ownerReservoirView)
void RimEclipseFaultColors::setReservoirView(RimEclipseView* ownerReservoirView)
{
m_reservoirView = ownerReservoirView;
m_customFaultResult->setReservoirView(ownerReservoirView);
@ -75,7 +75,7 @@ void RimFaultResultSlot::setReservoirView(RimEclipseView* ownerReservoirView)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimEclipseFaultColors::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
this->updateUiIconFromToggleField();
@ -92,7 +92,7 @@ void RimFaultResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedFiel
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultResultSlot::initAfterRead()
void RimEclipseFaultColors::initAfterRead()
{
m_customFaultResult->initAfterRead();
updateFieldVisibility();
@ -103,7 +103,7 @@ void RimFaultResultSlot::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultResultSlot::updateFieldVisibility()
void RimEclipseFaultColors::updateFieldVisibility()
{
m_customFaultResult->updateFieldVisibility();
}
@ -111,7 +111,7 @@ void RimFaultResultSlot::updateFieldVisibility()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseCellColors* RimFaultResultSlot::customFaultResult()
RimEclipseCellColors* RimEclipseFaultColors::customFaultResult()
{
return this->m_customFaultResult();
}
@ -119,7 +119,7 @@ RimEclipseCellColors* RimFaultResultSlot::customFaultResult()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimFaultResultSlot::objectToggleField()
caf::PdmFieldHandle* RimEclipseFaultColors::objectToggleField()
{
return &showCustomFaultResult;
}
@ -127,7 +127,7 @@ caf::PdmFieldHandle* RimFaultResultSlot::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimFaultResultSlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimEclipseFaultColors::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
group1->add(&(m_customFaultResult->m_resultTypeUiField));
@ -138,7 +138,7 @@ void RimFaultResultSlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimFaultResultSlot::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
QList<caf::PdmOptionItemInfo> RimEclipseFaultColors::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{
return m_customFaultResult->calculateValueOptionsForSpecifiedDerivedListPosition(true, fieldNeedingOptions, useOptionsOnly);
}
@ -146,7 +146,7 @@ QList<caf::PdmOptionItemInfo> RimFaultResultSlot::calculateValueOptions(const ca
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimFaultResultSlot::hasValidCustomResult()
bool RimEclipseFaultColors::hasValidCustomResult()
{
if (this->showCustomFaultResult())
{

6
ApplicationCode/ProjectDataModel/RimFaultResultSlot.h
View File

@ -30,13 +30,13 @@ class RimEclipseView;
///
///
//==================================================================================================
class RimFaultResultSlot : public caf::PdmObject
class RimEclipseFaultColors : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RimFaultResultSlot();
virtual ~RimFaultResultSlot();
RimEclipseFaultColors();
virtual ~RimEclipseFaultColors();
void setReservoirView(RimEclipseView* ownerReservoirView);

2
ApplicationCode/ProjectDataModel/RimResultDefinition.h
View File

@ -71,7 +71,7 @@ protected:
caf::PdmField<QString> m_resultVariable;
friend class RimEclipsePropertyFilter;
friend class RimFaultResultSlot;
friend class RimEclipseFaultColors;
// User interface only fields, to support "filtering"-like behaviour etc.
caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > > m_resultTypeUiField;

2
ApplicationCode/ProjectDataModel/RimResultSlot.h
View File

@ -46,7 +46,7 @@ public:
virtual void setResultVariable(const QString& resultName);
protected:
friend class RimFaultResultSlot;
friend class RimEclipseFaultColors;
virtual void initAfterRead();
private: