From 9831d071711f86a1ec9a96c00c6d34a06e5d3df0 Mon Sep 17 00:00:00 2001
From: Eva Lott <evalott100@gmail.com>
Date: Tue, 23 Jan 2024 09:40:12 +0000
Subject: [PATCH] Cleaned up after rebase

---
 pyproject.toml                |  2 +-
 src/pandablocks_ioc/_pvi.py   | 12 ++---
 tests/test-bobfiles/DATA.bob  | 85 +++++------------------------------
 tests/test-bobfiles/index.bob |  4 +-
 tests/test_tables.py          |  6 +--
 5 files changed, 24 insertions(+), 85 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 576799c3..c44d9067 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,7 +17,7 @@ dependencies = [
     "click",
     "h5py",
     "softioc>=4.4.0",
-    "pandablocks>=0.5.3",
+    "pandablocks~=0.7.0",
     "pvi~=0.7.0",
 ] # Add project dependencies here, e.g. ["click", "numpy"]
 dynamic = ["version"]
diff --git a/src/pandablocks_ioc/_pvi.py b/src/pandablocks_ioc/_pvi.py
index 109fcb38..7ddf8bab 100644
--- a/src/pandablocks_ioc/_pvi.py
+++ b/src/pandablocks_ioc/_pvi.py
@@ -81,9 +81,9 @@ def add_data_capture_pvi_info(
     data_capture_pvi_record: RecordWrapper,
 ):
     component = SignalRW(
-        data_capture_record_name,
-        data_capture_record_name,
-        widget=ButtonPanel(actions=dict(Start=1, Stop=0)),
+        name=epics_to_pvi_name(data_capture_record_name),
+        pv=data_capture_record_name,
+        widget=ButtonPanel(actions=dict(Start="1", Stop="0")),
         read_widget=LED(),
     )
     add_pvi_info_to_record(data_capture_pvi_record, data_capture_record_name, "rw")
@@ -95,9 +95,9 @@ def add_data_capture_pvi_info(
 def add_pcap_arm_pvi_info(group: PviGroup, pcap_arm_pvi_record: RecordWrapper):
     pcap_arm_record_name = EpicsName("PCAP:ARM")
     component = SignalRW(
-        pcap_arm_record_name,
-        pcap_arm_record_name,
-        widget=ButtonPanel(actions=dict(Arm=1, Disarm=0)),
+        name=epics_to_pvi_name(pcap_arm_record_name),
+        pv=pcap_arm_record_name,
+        widget=ButtonPanel(actions=dict(Arm="1", Disarm="0")),
         read_widget=LED(),
     )
     add_pvi_info_to_record(pcap_arm_pvi_record, pcap_arm_record_name, "rw")
diff --git a/tests/test-bobfiles/DATA.bob b/tests/test-bobfiles/DATA.bob
index 505e927c..1cabfce4 100644
--- a/tests/test-bobfiles/DATA.bob
+++ b/tests/test-bobfiles/DATA.bob
@@ -34,7 +34,7 @@
     <transparent>true</transparent>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Filepath</text>
+      <text>Hdfdirectory</text>
       <x>0</x>
       <y>0</y>
       <width>250</width>
@@ -52,7 +52,7 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Filename</text>
+      <text>Hdffilename</text>
       <x>0</x>
       <y>25</y>
       <width>250</width>
@@ -70,71 +70,12 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>Numcapture</text>
+      <text>Hdffullfilepath</text>
       <x>0</x>
       <y>50</y>
       <width>250</width>
       <height>20</height>
     </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:HDF5:NumCapture</pv_name>
-      <x>255</x>
-      <y>50</y>
-      <width>125</width>
-      <height>20</height>
-      <horizontal_alignment>1</horizontal_alignment>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label</name>
-      <text>Flushperiod</text>
-      <x>0</x>
-      <y>75</y>
-      <width>250</width>
-      <height>20</height>
-    </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:HDF5:FlushPeriod</pv_name>
-      <x>255</x>
-      <y>75</y>
-      <width>125</width>
-      <height>20</height>
-      <horizontal_alignment>1</horizontal_alignment>
-    </widget>
-    <widget type="label" version="2.0.0">
-      <name>Label</name>
-      <text>Capture</text>
-      <x>0</x>
-      <y>100</y>
-      <width>250</width>
-      <height>20</height>
-    </widget>
-    <widget type="textentry" version="3.0.0">
-      <name>TextEntry</name>
-      <pv_name>TEST_PREFIX:HDF5:Capture</pv_name>
-      <x>255</x>
-      <y>100</y>
-      <width>125</width>
-      <height>20</height>
-      <horizontal_alignment>1</horizontal_alignment>
-    </widget>
-  </widget>
-  <widget type="group" version="2.0.0">
-    <name>OUTPUTS</name>
-    <x>5</x>
-    <y>191</y>
-    <width>416</width>
-    <height>81</height>
-    <transparent>true</transparent>
-    <widget type="label" version="2.0.0">
-      <name>Label</name>
-      <text>Status</text>
-      <x>0</x>
-      <y>0</y>
-      <width>250</width>
-      <height>20</height>
-    </widget>
     <widget type="textupdate" version="2.0.0">
       <name>TextUpdate</name>
       <pv_name>TEST_PREFIX:DATA:HDFFullFilePath</pv_name>
@@ -147,7 +88,6 @@
       </font>
       </font>
       <horizontal_alignment>1</horizontal_alignment>
-      <format>6</format>
     </widget>
   </widget>
   <widget type="group" version="2.0.0">
@@ -159,7 +99,7 @@
     <transparent>true</transparent>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>DATA: Num Capture</text>
+      <text>Numcapture</text>
       <x>0</x>
       <y>0</y>
       <width>250</width>
@@ -176,7 +116,7 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>DATA: Num Captured</text>
+      <text>Numcaptured</text>
       <x>0</x>
       <y>25</y>
       <width>250</width>
@@ -197,7 +137,7 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>DATA: Num Received</text>
+      <text>Numreceived</text>
       <x>0</x>
       <y>50</y>
       <width>250</width>
@@ -218,7 +158,7 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>DATA: Flush Period</text>
+      <text>Flushperiod</text>
       <x>0</x>
       <y>75</y>
       <width>250</width>
@@ -235,7 +175,7 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>DATA: Capture</text>
+      <text>Capture</text>
       <x>0</x>
       <y>100</y>
       <width>250</width>
@@ -277,7 +217,7 @@
     </widget>
     <widget type="led" version="2.0.0">
       <name>LED</name>
-      <pv_name>TEST_PREFIX:</pv_name>
+      <pv_name>TEST_PREFIX:DATA:Capture</pv_name>
       <x>350</x>
       <y>100</y>
       <width>20</width>
@@ -285,7 +225,7 @@
     </widget>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>DATA: Capture Mode</text>
+      <text>Capturemode</text>
       <x>0</x>
       <y>125</y>
       <width>250</width>
@@ -311,7 +251,7 @@
       <name>OpenDisplay</name>
       <actions>
         <action type="open_display">
-          <file>PandA_POSITIONS_TABLE.bob</file>
+          <file>PandA_PositionsTable.bob</file>
           <target>tab</target>
           <description>Open Display</description>
         </action>
@@ -333,7 +273,7 @@
     <transparent>true</transparent>
     <widget type="label" version="2.0.0">
       <name>Label</name>
-      <text>DATA: Status</text>
+      <text>Status</text>
       <x>0</x>
       <y>0</y>
       <width>250</width>
@@ -351,7 +291,6 @@
       </font>
       </font>
       <horizontal_alignment>1</horizontal_alignment>
-      <format>6</format>
     </widget>
   </widget>
 </display>
diff --git a/tests/test-bobfiles/index.bob b/tests/test-bobfiles/index.bob
index 8fe3ed31..7f9a10ae 100644
--- a/tests/test-bobfiles/index.bob
+++ b/tests/test-bobfiles/index.bob
@@ -51,7 +51,7 @@
   </widget>
   <widget type="label" version="2.0.0">
     <name>Label</name>
-    <text>HDF5</text>
+    <text>DATA</text>
     <x>23</x>
     <y>55</y>
     <width>250</width>
@@ -66,7 +66,7 @@
         <description>Open Display</description>
       </action>
     </actions>
-    <text>HDF5</text>
+    <text>DATA</text>
     <x>278</x>
     <y>55</y>
     <width>125</width>
diff --git a/tests/test_tables.py b/tests/test_tables.py
index adf105c7..b1fac61f 100644
--- a/tests/test_tables.py
+++ b/tests/test_tables.py
@@ -363,9 +363,9 @@ async def test_table_updater_update_mode_submit_exception_data_error(
     assert isinstance(table_updater.client.send, AsyncMock)
     table_updater.client.send.side_effect = Exception("Mocked exception")
 
-    table_updater.all_values_dict[
-        EpicsName(EPICS_FORMAT_TABLE_NAME)
-    ] = InErrorException("Mocked in error exception")
+    table_updater.all_values_dict[EpicsName(EPICS_FORMAT_TABLE_NAME)] = (
+        InErrorException("Mocked in error exception")
+    )
 
     await table_updater.update_mode(TableModeEnum.SUBMIT.value)