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

Adjustments for release

Browse Source 
* 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
committed by GitHub
parent 1d00b38638
commit 527743a845
12 changed files with 107 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/Application/RiaGuiApplication.cpp
View File

@@ -1183,7 +1183,7 @@ void RiaGuiApplication::onFileSuccessfullyLoaded( const QString& fileName, RiaDe
auto plotWindow = getOrCreateAndShowMainPlotWindow();
plotWindow->raise();
}
else
else if ( fileType != RiaDefines::ImportFileType::RESINSIGHT_PROJECT_FILE )
{
auto mainWindow = getOrCreateAndShowMainWindow();
mainWindow->raise();
@@ -1271,6 +1271,12 @@ void RiaGuiApplication::onProjectOpened()
// Make sure to process events before this function to avoid strange Qt crash
RiuPlotMainWindowTools::refreshToolbars();
if ( m_project->showPlotWindow() && m_project->showPlotWindowOnTop() )
{
m_mainPlotWindow->raise();
m_mainPlotWindow->activateWindow();
}
}
//--------------------------------------------------------------------------------------------------

8
ApplicationLibCode/Application/RiaRftPltCurveDefinition.cpp
View File

@@ -57,6 +57,14 @@ const QDateTime& RiaRftPltCurveDefinition::timeStep() const
//--------------------------------------------------------------------------------------------------
bool RiaRftPltCurveDefinition::operator<( const RiaRftPltCurveDefinition& other ) const
{
if ( m_curveAddress.ensemble() != other.m_curveAddress.ensemble() )
{
// Sort by ensemble first, to make sure the ensemble curves are created and plotted before the single curves
if ( m_curveAddress.ensemble() ) return true;
return false;
}
if ( m_curveAddress == other.m_curveAddress )
{
if ( m_wellName == other.m_wellName )