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

#559 Linked views : Removed obsolete storage of RimView

Browse Source
This commit is contained in:
Magne Sjaastad 2016-12-09 21:15:24 +01:00
parent 7195455fbd
commit b73cb5136c
8 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@ -90,7 +90,6 @@ RimCellEdgeColors::~RimCellEdgeColors()
void RimCellEdgeColors::setReservoirView(RimEclipseView* ownerReservoirView) void RimCellEdgeColors::setReservoirView(RimEclipseView* ownerReservoirView)
{ {
m_reservoirView = ownerReservoirView; m_reservoirView = ownerReservoirView;
this->m_legendConfig()->setReservoirView(ownerReservoirView);
m_singleVarEdgeResultColors->setReservoirView(ownerReservoirView); m_singleVarEdgeResultColors->setReservoirView(ownerReservoirView);
} }

8
ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
View File

@ -135,7 +135,6 @@ void RimEclipseCellColors::changeLegendConfig(QString resultVarNameOfNewLegend)
if (!found) if (!found)
{ {
RimLegendConfig* newLegend = new RimLegendConfig; RimLegendConfig* newLegend = new RimLegendConfig;
newLegend->setReservoirView(m_reservoirView);
newLegend->resultVariableName = resultVarNameOfNewLegend; newLegend->resultVariableName = resultVarNameOfNewLegend;
m_legendConfigData.push_back(newLegend); m_legendConfigData.push_back(newLegend);
@ -225,13 +224,6 @@ void RimEclipseCellColors::setReservoirView(RimEclipseView* ownerReservoirView)
this->setEclipseCase(ownerReservoirView->eclipseCase()); this->setEclipseCase(ownerReservoirView->eclipseCase());
m_reservoirView = ownerReservoirView; m_reservoirView = ownerReservoirView;
for (size_t i = 0; i < m_legendConfigData.size(); i++)
{
m_legendConfigData[i]->setReservoirView(ownerReservoirView);
}
this->ternaryLegendConfig()->setReservoirView(ownerReservoirView);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -123,7 +123,6 @@ RimEclipseView::RimEclipseView()
this->cellResult()->setReservoirView(this); this->cellResult()->setReservoirView(this);
this->cellEdgeResult()->setReservoirView(this); this->cellEdgeResult()->setReservoirView(this);
this->cellEdgeResult()->legendConfig()->setReservoirView(this);
this->cellEdgeResult()->legendConfig()->setColorRangeMode(RimLegendConfig::PINK_WHITE); this->cellEdgeResult()->legendConfig()->setColorRangeMode(RimLegendConfig::PINK_WHITE);
this->faultResultSettings()->setReservoirView(this); this->faultResultSettings()->setReservoirView(this);

3
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@ -84,9 +84,6 @@ RimGeoMechView::RimGeoMechView(void)
m_propertyFilterCollection = new RimGeoMechPropertyFilterCollection(); m_propertyFilterCollection = new RimGeoMechPropertyFilterCollection();
m_propertyFilterCollection.uiCapability()->setUiHidden(true); m_propertyFilterCollection.uiCapability()->setUiHidden(true);
//this->cellResult()->setReservoirView(this);
this->cellResult()->legendConfig()->setReservoirView(this);
m_scaleTransform = new cvf::Transform(); m_scaleTransform = new cvf::Transform();
m_vizLogic = new RivGeoMechVizLogic(this); m_vizLogic = new RivGeoMechVizLogic(this);
} }

4
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@ -193,9 +193,9 @@ void RimLegendConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
{ {
viewLinker->updateCellResult(); viewLinker->updateCellResult();
} }
}
if (m_reservoirView) m_reservoirView->updateCurrentTimeStepAndRedraw(); view->updateCurrentTimeStepAndRedraw();
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimLegendConfig.h
View File

@ -57,8 +57,6 @@ public:
RimLegendConfig(); RimLegendConfig();
virtual ~RimLegendConfig(); virtual ~RimLegendConfig();
void setReservoirView(RimView* ownerReservoirView) {m_reservoirView = ownerReservoirView; }
caf::PdmField<QString> resultVariableName; // Used internally to describe the variable this legend setup is used for caf::PdmField<QString> resultVariableName; // Used internally to describe the variable this legend setup is used for
enum RangeModeType enum RangeModeType
@ -130,8 +128,6 @@ private:
void setUiValuesFromLegendConfig(const RimLegendConfig* otherLegendConfig); void setUiValuesFromLegendConfig(const RimLegendConfig* otherLegendConfig);
private: private:
caf::PdmPointer<RimView> m_reservoirView;
cvf::ref<cvf::ScalarMapperDiscreteLinear> m_linDiscreteScalarMapper; cvf::ref<cvf::ScalarMapperDiscreteLinear> m_linDiscreteScalarMapper;
cvf::ref<cvf::ScalarMapperDiscreteLog> m_logDiscreteScalarMapper; cvf::ref<cvf::ScalarMapperDiscreteLog> m_logDiscreteScalarMapper;
cvf::ref<cvf::ScalarMapperContinuousLog> m_logSmoothScalarMapper; cvf::ref<cvf::ScalarMapperContinuousLog> m_logSmoothScalarMapper;

4
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp
View File

@ -164,9 +164,9 @@ void RimTernaryLegendConfig::fieldChangedByUi(const caf::PdmFieldHandle* changed
{ {
viewLinker->updateCellResult(); viewLinker->updateCellResult();
} }
}
if (m_reservoirView) m_reservoirView->updateCurrentTimeStepAndRedraw(); view->updateCurrentTimeStepAndRedraw();
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h
View File

@ -65,8 +65,6 @@ public:
RimTernaryLegendConfig(); RimTernaryLegendConfig();
virtual ~RimTernaryLegendConfig(); virtual ~RimTernaryLegendConfig();
void setReservoirView(RimEclipseView* ownerReservoirView) {m_reservoirView = ownerReservoirView; }
void setAutomaticRanges(TernaryArrayIndex ternaryIndex, double globalMin, double globalMax, double localMin, double localMax); void setAutomaticRanges(TernaryArrayIndex ternaryIndex, double globalMin, double globalMax, double localMin, double localMax);
void ternaryRanges(double& soilLower, double& soilUpper, double& sgasLower, double& sgasUpper, double& swatLower, double& swatUpper) const; void ternaryRanges(double& soilLower, double& soilUpper, double& sgasLower, double& sgasUpper, double& swatLower, double& swatUpper) const;
@ -109,7 +107,6 @@ private:
std::vector<double> m_localAutoMax; std::vector<double> m_localAutoMax;
std::vector<double> m_localAutoMin; std::vector<double> m_localAutoMin;
caf::PdmPointer<RimEclipseView> m_reservoirView;
cvf::ref<RivTernarySaturationOverlayItem> m_legend; cvf::ref<RivTernarySaturationOverlayItem> m_legend;
cvf::ref<RivTernaryScalarMapper> m_scalarMapper; cvf::ref<RivTernaryScalarMapper> m_scalarMapper;
}; };