Localize text stamps, tweak font/buffer size of text stamps a bit (#5602

) * Localize text stamps, tweak font/buffer size of text stamps a bit * Fix iOS CI running out of space * Same number of decimals, auto wrap lines --------- Co-authored-by: Matthias Kuhn <matthias@opengis.ch>
opengisch · Aug 31, 2024 · b4e3bc6 · b4e3bc6 · qfield-fairy · Aug 31, 2024
1 parent c8b839a
commit b4e3bc6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -29,6 +29,10 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Reclaim disk space
+        run: |
+          rm -rf /Applications/Xcode_14*
+
       - name: 🌾 Prepare variables
         id: vars
         run: |

diff --git a/src/core/utils/fileutils.cpp b/src/core/utils/fileutils.cpp
@@ -257,17 +257,20 @@ void FileUtils::addImageStamp( const QString &imagePath, const QString &text )
     painter.setRenderHint( QPainter::Antialiasing );
 
     QFont font = painter.font();
-    const int pixelSize = std::min( img.width(), img.height() ) / 45;
-    font.setPixelSize( pixelSize );
+    font.setPixelSize( std::min( img.width(), img.height() ) / 40 );
     font.setBold( true );
 
     QgsRenderContext context = QgsRenderContext::fromQPainter( &painter );
     QgsTextFormat format;
     format.setFont( font );
+    format.setSize( font.pixelSize() );
+    format.setSizeUnit( Qgis::RenderUnit::Pixels );
     format.setColor( Qt::white );
     format.buffer().setColor( Qt::black );
+    format.buffer().setSize( 2 );
+    format.buffer().setSizeUnit( Qgis::RenderUnit::Pixels );
     format.buffer().setEnabled( true );
-    QgsTextRenderer::drawText( QPointF( 10, img.height() - 10 ), 0, Qgis::TextHorizontalAlignment::Left, text.split( QStringLiteral( "\n" ) ), context, format );
+    QgsTextRenderer::drawText( QRectF( 10, 10, img.width() - 20, img.height() - 20 ), 0, Qgis::TextHorizontalAlignment::Left, text.split( QStringLiteral( "\n" ) ), context, format, true, Qgis::TextVerticalAlignment::Bottom, Qgis::TextRendererFlag::WrapLines );
 
     img.save( imagePath, nullptr, 90 );
 

diff --git a/src/qml/QFieldCamera.qml b/src/qml/QFieldCamera.qml
@@ -87,7 +87,7 @@ Popup {
     id: stampExpressionEvaluator
 
     mode: ExpressionEvaluator.ExpressionMode
-    expressionText: "format_date(now(), 'yyyy-MM-dd @ HH:mm') || if(@gnss_coordinate is not null, format('\nLatitude %1 | Longitude %2 | Altitude %3 | Speed %4', coalesce(y(@gnss_coordinate), 'N/A'), coalesce(x(@gnss_coordinate), 'N/A'), coalesce(z(@gnss_coordinate), 'N/A'), if(@gnss_ground_speed != 'nan', @gnss_ground_speed || ' m/s', 'N/A')), '')"
+    expressionText: "format_date(now(), 'yyyy-MM-dd @ HH:mm') || if(@gnss_coordinate is not null, format('\n" + qsTr("Latitude") + " %1 | " + qsTr("Longitude") + " %2 | " + qsTr("Altitude") + " %3 | " + qsTr("Speed") + " %4', coalesce(format_number(y(@gnss_coordinate), 7), 'N/A'), coalesce(format_number(x(@gnss_coordinate), 7), 'N/A'), coalesce(format_number(z(@gnss_coordinate), 3) || ' m', 'N/A'), if(@gnss_ground_speed != 'nan', format_number(@gnss_ground_speed, 3) || ' m/s', 'N/A')), '')"
 
     project: qgisProject
     positionInformation: currentPosition