mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#6164 Color Legend : Use defines for UI text used multiple times
This commit is contained in:
@@ -61,3 +61,19 @@ double RiaDefines::nonDarcyFlowAlpha( RiaEclipseUnitTools::UnitSystem unitSystem
|
|||||||
return 0.0;
|
return 0.0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
QString RiaDefines::faciesColorLegendName()
|
||||||
|
{
|
||||||
|
return "Facies colors";
|
||||||
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
QString RiaDefines::rockTypeColorLegendName()
|
||||||
|
{
|
||||||
|
return "Rock Types";
|
||||||
|
}
|
||||||
|
|||||||
@@ -28,4 +28,7 @@ QString conductivityResultName();
|
|||||||
QString unitStringConductivity( RiaEclipseUnitTools::UnitSystem unitSystem );
|
QString unitStringConductivity( RiaEclipseUnitTools::UnitSystem unitSystem );
|
||||||
|
|
||||||
double nonDarcyFlowAlpha( RiaEclipseUnitTools::UnitSystem unitSystem );
|
double nonDarcyFlowAlpha( RiaEclipseUnitTools::UnitSystem unitSystem );
|
||||||
|
|
||||||
|
QString faciesColorLegendName();
|
||||||
|
QString rockTypeColorLegendName();
|
||||||
}; // namespace RiaDefines
|
}; // namespace RiaDefines
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
|
|
||||||
#include "RiaApplication.h"
|
#include "RiaApplication.h"
|
||||||
#include "RiaColorTables.h"
|
#include "RiaColorTables.h"
|
||||||
|
#include "RiaFractureDefines.h"
|
||||||
#include "RiaGuiApplication.h"
|
#include "RiaGuiApplication.h"
|
||||||
#include "RiaLogging.h"
|
#include "RiaLogging.h"
|
||||||
|
|
||||||
@@ -232,7 +233,8 @@ void RicNewFractureModelPlotFeature::createFaciesTrack( RimFractureModelPlot* pl
|
|||||||
faciesTrack->setAnnotationType( RiuPlotAnnotationTool::RegionAnnotationType::RESULT_PROPERTY_ANNOTATIONS );
|
faciesTrack->setAnnotationType( RiuPlotAnnotationTool::RegionAnnotationType::RESULT_PROPERTY_ANNOTATIONS );
|
||||||
faciesTrack->setRegionPropertyResultType( RiaDefines::ResultCatType::INPUT_PROPERTY, defaultProperty );
|
faciesTrack->setRegionPropertyResultType( RiaDefines::ResultCatType::INPUT_PROPERTY, defaultProperty );
|
||||||
|
|
||||||
RimColorLegend* faciesColors = RimProject::current()->colorLegendCollection()->findByName( "Facies colors" );
|
RimColorLegend* faciesColors =
|
||||||
|
RimProject::current()->colorLegendCollection()->findByName( RiaDefines::faciesColorLegendName() );
|
||||||
if ( faciesColors )
|
if ( faciesColors )
|
||||||
{
|
{
|
||||||
faciesTrack->setColorShadingLegend( faciesColors );
|
faciesTrack->setColorShadingLegend( faciesColors );
|
||||||
@@ -282,7 +284,8 @@ void RicNewFractureModelPlotFeature::createLayersTrack( RimFractureModelPlot* pl
|
|||||||
faciesTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() );
|
faciesTrack->setFormationWellPath( fractureModel->thicknessDirectionWellPath() );
|
||||||
faciesTrack->setFormationCase( eclipseCase );
|
faciesTrack->setFormationCase( eclipseCase );
|
||||||
|
|
||||||
RimColorLegend* faciesColors = RimProject::current()->colorLegendCollection()->findByName( "Facies colors" );
|
RimColorLegend* faciesColors =
|
||||||
|
RimProject::current()->colorLegendCollection()->findByName( RiaDefines::faciesColorLegendName() );
|
||||||
if ( faciesColors )
|
if ( faciesColors )
|
||||||
{
|
{
|
||||||
faciesTrack->setColorShadingLegend( faciesColors );
|
faciesTrack->setColorShadingLegend( faciesColors );
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
|
|
||||||
#include "RiaApplication.h"
|
#include "RiaApplication.h"
|
||||||
#include "RiaColorTables.h"
|
#include "RiaColorTables.h"
|
||||||
|
#include "RiaFractureDefines.h"
|
||||||
#include "RiaLogging.h"
|
#include "RiaLogging.h"
|
||||||
#include "RiaStdStringTools.h"
|
#include "RiaStdStringTools.h"
|
||||||
|
|
||||||
@@ -79,10 +80,10 @@ void RicImportFaciesFeature::onActionTriggered( bool isChecked )
|
|||||||
|
|
||||||
const caf::ColorTable& colorTable = RiaColorTables::contrastCategoryPaletteColors();
|
const caf::ColorTable& colorTable = RiaColorTables::contrastCategoryPaletteColors();
|
||||||
RimColorLegendCollection* colorLegendCollection = RimProject::current()->colorLegendCollection;
|
RimColorLegendCollection* colorLegendCollection = RimProject::current()->colorLegendCollection;
|
||||||
RimColorLegend* rockTypeColorLegend = colorLegendCollection->findByName( "Rock Types" );
|
RimColorLegend* rockTypeColorLegend = colorLegendCollection->findByName( RiaDefines::rockTypeColorLegendName() );
|
||||||
|
|
||||||
RimColorLegend* colorLegend = new RimColorLegend;
|
RimColorLegend* colorLegend = new RimColorLegend;
|
||||||
colorLegend->setColorLegendName( "Facies colors" );
|
colorLegend->setColorLegendName( RiaDefines::faciesColorLegendName() );
|
||||||
|
|
||||||
for ( auto it : codeNames )
|
for ( auto it : codeNames )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -17,11 +17,14 @@
|
|||||||
/////////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#include "RimColorLegendCollection.h"
|
#include "RimColorLegendCollection.h"
|
||||||
#include "RimColorLegend.h"
|
|
||||||
#include "RimRegularLegendConfig.h"
|
|
||||||
|
|
||||||
|
#include "RiaFractureDefines.h"
|
||||||
|
|
||||||
|
#include "RimColorLegend.h"
|
||||||
#include "RimColorLegendItem.h"
|
#include "RimColorLegendItem.h"
|
||||||
#include "RimProject.h"
|
#include "RimProject.h"
|
||||||
|
#include "RimRegularLegendConfig.h"
|
||||||
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
CAF_PDM_SOURCE_INIT( RimColorLegendCollection, "ColorLegendCollection" );
|
CAF_PDM_SOURCE_INIT( RimColorLegendCollection, "ColorLegendCollection" );
|
||||||
@@ -183,7 +186,7 @@ RimColorLegendItem* RimColorLegendCollection::createColorLegendItem( const QStri
|
|||||||
RimColorLegend* RimColorLegendCollection::createRockTypeColorLegend() const
|
RimColorLegend* RimColorLegendCollection::createRockTypeColorLegend() const
|
||||||
{
|
{
|
||||||
RimColorLegend* colorLegend = new RimColorLegend;
|
RimColorLegend* colorLegend = new RimColorLegend;
|
||||||
colorLegend->setColorLegendName( "Rock Types" );
|
colorLegend->setColorLegendName( RiaDefines::rockTypeColorLegendName() );
|
||||||
|
|
||||||
// Rock types colors taken from "Equinor GeoStandard - May 2020" document.
|
// Rock types colors taken from "Equinor GeoStandard - May 2020" document.
|
||||||
// 6.3.1 Epiclastic rocks
|
// 6.3.1 Epiclastic rocks
|
||||||
|
|||||||
@@ -48,6 +48,7 @@
|
|||||||
#include "RiuQwtPlotWidget.h"
|
#include "RiuQwtPlotWidget.h"
|
||||||
|
|
||||||
#include "RiaApplication.h"
|
#include "RiaApplication.h"
|
||||||
|
#include "RiaFractureDefines.h"
|
||||||
#include "RiaLogging.h"
|
#include "RiaLogging.h"
|
||||||
#include "RiaPreferences.h"
|
#include "RiaPreferences.h"
|
||||||
|
|
||||||
@@ -212,7 +213,7 @@ void RimElasticPropertiesCurve::performDataExtraction( bool* isUsingPseudoLength
|
|||||||
fractureModelPlot->getPorosityValues( poroValues );
|
fractureModelPlot->getPorosityValues( poroValues );
|
||||||
|
|
||||||
// TODO: make this settable??
|
// TODO: make this settable??
|
||||||
QString colorLegendName = "Facies colors";
|
QString colorLegendName = RiaDefines::faciesColorLegendName();
|
||||||
RimColorLegend* colorLegend = RimProject::current()->colorLegendCollection()->findByName( colorLegendName );
|
RimColorLegend* colorLegend = RimProject::current()->colorLegendCollection()->findByName( colorLegendName );
|
||||||
if ( !colorLegend )
|
if ( !colorLegend )
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user