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

#5961 Color Legend : Improve default color legend for contour plots

Browse Source
This commit is contained in:
Magne Sjaastad
2020-08-05 16:14:25 +02:00
parent 860e6d54a9
commit 6a6a093d05
4 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ApplicationCode/Commands/RicNewContourMapViewFeature.cpp
View File

@@ -208,6 +208,13 @@ RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMapFr
contourMap->faultCollection()->showFaultCollection = false; contourMap->faultCollection()->showFaultCollection = false;
contourMap->wellCollection()->isActive = false; contourMap->wellCollection()->isActive = false;
// Set default values
RimRegularLegendConfig* legendConfig = contourMap->cellResult()->legendConfig();
if ( legendConfig && legendConfig->mappingMode() == RimRegularLegendConfig::CATEGORY_INTEGER )
{
RicNewContourMapViewFeature::assignDefaultResultAndLegend( contourMap );
}
caf::PdmDocument::updateUiIconStateRecursively( contourMap ); caf::PdmDocument::updateUiIconStateRecursively( contourMap );
eclipseCase->contourMapCollection()->push_back( contourMap ); eclipseCase->contourMapCollection()->push_back( contourMap );
@@ -235,22 +242,7 @@ RimEclipseContourMapView* RicNewContourMapViewFeature::createEclipseContourMap(
RimEclipseContourMapView* contourMap = new RimEclipseContourMapView(); RimEclipseContourMapView* contourMap = new RimEclipseContourMapView();
contourMap->setEclipseCase( eclipseCase ); contourMap->setEclipseCase( eclipseCase );
// Set default values assignDefaultResultAndLegend( contourMap );
{
contourMap->cellResult()->setResultType( RiaDefines::ResultCatType::DYNAMIC_NATIVE );
if ( RiaApplication::instance()->preferences()->loadAndShowSoil )
{
contourMap->cellResult()->setResultVariable( "SOIL" );
}
RimRegularLegendConfig* legendConfig = contourMap->cellResult()->legendConfig();
if ( legendConfig )
{
RimColorLegend* legend = legendConfig->mapToColorLegend( RimRegularLegendConfig::RAINBOW );
legendConfig->setColorLegend( legend );
}
}
caf::PdmDocument::updateUiIconStateRecursively( contourMap ); caf::PdmDocument::updateUiIconStateRecursively( contourMap );
@@ -343,3 +335,26 @@ RimGeoMechContourMapView* RicNewContourMapViewFeature::createGeoMechContourMap(
return contourMap; return contourMap;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicNewContourMapViewFeature::assignDefaultResultAndLegend( RimEclipseContourMapView* contourMap )
{
if ( contourMap->cellResult() )
{
contourMap->cellResult()->setResultType( RiaDefines::ResultCatType::DYNAMIC_NATIVE );
if ( RiaApplication::instance()->preferences()->loadAndShowSoil )
{
contourMap->cellResult()->setResultVariable( "SOIL" );
}
RimRegularLegendConfig* legendConfig = contourMap->cellResult()->legendConfig();
if ( legendConfig )
{
RimColorLegend* legend = legendConfig->mapToColorLegend( RimRegularLegendConfig::RAINBOW );
legendConfig->setColorLegend( legend );
}
}
}

2
ApplicationCode/Commands/RicNewContourMapViewFeature.h
View File

@@ -54,4 +54,6 @@ protected:
static RimGeoMechContourMapView* createGeoMechContourMapFrom3dView( RimGeoMechCase* geoMechCase, static RimGeoMechContourMapView* createGeoMechContourMapFrom3dView( RimGeoMechCase* geoMechCase,
const RimGeoMechView* sourceView ); const RimGeoMechView* sourceView );
static RimGeoMechContourMapView* createGeoMechContourMap( RimGeoMechCase* geoMechCase ); static RimGeoMechContourMapView* createGeoMechContourMap( RimGeoMechCase* geoMechCase );
static void assignDefaultResultAndLegend( RimEclipseContourMapView* contourMap );
}; };

10
ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp
View File

@@ -699,12 +699,12 @@ void RimRegularLegendConfig::updateCategoryItems()
cvf::Color3ub ubColor( item->color() ); cvf::Color3ub ubColor( item->color() );
categories.push_back( std::make_tuple( item->itemName(), item->categoryValue(), ubColor ) ); categories.push_back( std::make_tuple( item->itemName(), item->categoryValue(), ubColor ) );
} }
// Reverse the categories to make the ordering identical to items in project tree
std::reverse( categories.begin(), categories.end() );
setCategoryItems( categories );
} }
// Reverse the categories to make the ordering identical to items in project tree
std::reverse( categories.begin(), categories.end() );
setCategoryItems( categories );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.cpp
View File

@@ -159,8 +159,6 @@ Color3ub CategoryMapper::mapToColor( double categoryValue ) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void CategoryMapper::majorTickValues( std::vector<double>* domainValues ) const void CategoryMapper::majorTickValues( std::vector<double>* domainValues ) const
{ {
// Not intended to be supported
CVF_ASSERT( false );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------