From 483e5bee3071c1607445e03e3809764c1966fae9 Mon Sep 17 00:00:00 2001
From: "K. Gofron" <kgofron@comcast.net>
Date: Mon, 28 Sep 2026 21:46:33 -0400
Subject: [PATCH] fix: stabilize image accumulation screen

---
 RELEASE.md                                    |   9 +
 .../op/bob/common/Acquire/ImgAccumulation.bob | 381 +++++-------------
 2 files changed, 99 insertions(+), 291 deletions(-)

diff --git a/RELEASE.md b/RELEASE.md
index 7417df1..ea338de 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -37,6 +37,15 @@ R1-8-0 (in progress)
   same command. Sanitizer jobs and generated dependency/version evidence
   remain follow-up R1-8-0 release-assurance work.
 
+### Image accumulation display stability
+
+* Replace nine overlapping, geometry-specific Phoebus image widgets with one
+  dynamically sized widget for each accumulated, current-frame, and last-N
+  waveform. The display continues to support 256x256, 512x512, and 1024x512
+  detector rasters while avoiding repeated array-index update warnings.
+* Preserve the existing waveform and geometry PV names and the accumulation
+  controls introduced for R1-8-0.
+
 ### Bounded rolling accumulation
 
 * Replace repeated sum-of-N recomputation with an exact rolling update whose
diff --git a/tpx3App/op/bob/common/Acquire/ImgAccumulation.bob b/tpx3App/op/bob/common/Acquire/ImgAccumulation.bob
index 77cd6e7..5e67921 100644
--- a/tpx3App/op/bob/common/Acquire/ImgAccumulation.bob
+++ b/tpx3App/op/bob/common/Acquire/ImgAccumulation.bob
@@ -707,7 +707,7 @@
     </widget>
   </widget>
   <widget type="image" version="2.0.0">
-    <name>Image_Accumulated_512</name>
+    <name>Image_Accumulated</name>
     <pv_name>$(P)$(R)ImageData</pv_name>
     <x>680</x>
     <y>750</y>
@@ -718,7 +718,7 @@
       <visible>true</visible>
       <title>X (Width)</title>
       <minimum>0.0</minimum>
-      <maximum>512.0</maximum>
+      <maximum>1.0</maximum>
       <title_font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
         </font>
@@ -732,7 +732,7 @@
       <visible>true</visible>
       <title>Y (Height)</title>
       <minimum>0.0</minimum>
-      <maximum>512.0</maximum>
+      <maximum>1.0</maximum>
       <title_font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
         </font>
@@ -743,159 +743,45 @@
       </scale_font>
     </y_axis>
     <rules>
-      <rule name="vis512" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==262144">
+      <rule name="Supported raster" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0==65536 || pvInt0==262144 || pvInt0==524288">
           <value>true</value>
         </exp>
         <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
       </rule>
-    </rules>
-    <data_width>512</data_width>
-    <data_height>512</data_height>
-  </widget>
-  <widget type="image" version="2.0.0">
-    <name>Image_Accumulated_256</name>
-    <pv_name>$(P)$(R)ImageData</pv_name>
-    <x>680</x>
-    <y>750</y>
-    <width>700</width>
-    <height>700</height>
-    <visible>false</visible>
-    <x_axis>
-      <visible>true</visible>
-      <title>X (Width)</title>
-      <minimum>0.0</minimum>
-      <maximum>256.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </x_axis>
-    <y_axis>
-      <visible>true</visible>
-      <title>Y (Height)</title>
-      <minimum>0.0</minimum>
-      <maximum>256.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </y_axis>
-    <rules>
-      <rule name="vis256" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==65536">
-          <value>true</value>
-        </exp>
+      <rule name="Image width" prop_id="data_width" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144"><expression>512</expression></exp>
+        <exp bool_exp="pvInt0==524288"><expression>1024</expression></exp>
         <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
       </rule>
-    </rules>
-    <data_width>256</data_width>
-    <data_height>256</data_height>
-  </widget>
-  <widget type="image" version="2.0.0">
-    <name>Image_Accumulated_1024</name>
-    <pv_name>$(P)$(R)ImageData</pv_name>
-    <x>680</x>
-    <y>750</y>
-    <width>700</width>
-    <height>350</height>
-    <visible>false</visible>
-    <x_axis>
-      <visible>true</visible>
-      <title>X (Width)</title>
-      <minimum>0.0</minimum>
-      <maximum>1024.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </x_axis>
-    <y_axis>
-      <visible>true</visible>
-      <title>Y (Height)</title>
-      <minimum>0.0</minimum>
-      <maximum>512.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </y_axis>
-    <rules>
-      <rule name="vis1024" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==524288">
-          <value>true</value>
-        </exp>
+      <rule name="Image height" prop_id="data_height" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144 || pvInt0==524288"><expression>512</expression></exp>
         <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
       </rule>
-    </rules>
-    <data_width>1024</data_width>
-    <data_height>512</data_height>
-  </widget>
-  <widget type="image" version="2.0.0">
-    <name>Image_Frame_512</name>
-    <pv_name>$(P)$(R)ImageFrame</pv_name>
-    <x>1420</x>
-    <y>750</y>
-    <width>700</width>
-    <height>700</height>
-    <visible>false</visible>
-    <x_axis>
-      <visible>true</visible>
-      <title>X (Width)</title>
-      <minimum>0.0</minimum>
-      <maximum>512.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </x_axis>
-    <y_axis>
-      <visible>true</visible>
-      <title>Y (Height)</title>
-      <minimum>0.0</minimum>
-      <maximum>512.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </y_axis>
-    <rules>
-      <rule name="vis512" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==262144">
-          <value>true</value>
-        </exp>
+      <rule name="X axis maximum" prop_id="x_axis.maximum" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144"><expression>512</expression></exp>
+        <exp bool_exp="pvInt0==524288"><expression>1024</expression></exp>
+        <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
+      </rule>
+      <rule name="Y axis maximum" prop_id="y_axis.maximum" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144 || pvInt0==524288"><expression>512</expression></exp>
+        <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
+      </rule>
+      <rule name="Widget height" prop_id="height" out_exp="true">
+        <exp bool_exp="pvInt0==65536 || pvInt0==262144"><expression>700</expression></exp>
+        <exp bool_exp="pvInt0==524288"><expression>350</expression></exp>
         <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
       </rule>
     </rules>
-    <data_width>512</data_width>
-    <data_height>512</data_height>
+    <data_width>1</data_width>
+    <data_height>1</data_height>
   </widget>
   <widget type="image" version="2.0.0">
-    <name>Image_Frame_256</name>
+    <name>Image_Frame</name>
     <pv_name>$(P)$(R)ImageFrame</pv_name>
     <x>1420</x>
     <y>750</y>
@@ -906,7 +792,7 @@
       <visible>true</visible>
       <title>X (Width)</title>
       <minimum>0.0</minimum>
-      <maximum>256.0</maximum>
+      <maximum>1.0</maximum>
       <title_font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
         </font>
@@ -920,7 +806,7 @@
       <visible>true</visible>
       <title>Y (Height)</title>
       <minimum>0.0</minimum>
-      <maximum>256.0</maximum>
+      <maximum>1.0</maximum>
       <title_font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
         </font>
@@ -931,112 +817,45 @@
       </scale_font>
     </y_axis>
     <rules>
-      <rule name="vis256" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==65536">
+      <rule name="Supported raster" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0==65536 || pvInt0==262144 || pvInt0==524288">
           <value>true</value>
         </exp>
         <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
       </rule>
-    </rules>
-    <data_width>256</data_width>
-    <data_height>256</data_height>
-  </widget>
-  <widget type="image" version="2.0.0">
-    <name>Image_Frame_1024</name>
-    <pv_name>$(P)$(R)ImageFrame</pv_name>
-    <x>1420</x>
-    <y>750</y>
-    <width>700</width>
-    <height>350</height>
-    <visible>false</visible>
-    <x_axis>
-      <visible>true</visible>
-      <title>X (Width)</title>
-      <minimum>0.0</minimum>
-      <maximum>1024.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </x_axis>
-    <y_axis>
-      <visible>true</visible>
-      <title>Y (Height)</title>
-      <minimum>0.0</minimum>
-      <maximum>512.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </y_axis>
-    <rules>
-      <rule name="vis1024f" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==524288">
-          <value>true</value>
-        </exp>
+      <rule name="Image width" prop_id="data_width" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144"><expression>512</expression></exp>
+        <exp bool_exp="pvInt0==524288"><expression>1024</expression></exp>
         <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
       </rule>
-    </rules>
-    <data_width>1024</data_width>
-    <data_height>512</data_height>
-  </widget>
-  <widget type="image" version="2.0.0">
-    <name>Image_Sum_N_Frames_512</name>
-    <pv_name>$(P)$(R)ImageSumNFrames</pv_name>
-    <x>1420</x>
-    <y>10</y>
-    <width>700</width>
-    <height>700</height>
-    <visible>false</visible>
-    <x_axis>
-      <visible>true</visible>
-      <title>X (Width)</title>
-      <minimum>0.0</minimum>
-      <maximum>512.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </x_axis>
-    <y_axis>
-      <visible>true</visible>
-      <title>Y (Height)</title>
-      <minimum>0.0</minimum>
-      <maximum>512.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </y_axis>
-    <rules>
-      <rule name="vis512" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==262144">
-          <value>true</value>
-        </exp>
+      <rule name="Image height" prop_id="data_height" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144 || pvInt0==524288"><expression>512</expression></exp>
+        <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
+      </rule>
+      <rule name="X axis maximum" prop_id="x_axis.maximum" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144"><expression>512</expression></exp>
+        <exp bool_exp="pvInt0==524288"><expression>1024</expression></exp>
+        <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
+      </rule>
+      <rule name="Y axis maximum" prop_id="y_axis.maximum" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144 || pvInt0==524288"><expression>512</expression></exp>
+        <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
+      </rule>
+      <rule name="Widget height" prop_id="height" out_exp="true">
+        <exp bool_exp="pvInt0==65536 || pvInt0==262144"><expression>700</expression></exp>
+        <exp bool_exp="pvInt0==524288"><expression>350</expression></exp>
         <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
       </rule>
     </rules>
-    <data_width>512</data_width>
-    <data_height>512</data_height>
+    <data_width>1</data_width>
+    <data_height>1</data_height>
   </widget>
   <widget type="image" version="2.0.0">
-    <name>Image_Sum_N_Frames_256</name>
+    <name>Image_Sum_N_Frames</name>
     <pv_name>$(P)$(R)ImageSumNFrames</pv_name>
     <x>1420</x>
     <y>10</y>
@@ -1047,7 +866,7 @@
       <visible>true</visible>
       <title>X (Width)</title>
       <minimum>0.0</minimum>
-      <maximum>256.0</maximum>
+      <maximum>1.0</maximum>
       <title_font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
         </font>
@@ -1061,7 +880,7 @@
       <visible>true</visible>
       <title>Y (Height)</title>
       <minimum>0.0</minimum>
-      <maximum>256.0</maximum>
+      <maximum>1.0</maximum>
       <title_font>
         <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
         </font>
@@ -1072,62 +891,42 @@
       </scale_font>
     </y_axis>
     <rules>
-      <rule name="vis256" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==65536">
+      <rule name="Supported raster" prop_id="visible" out_exp="false">
+        <exp bool_exp="pvInt0==65536 || pvInt0==262144 || pvInt0==524288">
           <value>true</value>
         </exp>
         <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
       </rule>
-    </rules>
-    <data_width>256</data_width>
-    <data_height>256</data_height>
-  </widget>
-  <widget type="image" version="2.0.0">
-    <name>Image_Sum_N_Frames_1024</name>
-    <pv_name>$(P)$(R)ImageSumNFrames</pv_name>
-    <x>1420</x>
-    <y>10</y>
-    <width>700</width>
-    <height>350</height>
-    <visible>false</visible>
-    <x_axis>
-      <visible>true</visible>
-      <title>X (Width)</title>
-      <minimum>0.0</minimum>
-      <maximum>1024.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </x_axis>
-    <y_axis>
-      <visible>true</visible>
-      <title>Y (Height)</title>
-      <minimum>0.0</minimum>
-      <maximum>512.0</maximum>
-      <title_font>
-        <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
-        </font>
-      </title_font>
-      <scale_font>
-        <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
-        </font>
-      </scale_font>
-    </y_axis>
-    <rules>
-      <rule name="vis1024n" prop_id="visible" out_exp="false">
-        <exp bool_exp="pv0==524288">
-          <value>true</value>
-        </exp>
+      <rule name="Image width" prop_id="data_width" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144"><expression>512</expression></exp>
+        <exp bool_exp="pvInt0==524288"><expression>1024</expression></exp>
+        <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
+      </rule>
+      <rule name="Image height" prop_id="data_height" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144 || pvInt0==524288"><expression>512</expression></exp>
+        <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
+      </rule>
+      <rule name="X axis maximum" prop_id="x_axis.maximum" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144"><expression>512</expression></exp>
+        <exp bool_exp="pvInt0==524288"><expression>1024</expression></exp>
+        <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
+      </rule>
+      <rule name="Y axis maximum" prop_id="y_axis.maximum" out_exp="true">
+        <exp bool_exp="pvInt0==65536"><expression>256</expression></exp>
+        <exp bool_exp="pvInt0==262144 || pvInt0==524288"><expression>512</expression></exp>
+        <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
+      </rule>
+      <rule name="Widget height" prop_id="height" out_exp="true">
+        <exp bool_exp="pvInt0==65536 || pvInt0==262144"><expression>700</expression></exp>
+        <exp bool_exp="pvInt0==524288"><expression>350</expression></exp>
         <pv_name>$(P)$(Cam)PixCount_RBV</pv_name>
       </rule>
     </rules>
-    <data_width>1024</data_width>
-    <data_height>512</data_height>
+    <data_width>1</data_width>
+    <data_height>1</data_height>
   </widget>
   <widget type="label" version="2.0.0">
     <name>FrameSum</name>