testing

base/backend/board.py

@@ -380,6 +380,7 @@ def is_conneced():
 def is_active():
     control = read_pci(1, '0x9040')[0]
     control_bits = '{0:032b}'.format(int(control, 16))
+    print control_bits[22:26]
     return control_bits[22:26] == "1111"
 
 

base/backendinterface.py

@@ -19,7 +19,6 @@ import storage
 import config
 import kcgwidget as kcgw
 # import widgets.timingWidget as tw
-import widgets.acquiresettings as acqs
 
 class DummyStorage():
     def __init__(self):
@@ -214,13 +213,16 @@ class _bif_ProgressBar(QtGui.QProgressBar):
         kcgw.statusbar.insertWidget(1, self)
         self.setValue(0)
         QtGui.qApp.processEvents()
-    def remove(self, timeout):
+    def remove(self, timeout=None):
         def remove_progressbar():
             kcgw.statusbar.removeWidget(self)
             kcgw.statusbar.removeWidget(self.label)
             kcgw.statusbar.showMessage(board.status.status_text)
             self.destroy()
-        QtCore.QTimer.singleShot(timeout, remove_progressbar)
+        if timeout:
+            QtCore.QTimer.singleShot(timeout, remove_progressbar)
+        else:
+            remove_progressbar()
 
 
 def bk_calibrate(self): # TODO: Wie zeitkritisch ist dies, setValue braucht sicher etwas zeit
@@ -304,7 +306,7 @@ def bk_calibrate(self): # TODO: Wie zeitkritisch ist dies, setValue braucht sich
         time.sleep(0.5)
         progressbar.setValue(15)
 
-        progressbar.remove(1000)
+        progressbar.remove(100)
         board.status.calibrated = True
 
     except board.BoardError as e:
@@ -335,7 +337,7 @@ def bk_sync_board():
             progressbar.setValue(i)
         logging.info("Done!")
         board.write_pci('0x0003f0', '0x9040')
-        progressbar.remove(1000)
+        progressbar.remove(100)
     except board.BoardError as e:
         logging.error("Synchronization failed: {}".format(str(e)))
         _bif_disable_wait_cursor()
@@ -408,7 +410,7 @@ def bk_set_defaults(self):
         board.write_pci('{0:08x}'.format(board.config.get('orbits_skip')), '0x9028')
         # acqs.setValueSilent('orbits_skip', board.config.get('orbits_skip'))
         board.status.defaults_set = True
-        progressbar.remove(1000)
+        progressbar.remove(100)
 
     except board.BoardError as e:
         logging.error("Setting defaults failed: {}".format(str(e)))
@@ -626,7 +628,7 @@ def bk_acquire():
 
 def _bif_stop_acquisition():
     board.status.acquisition = False
-    board.acquisition_progressbar.remove(1000)
+    board.acquisition_progressbar.remove(100)
     board.acquisition_timer.stop()
     for elem in Elements.getElements("acquireTrigger"):
         elem.setIcon(QtGui.QIcon(config.startIcon))
@@ -668,7 +670,7 @@ def _bif_start_acquisition():
                 _bif_iterate_spectrograms(spectrogram_dir) # TODO: not here ?
         else:
             _bif_stop_acquisition() # TODO: stop_acquisition
-            acquisition_progressbar.remove(5000)
+            acquisition_progressbar.remove(100)
 
     board.acquisition_timer.timeout.connect(on_timeout)
     board.acquisition_timer.start(board.config.get('orbits_wait_time') * 1000)

base/controlwidget.py

@@ -129,6 +129,8 @@ class LogHandler(logging.Handler):
     def __init__(self, log_area):
         logging.Handler.__init__(self)
         self.text_area = log_area
+        self.setFormatter(logging.Formatter('%(asctime)s: %(message)s'))
+        # log_handler.setFormatter(logging.Formatter('%(asctime)s - %(funcName)s(): %(message)s'))
 
     def emit(self, record):
         self.text_area.append(self.format(record))
@@ -228,11 +230,11 @@ class ControlWidget(kcgw.KCGWidgets):
 
         # ------------------[ Logging ]----------------------
         log_handler = LogHandler(self.log_area)
-        log_handler.setFormatter(logging.Formatter('%(asctime)s - %(funcName)s(): %(message)s'))
         self.logger = logging.getLogger()
         board.config.register_logger(self.logger)
         self.logger.addHandler(log_handler)
         self.logger.setLevel(logging.INFO)
+        logging.logger = self.logger
 
     def on_check(self, registers): # TODO: remove dependency on board
         # import random

base/groupedelements.py

@@ -102,7 +102,7 @@ class GroupedObjects:
         if group in self._objects:
             return self._objects[group]
         else:
-            return None
+            return []
 
 # Every Element is acessible through every Variable set here. Checkboxes, Buttons and MenuItems variables are set
 # to improve readability of the code. They refer to the same Object

base/kcg.py

@@ -14,6 +14,7 @@ from multiWidget import MultiWidget
 from groupedelements import Checkboxes, Buttons, MenuItems, Elements
 import widgets.acquiresettings as acqs
 import widgets.timingWidget as tw
+tr = QtCore.QCoreApplication.translate
 
 import config
 import time
@@ -41,7 +42,7 @@ def readconfig():
     if "{sessionname}" in config.default_subdirectory_name:
         status = False
         while not status:
-            text, status = QtGui.QInputDialog.getText(None, "Sessionname", "Enter Sessionname\n"
+            text, status = QtGui.QInputDialog.getText(None, tr("Dialog", "Sessionname"), "Enter Sessionname\n"
                                                                            "NOTE: You are being asked because it "
                                                                            "was set this way in the config file.:")
             if not status and not config.force_ask:
@@ -232,6 +233,7 @@ class Gui(QtGui.QMainWindow):
         kcgw.statusbar = self.statusbar # set status bar to kcgw to easily access from other sources
         self.pageIndicator = QtGui.QLabel()
         self.statusbar.addPermanentWidget(self.pageIndicator)
+        QtGui.QApplication.setStyle("Oxygen") # Make it look less blown up in Gnome for example
         self.initUI()
         self.after_start_status_handler()
 

base/multiWidget.py

@@ -3,7 +3,7 @@ from PyQt4 import QtGui, QtCore
 import kcgwidget as kcgw
 from leftbar import LeftBar
 import sys
-sys.path.append("../widgets")
+# sys.path.append("../widgets")
 import widgets.timingWidget as tw
 import widgets.acquiresettings as acqs
 
@@ -40,7 +40,6 @@ class MultiWidget(QtGui.QWidget):
         self.layout = QtGui.QVBoxLayout()
         self.setLayout(self.layout)
 
-
         self.splitter = QtGui.QSplitter(QtCore.Qt.Horizontal)
 
         self.leftBar = LeftBar(self)