Rename and improve log message

OPM · Mar 1, 2024 · 45a57c4 · 45a57c4
1 parent 5be1610
commit 45a57c4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygon.cpp b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygon.cpp
@@ -262,6 +262,6 @@ void RimPolygon::defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEd
 
     if ( m_isReadOnly )
     {
-        caf::PdmUiTreeViewItemAttribute::createTagIfTreeViewItemAttribute( attribute, ":/padlock.svg" );
+        caf::PdmUiTreeViewItemAttribute::appendTagToTreeViewItemAttribute( attribute, ":/padlock.svg" );
     }
 }
diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonFile.cpp b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonFile.cpp
@@ -77,15 +77,15 @@ void RimPolygonFile::loadData()
         m_polygons.deleteChildren();
 
         m_polygons.setValue( polygonsFromFile );
+    }
 
-        if ( polygonsFromFile.empty() )
-        {
-            RiaLogging::warning( "No polygons found in file: " + m_fileName().path() );
-        }
-        else
-        {
-            RiaLogging::warning( QString( "Imported %1 polygons from file: " ).arg( polygonsFromFile.size() ) + m_fileName().path() );
-        }
+    if ( polygonsFromFile.empty() )
+    {
+        RiaLogging::warning( "No polygons found in file: " + m_fileName().path() );
+    }
+    else
+    {
+        RiaLogging::info( QString( "Imported %1 polygons from file: " ).arg( polygonsFromFile.size() ) + m_fileName().path() );
     }
 }
 
@@ -197,11 +197,8 @@ void RimPolygonFile::appendMenuItems( caf::CmdFeatureMenuBuilder& menuBuilder )
 //--------------------------------------------------------------------------------------------------
 void RimPolygonFile::defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
 {
-    if ( auto* treeItemAttribute = dynamic_cast<caf::PdmUiTreeViewItemAttribute*>( attribute ) )
+    if ( m_polygons.empty() )
     {
-        if ( m_polygons.empty() )
-        {
-            caf::PdmUiTreeViewItemAttribute::createTagIfTreeViewItemAttribute( attribute, ":/warning.svg" );
-        }
+        caf::PdmUiTreeViewItemAttribute::appendTagToTreeViewItemAttribute( attribute, ":/warning.svg" );
     }
 }
diff --git a/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp b/ApplicationLibCode/ProjectDataModel/Polygons/RimPolygonInView.cpp
@@ -350,7 +350,7 @@ void RimPolygonInView::defineObjectEditorAttribute( QString uiConfigName, caf::P
 
         if ( m_polygon->isReadOnly() )
         {
-            caf::PdmUiTreeViewItemAttribute::createTagIfTreeViewItemAttribute( attribute, ":/padlock.svg" );
+            caf::PdmUiTreeViewItemAttribute::appendTagToTreeViewItemAttribute( attribute, ":/padlock.svg" );
         }
     }
 }

diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeAttributes.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeAttributes.cpp
@@ -72,7 +72,7 @@ std::unique_ptr<caf::PdmUiTreeViewItemAttribute::Tag>
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void caf::PdmUiTreeViewItemAttribute::createTagIfTreeViewItemAttribute( caf::PdmUiEditorAttribute* attribute,
+void caf::PdmUiTreeViewItemAttribute::appendTagToTreeViewItemAttribute( caf::PdmUiEditorAttribute* attribute,
                                                                         const QString&             iconResourceString )
 {
     if ( auto* treeItemAttribute = dynamic_cast<caf::PdmUiTreeViewItemAttribute*>( attribute ) )

diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeAttributes.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeAttributes.h
@@ -77,7 +77,7 @@ class PdmUiTreeViewItemAttribute : public PdmUiEditorAttribute
 
     static std::unique_ptr<Tag> createTag();
     static std::unique_ptr<Tag> createTag( const QColor& color, const QColor& backgroundColor, const QString& text );
-    static void createTagIfTreeViewItemAttribute( caf::PdmUiEditorAttribute* attribute, const QString& iconString );
+    static void appendTagToTreeViewItemAttribute( caf::PdmUiEditorAttribute* attribute, const QString& iconString );
 
     std::vector<std::unique_ptr<Tag>> tags;
 };
-Original file line number
+Diff line change
@@ Expand Up @@
             if ( m_polygon->isReadOnly() )
             {
-                caf::PdmUiTreeViewItemAttribute::createTagIfTreeViewItemAttribute( attribute, ":/padlock.svg" );
+                caf::PdmUiTreeViewItemAttribute::appendTagToTreeViewItemAttribute( attribute, ":/padlock.svg" );
             }
         }
     }
@@ Expand Down @@