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

RC3 adjustments

Browse Source 
* Update icons for summary and ensemble templates

* Icons for regression and decline

* #10374 LineEditor: Hide the placeholder widget when not used

* #10376 Assign a case ID to delta summary case

* Do not show decline range text in plot
This commit is contained in:
Magne Sjaastad
2023-06-10 16:30:34 +02:00
committed by GitHub
parent d3c33ce169
commit 91762aaeb1
21 changed files with 398 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicCreateMultiPlotFromSelectionFeature.cpp
View File

@@ -53,5 +53,5 @@ void RicCreateMultiPlotFromSelectionFeature::onActionTriggered( bool isChecked )
void RicCreateMultiPlotFromSelectionFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Create Summary Plot from Template" );
actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
}

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp
View File

@@ -77,7 +77,7 @@ void RicCreatePlotFromTemplateByShortcutFeature::onActionTriggered( bool isCheck
void RicCreatePlotFromTemplateByShortcutFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Create Plot from Last Used Template" );
actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
QKeySequence keySeq( Qt::CTRL, Qt::Key_T );

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp
View File

@@ -289,7 +289,7 @@ void RicSaveMultiPlotTemplateFeature::replaceStrings( const std::set<QString>& s
void RicSaveMultiPlotTemplateFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Save As Plot Template" );
actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicSetAsDefaultTemplateFeature.cpp
View File

@@ -63,7 +63,7 @@ void RicSetAsDefaultTemplateFeature::onActionTriggered( bool isChecked )
void RicSetAsDefaultTemplateFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Default Template" );
// actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
// actionToSetup->setIcon( QIcon( ":/plot-template-standard.svg" ) );
RimPlotTemplateFileItem* file = selectedTemplate();
if ( file != nullptr )

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicCreateDeclineCurvesFeature.cpp
View File

@@ -71,7 +71,7 @@ void RicCreateDeclineCurvesFeature::onActionTriggered( bool isChecked )
void RicCreateDeclineCurvesFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Create Decline Curves" );
actionToSetup->setIcon( QIcon( ":/SummaryCurve16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/decline-curve.svg" ) );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicCreateRegressionAnalysisCurveFeature.cpp
View File

@@ -64,7 +64,7 @@ void RicCreateRegressionAnalysisCurveFeature::onActionTriggered( bool isChecked
void RicCreateRegressionAnalysisCurveFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Create Regression Analysis Curve" );
actionToSetup->setIcon( QIcon( ":/SummaryCurve16x16.png" ) );
actionToSetup->setIcon( QIcon( ":/regression-curve.svg" ) );
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewDerivedSummaryFeature.cpp
View File

@@ -79,6 +79,8 @@ void RicNewDerivedSummaryFeature::onActionTriggered( bool isChecked )
derivedCase->createSummaryReaderInterface();
}
RimProject::current()->assignCaseIdToSummaryCase( derivedCase );
mainColl->addCase( derivedCase );
derivedCase->updateDisplayNameFromCases();

4
ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFileItem.cpp
View File

@@ -34,7 +34,7 @@ CAF_PDM_SOURCE_INIT( RimPlotTemplateFileItem, "PlotTemplateFileItem" );
//--------------------------------------------------------------------------------------------------
RimPlotTemplateFileItem::RimPlotTemplateFileItem()
{
CAF_PDM_InitObject( "PlotTemplateFileItem", ":/SummaryTemplate16x16.png", "Plot Template", "" );
CAF_PDM_InitObject( "PlotTemplateFileItem", ":/plot-template-standard.svg", "Plot Template", "" );
CAF_PDM_InitField( &m_absoluteFileName, "AbsolutePath", QString(), "Location" );
m_absoluteFileName.uiCapability()->setUiReadOnly( true );
@@ -57,7 +57,7 @@ void RimPlotTemplateFileItem::setFilePath( const QString& filePath )
m_absoluteFileName = filePath;
if ( isEnsembleTemplate() ) this->uiCapability()->setUiIcon( caf::IconProvider( ":/SummaryEnsembleTemplate16x16.png" ) );
if ( isEnsembleTemplate() ) this->uiCapability()->setUiIcon( caf::IconProvider( ":/plot-template-ensemble.svg" ) );
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp
View File

@@ -243,8 +243,8 @@ void RimPlotTemplateFolderItem::appendOptionItemsForPlotTemplatesRecursively( QL
}
}
caf::IconProvider templateIcon( ":/SummaryTemplate16x16.png" );
caf::IconProvider ensTemplateIcon( ":/SummaryEnsembleTemplate16x16.png" );
caf::IconProvider templateIcon( ":/plot-template-standard.svg" );
caf::IconProvider ensTemplateIcon( ":/plot-template-ensemble.svg" );
auto files = templateFolderItem->fileItems();
for ( auto file : files )

3
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryDeclineCurve.cpp
View File

@@ -54,7 +54,7 @@ void caf::AppEnum<RimSummaryDeclineCurve::DeclineCurveType>::setUp()
//--------------------------------------------------------------------------------------------------
RimSummaryDeclineCurve::RimSummaryDeclineCurve()
{
CAF_PDM_InitObject( "Decline Curve", ":/SummaryCurve16x16.png" );
CAF_PDM_InitObject( "Decline Curve", ":/decline-curve.svg" );
CAF_PDM_InitFieldNoDefault( &m_declineCurveType, "DeclineCurveType", "Type" );
CAF_PDM_InitField( &m_predictionYears, "PredictionYears", 5, "Years" );
@@ -424,6 +424,7 @@ void RimSummaryDeclineCurve::updateTimeAnnotations()
{
m_timeRangeAnnotation = plot->addTimeRangeAnnotation( m_minTimeStep, m_maxTimeStep );
m_timeRangeAnnotation->setColor( color() );
m_timeRangeAnnotation->setName( "" );
}
}

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

@@ -72,7 +72,7 @@ void caf::AppEnum<RimSummaryRegressionAnalysisCurve::ForecastUnit>::setUp()
//--------------------------------------------------------------------------------------------------
RimSummaryRegressionAnalysisCurve::RimSummaryRegressionAnalysisCurve()
{
CAF_PDM_InitObject( "Regression Analysis Curve", ":/SummaryCurve16x16.png" );
CAF_PDM_InitObject( "Regression Analysis Curve", ":/regression-curve.svg" );
CAF_PDM_InitFieldNoDefault( &m_regressionType, "RegressionType", "Type" );
CAF_PDM_InitField( &m_forecastForward, "ForecastForward", 0, "Forward" );
@@ -192,6 +192,8 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
else if ( m_regressionType == RegressionType::POWER_FIT )
{
auto [filteredTimeSteps, filteredValues] = getPositiveValues( timeStepsD, valuesInRange );
if ( filteredTimeSteps.empty() || filteredValues.empty() ) return {};
regression::PowerFitRegression powerFitRegression;
powerFitRegression.fit( filteredTimeSteps, filteredValues );
std::vector<double> predictedValues = powerFitRegression.predict( outputTimeStepsD );
@@ -200,6 +202,8 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
else if ( m_regressionType == RegressionType::EXPONENTIAL )
{
auto [filteredTimeSteps, filteredValues] = getPositiveValues( timeStepsD, valuesInRange );
if ( filteredTimeSteps.empty() || filteredValues.empty() ) return {};
regression::ExponentialRegression exponentialRegression;
exponentialRegression.fit( filteredTimeSteps, filteredValues );
std::vector<double> predictedValues = exponentialRegression.predict( outputTimeStepsD );
@@ -208,6 +212,8 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
else if ( m_regressionType == RegressionType::LOGARITHMIC )
{
auto [filteredTimeSteps, filteredValues] = getPositiveValues( timeStepsD, valuesInRange );
if ( filteredTimeSteps.empty() || filteredValues.empty() ) return {};
regression::LogarithmicRegression logarithmicRegression;
logarithmicRegression.fit( filteredTimeSteps, filteredValues );
std::vector<double> predictedValues = logarithmicRegression.predict( outputTimeStepsD );

2
ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
View File

@@ -320,7 +320,7 @@ QIcon RiuDockWidgetTools::dockIcon( const QString dockWidgetName )
else if ( dockWidgetName == plotMainWindowDataSourceTreeName() )
return QIcon( ":/data-sources.svg" );
else if ( dockWidgetName == plotMainWindowTemplateTreeName() )
return QIcon( ":/SummaryTemplate16x16.png" );
return QIcon( ":/plot-template-standard.svg" );
else if ( dockWidgetName == plotMainWindowScriptsTreeName() )
return QIcon( ":/scripts.svg" );
else if ( dockWidgetName == plotMainWindowPropertyEditorName() )