GUI simplification

    Disables Initialise, Environs, Acquire and Offsets buttons during Initialisation
    Forces user to Apply changes if Raw or Process dataset(s) changed
    Pixel grid size now always updated from json file when loaded
    Adds support for frameReceiver reset functionality
    Tidies up/hides extra controls from GUI in HTML
    Improves GUI progress bars behaviour.

Author: dw96

control/src/hexitec/HexitecDAQ.py

@@ -428,6 +428,7 @@ def hdf_closing_loop(self):
             # print(" DAQ Waiting, hdf_closing_loop()")
             IOLoop.instance().call_later(0.5, self.hdf_closing_loop)
         else:
+            self.frames_received = self.get_total_frames_received()
             self.hdf_file_location = self.file_dir + self.file_name + '.h5'
             self.prepare_hdf_file()
 
@@ -758,7 +759,7 @@ def get_total_frames_received(self):
             received = fr_status.get("frames", None).get("received", None)
             if received > 0:
                 total_received = total_received + received
-        # print(" *** FR total received frames: {}".format(total_received))
+        # print(" {0} *** FR total received frames: {0}".format(total_received))
         return total_received
 
     def _is_od_connected(self, status=None, adapter=""):
@@ -868,6 +869,7 @@ def set_number_frames(self, number_frames):
         self.number_frames = number_frames
         self.frames_expected = number_frames
         self.frames_processed = 0
+        self.frames_received = 0
         self.processed_remaining = self.number_frames - self.frames_processed
 
     def set_number_nodes(self, nodes):

control/src/hexitec/HexitecFem.py

@@ -675,10 +675,11 @@ def initialise_hardware(self, msg=None):
             self.initialise_system()
         except HexitecFemError as e:
             self.flag_error("Failed to initialise camera", str(e))
+            self.hardware_busy = False
         except Exception as e:
             error = "Camera initialisation failed"
             self.flag_error(error, str(e))
-        self.hardware_busy = False
+            self.hardware_busy = False
 
     def collect_data(self, msg=None):
         """Acquire data from camera."""
@@ -845,9 +846,9 @@ def acquire_data_completed(self):
         stop_ = datetime.strptime(self.acquire_stop_time, HexitecFem.DATE_FORMAT)
         self.acquire_time = (stop_ - start_).total_seconds()
 
-        logging.debug("Capturing {} frames took {} seconds".format(str(self.number_frames),
+        logging.debug("Sending {} frames took {} seconds".format(str(self.number_frames),
                                                                    self.acquire_time))
-        duration = "Requested {} frame(s), took {} seconds".format(self.number_frames,
+        duration = "Requested {} frames, sending took {} seconds".format(self.number_frames,
                                                                    self.acquire_time)
         self._set_status_message(duration)
         # Save duration to separate parameter tree entry:

control/src/hexitec/adapter.py

@@ -377,6 +377,19 @@ def _get_od_status(self, adapter):
         finally:
             return response
 
+    # def _get_fp_status(self):
+    #     """Get status from adapter."""
+    #     adapter = "fp"
+    #     try:
+    #         request = ApiAdapterRequest(None, content_type="application/json")
+    #         response = self.adapters[adapter].get("status/error/", request)
+    #         response = response.data["value"]
+    #     except KeyError:
+    #         logging.warning("%s Adapter Not Found" % adapter)
+    #         response = [{"Error": "Adapter {} not found".format(adapter)}]
+    #     finally:
+    #         return response
+
     def connect_hardware(self, msg):
         """Connect with hardware."""
         self.software_state = "Connecting"
@@ -563,6 +576,11 @@ def acquisition(self, put_data=None):
         request.body = "{}".format(1)
         self.adapters["fp"].put(command, request)
 
+        # # Reset FR(s) statistics
+        # command = "command/reset_statistics"
+        # request = ApiAdapterRequest("", content_type="application/json")
+        # self.adapters["fr"].put(command, request)
+
         self.daq_target = time.time()
         self.daq.prepare_daq(self.number_frames)
         # Acquisition starts here