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

Regression Curve: Remove unit text

Browse Source 
As cross plot curves is supported, it will require a bit work to make the unit text correct in all cases. To avoid confusion, remove the unit text.
This commit is contained in:
Magne Sjaastad
2023-10-19 10:15:57 +02:00
parent 9a02958640
commit c10d8561a3
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp
View File

@@ -730,7 +730,7 @@ QString RimSummaryRegressionAnalysisCurve::curveExportDescription( const RifEcli
//--------------------------------------------------------------------------------------------------
QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regression::LinearRegression& reg )
{
return RiaRegressionTextTools::generateRegressionText( reg ) + getXAxisUnitText();
return RiaRegressionTextTools::generateRegressionText( reg );
}
//--------------------------------------------------------------------------------------------------
@@ -738,7 +738,7 @@ QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regress
//--------------------------------------------------------------------------------------------------
QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regression::PolynomialRegression& reg )
{
return RiaRegressionTextTools::generateRegressionText( reg ) + getXAxisUnitText();
return RiaRegressionTextTools::generateRegressionText( reg );
}
//--------------------------------------------------------------------------------------------------
@@ -746,7 +746,7 @@ QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regress
//--------------------------------------------------------------------------------------------------
QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regression::PowerFitRegression& reg )
{
return RiaRegressionTextTools::generateRegressionText( reg ) + getXAxisUnitText();
return RiaRegressionTextTools::generateRegressionText( reg );
}
//--------------------------------------------------------------------------------------------------
@@ -754,7 +754,7 @@ QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regress
//--------------------------------------------------------------------------------------------------
QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regression::ExponentialRegression& reg )
{
return RiaRegressionTextTools::generateRegressionText( reg ) + getXAxisUnitText();
return RiaRegressionTextTools::generateRegressionText( reg );
}
//--------------------------------------------------------------------------------------------------
@@ -762,7 +762,7 @@ QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regress
//--------------------------------------------------------------------------------------------------
QString RimSummaryRegressionAnalysisCurve::generateRegressionText( const regression::LogarithmicRegression& reg )
{
return RiaRegressionTextTools::generateRegressionText( reg ) + getXAxisUnitText();
return RiaRegressionTextTools::generateRegressionText( reg );
}
//--------------------------------------------------------------------------------------------------
@@ -959,11 +959,3 @@ void RimSummaryRegressionAnalysisCurve::updateDefaultValues()
*std::max_element( m_sourceValuesY.begin(), m_sourceValuesY.end() ) );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryRegressionAnalysisCurve::getXAxisUnitText()
{
return QString( "<br>X Axis Unit: Year" );
}

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.h
View File

@@ -129,8 +129,6 @@ private:
static QString generateRegressionText( const regression::LogarithmicRegression& reg );
static QString generateRegressionText( const regression::ExponentialRegression& reg );
static QString getXAxisUnitText();
static void appendTimeSteps( std::vector<time_t>& destinationTimeSteps, const std::set<QDateTime>& sourceTimeSteps );
std::pair<time_t, time_t> fullTimeStepRange() const;