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

#2727 Legends : Rename to RimRegularLegendConfig

Browse Source
This commit is contained in:
Magne Sjaastad
2018-04-18 10:10:39 +02:00
parent f85c1de330
commit 3bc85ce794
41 changed files with 186 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
View File

@@ -29,7 +29,7 @@
#include "RimEclipseCase.h"
#include "RimEclipseFaultColors.h"
#include "RimEclipseView.h"
#include "RimLegendConfig.h"
#include "RimRegularLegendConfig.h"
#include "RimSimWellInView.h"
#include "RimSimWellInViewCollection.h"
#include "RimTernaryLegendConfig.h"
@@ -143,7 +143,7 @@ void RimEclipseCellColors::changeLegendConfig(QString resultVarNameOfNewLegend)
// Not found ?
if (!found)
{
RimLegendConfig* newLegend = new RimLegendConfig;
RimRegularLegendConfig* newLegend = new RimRegularLegendConfig;
newLegend->resultVariableName = resultVarNameOfNewLegend;
m_legendConfigData.push_back(newLegend);
@@ -168,7 +168,7 @@ void RimEclipseCellColors::initAfterRead()
if (obsoleteField_legendConfig)
{
// The current legend config is NOT stored in <ResultVarLegendDefinitionList> in ResInsight up to v 1.3.7-dev
RimLegendConfig* obsoleteLegend = obsoleteField_legendConfig();
RimRegularLegendConfig* obsoleteLegend = obsoleteField_legendConfig();
// set to NULL before pushing into container
obsoleteField_legendConfig = nullptr;
@@ -208,19 +208,19 @@ void RimEclipseCellColors::updateLegendCategorySettings()
if (this->hasCategoryResult())
{
legendConfig()->setMappingMode(RimLegendConfig::CATEGORY_INTEGER);
legendConfig()->setColorRangeMode(RimLegendConfig::CATEGORY);
legendConfig()->setMappingMode(RimRegularLegendConfig::CATEGORY_INTEGER);
legendConfig()->setColorRangeMode(RimRegularLegendConfig::CATEGORY);
}
else
{
if (legendConfig()->mappingMode() == RimLegendConfig::CATEGORY_INTEGER)
if (legendConfig()->mappingMode() == RimRegularLegendConfig::CATEGORY_INTEGER)
{
legendConfig()->setMappingMode(RimLegendConfig::LINEAR_CONTINUOUS);
legendConfig()->setMappingMode(RimRegularLegendConfig::LINEAR_CONTINUOUS);
}
if (legendConfig()->colorRangeMode() == RimLegendConfig::CATEGORY)
if (legendConfig()->colorRangeMode() == RimRegularLegendConfig::CATEGORY)
{
legendConfig()->setColorRangeMode(RimLegendConfig::NORMAL);
legendConfig()->setColorRangeMode(RimRegularLegendConfig::NORMAL);
}
}
}
@@ -274,7 +274,7 @@ public :
///
//--------------------------------------------------------------------------------------------------
void RimEclipseCellColors::updateLegendData(size_t currentTimeStep,
RimLegendConfig* legendConfig,
RimRegularLegendConfig* legendConfig,
RimTernaryLegendConfig* ternaryLegendConfig)
{
if (!legendConfig) legendConfig = this->legendConfig();
@@ -514,7 +514,7 @@ void RimEclipseCellColors::setResultVariable(const QString& val)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimLegendConfig* RimEclipseCellColors::legendConfig()
RimRegularLegendConfig* RimEclipseCellColors::legendConfig()
{
return m_legendConfigPtrField;
}