Adjustments for release

* Make sure text for multiple wells in same grid cell is displayed correctly
* Improve selection of result in Advanced Snapshot Export
* Restore the main window that was on top when project was saved
* Trim string to make sure '/' is exported with no space in front
* #9872 RFT-plot: Make colors stable for curves in RFT plots
* Set version to RC_02
This commit is contained in:
Magne Sjaastad
2023-03-09 08:54:28 +01:00
parent 44fb946136
commit 625ed3410c
12 changed files with 107 additions and 33 deletions

View File

@@ -142,7 +142,7 @@ void RiuAdvancedSnapshotExportWidget::addSnapshotItemFromActiveView()
if ( eclipseView )
{
multiSnapshot->eclipseResultType = eclipseView->cellResult()->resultType();
multiSnapshot->selectedEclipseResults.v().push_back( eclipseView->cellResult()->resultVariable() );
multiSnapshot->setSelectedEclipseResults( eclipseView->cellResult()->resultVariable() );
}
multiSnapshot->timeStepStart = activeView->currentTimeStep();
multiSnapshot->timeStepEnd = activeView->currentTimeStep();
@@ -198,10 +198,7 @@ QString RiuAdvancedSnapshotExportWidget::exportFolder() const
//--------------------------------------------------------------------------------------------------
void RiuAdvancedSnapshotExportWidget::customMenuRequested( QPoint pos )
{
caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance();
QMenu menu;
menu.addAction( commandManager->action( "PdmListField_DeleteItem", "Delete row" ) );
QAction* newRowAction = new QAction( "New row", this );
connect( newRowAction, SIGNAL( triggered() ), SLOT( addSnapshotItem() ) );

View File

@@ -1177,7 +1177,7 @@ QString RiuResultTextBuilder::wellResultText()
const int outletSegmentId = wellResultCell->outletSegmentId();
text += QString( "-- Well-cell connection info --\n Well Name: %1\n Branch Id: %2\n Segment "
"Id: %3\n Outlet Branch Id: %4\n Outlet Segment Id: %5" )
"Id: %3\n Outlet Branch Id: %4\n Outlet Segment Id: %5\n" )
.arg( singleWellResultData->m_wellName )
.arg( branchId )
.arg( segmentId )