[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3714] contrib/py/scripts/addons: minor code cleanup

Campbell Barton ideasman42 at gmail.com
Wed Sep 5 02:51:32 CEST 2012


Revision: 3714
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3714
Author:   campbellbarton
Date:     2012-09-05 00:51:31 +0000 (Wed, 05 Sep 2012)
Log Message:
-----------
minor code cleanup

Modified Paths:
--------------
    contrib/py/scripts/addons/animation_motion_trail.py
    contrib/py/scripts/addons/cmu_mocap_browser/__init__.py
    contrib/py/scripts/addons/curve_tools.py
    contrib/py/scripts/addons/development_geometry_index_display.py
    contrib/py/scripts/addons/mesh_show_vgroup_weights.py
    contrib/py/scripts/addons/mesh_vertex_slide.py
    contrib/py/scripts/addons/render_time.py
    contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py
    contrib/py/scripts/addons/space_view3d_game_props_visualiser.py
    contrib/py/scripts/addons/space_view3d_paint_bprojection.py

Modified: contrib/py/scripts/addons/animation_motion_trail.py
===================================================================
--- contrib/py/scripts/addons/animation_motion_trail.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/animation_motion_trail.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -1525,14 +1525,15 @@
                 
                 for kmi in kmis:
                     kmi.active = False
-                
-                context.window_manager.modal_handler_add(self)
+
                 self._handle1 = context.region.callback_add(calc_callback,
                     (self, context), 'POST_VIEW')
                 self._handle2 = context.region.callback_add(draw_callback,
                     (self, context), 'POST_PIXEL')
                 if context.area:
                     context.area.tag_redraw()
+
+                context.window_manager.modal_handler_add(self)
             else:
                 # disable
                 context.window_manager.motion_trail.enabled = -1

Modified: contrib/py/scripts/addons/cmu_mocap_browser/__init__.py
===================================================================
--- contrib/py/scripts/addons/cmu_mocap_browser/__init__.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/cmu_mocap_browser/__init__.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -206,11 +206,11 @@
                 ['b', 'Kb', 'Mb', 'Gb', 'Tb', 'Eb', 'Pb'][m])  # :-p
             self.fout = open(self.local_file, 'wb')
             self.recv = 0
-            context.window_manager.modal_handler_add(self)
             self.handle = context.region.\
                 callback_add(draw_callback, (self, context), 'POST_PIXEL')
             self.timer = context.window_manager.\
                 event_timer_add(0.001, context.window)
+            context.window_manager.modal_handler_add(self)
             return {'RUNNING_MODAL'}
         else:
             self.import_or_open()

Modified: contrib/py/scripts/addons/curve_tools.py
===================================================================
--- contrib/py/scripts/addons/curve_tools.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/curve_tools.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -1195,7 +1195,6 @@
     def invoke(self, context, event):
 
         if context.object:
-
             context.window_manager.modal_handler_add(self)
             return {'RUNNING_MODAL'}
         else:

Modified: contrib/py/scripts/addons/development_geometry_index_display.py
===================================================================
--- contrib/py/scripts/addons/development_geometry_index_display.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/development_geometry_index_display.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -167,14 +167,13 @@
                 return {'CANCELLED'}
         except: pass
         if context.area.type == 'VIEW_3D':
-            context.window_manager.modal_handler_add(self)
+            self.mouse_path = []
 
             # Add the region OpenGL drawing callback
             # draw in view space with 'POST_VIEW' and 'PRE_VIEW'
             self._handle = context.region.callback_add(draw_callback_indicies, (self, context), 'POST_PIXEL')
 
-            self.mouse_path = []
-
+            context.window_manager.modal_handler_add(self)
             return {'RUNNING_MODAL'}
         else:
             self.report({'WARNING'}, "View3D not found, cannot run operator")

Modified: contrib/py/scripts/addons/mesh_show_vgroup_weights.py
===================================================================
--- contrib/py/scripts/addons/mesh_show_vgroup_weights.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/mesh_show_vgroup_weights.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -172,11 +172,11 @@
             if context.scene.display_indices < 1:
                 # operator is called for the first time, start everything
                 context.scene.display_indices = 1
-                context.window_manager.modal_handler_add(self)
                 self.handle1 = context.region.callback_add(calc_callback,
                     (self, context), 'POST_VIEW')
                 self.handle2 = context.region.callback_add(draw_callback,
                     (self, context), 'POST_PIXEL')
+                context.window_manager.modal_handler_add(self)
                 return {'RUNNING_MODAL'}
             else:
                 # operator is called again, stop displaying

Modified: contrib/py/scripts/addons/mesh_vertex_slide.py
===================================================================
--- contrib/py/scripts/addons/mesh_vertex_slide.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/mesh_vertex_slide.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -446,11 +446,12 @@
         if tmpX2 - tmpX1 < 0:
             self.Direction = -self.Direction
 
+        context.area.tag_redraw()  # Force the redraw of the 3D View
+
         # Add the region OpenGL drawing callback
         # draw in view space with 'POST_VIEW' and 'PRE_VIEW'
+        self._handle = context.region.callback_add(self.__class__.draw_callback_px, (self, context), 'POST_PIXEL')
         context.window_manager.modal_handler_add(self)
-        self._handle = context.region.callback_add(self.__class__.draw_callback_px, (self, context), 'POST_PIXEL')
-        context.area.tag_redraw()  # Force the redraw of the 3D View
         return {'RUNNING_MODAL'}
 
 def menu_func(self, context):

Modified: contrib/py/scripts/addons/render_time.py
===================================================================
--- contrib/py/scripts/addons/render_time.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/render_time.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -119,11 +119,11 @@
     def invoke(self, context, event):
         if context.area.type == 'IMAGE_EDITOR':
             if timer["hud"] == False:
-                context.window_manager.modal_handler_add(self)
-
                 # Add the region OpenGL drawing callback
                 self._handle = context.region.callback_add(draw_callback_px, (self, context), 'POST_PIXEL')
                 timer["hud"] = True
+
+                context.window_manager.modal_handler_add(self)
                 return {'RUNNING_MODAL'}
             else:
                 timer["hud"] = False

Modified: contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py
===================================================================
--- contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -308,7 +308,7 @@
         
         # Initial run
         self.try_process_input(context, event, True)
-        
+
         context.window_manager.modal_handler_add(self)
         return {'RUNNING_MODAL'}
     
@@ -4643,10 +4643,7 @@
         CursorMonitor.is_running = True
         
         CursorDynamicSettings.recalc_csu(context, 'PRESS')
-        
-        # Currently there seems to be only one window manager
-        context.window_manager.modal_handler_add(self)
-        
+
         # I suppose that cursor position would change
         # only with user interaction.
         #self._timer = context.window_manager. \
@@ -4669,6 +4666,9 @@
         
         # Here we cannot return 'PASS_THROUGH',
         # or Blender will crash!
+
+        # Currently there seems to be only one window
+        context.window_manager.modal_handler_add(self)
         return {'RUNNING_MODAL'}
     
     def cancel(self, context):
@@ -5535,12 +5535,11 @@
     
     def execute(self, context):
         self.keymap_updated = False
-        
-        context.window_manager.modal_handler_add(self)
-        
+
         self._timer = context.window_manager.\
             event_timer_add(0.1, context.window)
-        
+
+        context.window_manager.modal_handler_add(self)        
         return {'RUNNING_MODAL'}
     
     def cancel(self, context):

Modified: contrib/py/scripts/addons/space_view3d_game_props_visualiser.py
===================================================================
--- contrib/py/scripts/addons/space_view3d_game_props_visualiser.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/space_view3d_game_props_visualiser.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -161,11 +161,12 @@
                 print('init')
                 # operator is called for the first time, start everything
                 context.scene.display_game_properties = 1
-                context.window_manager.modal_handler_add(self)
                 self.handle1 = context.region.callback_add(calc_callback,
                     (self, context), 'POST_VIEW')
                 self.handle2 = context.region.callback_add(draw_callback,
                     (self, context), 'POST_PIXEL')
+
+                context.window_manager.modal_handler_add(self)
                 return {'RUNNING_MODAL'}
             else:
                 # operator is called again, stop displaying

Modified: contrib/py/scripts/addons/space_view3d_paint_bprojection.py
===================================================================
--- contrib/py/scripts/addons/space_view3d_paint_bprojection.py	2012-09-04 20:32:09 UTC (rev 3713)
+++ contrib/py/scripts/addons/space_view3d_paint_bprojection.py	2012-09-05 00:51:31 UTC (rev 3714)
@@ -1151,13 +1151,13 @@
         return{'FINISHED'}
 
     def invoke(self, context, event):
-        context.window_manager.modal_handler_add(self)
         self.first_mouse = Vector((event.mouse_region_x,event.mouse_region_y))
         self.first_time = True
         for sub in context.object.modifiers:
-            if sub.type in ['SUBSURF', 'MULTIRES']:
+            if sub.type in {'SUBSURF', 'MULTIRES'}:
                 self.tmp_level = sub.levels
                 sub.levels = 0
+        context.window_manager.modal_handler_add(self)
         return {'RUNNING_MODAL'}
 
 # Oprerator Class to pan the view3D
@@ -1206,14 +1206,13 @@
         return {'RUNNING_MODAL'}
                 
     def invoke(self, context, event):
-        context.window_manager.modal_handler_add(self)
         self.first_mouse.x = event.mouse_region_x
         self.first_mouse.y = event.mouse_region_y   
         for sub in context.object.modifiers:
-            if sub.type in ['SUBSURF', 'MULTIRES']:

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-extensions-cvs mailing list