From b2ad43abb06293a5f9d5c72d51b3a41ea37bac66 Mon Sep 17 00:00:00 2001
From: chrin <jan.chrin@psi.ch>
Date: Thu, 6 Apr 2023 14:11:50 +0200
Subject: [PATCH] fixed widget_update in CAQTableWidget as used in Configure
 Table PVs

---
 .gitignore                           |   6 ++-
 __pycache__/pvgateway.cpython-37.pyc | Bin 37418 -> 37428 bytes
 __pycache__/pvwidgets.cpython-37.pyc | Bin 72208 -> 72218 bytes
 pvgateway.py                         |   6 +--
 pvwidgets.py                         |  55 +++++++++++++++------------
 5 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 15ff2ea..63917fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 # Temporary editor files #
 ##########################
 *~
-
-*.-*
\ No newline at end of file
+*.*:*
+*.*-
+*.*-*
+__pycache__
\ No newline at end of file
diff --git a/__pycache__/pvgateway.cpython-37.pyc b/__pycache__/pvgateway.cpython-37.pyc
index cb5cbe417ac06d91bd93910b3450ea78e9dbb886..b7e61016e0d608a1985a62f296e2bd40e85d7cfb 100644
GIT binary patch
delta 5478
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
D)m3x|

delta 5444
zcmb7IdvsLA8D}=hl58H52ZV%}2jR6SNx%>g2qa_^5=cTwLZYi=x!JwhEN*t!xf>pV
z5Ca4RL}RBFt*!Ne3iMdStMwdC%@KuKMQX+3<7!*+_&oJgYpYlfYUlUeJODY^?jOH=
zGxN>&ns2`OZl2s{Ik?YaTO1#68zq0+W*@e_W0`PGzSfrC>dE)0AuT_&;pVX7cIU61
znOB%spvOj76J{83ZQfG9!aHh|H9<Zy@&)85VQ{S~uvYQ=Jchn7F)`YHqZH2<08~IR
zparlHun15BXcp_!!ej0RnF+`OH0kHkzO=A5@kPeu`8Q)mlVHRs9#6B+<5k1_E{qc-
zRo1Qq0;<0%&=%y6Vlq<g@P&;CUm(o)iux<3vu4qKWux_{SW6MBr=+CuBeYpl!_B^c
zC%CTB7xt_62tFVpGmF_X`r^!{NLDZInK(E94sa%SDC=GBpcEMNyOdVVrG>dYpSNKx
z)~A&Pr2+1+>fzc?a?_K#F>RBU)isqV?sk=L7FXw9W$lsE{5i2IH_dtv$Xmpw+?)l+
zz#P@)4=Q0^j_E@*!GoOv4-aF4!c_w5X8;Nutm4;+w{pw!ehzZ41S6uu7ci`DH4s)g
ze-+cw5}dYH)$0o^krG4vUa@pi4ja(@ldfUxMg9KC^VrlC;G80%qR}2{s_d5|BTDnD
zYKXrmX}g6F=xk~-OUEgge#c7(Yk~n^ILNCU8ecE+re$ZniDf!-I-XdM>Q}>RwIVG-
zc=e8HKGt&rO!EOuf<1wIhIbjD;0#Ax%z(TD3Q;j5K|v_NkRq{JQbwXbxK8B`pBC~f
z8>)Ts`0Z9c0G<!9Y;(!H>{M}T{G(C&%IWLava?u-@c1~70N-O6#<lu`?wcBX-hkrQ
z_}7>x)8Gq7f*Mv$4R}mnFbC=UD?Rn<`78se$Dap~>2SgxWg4N0z>I0^xW0EriAAQ>
zoB4BMNiI3%73l?2mmrn+p8*tMc*UOsP}bZ6>UF>y07@SU^=S-C0dE1$iCYUCWt|}D
zx~-R#5#M2+l5}6;Vf*Moo4`aT^&ObvLP0I;@|Y3iABrnxPGI}>t7aaEh($W{Ucf=|
zx5BY$UP(F=tIA3%%3Y4q6|RQH<#l!C4!&K)&(3E%MDgsath>P8Dgv{|_v{AQ0&oN1
zsMG4x$^)GprmuA76iEcmNR)Zi5azysw}J;dh|RRn)L6T`zNWO=^!Xh4;~L7FT(!$x
zrPZbNHC(||45n(TBrD$<g^3AbOv5;lU6g3uHZrU!N@jgRDQb@2A}4vIOhyDp951RH
zJ6aCRYLtn!EWmwY`kXU`ba0595vjEY*CDGhu!h!p6dB(uFR}4KebL<aS!A!|6DOAx
z=GEFW_y&@IbmP(3f}rv%K$U`mXB=i3>7svGdJo@;iB`ZEFpUK$7*b?!2h|4{hlNDI
zRt%FsB?I6%PXUz*7!QEUhP5*QGlp`N4gvu;UC97n<`o!^L}H&lbACFCb9HfjZWq?F
zA!&5GqA6i{$0$aWHYCU^juxk}XT;mZ6IR7QUIn&10HFIak^pq`AHu>hz{7w?0B-{(
z%Doq)@3)xEf<#K>ZoOgQN>)D=6Hd8gx0wm%02}39+~8Gcz)hf-J7dePcR3c<yBe!%
z$~o?f`C3gG7Q$po9BoQwQ6iz_iP+)#$3GJ%N-~mY$LCNMY2K@UiT{*5G9KED7_Q1U
z11|&FVIPw8w0@%WX|}Ll@_h2W{81U~ipq18H<VR)&mH*ZshZZhMU7Mk?J1_^2{N`0
zRdaJ+DC`RcxF()0OBv6l2<I5BGZgZx9kT9MDglpQm9O5XWs_$AUM}(%0Dl1B`Qs?;
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
D|C3zC

diff --git a/__pycache__/pvwidgets.cpython-37.pyc b/__pycache__/pvwidgets.cpython-37.pyc
index a6fa8b4ffd20ab9932869f2fec9f99412f4cfe93..463e551d6ab15618b3dc90f60d87c7ef0496c0e9 100644
GIT binary patch
delta 68
zcmbQRg=N+j7A_}VUM>b8nD4WZ%a%jcRzESVSihh+Q!hC~zn~~TD>b=9KRGciRX;tm
WBquRR-`Ua4wK<7ndlCoZIza%cjTFZK

delta 58
zcmbQWg=NAP7A_}VUM>b8(6rjfWy>LLtY4g_pOm7Xl3Gx#Ur<?Cl9-&VUuLLhqG!;Y
M!?8VwgK?c80K()DFaQ7m

diff --git a/pvgateway.py b/pvgateway.py
index f8fe1b6..1116252 100644
--- a/pvgateway.py
+++ b/pvgateway.py
@@ -130,9 +130,9 @@ class PVGateway(QWidget):
 
         self.color_mode_requested = self.color_mode
 
-        if 'READ' in self.pv_name:
-                print('color mode',self.pv_name,  self.color_mode, self.color_mode_requested )
-
+        #if 'READ' in self.pv_name:
+        #print('color mode',self.pv_name,  self.color_mode, 
+        #self.color_mode_requested )
 
         if monitor_callback is not None:
             self.monitor_callback = monitor_callback
diff --git a/pvwidgets.py b/pvwidgets.py
index df9f610..414eebd 100644
--- a/pvwidgets.py
+++ b/pvwidgets.py
@@ -1,7 +1,7 @@
 ''' Module with channel access enabled QtWidgets.'''
 __author__ = 'Jan T. M. Chrin'
 
-import collections
+import collections 
 import numpy as np
 import re
 from threading import Lock
@@ -1196,10 +1196,12 @@ class CAQTableWidget(QTableWidget):
 
     def widget_update(self):
 
+
         for _row, pvgate in enumerate(self.pv_gateway):
-        #for _row in range(0, len(self.pv_gateway)):
+            
             if not pvgate.notify_unison:
                 continue
+
             _handle = pvgate.handle
             _pvd = pvgate.cafe.getPVCache(_handle)
 
@@ -1219,10 +1221,14 @@ class CAQTableWidget(QTableWidget):
             f.setPointSize(8)
             qtwi.setFont(f)
 
-            self.setItem(_row, self.no_columns-3,
+            val_col_no = self.columns_dict['Value']
+            if self.show_timestamp:
+                ts_col_no = self.columns_dict['Timestamp']
+
+            self.setItem(_row,  val_col_no,
                          QTableWidgetItem(qtwi))
-            self.item(_row, self.no_columns-3).setTextAlignment(Qt.AlignRight |
-                                                                Qt.AlignVCenter)
+            self.item(_row, val_col_no).setTextAlignment(Qt.AlignRight |
+                                                        Qt.AlignVCenter)
 
             _ts_date = _pvd.tsDateAsString
             _ts_str_len = len(_ts_date)
@@ -1248,8 +1254,9 @@ class CAQTableWidget(QTableWidget):
             f.setPointSize(8)
             qtwi.setFont(f)
 
-            self.setItem(_row, self.no_columns-2, QTableWidgetItem(qtwi))
-            self.item(_row, self.no_columns-2).setTextAlignment(Qt.AlignCenter)
+            if self.show_timestamp:
+                self.setItem(_row, ts_col_no, QTableWidgetItem(qtwi))
+                self.item(_row, ts_col_no).setTextAlignment(Qt.AlignCenter)
 
             _prop = pvgate.qt_dynamic_property_get()
 
@@ -1271,31 +1278,29 @@ class CAQTableWidget(QTableWidget):
                     _fgcolor = "black"
 
                 #Colors for bg/fg reversed as is the old norm
-                self.item(_row, self.no_columns-3).setBackground(
-                    QColor(_bgcolor))
-                self.item(_row, self.no_columns-2).setBackground(
-                    QColor(_bgcolor))
-                self.item(_row, self.no_columns-3).setForeground(
-                    QColor(_fgcolor))
-                self.item(_row, self.no_columns-2).setForeground(
-                    QColor(_fgcolor))
+                self.item(_row, val_col_no).setBackground(QColor(_bgcolor))
+                self.item(_row,  val_col_no).setForeground(QColor(_fgcolor))
+
+                if self.show_timestamp:
+                    self.item(_row, ts_col_no).setBackground(QColor(_bgcolor))
+                    self.item(_row, ts_col_no).setForeground(QColor(_fgcolor))
 
             elif _prop == pvgate.READBACK_STATIC:
 
-                self.item(_row, self.no_columns-3).setBackground(
-                    QColor(pvgate.bg_readback))
-                self.item(_row, self.no_columns-2).setBackground(
+                self.item(_row, val_col_no).setBackground(
                     QColor(pvgate.bg_readback))
+                if self.show_timestamp:
+                    self.item(_row, ts_col_no).setBackground(
+                        QColor(pvgate.bg_readback))
 
             elif _prop == pvgate.DISCONNECTED:
-                self.item(_row, self.no_columns-3).setBackground(
+                self.item(_row, val_col_no).setBackground(
                     QColor("#ffffff"))
-                self.item(_row, self.no_columns-2).setBackground(
-                    QColor("#ffffff"))
-                self.item(_row, self.no_columns-3).setForeground(
-                    QColor("#777777"))
-                self.item(_row, self.no_columns-2).setForeground(
+                self.item(_row, val_col_no).setForeground(
                     QColor("#777777"))
+                if self.show_timestamp:
+                     self.item(_row, ts_col_no).setBackground(QColor("#ffffff"))
+                     self.item(_row, ts_col_no).setForeground(QColor("#777777"))
 
             else:
                 print(_prop, "widget_update unknown in element/row", _row,
@@ -1701,7 +1706,7 @@ class CAQTableWidget(QTableWidget):
             _restore_layout.setAlignment(Qt.AlignCenter)
             _restore_layout.setContentsMargins(1, 1, 0, 0)
             _restore_widget.setLayout(_restore_layout)
-            self.setCellWidget(len(self.pv_gateway), 0, _restore_widget)
+            self.setCellWidget(len(self.pv_gateway), 2, _restore_widget)
 
         #Do not display no for last row (Reconnect button)
         _row_digit_last_cell = QTableWidgetItem(str(""))