Merge pull request #41394 from nirvn/pointcloud_icon

Point cloud layer icon improvements
qgis · Feb 7, 2021 · fb0ace3 · fb0ace3
2 parents dec709f + 53f0e2a
commit fb0ace3
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 250 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -585,6 +585,7 @@
         <file>themes/default/propertyicons/digitizing.svg</file>
         <file>themes/default/propertyicons/display.svg</file>
         <file>themes/default/propertyicons/editmetadata.svg</file>
+        <file>themes/default/propertyicons/elevationscale.svg</file>
         <file>themes/default/propertyicons/gdal.svg</file>
         <file>themes/default/propertyicons/general.svg</file>
         <file>themes/default/propertyicons/histogram.svg</file>

diff --git a/images/themes/default/mActionAddPointCloudLayer.svg b/images/themes/default/mActionAddPointCloudLayer.svg
diff --git a/images/themes/default/mIconPointCloudLayer.svg b/images/themes/default/mIconPointCloudLayer.svg
diff --git a/images/themes/default/propertyicons/elevationscale.svg b/images/themes/default/propertyicons/elevationscale.svg
diff --git a/python/core/auto_generated/qgsdataitem.sip.in b/python/core/auto_generated/qgsdataitem.sip.in
@@ -620,7 +620,7 @@ Returns icon for mesh layer type
 %Docstring
 Returns icon for vector tile layer
 %End
-    static QIcon iconPointCloudLayer();
+    static QIcon iconPointCloud();
 %Docstring
 Returns icon for point cloud layer
 %End

diff --git a/src/app/pointcloud/qgspointcloudelevationpropertieswidget.cpp b/src/app/pointcloud/qgspointcloudelevationpropertieswidget.cpp
@@ -70,7 +70,7 @@ void QgsPointCloudElevationPropertiesWidget::onChanged()
 QgsPointCloudElevationPropertiesWidgetFactory::QgsPointCloudElevationPropertiesWidgetFactory( QObject *parent )
   : QObject( parent )
 {
-  setIcon( QgsApplication::getThemeIcon( QStringLiteral( "mesh/Elevation.svg" ) ) );
+  setIcon( QgsApplication::getThemeIcon( QStringLiteral( "propertyicons/elevationscale.svg" ) ) );
   setTitle( tr( "Elevation" ) );
 }
 

diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp
@@ -213,7 +213,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
           break;
 
         case QgsMapLayerType::PointCloudLayer:
-          icon = QgsLayerItem::iconPointCloudLayer();
+          icon = QgsLayerItem::iconPointCloud();
           break;
 
         case QgsMapLayerType::VectorLayer:

diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -106,7 +106,7 @@ QIcon QgsLayerItem::iconVectorTile()
   return QgsApplication::getThemeIcon( QStringLiteral( "/mIconVectorTileLayer.svg" ) );
 }
 
-QIcon QgsLayerItem::iconPointCloudLayer()
+QIcon QgsLayerItem::iconPointCloud()
 {
   return QgsApplication::getThemeIcon( QStringLiteral( "/mIconPointCloudLayer.svg" ) );
 }

diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -645,7 +645,7 @@ class CORE_EXPORT QgsLayerItem : public QgsDataItem
     //! Returns icon for vector tile layer
     static QIcon iconVectorTile();
     //! Returns icon for point cloud layer
-    static QIcon iconPointCloudLayer();
+    static QIcon iconPointCloud();
     //! \returns the layer name
     virtual QString layerName() const { return name(); }
 };