From be49cb2766208c38e725fadcdf43317781e013d1 Mon Sep 17 00:00:00 2001 From: astridkbjorke Date: Mon, 20 Feb 2017 15:39:15 +0100 Subject: [PATCH] #1138 - pre-proto - Updating stimPlan legends after reading in xml file --- .../ProjectDataModel/RimStimPlanColors.cpp | 5 ++++- .../RimStimPlanFractureTemplate.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimStimPlanColors.cpp b/ApplicationCode/ProjectDataModel/RimStimPlanColors.cpp index b731b432a4..db3e0f17d8 100644 --- a/ApplicationCode/ProjectDataModel/RimStimPlanColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimStimPlanColors.cpp @@ -43,7 +43,7 @@ RimStimPlanColors::RimStimPlanColors() CAF_PDM_InitObject("StimPlan Colors", ":/draw_style_faults_24x24.png", "", ""); CAF_PDM_InitField(&m_resultNameAndUnit, "ResultName", QString(""), "Result Variable", "", "", ""); - CAF_PDM_InitField(&opacityLevel, "opacityLevel", 0.2f, "StimPlan grid Transparency", "", "", ""); + CAF_PDM_InitField(&opacityLevel, "opacityLevel", 0.2f, "Transparency", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_legendConfigurations, "LegendConfigurations", "", "", "", ""); @@ -115,6 +115,9 @@ void RimStimPlanColors::loadDataAndUpdate() { RimLegendConfig* legendConfig = new RimLegendConfig(); legendConfig->resultVariableName = resultNameUnitString; + legendConfig->setMappingMode(RimLegendConfig::LINEAR_DISCRETE); + legendConfig->setColorRangeMode(RimLegendConfig::STIMPLAN); + m_legendConfigurations.push_back(legendConfig); } diff --git a/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp index 6dec575b19..6ef7b007ad 100644 --- a/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp +++ b/ApplicationCode/ProjectDataModel/RimStimPlanFractureTemplate.cpp @@ -18,10 +18,14 @@ #include "RimStimPlanFractureTemplate.h" +#include "RiaApplication.h" + #include "RigStimPlanFractureDefinition.h" +#include "RimEclipseView.h" #include "RimFracture.h" #include "RimProject.h" +#include "RimStimPlanColors.h" #include "RimStimPlanLegendConfig.h" #include "cafPdmObject.h" @@ -173,14 +177,6 @@ void RimStimPlanFractureTemplate::readStimPlanXMLFile(QString * errorMessage) size_t numberOfTimeSteps; numberOfTimeSteps = m_stimPlanFractureDefinitionData->timeSteps.size(); - -// std::vector>> condValues(numberOfTimeSteps); -// m_stimPlanFractureDefinitionData->conductivities = condValues; -// std::vector>> widthValues(numberOfTimeSteps); -// m_stimPlanFractureDefinitionData->widths = widthValues; -// std::vector>> permValues(numberOfTimeSteps); -// m_stimPlanFractureDefinitionData->permeabilities = permValues; - //Start reading from top: QFile dataFile(m_stimPlanFileName()); @@ -240,6 +236,10 @@ void RimStimPlanFractureTemplate::readStimPlanXMLFile(QString * errorMessage) } setDepthOfWellPathAtFracture(); + + RimEclipseView* activeView = dynamic_cast(RiaApplication::instance()->activeReservoirView()); + if (!activeView) return; + activeView->stimPlanColors->loadDataAndUpdate(); }