[Bf-extensions-cvs] [a32b859f] master: Collection Manager: QCD polishing. Task: T69577
Ryan Inch
noreply at git.blender.org
Mon Mar 30 08:43:34 CEST 2020
Commit: a32b859fecb1a1d269408d0b9730eb5c7fc52c0f
Author: Ryan Inch
Date: Mon Mar 30 02:34:28 2020 -0400
Branches: master
https://developer.blender.org/rBAa32b859fecb1a1d269408d0b9730eb5c7fc52c0f
Collection Manager: QCD polishing. Task: T69577
Made QCD internal structure more stable.
Prevented reload scripts from resetting QCD slots.
Fixed QCD being left in an incorrect state on undo/redo.
Fixed a small error on unregister.
===================================================================
M object_collection_manager/__init__.py
M object_collection_manager/internals.py
M object_collection_manager/operators.py
A object_collection_manager/persistent_data.py
M object_collection_manager/qcd_init.py
M object_collection_manager/qcd_move_widget.py
M object_collection_manager/qcd_operators.py
M object_collection_manager/ui.py
===================================================================
diff --git a/object_collection_manager/__init__.py b/object_collection_manager/__init__.py
index 56450064..de40b9e1 100644
--- a/object_collection_manager/__init__.py
+++ b/object_collection_manager/__init__.py
@@ -22,7 +22,7 @@ bl_info = {
"name": "Collection Manager",
"description": "Manage collections and their objects",
"author": "Ryan Inch",
- "version": (2,4,5),
+ "version": (2,4,9),
"blender": (2, 80, 0),
"location": "View3D - Object Mode (Shortcut - M)",
"warning": '', # used for warning icon and text in addons panel
@@ -126,6 +126,9 @@ def register():
qcd_init.register_qcd()
def unregister():
+ if bpy.context.preferences.addons[__package__].preferences.enable_qcd:
+ qcd_init.unregister_qcd()
+
for cls in classes:
bpy.utils.unregister_class(cls)
@@ -136,8 +139,6 @@ def unregister():
km.keymap_items.remove(kmi)
addon_keymaps.clear()
- qcd_init.unregister_qcd()
-
if __name__ == "__main__":
register()
diff --git a/object_collection_manager/internals.py b/object_collection_manager/internals.py
index 5ebc6025..116eb38c 100644
--- a/object_collection_manager/internals.py
+++ b/object_collection_manager/internals.py
@@ -18,6 +18,8 @@
# Copyright 2011, Ryan Inch
+from . import persistent_data
+
import bpy
from bpy.types import (
@@ -45,21 +47,23 @@ class QCDSlots():
overrides = {}
allow_update = True
+ def __init__(self):
+ self._slots = persistent_data.slots
+ self.overrides = persistent_data.overrides
+
def __iter__(self):
return self._slots.items().__iter__()
def __repr__(self):
return self._slots.__repr__()
- def __contains__(self, key):
- try:
- int(key)
- return key in self._slots
+ def contains(self, *, idx=None, name=None):
+ if idx:
+ return idx in self._slots.keys()
+ if name:
+ return name in self._slots.values()
- except ValueError:
- return key in self._slots.values()
-
- return False
+ raise
def get_data_for_blend(self):
return f"{self._slots.__repr__()}\n{self.overrides.__repr__()}"
@@ -69,8 +73,14 @@ class QCDSlots():
blend_slots = eval(decoupled_data[0])
blend_overrides = eval(decoupled_data[1])
- self._slots = blend_slots
- self.overrides = blend_overrides
+ self._slots.clear()
+ self.overrides.clear()
+
+ for k, v in blend_slots.items():
+ self._slots[k] = v
+
+ for k, v in blend_overrides.items():
+ self.overrides[k] = v
def length(self):
return len(self._slots)
@@ -91,21 +101,64 @@ class QCDSlots():
def add_slot(self, idx, name):
self._slots[idx] = name
- def update_slot(self, idx, name):
- self._slots[idx] = name
+ if name in self.overrides:
+ del self.overrides[name]
- def del_slot(self, slot):
- try:
- int(slot)
- del self._slots[slot]
+ def update_slot(self, idx, name):
+ self.add_slot(idx, name)
- except ValueError:
- idx = self.get_idx(slot)
+ def del_slot(self, *, idx=None, name=None):
+ if idx and not name:
del self._slots[idx]
+ return
+
+ if name and not idx:
+ slot_idx = self.get_idx(name)
+ del self._slots[slot_idx]
+ return
- def clear(self):
+ raise
+
+ def add_override(self, name):
+ qcd_slots.del_slot(name=name)
+ qcd_slots.overrides[name] = True
+
+ def clear_slots(self):
self._slots.clear()
+ def update_qcd(self):
+ for idx, name in list(self._slots.items()):
+ if not layer_collections.get(name, None):
+ qcd_slots.del_slot(name=name)
+
+ def auto_numerate(self, *, renumerate=False):
+ global max_lvl
+
+ if self.length() < 20:
+ lvl = 0
+ num = 1
+ while lvl <= max_lvl:
+ if num > 20:
+ break
+
+ for laycol in layer_collections.values():
+ if num > 20:
+ break
+
+ if int(laycol["lvl"]) == lvl:
+ if laycol["name"] in qcd_slots.overrides:
+ if not renumerate:
+ num += 1
+ continue
+
+ if (not self.contains(idx=str(num)) and
+ not self.contains(name=laycol["name"])):
+ self.add_slot(str(num), laycol["name"])
+
+ num += 1
+
+ lvl += 1
+
qcd_slots = QCDSlots()
@@ -140,45 +193,39 @@ def update_qcd_slot(self, context):
update_needed = False
try:
- int(self.qcd_slot)
+ int(self.qcd_slot_idx)
except:
- if self.qcd_slot == "":
- qcd_slots.del_slot(self.name)
- qcd_slots.overrides[self.name] = True
+ if self.qcd_slot_idx == "":
+ qcd_slots.add_override(self.name)
- if self.name in qcd_slots:
+ if qcd_slots.contains(name=self.name):
qcd_slots.allow_update = False
- self.qcd_slot = qcd_slots.get_idx(self.name)
+ self.qcd_slot_idx = qcd_slots.get_idx(self.name)
qcd_slots.allow_update = True
if self.name in qcd_slots.overrides:
qcd_slots.allow_update = False
- self.qcd_slot = ""
+ self.qcd_slot_idx = ""
qcd_slots.allow_update = True
return
- if self.name in qcd_slots:
- qcd_slots.del_slot(self.name)
+ if qcd_slots.contains(name=self.name):
+ qcd_slots.del_slot(name=self.name)
update_needed = True
- if self.qcd_slot in qcd_slots:
- qcd_slots.overrides[qcd_slots.get_name(self.qcd_slot)] = True
- qcd_slots.del_slot(self.qcd_slot)
+ if qcd_slots.contains(idx=self.qcd_slot_idx):
+ qcd_slots.add_override(qcd_slots.get_name(self.qcd_slot_idx))
update_needed = True
- if int(self.qcd_slot) > 20:
- self.qcd_slot = "20"
+ if int(self.qcd_slot_idx) > 20:
+ self.qcd_slot_idx = "20"
- if int(self.qcd_slot) < 1:
- self.qcd_slot = "1"
-
- qcd_slots.add_slot(self.qcd_slot, self.name)
-
- if self.name in qcd_slots.overrides:
- del qcd_slots.overrides[self.name]
+ if int(self.qcd_slot_idx) < 1:
+ self.qcd_slot_idx = "1"
+ qcd_slots.add_slot(self.qcd_slot_idx, self.name)
if update_needed:
update_property_group(context)
@@ -187,10 +234,10 @@ def update_qcd_slot(self, context):
class CMListCollection(PropertyGroup):
name: StringProperty(update=update_col_name)
last_name: StringProperty()
- qcd_slot: StringProperty(name="QCD Slot", update=update_qcd_slot)
+ qcd_slot_idx: StringProperty(name="QCD Slot", update=update_qcd_slot)
-def update_collection_tree(context, renumerate=False):
+def update_collection_tree(context, *, renumerate_qcd=False):
global max_lvl
global row_index
global collection_tree
@@ -222,36 +269,9 @@ def update_collection_tree(context, renumerate=False):
for laycol in master_laycol["children"]:
collection_tree.append(laycol)
- # update qcd
- for x in range(20):
- qcd_slot = qcd_slots.get_name(str(x+1))
- if qcd_slot and not layer_collections.get(qcd_slot, None):
- qcd_slots.del_slot(qcd_slot)
-
- # update autonumeration
- if qcd_slots.length() < 20:
- lvl = 0
- num = 1
- while lvl <= max_lvl:
- if num > 20:
- break
-
- for laycol in layer_collections.values():
- if num > 20:
- break
-
- if int(laycol["lvl"]) == lvl:
- if laycol["name"] in qcd_slots.overrides:
- if not renumerate:
- num += 1
- continue
-
- if str(num) not in qcd_slots and laycol["name"] not in qcd_slots:
- qcd_slots.add_slot(str(num), laycol["name"])
-
- num += 1
+ qcd_slots.update_qcd()
- lvl += 1
+ qcd_slots.auto_numerate(renumerate=renumerate_qcd)
def get_all_collections(context, collections, parent, tree, level=0, visible=False):
@@ -290,13 +310,13 @@ def get_all_collections(context, collections, parent, tree, level=0, visible=Fal
get_all_collections(context, item.children, laycol, laycol["children"], level+1)
-def update_property_group(context, renumerate=False):
+def update_property_group(context, *, renumerate_qcd=False):
global collection_tree
global qcd_slots
qcd_slots.allow_update = False
- update_collection_tree(context, renumerate)
+ update_collection_tree(context, renumerate_qcd=renumerate_qcd)
context.scene.collection_manager.cm_list_collection.clear()
create_property_group(context, collection_tree)
@@ -312,7 +332,7 @@ def create_property_group(context, tree):
for laycol in tree:
new_cm_listitem = cm.cm_list_collection.add()
new_cm_listitem.name = laycol["name"]
- new_cm_listitem.qcd_slot = qcd_slots.get_idx(laycol["name"], "")
+ new_cm_listitem.qcd_slot_idx = qcd_slots.get_idx(laycol["name"], "")
if laycol["has_children"]:
create_property_group(context, laycol["children"])
diff --git a/object_collection_manager/operators.py b/object_collection_manager/operators.py
index bf7a77f8..c8c10336 100644
--- a/object_collection_manager/operators.py
+++ b/object_collection_manager/operators.py
@@ -1905,8 +1905,8 @@ class CMRemoveCollectionOperator(Operator):
# update qcd
- if self.collection_name in qcd_slots:
- qcd_slots.del_slot(self.collection_name)
+ if qcd_slots.contains(name=self.collection_name):
+ qcd_slots.del_slot(name=self.collection_name)
if self.collection_name in qcd_slots.overrides:
del qcd_slots.overrides[se
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list