From 4aadf6e801dd1881c869c48ded00f2362ccf937a Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Mon, 29 Jul 2024 09:45:44 +0200 Subject: [PATCH] Correct or remove ssihub references. --- .../Commands/OsduImportCommands/CMakeLists_files.cmake | 2 +- .../ProjectDataModel/WellPath/RimWellPath.cpp | 8 ++++---- ApplicationLibCode/UserInterface/RiuMainWindow.h | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ApplicationLibCode/Commands/OsduImportCommands/CMakeLists_files.cmake b/ApplicationLibCode/Commands/OsduImportCommands/CMakeLists_files.cmake index afc1fb1b39..dc30cc6baa 100644 --- a/ApplicationLibCode/Commands/OsduImportCommands/CMakeLists_files.cmake +++ b/ApplicationLibCode/Commands/OsduImportCommands/CMakeLists_files.cmake @@ -28,7 +28,7 @@ list(APPEND COMMAND_QT_MOC_HEADERS ) source_group( - "CommandFeature\\SsiHub" + "CommandFeature\\Osdu" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake ) diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp index 339d974dee..98bad74ac8 100644 --- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp @@ -736,18 +736,18 @@ void RimWellPath::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& ui simWellGroup->add( &m_branchIndex ); } - caf::PdmUiGroup* ssihubGroup = uiOrdering.addNewGroup( "Well Info" ); + caf::PdmUiGroup* wellInfoGroup = uiOrdering.addNewGroup( "Well Info" ); if ( m_wellPathGeometry.notNull() && m_wellPathGeometry->rkbDiff() > 0.0 ) { - ssihubGroup->add( &m_airGap ); + wellInfoGroup->add( &m_airGap ); } if ( m_wellPathGeometry.notNull() && m_wellPathGeometry->hasDatumElevation() ) { - ssihubGroup->add( &m_datumElevation ); + wellInfoGroup->add( &m_datumElevation ); } - ssihubGroup->add( &m_unitSystem ); + wellInfoGroup->add( &m_unitSystem ); caf::PdmUiGroup* formationFileInfoGroup = uiOrdering.addNewGroup( "Well Picks" ); formationFileInfoGroup->add( &m_wellPathFormationFilePath ); diff --git a/ApplicationLibCode/UserInterface/RiuMainWindow.h b/ApplicationLibCode/UserInterface/RiuMainWindow.h index e16cbebfe8..c2e48906a7 100644 --- a/ApplicationLibCode/UserInterface/RiuMainWindow.h +++ b/ApplicationLibCode/UserInterface/RiuMainWindow.h @@ -69,11 +69,6 @@ class PdmUiPropertyView; class PdmUiItem; } // namespace caf -namespace ssihub -{ -class Interface; -} - namespace ads { class CDockWidget;