From 358d19c88375bcbf906406dcb0a9942a20991452 Mon Sep 17 00:00:00 2001 From: Sigma Dimensions <79010126+myoualid@users.noreply.github.com> Date: Fri, 20 Jan 2023 13:51:08 +0100 Subject: [PATCH] BBIM: fix bug where task inputs could also be "USERDEFINED" or "NOTDEFINED" --- src/blenderbim/blenderbim/tool/sequence.py | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/blenderbim/blenderbim/tool/sequence.py b/src/blenderbim/blenderbim/tool/sequence.py index 1bf083b666..c022d735e0 100644 --- a/src/blenderbim/blenderbim/tool/sequence.py +++ b/src/blenderbim/blenderbim/tool/sequence.py @@ -1064,6 +1064,14 @@ class Sequence(blenderbim.core.tool.Sequence): "PredefinedType": ["CONSTRUCTION", "INSTALLATION"], "Color": (0.0, 1.0, 0.0), }, + "OPERATION": { + "PredefinedType": ["ATTENDANCE", "MAINTENANCE", "OPERATION", "RENOVATION"], + "Color": (0.0, 0.0, 1.0), + }, + "MOVEMENT_TO": { + "PredefinedType": ["LOGISTIC", "MOVE"], + "Color": (1.0, 1.0, 0.0), + }, "DESTRUCTION": { "PredefinedType": ["DEMOLITION", "DISMANTLE", "DISPOSAL", "REMOVAL"], "Color": (1.0, 0.0, 0.0), @@ -1072,14 +1080,6 @@ class Sequence(blenderbim.core.tool.Sequence): "PredefinedType": ["LOGISTIC", "MOVE"], "Color": (1.0, 0.5, 0.0), }, - "MOVEMENT_TO": { - "PredefinedType": ["LOGISTIC", "MOVE"], - "Color": (1.0, 1.0, 0.0), - }, - "OPERATION": { - "PredefinedType": ["ATTENDANCE", "MAINTENANCE", "OPERATION", "RENOVATION"], - "Color": (0.0, 0.0, 1.0), - }, "USERDEFINED": { "PredefinedType": ["USERDEFINED", "NOTDEFINED"], "Color": (0.2, 0.2, 0.2), @@ -1091,8 +1091,12 @@ class Sequence(blenderbim.core.tool.Sequence): predefined_type_item = props.task_colors_components_outputs.add() elif group in ["MOVEMENT_FROM", "DESTRUCTION"]: predefined_type_item = props.task_colors_components_inputs.add() - else: - predefined_type_item = props.task_colors_components_outputs.add() + elif group == "USERDEFINED": + predefined_type_item = props.task_colors_components_inputs.add() + predefined_type_item2 = props.task_colors_components_outputs.add() + predefined_type_item2.name = predefined_type + predefined_type_item2.color = data["Color"] + # TO DO: consider cases where users confuses inputs and outputs predefined_type_item.name = predefined_type predefined_type_item.color = data["Color"]