Changeset 8252:fc502493965c in orange

Timestamp:

08/22/11 12:56:36 (22 months ago)

Author:

Noughmad <Noughmad@…>

Branch:

default

Convert:

c27641d2087ec54b140333df041d50a23e1622aa

Message:

Disable animations while performing a FreeViz optimization.

Location:

orange/OrangeWidgets

Files:

• OWFreeVizOptimization.py (modified) (3 diffs)
• plot/owplot.py (modified) (2 diffs)
• plot/owplotgui.py (modified) (1 diff)

orange/OrangeWidgets/OWFreeVizOptimization.py

@@ -256 +256 @@
         self.cancelOptimization = 0
         #qApp.processEvents()
+        
+        if hasattr(self.graph, 'animate_points'):
+            self.graph_is_animated = self.graph.animate_points
+            self.graph.animate_points = False
 
         ns = FreeViz.optimizeSeparation(self, self.stepsBeforeUpdate, singleStep, self.parentWidget.distances)
@@ -267 +271 @@
     def stopOptimization(self):
         self.cancelOptimization = 1
+        if hasattr(self, 'graph_is_animated'):
+            self.graph.animate_points = self.graph_is_animated
 
 #    # #############################################################
@@ -422 +428 @@
     ow.show()
     a.exec_()
+

orange/OrangeWidgets/plot/owplot.py

@@ -1576 +1576 @@
     def update_animations(self, use_animations=None):
         if use_animations is not None:
-            self.use_animations = use_animations
+            self.animate_plot = use_animations
+            self.animate_points = use_animations
             
     def update_performance(self, num_points = None):
@@ -1586 +1587 @@
                     num_points = sum( len(c.points()) for c in self.curves )
             if num_points > self.disable_animations_threshold:
-                qDebug('Disabling animations')
+                self.disabled_animate_points = self.animate_points
                 self.animate_points = False
+                
+                self.disabled_animate_plot = self.animate_plot
                 self.animate_plot = False
+                
+                self.disabled_antialias_lines = self.animate_points
                 self.antialias_lines = False
-            else:
-                qDebug('Enabling animations')
-                self.animate_points = True
-                self.animate_plot = True
-                self.antialias_lines = True
+            
+            elif hasattr(self, 'disabled_animate_points'):
+                self.animate_points = self.disabled_animate_points
+                del self.disabled_animate_points
+                
+                self.animate_plot = self.disabled_animate_plot
+                del self.disabled_animate_plot
+                
+                self.antialias_lines = self.disabled_antialias_lines
+                del self.disabled_antialias_lines
         
     def animate(self, target, prop_name, end_val, duration = None, start_val = None):

orange/OrangeWidgets/plot/owplotgui.py

@@ -315 +315 @@
             and the callback ``cb_name`` is called. 
         '''
-        OWGUI.checkBox(widget, self._plot, value, label, callback=self._get_callback(cb_name))    
+        OWGUI.checkBox(widget, self._plot, value, label, callback=self._get_callback(cb_name))
         
     def antialiasing_check_box(self, widget):