Merge pull request #156 from /issues/104

Issues/104

AnimatedWidget.py → Widgets/AnimatedWidget.py

@@ -29,10 +29,19 @@ def set_i(self, value, trigger=False, record=False):
 
     def receivedOptions(self):
         self.normalize = self.options[0]
-        self.averaging = int(self.options[1])
+        self.subsampling = int(self.options[1])
+        if self.subsampling == 0:
+            self.subsampling = 1
         self.layer = self.options[2]
         self.scale = int(self.options[3])
         self.vector_set = self.options[4]
-        self.decimate = int(self.options[5])
-        self.disableDot = self.options[6]
-        self.hyperContrast = self.options[7]
+        self.color_policy_type = self.options[5]
+        self.hyperContrast = self.options[6]
+        try:    
+            # only arrows have resolution
+            self.resolution = self.options[7]
+        except IndexError:
+            pass
+
+    def initial_transformation(self):
+        pass

Widgets/Structure3DScatterWidget.py

@@ -1,6 +1,6 @@
 import numpy as np
 import pyqtgraph.opengl as gl
-from AnimatedWidget import AnimatedWidget
+from Widgets.AnimatedWidget import AnimatedWidget
 
 class Structure3DScatterWidget(gl.GLViewWidget, AnimatedWidget):
     def __init__(self):

WidgetHandler.py → Widgets/WidgetHandler.py

@@ -97,6 +97,12 @@ def removeWidget(self, widget):
                 self.deleteWidget()
                 self._layout.removeWidget(widget)
         except:
+            return
+            """
+            leaving for the sake of documenatation
+            this execption is not actually exception 
+            but a RuntimeWarning
+            """
             raise ValueError("Layout is not proper or argument is not a widget")
 
     def addToolBar(self, toolbar):