OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-16 18:32:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge dev into feature-analysis-plots-initial

Browse Source
This commit is contained in:
Jacob Støren committed 2020-03-31 13:13:47 +02:00
2 parents 8167167bc9 ead29ef70f
commit adb06f229c
288 files changed
+44732 -2326
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
+1
View File
@@ -67,6 +67,7 @@ void RivReservoirViewPartMgr::scheduleGeometryRegen( RivCellSetEnum geometryType
{
case OVERRIDDEN_CELL_VISIBILITY:
clearGeometryCache( OVERRIDDEN_CELL_VISIBILITY );
break;
case INACTIVE:
clearGeometryCache( INACTIVE );
clearGeometryCache( RANGE_FILTERED_INACTIVE );
ApplicationCode/ModelVisualization/RivWellDiskPartMgr.cpp
+20 -18
View File
@@ -57,6 +57,8 @@
#include "cvfUniform.h"
#include "cvfqtUtils.h"
#include <cmath>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -181,9 +183,9 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
cvf::ref<cvf::Effect> effectToUse = RiaGuiApplication::instance()->useShaders() ? m_shaderEffect : m_fixedFuncEffect;
const cvf::Color3ub colorTable[] = {cvf::Color3ub( cvf::Color3::DARK_GREEN ),
cvf::Color3ub( cvf::Color3::DARK_RED ),
cvf::Color3ub( cvf::Color3::DARK_BLUE )};
const cvf::Color3ub colorTable[] = {cvf::Color3ub( 0, 177, 89 ), // Green
cvf::Color3ub( 255, 66, 66 ), // Red
cvf::Color3ub( 66, 66, 255 )}; // Blue
size_t vertexCount = geo1->vertexCount();
cvf::ref<cvf::Color3ubArray> colorArray = new cvf::Color3ubArray;
@@ -193,8 +195,6 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
std::vector<std::pair<cvf::String, cvf::Vec3f>> labelsWithPosition;
int numberPrecision = 2;
double accumulatedPropertyValue = 0.0;
const double valueThresholdForLabel = 1e-6;
@@ -216,7 +216,7 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
if ( diskData.singlePropertyValue() > valueThresholdForLabel )
{
const double singleProperty = diskData.singlePropertyValueSigned();
labelText += QString( "\n%2" ).arg( singleProperty, 0, 'g', numberPrecision );
labelText += QString( "\n%2" ).arg( RivWellDiskPartMgr::formatNumber( singleProperty ) );
}
}
}
@@ -239,11 +239,8 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
if ( oilFraction > valueThresholdForLabel )
{
auto p = createTextAndLocation( oilFraction / 2.0,
diskPosition,
ijScaleFactor,
diskData.oilSigned(),
numberPrecision );
auto p = createTextAndLocation( oilFraction / 2.0, diskPosition, ijScaleFactor, diskData.oilSigned() );
labelsWithPosition.push_back( p );
aggregatedFraction += oilFraction;
}
@@ -253,8 +250,7 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
auto p = createTextAndLocation( aggregatedFraction + gasFraction / 2.0,
diskPosition,
ijScaleFactor,
diskData.gasSigned(),
numberPrecision );
diskData.gasSigned() );
labelsWithPosition.push_back( p );
aggregatedFraction += gasFraction;
}
@@ -264,8 +260,7 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
auto p = createTextAndLocation( aggregatedFraction + waterFraction / 2.0,
diskPosition,
ijScaleFactor,
diskData.waterSigned(),
numberPrecision );
diskData.waterSigned() );
labelsWithPosition.push_back( p );
aggregatedFraction += waterFraction;
@@ -409,14 +404,21 @@ void RivWellDiskPartMgr::buildWellDiskParts( size_t frameIndex, const caf::Displ
}
}
QString RivWellDiskPartMgr::formatNumber( double num )
{
if ( std::fabs( num ) < 1e4 )
return QString::number( num, 'f', 1 );
else
return QString::number( num, 'g', 2 );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<cvf::String, cvf::Vec3f> RivWellDiskPartMgr::createTextAndLocation( const double aggregatedFraction,
cvf::Vec3d diskPosition,
double ijScaleFactor,
const double fraction,
int precision )
const double fraction )
{
double sinA = cvf::Math::sin( aggregatedFraction * 2.0 * cvf::PI_F );
double cosA = cvf::Math::cos( aggregatedFraction * 2.0 * cvf::PI_F );
@@ -430,7 +432,7 @@ std::pair<cvf::String, cvf::Vec3f> RivWellDiskPartMgr::createTextAndLocation( co
v.x() = v.x() + static_cast<float>( -sinA * radius );
v.y() = v.y() + static_cast<float>( cosA * radius );
auto s = QString::number( fraction, 'g', precision );
auto s = RivWellDiskPartMgr::formatNumber( fraction );
cvf::String text = cvf::String( s.toStdString() );
auto p = std::make_pair( text, v );
ApplicationCode/ModelVisualization/RivWellDiskPartMgr.h
+2 -2
View File
@@ -59,14 +59,14 @@ private:
std::pair<cvf::String, cvf::Vec3f> createTextAndLocation( const double aggregatedFraction,
cvf::Vec3d diskPosition,
double ijScaleFactor,
const double fraction,
int precision );
const double fraction );
void clearAllGeometry();
Rim3dView* viewWithSettings();
RimSimWellInViewCollection* simWellInViewCollection();
static cvf::Color4f getWellInjectionColor( RigWellResultFrame::WellProductionType productionType );
static QString formatNumber( double num );
private:
caf::PdmPointer<RimSimWellInView> m_rimWell;