Make render and alpha values use the modified struct

IENT · Jan 29, 2025 · 4ca565e · 4ca565e
1 parent 8bcdf28
commit 4ca565e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/YUViewLib/src/statistics/StatisticsDataPainting.cpp b/YUViewLib/src/statistics/StatisticsDataPainting.cpp
@@ -122,7 +122,8 @@ void paintVector(QPainter                    *painter,
     if (vector.mapToColor)
       arrowColor.setHsvF(
           functions::clip((std::atan2(vy, vx) + M_PI) / (2 * M_PI), 0.0, 1.0), 1.0, 1.0);
-    arrowColor.setAlpha(arrowColor.alpha() * ((float)statisticsType.alphaFactor / 100.0));
+    arrowColor.setAlpha(
+        functions::scaleValueByPercent(arrowColor.alpha(), *statisticsType.alphaFactor));
 
     if (vector.scaleToZoom)
       vectorStyle.width = vectorStyle.width * zoomFactor / 8;
@@ -347,7 +348,7 @@ void stats::paintStatisticsData(QPainter              *painter,
               float(value) / (valueItem.size[0] * valueItem.size[1]));
         else
           rectColor = it->valueDataOptions->colorMapper.getColor(value);
-        rectColor.setAlpha(rectColor.alpha() * ((float)it->alphaFactor / 100.0));
+        rectColor.setAlpha(functions::scaleValueByPercent(rectColor.alpha(), *it->alphaFactor));
 
         auto rectQColor = functionsGui::toQColor(rectColor);
         painter->setBrush(rectQColor);
@@ -436,7 +437,7 @@ void stats::paintStatisticsData(QPainter              *painter,
                 float(value) / (boundingRect.size().width() * boundingRect.size().height()));
           else
             color = valueOptions.colorMapper.getColor(value);
-          color.setAlpha(color.alpha() * ((float)it->alphaFactor / 100.0));
+          color.setAlpha(functions::scaleValueByPercent(color.alpha(), *it->alphaFactor));
 
           // Fill polygon
           QPainterPath path;
@@ -563,7 +564,7 @@ void stats::paintStatisticsData(QPainter              *painter,
           if (it->vectorDataOptions->mapToColor)
             arrowColor.setHsvF(
                 functions::clip((std::atan2(vy, vx) + M_PI) / (2 * M_PI), 0.0, 1.0), 1.0, 1.0);
-          arrowColor.setAlpha(arrowColor.alpha() * ((float)it->alphaFactor / 100.0));
+          arrowColor.setAlpha(functions::scaleValueByPercent(arrowColor.alpha(), *it->alphaFactor));
           if (it->vectorDataOptions->scaleToZoom)
             vectorStyle.width = vectorStyle.width * zoomFactor / 8;
 
@@ -887,7 +888,7 @@ void stats::paintStatisticsData(QPainter              *painter,
           if (it->vectorDataOptions->mapToColor)
             arrowColor.setHsvF(
                 functions::clip((std::atan2(vy, vx) + M_PI) / (2 * M_PI), 0.0, 1.0), 1.0, 1.0);
-          arrowColor.setAlpha(arrowColor.alpha() * ((float)it->alphaFactor / 100.0));
+          arrowColor.setAlpha(functions::scaleValueByPercent(arrowColor.alpha(), *it->alphaFactor));
           if (it->vectorDataOptions->scaleToZoom)
             vectorStyle.width = vectorStyle.width * zoomFactor / 8;
 

diff --git a/YUViewLib/src/statistics/StatisticsType.cpp b/YUViewLib/src/statistics/StatisticsType.cpp
@@ -94,9 +94,6 @@ StatisticsType::StatisticsType(int typeId, std::string typeName)
 
 void StatisticsType::saveInitialState()
 {
-  this->init.render      = this->render;
-  this->init.alphaFactor = this->alphaFactor;
-
   this->init.valueDataOptions  = this->valueDataOptions;
   this->init.vectorDataOptions = this->vectorDataOptions;
   this->init.gridOptions       = this->gridOptions;

diff --git a/YUViewLib/src/statistics/StatisticsType.h b/YUViewLib/src/statistics/StatisticsType.h
@@ -32,6 +32,7 @@
 
 #pragma once
 
+#include <common/Modified.h>
 #include <common/Typedef.h>
 
 #include "ColorMapper.h"
@@ -71,7 +72,6 @@ class StatisticsType
   friend class StatisticsTypePlaylistHandler;
 
 public:
-
   int         typeID{};
   std::string typeName{};
   std::string description{};
@@ -80,10 +80,9 @@ class StatisticsType
 
   void setMappingValues(std::vector<std::string> values);
 
-  // Is this statistics type rendered and what is the alpha value?
   // These are corresponding to the controls in the properties panel
-  bool render{};
-  int  alphaFactor{50};
+  modified<bool> render{};
+  modified<int>  alphaFactor{50};
 
   struct ValueDataOptions
   {
@@ -137,9 +136,6 @@ class StatisticsType
 
   struct initialState
   {
-    bool render;
-    int  alphaFactor;
-
     std::optional<ValueDataOptions>  valueDataOptions;
     std::optional<VectorDataOptions> vectorDataOptions;
     GridOptions                      gridOptions;

diff --git a/YUViewLib/src/statistics/StatisticsTypePlaylistHandler.cpp b/YUViewLib/src/statistics/StatisticsTypePlaylistHandler.cpp
@@ -128,8 +128,8 @@ void StatisticsTypePlaylistHandler::saveToPlaylist(const StatisticsType &type,
                                                    YUViewDomElement     &root)
 {
   bool allValuesIdenticalToInitialValues =
-      (type.init.render == type.render &&                       //
-       type.init.alphaFactor == type.alphaFactor &&             //
+      (!type.render.wasModified() &&                            //
+       !type.alphaFactor.wasModified() &&                       //
        type.init.valueDataOptions == type.valueDataOptions &&   //
        type.init.vectorDataOptions == type.vectorDataOptions && //
        type.init.gridOptions == type.gridOptions);
@@ -142,9 +142,9 @@ void StatisticsTypePlaylistHandler::saveToPlaylist(const StatisticsType &type,
   newChild.appendChild(root.ownerDocument().createTextNode(QString::fromStdString(type.typeName)));
 
   // Append only the parameters that changed
-  if (type.init.render != type.render)
+  if (type.render.wasModified())
     newChild.setAttribute("render", type.render);
-  if (type.init.alphaFactor != type.alphaFactor)
+  if (type.alphaFactor.wasModified())
     newChild.setAttribute("alphaFactor", type.alphaFactor);
 
   addModifiedValuesToElement(newChild, type.valueDataOptions, type.init.valueDataOptions);