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

Add missing depth columns in show plot data if multiple curves

Browse Source
This commit is contained in:
jonjenssen
2023-03-08 17:53:42 +01:00
committed by jonjenssen
parent ae977975c8
commit 1d00b38638
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/UserInterface/RiuDepthQwtPlot.cpp
View File

@@ -49,7 +49,6 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuDepthQwtPlot::RiuDepthQwtPlot( QWidget* parent ) RiuDepthQwtPlot::RiuDepthQwtPlot( QWidget* parent )
: RiuDockedQwtPlot( parent ) : RiuDockedQwtPlot( parent )
, m_bShowDepth( true )
{ {
setAutoFillBackground( true ); setAutoFillBackground( true );
setDefaults(); setDefaults();
@@ -145,8 +144,8 @@ void RiuDepthQwtPlot::addCurve( const RimCase* rimCase,
m_caseNames[caseId] = rimCase->caseUserDescription(); m_caseNames[caseId] = rimCase->caseUserDescription();
m_curveNames[caseId].push_back( curveName ); m_curveNames[caseId].push_back( curveName );
m_curveData[caseId].push_back( resultValues ); m_curveData[caseId].push_back( resultValues );
m_kSteps[caseId] = kIndexes; m_kSteps[caseId] = kIndexes;
m_depthValues[caseId] = depthValues; m_depthValues[caseId].push_back( depthValues );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -254,9 +253,9 @@ QString RiuDepthQwtPlot::asciiDataForUiSelectedCurves() const
if ( i == 0 ) if ( i == 0 )
{ {
out += "K Index"; out += "K Index";
out += "\tDepth";
for ( QString curveName : m_curveNames.at( caseId ) ) for ( QString curveName : m_curveNames.at( caseId ) )
{ {
out += "\tDepth";
out += "\t" + curveName; out += "\t" + curveName;
} }
} }
@@ -266,11 +265,10 @@ QString RiuDepthQwtPlot::asciiDataForUiSelectedCurves() const
out += kString; out += kString;
QString depthString = QString::number( m_depthValues.at( caseId )[i], 'f', 2 );
out += "\t" + depthString;
for ( size_t j = 0; j < m_curveData.at( caseId ).size(); j++ ) // curves for ( size_t j = 0; j < m_curveData.at( caseId ).size(); j++ ) // curves
{ {
QString depthString = QString::number( m_depthValues.at( caseId )[j][i], 'f', 2 );
out += "\t" + depthString;
out += "\t" + QString::number( m_curveData.at( caseId )[j][i], 'g', 6 ); out += "\t" + QString::number( m_curveData.at( caseId )[j][i], 'g', 6 );
} }
} }
@@ -301,6 +299,9 @@ void RiuDepthQwtPlot::updateAxisScaling()
{ {
double valRangeX = m_maxX - m_minX; double valRangeX = m_maxX - m_minX;
if ( valRangeX == 0.0 ) valRangeX = 1.0; if ( valRangeX == 0.0 ) valRangeX = 1.0;
this->setAxisScale( QwtAxis::YLeft, m_maxY + 0.1, m_minY - 0.1 ); double valRangeY = m_maxY - m_minY;
if ( valRangeY == 0.0 ) valRangeY = 1.0;
this->setAxisScale( QwtAxis::YLeft, m_maxY + 0.02 * valRangeY, m_minY - 0.02 * valRangeY );
this->setAxisScale( QwtAxis::XTop, m_minX - 0.02 * valRangeX, m_maxX + 0.1 * valRangeX ); this->setAxisScale( QwtAxis::XTop, m_minX - 0.02 * valRangeX, m_maxX + 0.1 * valRangeX );
} }

4
ApplicationLibCode/UserInterface/RiuDepthQwtPlot.h
View File

@@ -75,7 +75,7 @@ private:
std::map<int, QString> m_caseNames; std::map<int, QString> m_caseNames;
std::map<int, std::vector<int>> m_kSteps; std::map<int, std::vector<int>> m_kSteps;
std::map<int, std::vector<double>> m_depthValues; std::map<int, std::vector<std::vector<double>>> m_depthValues;
std::map<int, std::vector<std::vector<double>>> m_curveData; std::map<int, std::vector<std::vector<double>>> m_curveData;
std::map<int, std::vector<QString>> m_curveNames; std::map<int, std::vector<QString>> m_curveNames;
@@ -83,6 +83,4 @@ private:
double m_minY; double m_minY;
double m_maxX; double m_maxX;
double m_minX; double m_minX;
bool m_bShowDepth;
}; };