瀏覽代碼

fixes io.is_data_consistent on 0b files

also moves some variables from board to status.status
and fixes continuousread to continuous_read in is_continuous_read_active
Patrick Schreiber 8 年之前
父節點
當前提交
c28ba65db8
共有 2 個文件被更改,包括 7 次插入5 次删除
  1. 2 0
      KCG/base/backend/io.py
  2. 5 5
      KCG/base/backendinterface.py

+ 2 - 0
KCG/base/backend/io.py

@@ -13,6 +13,8 @@ import board
 BUNCHES_PER_TURN = config.bunches_per_turn
 
 def is_data_consistent(dataset):
+    if len(dataset.array) == 0:
+        return False
     bunch_numbers = dataset.array[:, -1]
     expected = np.tile(np.arange(0, BUNCHES_PER_TURN), bunch_numbers.shape[0] / BUNCHES_PER_TURN)
     wrong_indices = np.argwhere(bunch_numbers != expected)

+ 5 - 5
KCG/base/backendinterface.py

@@ -76,7 +76,7 @@ def _bif_continuous_read_is_enabled(popup_title_text=None):
             return False
         else:
             _bif_set_continuous_read_inactive()
-            Elements.setChecked("continuousread", False)
+            Elements.setChecked("continuous_read", False)
             return True
     else:
         return False
@@ -718,10 +718,10 @@ def _bif_start_acquisition():
             continue
         elem.setIcon(QtGui.QIcon(config.install_path + config.stopIcon))
         elem.setText(tr("Button", "Stop Acquisition"))
-    board.acquisition_timer = QtCore.QTimer()
+    storage.storage.acquisition_timer = QtCore.QTimer()
     num_acquisitions = board.config.get("acquisition_count")
     acquisition_progressbar = _bif_ProgressBar(0, num_acquisitions, tr("sw", "Acquiring"))
-    board.acquisition_progressbar = acquisition_progressbar
+    # storage.storage.acquisition_progressbar = acquisition_progressbar
 
     # We increase already once because we do a single acquisition before the
     # timer is started, otherwise we have to wait until the timer fires the
@@ -749,8 +749,8 @@ def _bif_start_acquisition():
             _bif_stop_acquisition()
             acquisition_progressbar.remove(0)
 
-    board.acquisition_timer.timeout.connect(on_timeout)
-    board.acquisition_timer.start(board.config.get('orbits_wait_time') * 1000)
+    storage.storage.acquisition_timer.timeout.connect(on_timeout)
+    storage.storage.acquisition_timer.start(board.config.get('orbits_wait_time') * 1000)
 
 
 def bk_single_read():