Merge branch 'feature/reworkStatisticsType' of github.com:IENT/YUView…

… into feature/reworkStatisticsType
IENT · Jan 11, 2025 · c2b3392 · c2b3392
2 parents cf7650b + 2defa85
commit c2b3392
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/YUViewLib/src/decoder/decoderHM.cpp b/YUViewLib/src/decoder/decoderHM.cpp
@@ -566,7 +566,7 @@ void decoderHM::fillStatisticList(stats::StatisticsData &statisticsData) const
               .withValueDataOptions(StatisticsType::ValueDataOptions(
                   {.colorMapper = ColorMapper({0, 34}, PredefinedType::Jet)}))
               .withVectorDataOptions(
-                  StatisticsType::VectorDataOptions({.scale = 32, .renderDataValues = true}))
+                  StatisticsType::VectorDataOptions({.renderDataValues = true, .scale = 32}))
               .withMappingValues(
                   {"INTRA_PLANAR",     "INTRA_DC",         "INTRA_ANGULAR_2",  "INTRA_ANGULAR_3",
                    "INTRA_ANGULAR_4",  "INTRA_ANGULAR_5",  "INTRA_ANGULAR_6",  "INTRA_ANGULAR_7",

diff --git a/YUViewLib/src/decoder/decoderLibde265.cpp b/YUViewLib/src/decoder/decoderLibde265.cpp
@@ -1002,7 +1002,7 @@ void decoderLibde265::fillStatisticList(stats::StatisticsData &statisticsData) c
           .withDescription("The intra mode for the luma component per TU (intra prediction is "
                            "performed on a TU level)")
           .withVectorDataOptions(
-              StatisticsType::VectorDataOptions({.scale = 32, .renderDataValues = false}))
+              StatisticsType::VectorDataOptions({.renderDataValues = false, .scale = 32}))
           .withMappingValues(INTRA_DIR_LIST)
           .build());
 
@@ -1013,7 +1013,7 @@ void decoderLibde265::fillStatisticList(stats::StatisticsData &statisticsData) c
           .withDescription("The intra mode for the chroma component per TU (intra prediction is "
                            "performed on a TU level)")
           .withVectorDataOptions(
-              StatisticsType::VectorDataOptions({.scale = 32, .renderDataValues = false}))
+              StatisticsType::VectorDataOptions({.renderDataValues = false, .scale = 32}))
           .withMappingValues(INTRA_DIR_LIST)
           .build());
 

diff --git a/YUViewLib/src/statistics/StatisticsFileCSV.cpp b/YUViewLib/src/statistics/StatisticsFileCSV.cpp
@@ -315,9 +315,9 @@ void StatisticsFileCSV::loadStatisticData(StatisticsData &statisticsData, int po
         this->blockOutsideOfFramePOC = poc;
 
       auto &statTypes = statisticsData.getStatisticsTypes();
-      auto  statIt    = std::find_if(statTypes.begin(),
-                                 statTypes.end(),
-                                 [type](StatisticsType &t) { return t.typeID == type; });
+      auto  statIt    = std::find_if(statTypes.begin(), statTypes.end(), [type](StatisticsType &t) {
+        return t.typeID == type;
+      });
       Q_ASSERT_X(statIt != statTypes.end(), Q_FUNC_INFO, "Stat type not found.");
 
       if (vectorData && statIt->vectorDataOptions)
@@ -398,11 +398,11 @@ void StatisticsFileCSV::readHeaderFromFile(StatisticsData &statisticsData)
         {
           if (rowItemList[4] == "map" || rowItemList[4] == "range")
           {
-            aType.valueDataOptions.emplace();
+            aType.valueDataOptions = StatisticsType::ValueDataOptions();
           }
           else if (rowItemList[4] == "vector" || rowItemList[4] == "line")
           {
-            aType.vectorDataOptions.emplace();
+            aType.vectorDataOptions = StatisticsType::VectorDataOptions();
             if (rowItemList[4] == "line")
               aType.vectorDataOptions->arrowHead = StatisticsType::ArrowHead::none;
           }

diff --git a/YUViewLib/src/statistics/StatisticsType.h b/YUViewLib/src/statistics/StatisticsType.h
@@ -101,7 +101,7 @@ class StatisticsType
   {
     bool               render{true};
     bool               scaleToBlockSize{};
-    color::ColorMapper colorMapper;
+    color::ColorMapper colorMapper{};
   };
 
   std::optional<ValueDataOptions> valueDataOptions;
@@ -118,7 +118,7 @@ class StatisticsType
     bool          render{true};
     bool          renderDataValues{true};
     bool          scaleToZoom{};
-    LineDrawStyle style;
+    LineDrawStyle style{};
     int           scale{};
     bool          mapToColor{};
     ArrowHead     arrowHead{};
@@ -129,7 +129,7 @@ class StatisticsType
   struct GridOptions
   {
     bool          render{};
-    LineDrawStyle style;
+    LineDrawStyle style{};
     bool          scaleToZoom{};
   };
 

diff --git a/YUViewUnitTest/statistics/StatisticsDataTest.cpp b/YUViewUnitTest/statistics/StatisticsDataTest.cpp
@@ -50,6 +50,7 @@ TEST(StatisticsData, testPixelValueRetrievalInteger)
                        .withTypeName("Something")
                        .withValueDataOptions({.colorMapper = stats::color::ColorMapper(
                                                   {0, 10}, stats::color::PredefinedType::Jet)})
+                       .withRender(true)
                        .build());
 
   EXPECT_EQ(data.needsLoading(frameIndex), ItemLoadingState::LoadingNeeded);
@@ -80,6 +81,7 @@ TEST(StatisticsData, testPixelValueRetrievalVector)
                        .withTypeID(typeID)
                        .withTypeName("Something")
                        .withVectorDataOptions({.scale = 4})
+                       .withRender(true)
                        .build());
 
   EXPECT_EQ(data.needsLoading(frameIndex), ItemLoadingState::LoadingNeeded);