Merge pull request #18 from gpilab/develop

borupdaniel · web-flow · commit cddf4594040c · 2019-09-04T11:56:41.000-05:00
Bug Fixes
diff --git a/display/GPI/CrossSection_GPI.py b/display/GPI/CrossSection_GPI.py
@@ -52,7 +52,7 @@ class MatplotDisplay2(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(MatplotDisplay2, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         #self.data = self.get_data2()
         self._data = None
@@ -137,7 +137,7 @@ class WindowLevel(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(WindowLevel, self).__init__(title, parent)
+        super().__init__(title, parent)
         self.sl = gpi.BasicCWFCSliders()
         self.sl.valueChanged.connect(self.valueChanged)
         self.pb = gpi.BasicPushButton()
diff --git a/display/GPI/DataQuery_GPI.py b/display/GPI/DataQuery_GPI.py
@@ -49,7 +49,7 @@ class DataSliders(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(DataSliders, self).__init__(title, parent)
+        super().__init__(title, parent)
         self.sl = gpi.BasicCWFCSliders()
         self.sl.valueChanged.connect(self.valueChanged)
         # at least one button
diff --git a/display/GPI/GLViewer_GPI.py b/display/GPI/GLViewer_GPI.py
@@ -74,7 +74,7 @@ class GPIGLWidget(QtOpenGL.QGLWidget):
     zRotationChanged = gpi.Signal(int)
 
     def __init__(self, parent=None):
-        super(GPIGLWidget, self).__init__(parent)
+        super().__init__(parent)
 
         self.xRot = 0
         self.yRot = 0
@@ -437,7 +437,7 @@ def __init__(self, title, parent=None):
         if QtOpenGL is None:
             raise ImportError("QtOpenGL not available in the current Qt "
                               "package ({})".format(QT_API_NAME))
-        super(OpenGLWindow, self).__init__(title, parent)
+        super().__init__(title, parent)
         f = QtOpenGL.QGLFormat()
         f.setAccum(True)
         f.setDoubleBuffer(True)
diff --git a/display/GPI/ImageDisplay_GPI.py b/display/GPI/ImageDisplay_GPI.py
@@ -44,7 +44,7 @@ class WindowLevel(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(WindowLevel, self).__init__(title, parent)
+        super().__init__(title, parent)
         self.sl = gpi.BasicCWFCSliders()
         self.sl.valueChanged.connect(self.valueChanged)
         self.pb = gpi.BasicPushButton()
diff --git a/display/GPI/ImageRate_GPI.py b/display/GPI/ImageRate_GPI.py
@@ -46,7 +46,7 @@ class ComboBox_GROUP(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(ComboBox_GROUP, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         self._val = {}
         self._val['image_quality_left'] = 0
diff --git a/display/GPI/Matplotlib_GPI.py b/display/GPI/Matplotlib_GPI.py
@@ -55,11 +55,11 @@
 class MainWin_close(QtWidgets.QMainWindow):
     window_closed = gpi.Signal()
     def __init__(self):
-        super(MainWin_close, self).__init__()
+        super().__init__()
         self._isActive = True
 
     def closeEvent(self, event):
-        super(MainWin_close, self).closeEvent(event)
+        super().closeEvent(event)
         self.window_closed.emit()
         self._isActive = False
 
@@ -87,7 +87,7 @@ class NavbarTools(NavigationToolbar):
       )
 
     def __init__(self, canvas, parent):
-        super(NavbarTools, self).__init__(canvas, parent)
+        super().__init__(canvas, parent)
 
     def _init_toolbar(self):
         self.basedir = os.path.join(matplotlib.rcParams[ 'datapath' ],'images')
@@ -284,7 +284,7 @@ class MatplotDisplay(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(MatplotDisplay, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         # gpi interface
         self._collapsables = []
diff --git a/display/GPI/dictionquery_GPI.py b/display/GPI/dictionquery_GPI.py
@@ -94,7 +94,7 @@ class ReduceSliders(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(ReduceSliders, self).__init__(title, parent)
+        super().__init__(title, parent)
         self.sl = gpi.BasicCWFCSliders()
         self.sl.valueChanged.connect(self.valueChanged)
         # at least one button
diff --git a/generators/GPI/Shapes_GPI.py b/generators/GPI/Shapes_GPI.py
@@ -46,7 +46,7 @@ class SHAPES_GROUP(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(SHAPES_GROUP, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         self._val = {}
         self._val['size'] = 1
diff --git a/math/GPI/FFTW_GPI.py b/math/GPI/FFTW_GPI.py
@@ -49,7 +49,7 @@ class FFTW_GROUP(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(FFTW_GROUP, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         self._val = {}
         self._val['compute'] = False
diff --git a/math/GPI/FFT_NUMPY_GPI.py b/math/GPI/FFT_NUMPY_GPI.py
@@ -48,7 +48,7 @@ class FFTW_GROUP(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(FFTW_GROUP, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         self._val = {}
         self._val['compute'] = False
diff --git a/math/GPI/Interpolate_GPI.py b/math/GPI/Interpolate_GPI.py
@@ -48,7 +48,7 @@ class Interpolate_GROUP(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(Interpolate_GROUP, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         # Widgets
         self._val = {}
diff --git a/math/GPI/Zeropad_GPI.py b/math/GPI/Zeropad_GPI.py
@@ -49,7 +49,7 @@ class FFTW_GROUP(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(FFTW_GROUP, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         self._val = {}
         self._val['length'] = 1
diff --git a/shapers/GPI/Flip_GPI.py b/shapers/GPI/Flip_GPI.py
@@ -43,7 +43,7 @@ class NonExclusivePushButtons2(gpi.NonExclusivePushButtons):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(NonExclusivePushButtons2, self).__init__(title, parent)
+        super().__init__(title, parent)
 
     # overwrite set_val
     def set_val(self, value):
diff --git a/shapers/GPI/Reduce_GPI.py b/shapers/GPI/Reduce_GPI.py
@@ -48,7 +48,7 @@ class ReduceSliders(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(ReduceSliders, self).__init__(title, parent)
+        super().__init__(title, parent)
         self.sl = gpi.BasicCWFCSliders()
         self.sl.valueChanged.connect(self.valueChanged)
         # at least one button
@@ -271,7 +271,7 @@ def compute(self):
                     xi.append(slice(w['floor']-1, w['ceiling']))
 
             # apply indices to the data
-            out = data[xi]
+            out = data[tuple(xi)]
 
             # update UI info
             self.setAttr('I/O Info:', val="input: "+str(data.shape)
diff --git a/shapers/GPI/Transpose_GPI.py b/shapers/GPI/Transpose_GPI.py
@@ -43,7 +43,7 @@ class GPITabBar(QtWidgets.QTabBar):
     currentChanged = gpi.Signal()
 
     def __init__(self, parent=None):
-        super(GPITabBar, self).__init__(parent)
+        super().__init__(parent)
         self._labels_at_press = None
 
     def clearTabs(self):
@@ -59,10 +59,10 @@ def labels(self):
 
     def mousePressEvent(self, event):
         self._labels_at_press = self.labels()
-        super(GPITabBar, self).mousePressEvent(event)
+        super().mousePressEvent(event)
 
     def mouseReleaseEvent(self, event):
-        super(GPITabBar, self).mouseReleaseEvent(event)
+        super().mouseReleaseEvent(event)
         if self.labels() != self._labels_at_press:
             self.currentChanged.emit()
 
@@ -71,7 +71,7 @@ class OrderButtons(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(OrderButtons, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         # at least one button
         wdgLayout = QtWidgets.QGridLayout()
diff --git a/spinSim/GPI/Spyn_GPI.py b/spinSim/GPI/Spyn_GPI.py
@@ -47,7 +47,7 @@ class SpynAxys(gpi.GenericWidgetGroup):
     valueChanged = gpi.Signal()
 
     def __init__(self, title, parent=None):
-        super(SpynAxys, self).__init__(title, parent)
+        super().__init__(title, parent)
 
         self._val = {}
         self._val['length'] = 1
