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

#7632 Preferences : Add separate tab Eclipse Summary

Browse Source 
Remove obsolete includes
This commit is contained in:
Magne Sjaastad
2021-04-28 10:29:53 +02:00
parent 46f186b72d
commit 1cf1eef048
64 changed files with 153 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ModelVisualization/Intersections/RivExtrudedCurveIntersectionPartMgr.cpp
View File

@@ -124,7 +124,7 @@ void RivExtrudedCurveIntersectionPartMgr::applySingleColorEffect()
}
// Update mesh colors as well, in case of change
RiaPreferences* prefs = RiaApplication::instance()->preferences();
RiaPreferences* prefs = RiaPreferences::current();
if ( m_intersectionGridLines.notNull() )
{
@@ -340,7 +340,7 @@ void RivExtrudedCurveIntersectionPartMgr::createFaultLabelParts( const std::vect
}
}
cvf::Color3f faultLabelColor = RiaApplication::instance()->preferences()->defaultWellLabelColor();
cvf::Color3f faultLabelColor = RiaPreferences::current()->defaultWellLabelColor();
if ( faultInViewColl ) faultLabelColor = faultInViewColl->faultLabelColor();
cvf::Font* font = RiaGuiApplication::instance()->defaultSceneFont();
@@ -415,7 +415,7 @@ void RivExtrudedCurveIntersectionPartMgr::createFaultLabelParts( const std::vect
part->updateBoundingBox();
caf::MeshEffectGenerator gen( RiaApplication::instance()->preferences()->defaultFaultGridLineColors() );
caf::MeshEffectGenerator gen( RiaPreferences::current()->defaultFaultGridLineColors() );
cvf::ref<cvf::Effect> eff = gen.generateCachedEffect();
part->setEffect( eff.p() );

2
ApplicationLibCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@@ -498,7 +498,7 @@ void RivFaultPartMgr::updatePartEffect()
updateNNCColors( 0, nullptr );
// Update mesh colors as well, in case of change
RiaPreferences* prefs = RiaApplication::instance()->preferences();
RiaPreferences* prefs = RiaPreferences::current();
cvf::ref<cvf::Effect> eff;
caf::MeshEffectGenerator faultEffGen( prefs->defaultFaultGridLineColors() );

5
ApplicationLibCode/ModelVisualization/RivGridPartMgr.cpp
View File

@@ -20,7 +20,6 @@
#include "RivGridPartMgr.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RiaRegressionTestRunner.h"
@@ -175,7 +174,7 @@ void RivGridPartMgr::generatePartGeometry( cvf::StructGridGeometryGenerator& geo
part->setTransform( m_scaleTransform.p() );
part->updateBoundingBox();
RiaPreferences* prefs = RiaApplication::instance()->preferences();
RiaPreferences* prefs = RiaPreferences::current();
cvf::ref<cvf::Effect> eff;
caf::MeshEffectGenerator effGen( prefs->defaultGridLineColors() );
@@ -227,7 +226,7 @@ void RivGridPartMgr::updateCellColor( cvf::Color4f color )
// Update mesh colors as well, in case of change
if ( m_surfaceGridLines.notNull() )
{
RiaPreferences* prefs = RiaApplication::instance()->preferences();
RiaPreferences* prefs = RiaPreferences::current();
caf::MeshEffectGenerator effGen( prefs->defaultGridLineColors() );
cvf::ref<cvf::Effect> eff = effGen.generateCachedEffect();
m_surfaceGridLines->setEffect( eff.p() );

3
ApplicationLibCode/ModelVisualization/RivMeasurementPartMgr.cpp
View File

@@ -23,6 +23,7 @@
#include "RiaBoundingBoxTools.h"
#include "RiaColorTools.h"
#include "RiaFontCache.h"
#include "RiaGuiApplication.h"
#include "RiaPreferences.h"
#include "Rim3dView.h"
@@ -186,7 +187,7 @@ void RivMeasurementPartMgr::buildPolyLineParts( const cvf::Camera*
RiaGuiApplication* app = RiaGuiApplication::instance();
auto backgroundColor = app->preferences()->defaultViewerBackgroundColor;
auto backgroundColor = RiaPreferences::current()->defaultViewerBackgroundColor;
auto fontColor = RiuGuiTheme::getColorByVariableName( "textColor" );
QString text = m_measurement->label();
auto labelPosition = pointsInDisplay.back();

3
ApplicationLibCode/ModelVisualization/Surfaces/RivSurfacePartMgr.cpp
View File

@@ -18,7 +18,6 @@
#include "RivSurfacePartMgr.h"
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "ProjectDataModel/RimCase.h"
@@ -206,7 +205,7 @@ void RivSurfacePartMgr::updateNativeSurfaceColors()
// Update mesh colors as well, in case of change
RiaPreferences* prefs = RiaApplication::instance()->preferences();
RiaPreferences* prefs = RiaPreferences::current();
if ( m_intersectionGridLines.notNull() )
{