stats about infinities

wkjarosz · Feb 18, 2024 · 725e025 · 725e025
1 parent 557e91d
commit 725e025
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/TODO.md b/TODO.md
@@ -2,15 +2,15 @@
 
 ##
 
-- [ ] have spdlog output to the log window
+- [x] have spdlog output to the log window
 - [ ] load multiplate images/entire directories
 - [ ] fix reference image index when closing image
 - [ ] render pixel grid in the shader
 - [ ] figure out how to better handle channels dropdown with channel groups and arbitrary channels
 - [ ] improve statistics
-  - [ ] compute min/max/avg ignoring infinities, and report # of infinities
+  - [x] compute min/max/avg ignoring infinities, and report # of infinities
   - [ ] compute statistics also over selection
-  - [ ] compute pixel hover (and statistics) while considering the blend mode
+  - [ ] account for blend mode when computing pixel hover (and statistics)
 - [ ] figure our threading while considering emscripten
 - [ ] selection support
 - [ ] command palette/improved hotkey support

diff --git a/src/image.cpp b/src/image.cpp
@@ -84,7 +84,9 @@ PixelStatistics::PixelStatistics(const Array2Df &img, float the_exposure, AxisSc
         float val = img(i);
 
         if (isnan(val))
-            ++invalid_pixels;
+            ++nan_pixels;
+        else if (isinf(val))
+            ++inf_pixels;
         else
         {
             ++valid_pixels;

diff --git a/src/image.h b/src/image.h
@@ -87,7 +87,8 @@ struct PixelStatistics
     float minimum;
     float maximum;
     float average;
-    int   invalid_pixels = 0;
+    int   nan_pixels = 0;
+    int   inf_pixels = 0;
 
     Histogram histogram;
 

diff --git a/src/image_gui.cpp b/src/image_gui.cpp
@@ -512,7 +512,7 @@ void Image::draw_info()
     //         ImGui::Text("%-6.3g", stats->minimum), ImGui::TableNextColumn();
     //         ImGui::Text("%-6.3g", stats->average), ImGui::TableNextColumn();
     //         ImGui::Text("%-6.3g", stats->maximum), ImGui::TableNextColumn();
-    //         ImGui::Text("%d", stats->invalid_pixels);
+    //         ImGui::Text("%d", stats->nan_pixels);
     //         // ImGui::PopFont();
     //     }
     //     ImGui::EndTable();
@@ -541,8 +541,8 @@ void Image::draw_info()
         ImGui::TableHeadersRow();
         ImGui::PopFont();
 
-        const char   *stat_names[4] = {"Min", "Avg", "Max", "# of NaNs"};
-        constexpr int NUM_STATS     = sizeof(stat_names) / sizeof(stat_names[0]);
+        const char   *stat_names[] = {"Min", "Avg", "Max", "# of NaNs", "# of Infs"};
+        constexpr int NUM_STATS    = sizeof(stat_names) / sizeof(stat_names[0]);
         for (int s = 0; s < NUM_STATS; ++s)
         {
             ImGui::PushFont(bold_font);
@@ -559,7 +559,9 @@ void Image::draw_info()
                 case 0: ImGui::Text("%-6.3g", channel_stats[c]->minimum); break;
                 case 1: ImGui::Text("%-6.3g", channel_stats[c]->average); break;
                 case 2: ImGui::Text("%-6.3g", channel_stats[c]->maximum); break;
-                default: ImGui::Text("%d", channel_stats[c]->invalid_pixels); break;
+                case 3: ImGui::Text("%d", channel_stats[c]->nan_pixels); break;
+                case 4:
+                default: ImGui::Text("%d", channel_stats[c]->inf_pixels); break;
                 }
             }
         }