Cleanup

OPM · Feb 12, 2025 · ebaf132 · ebaf132
1 parent c2fb12b
commit ebaf132
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/ApplicationLibCode/Application/Tools/Summary/RiaSummaryAddressAnalyzer.cpp b/ApplicationLibCode/Application/Tools/Summary/RiaSummaryAddressAnalyzer.cpp
@@ -549,8 +549,8 @@ void RiaSummaryAddressAnalyzer::analyzeSingleAddress( const RifEclipseSummaryAdd
 
     if ( address.category() == SummaryCategory::SUMMARY_WELL_CONNECTION )
     {
-        auto wellNameAndCompletion = std::make_pair( wellName, address.blockAsString() );
-        m_wellConnections.insert( wellNameAndCompletion );
+        auto wellNameAndConnection = std::make_pair( wellName, address.connectionAsString() );
+        m_wellConnections.insert( wellNameAndConnection );
     }
     else if ( address.category() == SummaryCategory::SUMMARY_WELL_SEGMENT )
     {

diff --git a/ApplicationLibCode/Application/Tools/Summary/RiaSummaryDefines.cpp b/ApplicationLibCode/Application/Tools/Summary/RiaSummaryDefines.cpp
@@ -117,13 +117,13 @@ QString RiaDefines::summaryWellGroup()
 //--------------------------------------------------------------------------------------------------
 QString RiaDefines::summaryWellSegment()
 {
-    return "Well Segment";
+    return "Segment";
 }
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-QString RiaDefines::summaryConnection()
+QString RiaDefines::summaryWellConnection()
 {
     return "Connection";
 }

diff --git a/ApplicationLibCode/Application/Tools/Summary/RiaSummaryDefines.h b/ApplicationLibCode/Application/Tools/Summary/RiaSummaryDefines.h
@@ -51,7 +51,7 @@ QString summaryWell();
 QString summaryWellCompletion();
 QString summaryWellGroup();
 QString summaryWellSegment();
-QString summaryConnection();
+QString summaryWellConnection();
 QString summarySegment();
 QString summaryBlock();
 QString summaryLgrConnection();

diff --git a/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp b/ApplicationLibCode/FileInterface/RifEclipseSummaryAddress.cpp
@@ -720,7 +720,7 @@ std::string RifEclipseSummaryAddress::itemUiText() const
         case SummaryCategory::SUMMARY_WELL_CONNECTION:
         {
             text += wellName();
-            text += ":" + blockAsString();
+            text += ":" + connectionAsString();
         }
         break;
         case SummaryCategory::SUMMARY_WELL_LGR:
@@ -736,7 +736,7 @@ std::string RifEclipseSummaryAddress::itemUiText() const
             text += ":";
             text += wellName();
             text += ":";
-            text += blockAsString();
+            text += connectionAsString();
         }
         break;
         case SummaryCategory::SUMMARY_WELL_SEGMENT:

diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddress.cpp
@@ -38,7 +38,7 @@ void caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>::setUp()
     addItem( RifAdr::SUMMARY_GROUP, "SUMMARY_WELL_GROUP", RiaDefines::summaryWellGroup() );
     addItem( RifAdr::SUMMARY_WELL, "SUMMARY_WELL", RiaDefines::summaryWell() );
     addItem( RifAdr::SUMMARY_WELL_COMPLETION, "SUMMARY_WELL_COMPLETION", RiaDefines::summaryWellCompletion() );
-    addItem( RifAdr::SUMMARY_WELL_CONNECTION, "SUMMARY_WELL_CONNECTION", RiaDefines::summaryConnection() );
+    addItem( RifAdr::SUMMARY_WELL_CONNECTION, "SUMMARY_WELL_CONNECTION", RiaDefines::summaryWellConnection() );
     addItem( RifAdr::SUMMARY_WELL_CONNECTION_LGR, "SUMMARY_WELL_CONNECTION_LGR", RiaDefines::summaryLgrConnection() );
     addItem( RifAdr::SUMMARY_WELL_LGR, "SUMMARY_WELL_LGR", RiaDefines::summaryLgrWell() );
     addItem( RifAdr::SUMMARY_WELL_SEGMENT, "SUMMARY_SEGMENT", RiaDefines::summarySegment() );

diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp
@@ -47,7 +47,7 @@ void caf::AppEnum<RimSummaryAddressCollection::CollectionContentType>::setUp()
     addItem( CollectionContentType::AQUIFER, "AQUIFER", RiaDefines::summaryAquifer() );
     addItem( CollectionContentType::NETWORK, "NETWORK", RiaDefines::summaryNetwork() );
     addItem( CollectionContentType::REGION_2_REGION, "REGION_2_REGION", RiaDefines::summaryRegion2Region() );
-    addItem( CollectionContentType::WELL_CONNECTION, "WELL_CONNECTION", RiaDefines::summaryConnection() );
+    addItem( CollectionContentType::WELL_CONNECTION, "WELL_CONNECTION", RiaDefines::summaryWellConnection() );
     addItem( CollectionContentType::WELL_COMPLETION, "WELL_COMPLETION", RiaDefines::summaryWellCompletion() );
     addItem( CollectionContentType::WELL_LGR, "WELL_LGR", RiaDefines::summaryLgrWell() );
     addItem( CollectionContentType::WELL_CONNECTION_LGR, "WELL_CONNECTION_LGR", RiaDefines::summaryLgrConnection() );

diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryDataSourceStepping.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryDataSourceStepping.cpp
@@ -40,7 +40,7 @@ void AppEnum<RimSummaryDataSourceStepping::SourceSteppingDimension>::setUp()
     addItem( ssd::BLOCK, "BLOCK", RiaDefines::summaryBlock() );
     addItem( ssd::AQUIFER, "AQUIFER", RiaDefines::summaryAquifer() );
     addItem( ssd::WELL_SEGMENT, "WELL_SEGMENT", RiaDefines::summaryWellSegment() );
-    addItem( ssd::WELL_CONNECTION, "WELL_CONNECTION", RiaDefines::summaryConnection() );
+    addItem( ssd::WELL_CONNECTION, "WELL_CONNECTION", RiaDefines::summaryWellConnection() );
     setDefault( ssd::VECTOR );
 }
 } // namespace caf
diff --git a/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp b/ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp
@@ -921,7 +921,7 @@ void RiuSummaryVectorSelectionUi::defineUiOrdering( QString uiConfigName, caf::P
     else if ( sumCategory == SummaryCategory::SUMMARY_WELL_CONNECTION )
     {
         {
-            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryConnection() + "s" );
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup( RiaDefines::summaryWellConnection() + "s" );
             myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_CONNECTION][0]->pdmField() );
             myGroup->add( m_identifierFieldsMap[SummaryCategory::SUMMARY_WELL_CONNECTION][1]->pdmField() );
         }