GRInstantInfoBox show average GR on comment label

Author: zinuzoid

NEWS.txt

@@ -19,6 +19,7 @@ Version JET
 - Increase cylinder waypoint circle interpolation from 20 to 100 - 400 sections based on radius
 - Update SnailTrail Vario#2 color
 - NextArrowInfoBox show bearing different instead of distance
+- GRInstantInfoBox show average GR on comment label
 
 ------------------------
 

src/Formatter/GlideRatioFormatter.cpp

@@ -8,11 +8,17 @@
 #include <math.h>
 
 void
-FormatGlideRatio(TCHAR *buffer, size_t size, double gr)
+FormatGlideRatio(TCHAR *buffer, size_t size, double gr, const TCHAR *suffix)
 {
   assert(buffer != NULL);
   assert(size >= 8);
 
-  StringFormat(buffer, size,
-             fabs(gr) < 100 ? _T("%.1f") : _T("%.0f"), (double) gr);
+  if(suffix == NULL) {
+    StringFormat(buffer, size,
+              fabs(gr) < 100 ? _T("%.1f") : _T("%.0f"), (double) gr);
+  } else {
+    StringFormat(buffer, size,
+             fabs(gr) < 100 ? _T("%s%.1f") : _T("%s%.0f"), suffix, (double) gr);
+  }
+
 }

src/Formatter/GlideRatioFormatter.hpp

@@ -7,4 +7,4 @@
 #include <cstddef>
 
 void
-FormatGlideRatio(TCHAR *buffer, size_t size, double gr);
+FormatGlideRatio(TCHAR *buffer, size_t size, double gr, const TCHAR *suffix = NULL);

src/InfoBoxes/Content/Glide.cpp

@@ -15,11 +15,17 @@ UpdateInfoBoxGRInstant(InfoBoxData &data) noexcept
 
   if (!::GradientValid(gr)) {
     data.SetInvalid();
-    return;
+  } else {
+    data.SetValueFromGlideRatio(gr);
   }
 
-  // Set Value
-  data.SetValueFromGlideRatio(gr);
+  const auto average_gr = CommonInterface::Calculated().average_gr;
+  
+  if (!::GradientValid(average_gr) || average_gr == 0.0) {
+    data.SetCommentInvalid();
+  } else {
+    data.SetCommentFromGlideRatio(average_gr, _T("avg:"));
+  }
 }
 
 void

src/InfoBoxes/Data.hpp

@@ -136,6 +136,7 @@ struct InfoBoxData {
    * Set the InfoBox value to the specified glide ratio.
    */
   void SetValueFromGlideRatio(double gr) noexcept;
+  void SetCommentFromGlideRatio(double gr, const TCHAR *suffix=_T("")) noexcept;
 
   /**
    * Set the InfoBox value to the specified distance.

src/InfoBoxes/Format.cpp

@@ -28,6 +28,12 @@ InfoBoxData::SetValueFromGlideRatio(double gr) noexcept
   SetValueUnit(Unit::GRADIENT);
 }
 
+void
+InfoBoxData::SetCommentFromGlideRatio(double gr, const TCHAR *suffix) noexcept
+{
+  FormatGlideRatio(comment.buffer(), comment.capacity(), gr, suffix);
+}
+
 void
 InfoBoxData::SetComment(Angle _value, const TCHAR *suffix) noexcept
 {