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

Add a few sensible asserts to RimGridCrossPlotDataSet

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-04-03 08:35:57 +02:00
parent 716ac4bf83
commit c2eafebfc8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@ -110,6 +110,7 @@ RimGridCrossPlotDataSet::RimGridCrossPlotDataSet()
CAF_PDM_InitFieldNoDefault(&m_groupingProperty, "GroupingProperty", "Data Grouping Property", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_groupingProperty, "GroupingProperty", "Data Grouping Property", "", "", "");
m_groupingProperty = new RimEclipseCellColors; m_groupingProperty = new RimEclipseCellColors;
m_groupingProperty.uiCapability()->setUiHidden(true); m_groupingProperty.uiCapability()->setUiHidden(true);
CVF_ASSERT(m_groupingProperty->legendConfig());
m_groupingProperty->legendConfig()->setMappingMode(RimRegularLegendConfig::CATEGORY_INTEGER); m_groupingProperty->legendConfig()->setMappingMode(RimRegularLegendConfig::CATEGORY_INTEGER);
m_groupingProperty->setTernaryEnabled(false); m_groupingProperty->setTernaryEnabled(false);
@ -777,6 +778,8 @@ void RimGridCrossPlotDataSet::defineUiOrdering(QString uiConfigName, caf::PdmUiO
uiOrdering.add(&m_cellFilterView); uiOrdering.add(&m_cellFilterView);
uiOrdering.add(&m_grouping); uiOrdering.add(&m_grouping);
CVF_ASSERT(m_xAxisProperty && m_yAxisProperty && m_groupingProperty && "All property objects should always be created");
if (m_grouping() == GROUP_BY_TIME && !(m_xAxisProperty->hasDynamicResult() || m_yAxisProperty->hasDynamicResult())) if (m_grouping() == GROUP_BY_TIME && !(m_xAxisProperty->hasDynamicResult() || m_yAxisProperty->hasDynamicResult()))
{ {
m_grouping = NO_GROUPING; m_grouping = NO_GROUPING;
@ -912,6 +915,7 @@ QList<caf::PdmOptionItemInfo> RimGridCrossPlotDataSet::calculateValueOptions(con
options.push_back(caf::PdmOptionItemInfo("Disabled", nullptr)); options.push_back(caf::PdmOptionItemInfo("Disabled", nullptr));
for (RimEclipseView* view : eclipseCase->reservoirViews.childObjects()) for (RimEclipseView* view : eclipseCase->reservoirViews.childObjects())
{ {
CVF_ASSERT(view && "Really always should have a valid view pointer in ReservoirViews");
options.push_back(caf::PdmOptionItemInfo(view->name(), view, false, view->uiIcon())); options.push_back(caf::PdmOptionItemInfo(view->name(), view, false, view->uiIcon()));
} }
} }
@ -925,7 +929,7 @@ QList<caf::PdmOptionItemInfo> RimGridCrossPlotDataSet::calculateValueOptions(con
} }
{ {
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>(m_case()); RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>(m_case());
if (!eclipseCase || !eclipseCase->eclipseCaseData()->activeFormationNames()) if (!(eclipseCase && eclipseCase->activeFormationNames()))
{ {
validOptions.erase(GROUP_BY_FORMATION); validOptions.erase(GROUP_BY_FORMATION);
} }