[Bf-extensions-cvs] [941b601] master: Some UI tweaks to improve usability and avoid confusing workflow.

[Lukas Tönne]

Commit: 941b601cfd2a184b993155cfdab1b9234a9690a4
Author: Lukas Tönne
Date:   Mon Dec 15 22:05:32 2014 +0100
Branches: master
https://developer.blender.org/rBAC941b601cfd2a184b993155cfdab1b9234a9690a4

Some UI tweaks to improve usability and avoid confusing workflow.

The main "make samples" operator now disables the ground object settings
UI, which forces users to explicitly delete the samples before running
it again.

The secondary update operators for patches and physics are disabled
when there are no samples/blobs, which makes the workflow much more
structured and easier to understand.

===================================================================

M	object_physics_meadow/blob.py
M	object_physics_meadow/meadow.py
M	object_physics_meadow/ui.py

===================================================================

diff --git a/object_physics_meadow/blob.py b/object_physics_meadow/blob.py
index ce2fc78..c622ddb 100644
--- a/object_physics_meadow/blob.py
+++ b/object_physics_meadow/blob.py
@@ -194,6 +194,12 @@ def blobs_from_customprops(data):
     blobs = pickle.loads(A.tobytes())
     return blobs
 
+def object_has_blob_data(ob):
+    return ob.meadow.get('blobs') is not None
+
+def object_free_blob_data(ob):
+    if ob.meadow.get('blobs') is not None:
+        del ob.meadow['blobs']
 
 def make_blob_visualizer(context, groundob, blobs, display_radius, hide, hide_render=True):
     # common parent empty for blobs
diff --git a/object_physics_meadow/meadow.py b/object_physics_meadow/meadow.py
index 6642ea9..0e10bec 100644
--- a/object_physics_meadow/meadow.py
+++ b/object_physics_meadow/meadow.py
@@ -72,6 +72,13 @@ def make_blobs(context, gridob, groundob):
         ps.print_stats()
         print(s.getvalue())
 
+def delete_blobs(context, groundob):
+    if groundob:
+        blob.object_free_blob_data(groundob)
+
+    patch.patch_group_clear(context)
+    blob.blob_group_clear(context)
+
 ### Patch copies for simulation ###
 def make_patches(context, gridob, groundob):
     scene = context.scene
diff --git a/object_physics_meadow/ui.py b/object_physics_meadow/ui.py
index abe9fe9..9b616f3 100644
--- a/object_physics_meadow/ui.py
+++ b/object_physics_meadow/ui.py
@@ -43,6 +43,8 @@ class OBJECT_PT_Meadow(Panel):
     
     def draw(self, context):
         settings = _settings.get(context)
+        groundob = find_meadow_object(context, 'GROUND')
+        has_samples = blob.object_has_blob_data(groundob) if groundob else False
         ob = context.object
         meadow = ob.meadow
         layout = self.layout
@@ -53,7 +55,6 @@ class OBJECT_PT_Meadow(Panel):
         
         if meadow.type == 'TEMPLATE':
             row = layout.row()
-            groundob = find_meadow_object(context, 'GROUND')
             if groundob:
                 row.prop_search(meadow, "density_vgroup_name", groundob, "vertex_groups", text="Density Vertex Group")
             else:
@@ -67,19 +68,29 @@ class OBJECT_PT_Meadow(Panel):
             sub.prop(meadow, "use_centered")
         
         elif meadow.type == 'GROUND':
-            layout.prop(meadow, "seed")
+            box = layout.box()
             
-            col = layout.column(align=True)
+            sub = box.column()
+            # this politely prevents users from changing settings unwantedly,
+            # they have to delete the samples first
+            sub.enabled = not has_samples
+            sub.prop(meadow, "seed")
+            col = sub.column(align=True)
             col.prop(meadow, "patch_radius")
             col.prop(meadow, "max_patches")
+            sub.prop(meadow, "sampling_levels")
             
-            layout.prop(meadow, "sampling_levels")
+            if has_samples:
+                box.operator("meadow.delete_blobs", icon='X', text="Delete Samples")
+            else:
+                box.operator("meadow.make_blobs", icon='STICKY_UVS_DISABLE', text="Create Samples")
         
         layout.separator()
         
-        layout.operator("meadow.make_blobs", icon='STICKY_UVS_DISABLE')
-        layout.operator("meadow.make_patches", icon='PARTICLE_PATH')
-        layout.operator("meadow.rebake_meadow")
+        sub = layout.column()
+        sub.enabled = has_samples
+        sub.operator("meadow.make_patches", icon='PARTICLE_PATH', text="Update Patches")
+        sub.operator("meadow.rebake_meadow", icon='MOD_PHYSICS', text="Update Physics Cache")
 
 
 class MeadowOperatorBase():
@@ -133,6 +144,24 @@ class MakeBlobsOperator(MeadowOperatorBase, Operator):
         return {'FINISHED'}
 
 
+class DeleteBlobsOperator(MeadowOperatorBase, Operator):
+    """Delete Blob objects storing dupli distribution"""
+    bl_idname = "meadow.delete_blobs"
+    bl_label = "Delete Blobs"
+    bl_options = {'REGISTER', 'UNDO'}
+    
+    def execute(self, context):
+        scene = context.scene
+        settings = _settings.get(context)
+        
+        groundob = find_meadow_object(context, 'GROUND')
+        
+        with ObjectSelection():
+            meadow.delete_blobs(context, groundob)
+        
+        return {'FINISHED'}
+
+
 class MakePatchesOperator(MeadowOperatorBase, Operator):
     """Make Patch copies across the grid for simulation and set up duplis"""
     bl_idname = "meadow.make_patches"
@@ -202,6 +231,7 @@ def register():
     bpy.utils.register_class(OBJECT_PT_Meadow)
     
     bpy.utils.register_class(MakeBlobsOperator)
+    bpy.utils.register_class(DeleteBlobsOperator)
     bpy.utils.register_class(MakePatchesOperator)
     bpy.utils.register_class(MakeMeadowOperator)
     bpy.utils.register_class(RebakeMeadowOperator)
@@ -212,6 +242,7 @@ def unregister():
     
     bpy.types.INFO_MT_add.remove(menu_generate_meadow)
     bpy.utils.unregister_class(MakeBlobsOperator)
+    bpy.utils.unregister_class(DeleteBlobsOperator)
     bpy.utils.unregister_class(MakePatchesOperator)
     bpy.utils.unregister_class(MakeMeadowOperator)
     bpy.utils.unregister_class(RebakeMeadowOperator)