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

Use unique id for all 3d and plot dock widgets.

Browse Source
This commit is contained in:
Jon Jenssen authored and JJ committed 2026-06-17 13:55:32 +02:00
1 parent ba5308881b
commit 3b43dac7d4
4 files changed
+43 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp
+7 -5
View File
@@ -43,8 +43,6 @@
CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimViewWindow, "ViewWindow" ); // Do not use. Abstract class
size_t RimViewWindow::m_nextDockWindowId = 0;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -60,7 +58,7 @@ 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" );
CAF_PDM_InitField( &m_dockWindowId, "DockWindowId", QString(), "Dock Window Id" );
m_dockWindowId.uiCapability()->setUiHidden( true );
}
@@ -299,9 +297,13 @@ void RimViewWindow::updateWindowTitle()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimViewWindow::dockWindowName() const
QString RimViewWindow::dockWindowName()
{
return QString( "%1_%2" ).arg( RiuDockWidgetTools::viewWindowPrefix() ).arg( m_dockWindowId() );
if ( m_dockWindowId().isEmpty() )
{
m_dockWindowId = RiuDockWidgetTools::uniqueIdForDockWidget();
}
return m_dockWindowId();
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/ProjectDataModel/RimViewWindow.h
+5 -7
View File
@@ -73,7 +73,7 @@ public:
virtual void updateWindowTitle();
QString dockWindowName() const;
QString dockWindowName();
protected:
//// Interface for the Window controller
@@ -107,10 +107,8 @@ private:
protected:
caf::PdmChildField<RimDockWindowController*> m_windowController;
caf::PdmField<bool> m_showWindow;
ads::CDockWidget* m_dockWidget;
caf::PdmField<size_t> m_dockWindowId;
bool m_isActiveViewer;
static size_t m_nextDockWindowId;
caf::PdmField<bool> m_showWindow;
ads::CDockWidget* m_dockWidget;
caf::PdmField<QString> m_dockWindowId;
bool m_isActiveViewer;
};