OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-25 06:38:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove last traces of MDI

Browse Source
This commit is contained in:
Jon Jenssen authored and JJ committed 2026-06-17 13:55:32 +02:00
1 parent 967975828c
commit a1fe3739d1
27 files changed
+27 -251
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Application/RiaGuiApplication.cpp
+4 -2
View File
@@ -862,7 +862,8 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( gsl::not_n
if ( snapshotHeight > -1 && snapshotWidth > -1 )
{
RiuMainWindowTools::setWindowSizeOnWidgetsInMdiWindows( mainPlotWnd, snapshotWidth, snapshotHeight );
// TODO - handle snapshot view sizes
// RiuMainWindowTools::setWindowSizeOnWidgetsInViewWindows( mainPlotWnd, snapshotWidth, snapshotHeight );
}
processEvents();
@@ -879,7 +880,8 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( gsl::not_n
if ( snapshotHeight > -1 && snapshotWidth > -1 )
{
RiuMainWindowTools::setFixedWindowSizeFor3dViews( mainWnd, snapshotWidth, snapshotHeight );
// TODO - handle snapshot view sizes
// RiuMainWindowTools::setFixedWindowSizeFor3dViews( mainWnd, snapshotWidth, snapshotHeight );
}
processEvents();
ApplicationLibCode/Application/Tools/RiaRegressionTestRunner.cpp
+4 -2
View File
@@ -556,7 +556,8 @@ void RiaRegressionTestRunner::setDefaultSnapshotSizeFor3dViews()
QSize defaultSize = RiaRegressionTestRunner::regressionDefaultImageSize();
RiuMainWindowTools::setFixedWindowSizeFor3dViews( mainWnd, defaultSize.width(), defaultSize.height() );
// TODO - fix snapshot view sizes
// RiuMainWindowTools::setFixedWindowSizeFor3dViews( mainWnd, defaultSize.width(), defaultSize.height() );
}
//--------------------------------------------------------------------------------------------------
@@ -569,7 +570,8 @@ void RiaRegressionTestRunner::setDefaultSnapshotSizeForPlotWindows()
QSize defaultSize = RiaRegressionTestRunner::regressionDefaultImageSize();
RiuMainWindowTools::setWindowSizeOnWidgetsInMdiWindows( plotMainWindow, defaultSize.width(), defaultSize.height() );
// TODO - fix snapshot view sizes
// RiuMainWindowTools::setWindowSizeOnWidgetsInViewWindows( plotMainWindow, defaultSize.width(), defaultSize.height() );
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/Commands/ExportCommands/RicSnapshotAllPlotsToFileFeature.cpp
-4
View File
@@ -37,7 +37,6 @@
#include <QDebug>
#include <QDir>
#include <QFileInfo>
#include <QMdiSubWindow>
CAF_CMD_SOURCE_INIT( RicSnapshotAllPlotsToFileFeature, "RicSnapshotAllPlotsToFileFeature" );
@@ -101,9 +100,6 @@ void RicSnapshotAllPlotsToFileFeature::exportSnapshotOfPlotsIntoFolder( const QS
if ( activateWidget )
{
// If the active MDI widget is maximized, all widgets will be maximized in the MDI area before taking
// snapshots
RiuPlotMainWindowTools::selectAsCurrentItem( viewWindow );
QApplication::processEvents();
}
ApplicationLibCode/Commands/ExportCommands/RicSnapshotAllViewsToFileFeature.cpp
-1
View File
@@ -47,7 +47,6 @@
#include <QDir>
#include <QFileInfo>
#include <QImage>
#include <QMdiSubWindow>
CAF_CMD_SOURCE_INIT( RicSnapshotAllViewsToFileFeature, "RicSnapshotAllViewsToFileFeature" );
ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp
-1
View File
@@ -33,7 +33,6 @@
#include <QClipboard>
#include <QDebug>
#include <QFileInfo>
#include <QMdiSubWindow>
CAF_CMD_SOURCE_INIT( RicSnapshotViewToClipboardFeature, "RicSnapshotViewToClipboardFeature" );
ApplicationLibCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp
-1
View File
@@ -40,7 +40,6 @@
#include <QClipboard>
#include <QDebug>
#include <QFileInfo>
#include <QMdiSubWindow>
#include <QPageLayout>
#include <QPdfWriter>
ApplicationLibCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake
-1
View File
@@ -41,7 +41,6 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicDeleteSubPlotCtxFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicToggleYAxisLinkingFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicToggleXAxisLinkingFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicOpenSummaryPlotEditorFromMdiAreaFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryTableFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicDuplicateSummaryTableFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicCreateDeclineCurvesFeature.cpp
ApplicationLibCode/Commands/SummaryPlotCommands/RicOpenSummaryPlotEditorFromMdiAreaFeature.cpp
-29
View File
@@ -1,29 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2023- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicOpenSummaryPlotEditorFromMdiAreaFeature.h"
CAF_CMD_SOURCE_INIT( RicOpenSummaryPlotEditorFromMdiAreaFeature, "RicOpenSummaryPlotEditorFromMdiAreaFeature" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicOpenSummaryPlotEditorFromMdiAreaFeature::isCommandEnabled() const
{
return true;
}
ApplicationLibCode/Commands/SummaryPlotCommands/RicOpenSummaryPlotEditorFromMdiAreaFeature.h
-32
View File
@@ -1,32 +0,0 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2023- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RicOpenSummaryPlotEditorFeature.h"
//==================================================================================================
///
//==================================================================================================
class RicOpenSummaryPlotEditorFromMdiAreaFeature : public RicOpenSummaryPlotEditorFeature
{
CAF_CMD_HEADER_INIT;
protected:
bool isCommandEnabled() const override;
};
ApplicationLibCode/Commands/SummaryPlotCommands/RicViewZoomAllFeature.cpp
+6 -15
View File
@@ -28,7 +28,6 @@
#include "RiuPlotMainWindow.h"
#include <QAction>
#include <QMdiSubWindow>
CAF_CMD_SOURCE_INIT( RicViewZoomAllFeature, "RicViewZoomAllFeature" );
@@ -43,25 +42,17 @@ void RicViewZoomAllFeature::onActionTriggered( bool isChecked )
if ( dynamic_cast<RiuMainWindow*>( topLevelWidget ) )
{
RimViewWindow* viewWindow = RiaGuiApplication::instance()->activeReservoirView();
if ( viewWindow )
if ( auto viewWindow = RiaGuiApplication::instance()->activeReservoirView() )
{
viewWindow->zoomAll();
}
}
else if ( dynamic_cast<RiuPlotMainWindow*>( topLevelWidget ) )
else if ( auto plotMainWin = dynamic_cast<RiuPlotMainWindow*>( topLevelWidget ) )
{
RiuPlotMainWindow* mainPlotWindow = dynamic_cast<RiuPlotMainWindow*>( topLevelWidget );
// QList<QMdiSubWindow*> subwindows = mainPlotWindow->subWindowList( QMdiArea::StackingOrder );
// if ( !subwindows.empty() )
//{
// RimViewWindow* viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget( subwindows.back()->widget() );
// if ( viewWindow )
// {
// viewWindow->zoomAll();
// }
//}
if ( auto activePlotView = plotMainWin->activePlotView() )
{
activePlotView->zoomAll();
}
}
}
ApplicationLibCode/ProjectDataModel/Flow/RimFlowPlotCollection.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ void RimFlowPlotCollection::deleteAllPlots()
{
if ( m_defaultWellAllocPlot )
{
m_defaultWellAllocPlot->removeFromMdiAreaAndDeleteViewWidget();
m_defaultWellAllocPlot->removeFromDockAreaAndDeleteViewWidget();
delete m_defaultWellAllocPlot();
}
delete m_defaultWellConnectivityTable;
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
+1 -1
View File
@@ -737,7 +737,7 @@ QString RimWellAllocationPlot::wellName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellAllocationPlot::removeFromMdiAreaAndDeleteViewWidget()
void RimWellAllocationPlot::removeFromDockAreaAndDeleteViewWidget()
{
removeWindowFromDock();
deleteViewWidget();
ApplicationLibCode/ProjectDataModel/Flow/RimWellAllocationPlot.h
+1 -1
View File
@@ -87,7 +87,7 @@ public:
QString wellName() const;
void removeFromMdiAreaAndDeleteViewWidget();
void removeFromDockAreaAndDeleteViewWidget();
void showPlotLegend( bool doShow );
ApplicationLibCode/ProjectDataModel/RimDockWindowController.h
-1
View File
@@ -27,7 +27,6 @@
class RiuMainWindowBase;
class RimViewWindow;
struct RimMdiWindowGeometry;
//==================================================================================================
///
ApplicationLibCode/SocketInterface/RiaSocketServer.cpp
-17
View File
@@ -38,7 +38,6 @@
#include "cafFactory.h"
#include <QtNetwork>
#include <QtWidgets/QMdiSubWindow>
#include <cstdlib>
@@ -149,22 +148,6 @@ RimEclipseCase* RiaSocketServer::findReservoir( int caseId )
{
return eclipseView->eclipseCase();
}
//// If the active mdi window is different from an Eclipse view, search through available mdi windows to find the
//// last activated Eclipse view. The sub windows are returned with the most recent activated window at the back.
// QList<QMdiSubWindow*> subWindows = RiuMainWindow::instance()->subWindowList( QMdiArea::ActivationHistoryOrder );
// for ( int i = subWindows.size() - 1; i > -1; i-- )
//{
// RiuViewer* viewer = subWindows[i]->widget()->findChild<RiuViewer*>();
// if ( viewer )
// {
// RimEclipseView* riv = dynamic_cast<RimEclipseView*>( viewer->ownerReservoirView() );
// if ( riv )
// {
// return riv->eclipseCase();
// }
// }
// }
}
else
{
ApplicationLibCode/UserInterface/RiuMainWindow.cpp
+4 -14
View File
@@ -100,7 +100,6 @@
#include <QDir>
#include <QLabel>
#include <QLayout>
#include <QMdiSubWindow>
#include <QMenuBar>
#include <QMimeData>
#include <QSpinBox>
@@ -234,8 +233,6 @@ void RiuMainWindow::initializeGuiNewProjectLoaded()
setPdmRoot( RimProject::current() );
restoreTreeViewState();
// m_mdiArea->applyTiling();
slotRefreshFileActions();
slotRefreshUndoRedoActions();
slotRefreshViewActions();
@@ -254,16 +251,6 @@ void RiuMainWindow::initializeGuiNewProjectLoaded()
statusBar()->showMessage( "Ready ...", 5000 );
}
// QMdiSubWindow* activeSubWindow = m_mdiArea->activeSubWindow();
// if ( activeSubWindow )
//{
// auto w = findViewWindowFromSubWindow( activeSubWindow );
// if ( w && w->mdiWindowGeometry().isMaximized )
// {
// activeSubWindow->showMaximized();
// }
// }
// Sync selections with property editor.
// Go backwards as the most "important" tree view is first in the list
// and we want that to use the property editor in case multiple tree views are visible
@@ -336,7 +323,10 @@ void RiuMainWindow::cleanupGuiCaseClose()
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::cleanupGuiBeforeProjectClose()
{
// m_mdiArea->closeAllSubWindows();
for ( auto v : viewWindows() )
{
v->removeWindowFromDock();
}
setPdmRoot( nullptr );
ApplicationLibCode/UserInterface/RiuMainWindow.h
-1
View File
@@ -242,7 +242,6 @@ private slots:
// Windows slots
void slotBuildWindowActions();
// void slotSubWindowActivated( QMdiSubWindow* subWindow );
void selectedObjectsChanged();
void customMenuRequested( const QPoint& pos );
ApplicationLibCode/UserInterface/RiuMainWindowTools.cpp
-63
View File
@@ -36,7 +36,6 @@
#include "cafPdmUiTreeView.h"
#include <QMainWindow>
#include <QMdiSubWindow>
#include <QModelIndex>
// Dark title bar is taken from
@@ -167,68 +166,6 @@ void RiuMainWindowTools::collapseSiblings( const caf::PdmUiItem* sourceUiItem )
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindowTools::setWindowSizeOnWidgetsInMdiWindows( RiuMainWindowBase* mainWindow, int width, int height )
{
if ( !mainWindow ) return;
auto widgets = mainWindow->findChildren<QMdiSubWindow*>();
for ( auto w : widgets )
{
if ( !w ) continue;
w->showNormal();
}
// Process events before resize to make sure the widget is ready for resize
// If not, a maximized window with not get the prescribed window size
QApplication::processEvents();
for ( auto w : widgets )
{
if ( !w ) continue;
auto viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget( w->widget() );
if ( viewWindow && viewWindow->viewWidget() )
{
QWidget* viewWidget = viewWindow->viewWidget();
viewWidget->resize( width, height );
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindowTools::setFixedWindowSizeFor3dViews( RiuMainWindowBase* mainWindow, int width, int height )
{
if ( !mainWindow ) return;
RimProject* proj = RimProject::current();
if ( !proj ) return;
for ( Rim3dView* riv : proj->allViews() )
{
if ( riv && riv->viewer() )
{
//// Make sure all views are maximized for snapshotting
// QMdiSubWindow* subWnd = mainWindow->findMdiSubWindow( riv->viewer()->layoutWidget() );
// if ( subWnd )
//{
// subWnd->showMaximized();
// }
// This size is set to match the regression test reference images
QSize windowSize( width, height );
riv->viewer()->setFixedSize( windowSize );
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/UserInterface/RiuMainWindowTools.h
-3
View File
@@ -23,7 +23,6 @@ namespace caf
class PdmUiItem;
} // namespace caf
class RiuMainWindowBase;
class QWidget;
//--------------------------------------------------------------------------------------------------
///
@@ -33,7 +32,5 @@ class RiuMainWindowTools
public:
static void collapseSiblings( const caf::PdmUiItem* uiItem );
static void setWindowSizeOnWidgetsInMdiWindows( RiuMainWindowBase* mainWindow, int width, int height );
static void setFixedWindowSizeFor3dViews( RiuMainWindowBase* mainWindow, int width, int height );
static void setDarkTitleBarWindows( QWidget* widget );
};
ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp
+2 -2
View File
@@ -210,8 +210,8 @@ RimViewWindow* RiuMatrixPlotWidget::ownerViewWindow() const
//--------------------------------------------------------------------------------------------------
void RiuMatrixPlotWidget::contextMenuEvent( QContextMenuEvent* )
{
// Added empty override to preventing menu for Mdi Area
// I.e.: RiuContextMenuLauncher for RiuPlotMainWindow (mdi area)
// Added empty override to preventing menu for central area
// I.e.: RiuContextMenuLauncher for RiuPlotMainWindow
return;
}
ApplicationLibCode/UserInterface/RiuMultiPlotBook.cpp
-1
View File
@@ -44,7 +44,6 @@
#include <QFocusEvent>
#include <QFontMetrics>
#include <QHBoxLayout>
#include <QMdiSubWindow>
#include <QMenu>
#include <QPagedPaintDevice>
#include <QPainter>
ApplicationLibCode/UserInterface/RiuMultiPlotPage.cpp
-1
View File
@@ -59,7 +59,6 @@
#include <QFontMetrics>
#include <QGraphicsDropShadowEffect>
#include <QHBoxLayout>
#include <QMdiSubWindow>
#include <QMenu>
#include <QPainter>
#include <QScrollBar>
ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
+4 -48
View File
@@ -76,7 +76,6 @@
#include <QCloseEvent>
#include <QLayout>
#include <QMdiSubWindow>
#include <QMenuBar>
#include <QMessageBox>
#include <QSettings>
@@ -236,7 +235,10 @@ void RiuPlotMainWindow::initializeGuiNewProjectLoaded()
//--------------------------------------------------------------------------------------------------
void RiuPlotMainWindow::cleanupGuiBeforeProjectClose()
{
// m_mdiArea->closeAllSubWindows();
for ( auto v : viewWindows() )
{
v->removeWindowFromDock();
}
setPdmRoot( nullptr );
@@ -807,52 +809,6 @@ void RiuPlotMainWindow::setPdmRoot( caf::PdmObject* pdmRoot )
}
}
////--------------------------------------------------------------------------------------------------
/////
////--------------------------------------------------------------------------------------------------
// void RiuPlotMainWindow::slotSubWindowActivated( QMdiSubWindow* subWindow )
//{
// if ( isBlockingSubWindowActivatedSignal() ) return;
//
// RimViewWindow* activatedView = findViewWindowFromSubWindow( subWindow );
//
// if ( !activatedView ) return;
// m_activePlotViewWindow = activatedView;
//
// if ( !isBlockingViewSelectionOnSubWindowActivated() )
// {
// caf::PdmUiTreeView* projectTree = getTreeViewWithItem( activatedView );
// if ( projectTree )
// {
// std::vector<caf::PdmUiItem*> currentSelection;
// projectTree->selectedUiItems( currentSelection );
// bool childSelected = false;
// for ( caf::PdmUiItem* uiItem : currentSelection )
// {
// caf::PdmObject* pdmObject = dynamic_cast<caf::PdmObject*>( uiItem );
// if ( pdmObject )
// {
// std::vector<RimViewWindow*> ancestralViews = pdmObject->allAncestorsOrThisOfType<RimViewWindow>();
// for ( auto ancestralView : ancestralViews )
// {
// if ( ancestralView == activatedView )
// {
// childSelected = true;
// }
// }
// }
// }
// if ( !childSelected )
// {
// selectAsCurrentItem( activatedView );
// }
// }
// }
//
// updateWellLogPlotToolBar();
// updateMultiPlotToolBar();
// }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/UserInterface/RiuPlotMainWindow.h
-6
View File
@@ -22,15 +22,11 @@
#include "cafPdmPointer.h"
#include <QMdiArea>
#include <QPointer>
#include <QString>
#include <memory>
struct RimMdiWindowGeometry;
class QMdiSubWindow;
class RiuViewer;
class RimViewWindow;
class RicSummaryPlotEditorDialog;
@@ -119,8 +115,6 @@ private slots:
void slotBuildWindowActions();
// void slotSubWindowActivated( QMdiSubWindow* subWindow );
void selectedObjectsChanged( caf::PdmUiTreeView* projectTree, caf::PdmUiPropertyView* propertyView );
void customMenuRequested( const QPoint& pos );
ApplicationLibCode/UserInterface/RiuQwtPlotWidget.cpp
-1
View File
@@ -107,7 +107,6 @@ RiuQwtPlotWidget::RiuQwtPlotWidget( RimPlot* plotDefinition, QWidget* parent )
SLOT( onPlotItemSelected( std::shared_ptr<RiuPlotItem>, bool, int ) ) );
connect( this, SIGNAL( onKeyPressEvent( QKeyEvent* ) ), plotDefinition, SLOT( onKeyPressEvent( QKeyEvent* ) ) );
connect( this, SIGNAL( onWheelEvent( QWheelEvent* ) ), plotDefinition, SLOT( onWheelEvent( QWheelEvent* ) ) );
connect( this, SIGNAL( onMousePressEvent( QMouseEvent* ) ), plotDefinition, SLOT( onMousePressEvent( QMouseEvent* ) ) );
connect( this, SIGNAL( destroyed() ), plotDefinition, SLOT( onViewerDestroyed() ) );
}
ApplicationLibCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp
-1
View File
@@ -39,7 +39,6 @@
#include <QFocusEvent>
#include <QHBoxLayout>
#include <QMdiSubWindow>
#include <QMenu>
#include <cmath>
ApplicationLibCode/UserInterface/RiuViewerToViewInterface.h
-1
View File
@@ -27,7 +27,6 @@
class RimCase;
class RimViewLinker;
struct RimMdiWindowGeometry;
class RimViewController;
namespace caf