From 83cf5fab0bb74317a5e616c740f877be0f87de28 Mon Sep 17 00:00:00 2001
From: NEDJIMAbelgacem <gb_nedjima@esi.dz>
Date: Thu, 28 Jul 2022 17:27:06 +0100
Subject: [PATCH] fix layout tests

---
 .../pointcloud/qgspointcloudrenderer.sip.in   |  7 ++-
 src/core/pointcloud/qgspointcloudrenderer.cpp | 40 ++++++++++++++++
 src/core/pointcloud/qgspointcloudrenderer.h   | 47 ++-----------------
 3 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/python/core/auto_generated/pointcloud/qgspointcloudrenderer.sip.in b/python/core/auto_generated/pointcloud/qgspointcloudrenderer.sip.in
index f90ee61d979..106c80f0ea6 100644
--- a/python/core/auto_generated/pointcloud/qgspointcloudrenderer.sip.in
+++ b/python/core/auto_generated/pointcloud/qgspointcloudrenderer.sip.in
@@ -588,9 +588,12 @@ Retrieves the z value for the point at index ``i``.
 Draws a point using a ``color`` at the specified ``x`` and ``y`` (in map coordinates).
 %End
 
-    QColor encodeElevation( float z ) const;
-
     void drawPointToElevationMap( double x, double y, double z, QgsPointCloudRenderContext &context ) const;
+%Docstring
+Draws a point at the elevation ``z`` using at the specified ``x`` and ``y`` (in map coordinates) on the elevation map.
+
+.. versionadded:: 3.28
+%End
 
     void copyCommonProperties( QgsPointCloudRenderer *destination ) const;
 %Docstring
diff --git a/src/core/pointcloud/qgspointcloudrenderer.cpp b/src/core/pointcloud/qgspointcloudrenderer.cpp
index fb5e6f3078c..949863a62e3 100644
--- a/src/core/pointcloud/qgspointcloudrenderer.cpp
+++ b/src/core/pointcloud/qgspointcloudrenderer.cpp
@@ -159,6 +159,46 @@ QStringList QgsPointCloudRenderer::legendRuleKeys() const
   return QStringList();
 }
 
+void QgsPointCloudRenderer::drawPointToElevationMap( double x, double y, double z, QgsPointCloudRenderContext &context ) const
+{
+  const QPointF originalXY( x, y );
+  context.renderContext().mapToPixel().transformInPlace( x, y );
+  QPainter *elevationPainter = context.elevationPainter();
+  const double zMin = -5000;//context.zMin();//-37.2;
+  const double zMax = +5000;//context.zMax();// 532.87;
+  float zFloat = ( z - zMin ) / ( zMax - zMin );
+  zFloat = std::max<double>( 0.0, std::min<double>( 1.0, zFloat ) );
+  context.updateZRange( zFloat );
+
+  QColor c;
+  c.setRedF( zFloat );
+  zFloat *= std::pow<float>( 2, 8 );
+  zFloat -= ( int )zFloat;
+  c.setGreenF( zFloat );
+  zFloat *= std::pow<float>( 2, 8 );
+  zFloat -= ( int )zFloat;
+  c.setBlueF( zFloat );
+  c.setAlphaF( 1.0f );
+
+  QBrush brush( c );
+  switch ( mPointSymbol )
+  {
+    case Qgis::PointCloudSymbol::Square:
+      elevationPainter->fillRect( QRectF( x - mPainterPenWidth * 0.5,
+                                          y - mPainterPenWidth * 0.5,
+                                          mPainterPenWidth, mPainterPenWidth ), brush );
+      break;
+
+    case Qgis::PointCloudSymbol::Circle:
+      elevationPainter->setBrush( brush );
+      elevationPainter->setPen( Qt::NoPen );
+      elevationPainter->drawEllipse( QRectF( x - mPainterPenWidth * 0.5,
+                                             y - mPainterPenWidth * 0.5,
+                                             mPainterPenWidth, mPainterPenWidth ) );
+      break;
+  };
+}
+
 void QgsPointCloudRenderer::copyCommonProperties( QgsPointCloudRenderer *destination ) const
 {
   destination->setPointSize( mPointSize );
diff --git a/src/core/pointcloud/qgspointcloudrenderer.h b/src/core/pointcloud/qgspointcloudrenderer.h
index de3841dede6..ceb3dcd42e3 100644
--- a/src/core/pointcloud/qgspointcloudrenderer.h
+++ b/src/core/pointcloud/qgspointcloudrenderer.h
@@ -749,48 +749,11 @@ class CORE_EXPORT QgsPointCloudRenderer
       };
     }
 
-    QColor encodeElevation( float z ) const
-    {
-      QColor c;
-      c.setRedF( z );
-      z *= std::pow<float>( 2, 8 );
-      z -= ( int )z;
-      c.setGreenF( z );
-      z *= std::pow<float>( 2, 8 );
-      z -= ( int )z;
-      c.setBlueF( z );
-      c.setAlphaF( 1.0f );
-      return c;
-    }
-
-    void drawPointToElevationMap( double x, double y, double z, QgsPointCloudRenderContext &context ) const
-    {
-      const QPointF originalXY( x, y );
-      context.renderContext().mapToPixel().transformInPlace( x, y );
-      QPainter *elevationPainter = context.elevationPainter();
-      const double zMin = -5000;//context.zMin();//-37.2;
-      const double zMax = +5000;//context.zMax();// 532.87;
-      float zFloat = ( z - zMin ) / ( zMax - zMin );
-      zFloat = std::max<double>( 0.0, std::min<double>( 1.0, zFloat ) );
-      context.updateZRange( zFloat );
-      QBrush brush( encodeElevation( zFloat ) );
-      switch ( mPointSymbol )
-      {
-        case Qgis::PointCloudSymbol::Square:
-          elevationPainter->fillRect( QRectF( x - mPainterPenWidth * 0.5,
-                                              y - mPainterPenWidth * 0.5,
-                                              mPainterPenWidth, mPainterPenWidth ), brush );
-          break;
-
-        case Qgis::PointCloudSymbol::Circle:
-          elevationPainter->setBrush( brush );
-          elevationPainter->setPen( Qt::NoPen );
-          elevationPainter->drawEllipse( QRectF( x - mPainterPenWidth * 0.5,
-                                                 y - mPainterPenWidth * 0.5,
-                                                 mPainterPenWidth, mPainterPenWidth ) );
-          break;
-      };
-    }
+    /**
+     * Draws a point at the elevation \a z using at the specified \a x and \a y (in map coordinates) on the elevation map.
+     * \since QGIS 3.28
+     */
+    void drawPointToElevationMap( double x, double y, double z, QgsPointCloudRenderContext &context ) const;
 
     /**
      * Copies common point cloud properties (such as point size and screen error) to the \a destination renderer.