Merge pull request #116 from FXIhub/travis

More changes to be compatible with python 3

Author: Benedikt J. Daurer

examples/basic/hitfinding.py

@@ -50,11 +50,11 @@ def onEvent(evt):
     analysis.hitfinding.hitrate(evt, hit, history=5000)
 
     # Plot the hitscore
-    plotting.line.plotHistory(evt["analysis"]["litpixel: hitscore"], label='Nr. of lit pixels', hline=100)
+    plotting.line.plotHistory(evt["analysis"]["litpixel: hitscore"], label='Nr. of lit pixels', hline=100, group="A")
 
     # Plot the hitrate
-    plotting.line.plotHistory(evt["analysis"]["hitrate"], label='Hit rate [%]')
+    plotting.line.plotHistory(evt["analysis"]["hitrate"], label='Hit rate [%]', group="B")
 
     # Visualize detector image of hits
     if hit:
-        plotting.image.plotImage(evt["photonPixelDetectors"]["CCD"], vmin=-10, vmax=40)
+        plotting.image.plotImage(evt["photonPixelDetectors"]["CCD"], vmin=-10, vmax=40, group="Detectors")

src/interface/Qt.py

@@ -167,6 +167,7 @@ def setResizeMode(self, mode):
         QtWidgets.QHeaderView.setResizeMode = setResizeMode
 
 
+        QtGui.qApp = QtWidgets.qApp
         QtGui.QApplication = QtWidgets.QApplication
         QtGui.QGraphicsScene = QtWidgets.QGraphicsScene
         QtGui.QGraphicsObject = QtWidgets.QGraphicsObject

src/interface/data_source.py

@@ -43,7 +43,7 @@ def subscribe(self, title, plot):
         if title not in self._subscribed_titles:
             self._subscribed_titles[title] = [plot]
             try:
-                self._data_socket.subscribe(bytes(title))
+                self._data_socket.subscribe(title)
                 self.subscribed.emit(title)
                 logging.debug("Subscribing to %s on %s.", title, self.name())
             # socket might still not exist
@@ -58,7 +58,7 @@ def unsubscribe(self, title, plot):
         self._subscribed_titles[title].remove(plot)
         # Check if list is empty
         if not self._subscribed_titles[title]:
-            self._data_socket.unsubscribe(bytes(title))
+            self._data_socket.unsubscribe(title)
             self.unsubscribed.emit(title)
             logging.debug("Unsubscribing from %s on %s.", title, self.name())
             self._subscribed_titles.pop(title)
@@ -71,7 +71,7 @@ def subscribe_for_recording(self, title):
         if title not in self._recorded_titles:
             self._recorded_titles[title] = True
             try:
-                self._data_socket.subscribe(bytes(title))
+                self._data_socket.subscribe(title)
                 self.subscribed.emit(title)
                 logging.debug("Subscribing to %s on %s.", title, self.name())
             # socket might still not exist
@@ -83,7 +83,7 @@ def unsubscribe_for_recording(self, title):
         If no one else is associated with it unsubscrine"""
         self._recorded_titles[title] = False
         if not title in self._subscribed_titles:
-            self._data_socket.unsubscribe(bytes(title))
+            self._data_socket.unsubscribe(title)
             self.unsubscribed.emit(title)
             logging.debug("Unsubscribing from %s on %s.", title, self.name())
             self._recorded_titles.pop(title)
@@ -109,15 +109,15 @@ def _connect(self):
 
     def _get_data_port(self):
         """Ask to the backend for the data port"""
-        self._ctrl_socket.send_multipart(['data_port'])
+        self._ctrl_socket.send_multipart(['data_port'.encode('UTF-8')])
 
     def query_configuration(self):
         """Ask to the backend for the configuration"""
-        self._ctrl_socket.send_multipart(['conf'])
+        self._ctrl_socket.send_multipart(['conf'.encode('UTF-8')])
 
     def query_reloading(self):
         """Ask the backend to reload its configuration"""
-        self._ctrl_socket.send_multipart(['reload'])
+        self._ctrl_socket.send_multipart(['reload'.encode('UTF-8')])
 
     def _get_request_reply(self, socket=None):
         """Handle the reply of the backend to a previous request"""

src/interface/ringbuffer.py

@@ -192,7 +192,7 @@ def resize(self, new_maxlen):
 
     def _init_data(self):
         """Initialize the buffer with the given data"""
-        self._data = [None for i in xrange(self._maxlen)]
+        self._data = [None for i in range(self._maxlen)]
 
     def __len__(self):
         """Return the length of the buffer"""

src/interface/ui/data_window.py

@@ -54,7 +54,6 @@ def _on_title_change(self, title):
     def on_menu_show(self):
         """Show what data sources are available"""
         # Go through all the available data sources and add them
-
         def add_menu(title, menu, ds):
             action = QtGui.QAction(title, self)
             action.setData([ds, title])

src/interface/ui/image_window.ui

@@ -490,6 +490,7 @@
     <property name="title">
      <string>Data Sources</string>
     </property>
+    <addaction name="actionDefault"/>
    </widget>
    <widget class="QMenu" name="menuSave">
     <property name="title">
@@ -709,6 +710,11 @@
     <string>Reset Cache</string>
    </property>
   </action>
+  <action name="actionDefault">
+   <property name="text">
+    <string>default</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

src/interface/ui/plotdata_table.py

@@ -75,7 +75,7 @@ def get_group_row(self, group):
         return self.table.indexFromItem(self._groups[group][1]).row()
 
     def item_is_group_header(self, item):
-        return isinstance(item.data(QtCore.Qt.UserRole), unicode)
+        return isinstance(item.data(QtCore.Qt.UserRole), type(u""))
 
     def _on_plotdata_added(self, plotdata):
         source = self.sender()

src/interface/zmqsocket.py

@@ -109,5 +109,4 @@ def recv_array(self, flags=0, copy=True, track=False):
         """Receive a numpy array"""
         md = self._socket.recv_json(flags=flags)
         msg = self._socket.recv(flags=flags, copy=copy, track=track)
-        buf = buffer(msg)
-        return  numpy.ndarray(shape=md['shape'], dtype=md['dtype'], buffer=buf, strides=md['strides'])
+        return  numpy.ndarray(shape=md['shape'], dtype=md['dtype'], buffer=msg, strides=md['strides'])

src/ipc/zmqserver.py

@@ -119,13 +119,14 @@ def send(self, title, data):
 
     def _answer_command(self, stream, msg):
         """Reply to commands received on the _ctrl_stream"""
-        if(msg[0] == 'conf'):
+        print(msg)
+        if(msg[0] == 'conf'.encode('UTF-8')):
             stream.socket.send_json(['conf', ipc.broadcast.data_conf])
-        if(msg[0] == 'data_port'):
-            stream.socket.send_json(['data_port', bytes(self._broker_pub_port)])
+        if(msg[0] == 'data_port'.encode('UTF-8')):
+            stream.socket.send_json(['data_port', self._broker_pub_port])
         if(msg[0] == 'uuid'):
             stream.socket.send_json(['uuid', bytes(ipc.uuid)])
-        if(msg[0] == 'reload'):
+        if(msg[0] == 'reload'.encode('UTF-8')):
             #TODO: Find a way to replace this with a direct function call (in all workers)
             stream.socket.send_json(['reload', bytes(True)])
             print("Answering reload command")
@@ -141,10 +142,10 @@ def _forward_xsub(self, stream, msg):
         self._xpub_stream.send_multipart(msg)
 
     def _forward_xpub(self, stream, msg):
-        if msg[0][0] == '\x00':
+        if (msg[0][0] == '\x00') or (msg[0][0] == 0):
             logging.debug("Got unsubscription for: %r" % msg[0][1:])
             self._subscribed.discard(msg[0][1:])
-        elif msg[0][0] == '\x01':
+        elif (msg[0][0] == '\x01') or (msg[0][0] == 1):
             logging.debug("Got subscription for: %r" % msg[0][1:])
             self._subscribed.add(msg[0][1:])
         else: