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

Some fixes

Browse Source
This commit is contained in:
jonjenssen authored and JJ committed 2026-06-17 13:55:32 +02:00
1 parent 2faa1cd149
commit ba5308881b
6 files changed
+15 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimProject.cpp
+2
View File
@@ -267,6 +267,8 @@ void RimProject::close()
mainWindowTreeViewStates = "";
plotWindowCurrentModelIndexPaths = "";
plotWindowTreeViewStates = "";
mainWindowDockState = "";
plotWindowDockState = "";
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
+4 -2
View File
@@ -50,7 +50,6 @@ size_t RimViewWindow::m_nextDockWindowId = 0;
//--------------------------------------------------------------------------------------------------
RimViewWindow::RimViewWindow()
: m_dockWidget( nullptr )
, m_dockWindowId( m_nextDockWindowId++ )
, m_isActiveViewer( false )
{
CAF_PDM_InitScriptableObjectWithNameAndComment( "View window", "", "", "", "ViewWindow", "The Base Class for all Views and Plots in ResInsight" );
@@ -60,6 +59,9 @@ RimViewWindow::RimViewWindow()
CAF_PDM_InitField( &m_showWindow, "ShowWindow", true, "Show Window" );
m_showWindow.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_dockWindowId, "DockWindowId", m_nextDockWindowId++, "Dock Window Id" );
m_dockWindowId.uiCapability()->setUiHidden( true );
}
//--------------------------------------------------------------------------------------------------
@@ -299,7 +301,7 @@ void RimViewWindow::updateWindowTitle()
//--------------------------------------------------------------------------------------------------
QString RimViewWindow::dockWindowName() const
{
return QString( "%1_%2" ).arg( RiuDockWidgetTools::viewWindowPrefix() ).arg( m_dockWindowId );
return QString( "%1_%2" ).arg( RiuDockWidgetTools::viewWindowPrefix() ).arg( m_dockWindowId() );
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/ProjectDataModel/RimViewWindow.h
+4 -4
View File
@@ -107,10 +107,10 @@ private:
protected:
caf::PdmChildField<RimDockWindowController*> m_windowController;
caf::PdmField<bool> m_showWindow;
ads::CDockWidget* m_dockWidget;
size_t m_dockWindowId;
bool m_isActiveViewer;
caf::PdmField<bool> m_showWindow;
ads::CDockWidget* m_dockWidget;
caf::PdmField<size_t> m_dockWindowId;
bool m_isActiveViewer;
static size_t m_nextDockWindowId;
};
ApplicationLibCode/UserInterface/RiuDockWidgetTools.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ QString RiuDockWidgetTools::main3DWindowName()
//--------------------------------------------------------------------------------------------------
QString RiuDockWidgetTools::centralScreenName()
{
return "dockCentralScreen";
return "dockWelcomeScreen";
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
+2 -2
View File
@@ -122,7 +122,7 @@ ads::CDockManager* RiuMainWindowBase::dockManager() const
//--------------------------------------------------------------------------------------------------
QString RiuMainWindowBase::dockWidgetStateString() const
{
return QString::fromUtf8( m_dockManager->saveState( DOCKSTATE_VERSION ).toBase64() );
return QString::fromLatin1( m_dockManager->saveState( DOCKSTATE_VERSION ).toBase64() );
}
//--------------------------------------------------------------------------------------------------
@@ -130,7 +130,7 @@ QString RiuMainWindowBase::dockWidgetStateString() const
//--------------------------------------------------------------------------------------------------
void RiuMainWindowBase::restoreDockWidgetState( QString dockStateString )
{
QByteArray dockState = QByteArray::fromBase64( dockStateString.toUtf8() );
QByteArray dockState = QByteArray::fromBase64( dockStateString.toLatin1() );
m_dockManager->restoreState( dockState, DOCKSTATE_VERSION );
}
ApplicationLibCode/UserInterface/RiuViewer.cpp
+2
View File
@@ -723,6 +723,8 @@ void RiuViewer::mousePressEvent( QMouseEvent* mouseEvent )
if ( mouseEvent )
{
m_lastMousePressPosition = mouseEvent->pos();
if ( auto ownView = ownerViewWindow() ) ownView->setAsActiveViewer();
}
}