Minor improvement to the sequence UI to always allow you to cancel editing mode.

2026-08-09 09:21:46 +00:00 · 2022-01-17 15:11:38 +11:00
parent 482788a46f
commit 1a735c4bef
2 changed files with 120 additions and 4 deletions
@@ -161,15 +161,12 @@ class BIM_PT_work_schedules(Panel):
            task = self.tprops.tasks[self.props.active_task_index]
            ifc_definition_id = task.ifc_definition_id
        if ifc_definition_id:
-            if self.props.active_task_id == ifc_definition_id:
+            if self.props.active_task_id:
                if self.props.editing_task_type == "TASKTIME":
                    row.operator("bim.edit_task_time", text="", icon="CHECKMARK")
                elif self.props.editing_task_type == "ATTRIBUTES":
                    row.operator("bim.edit_task", text="", icon="CHECKMARK")
                row.operator("bim.disable_editing_task", text="", icon="CANCEL")
-            elif self.props.active_task_id:
-                row.operator("bim.add_task", text="", icon="ADD").task = ifc_definition_id
-                row.operator("bim.remove_task", text="", icon="X").task = ifc_definition_id
            else:
                row.operator("bim.enable_editing_task_sequence", text="", icon="TRACKING").task = ifc_definition_id
                row.operator("bim.enable_editing_task_time", text="", icon="TIME").task = ifc_definition_id
@@ -0,0 +1,119 @@
+import datetime
+import test.bootstrap
+import ifcopenshell.api
+
+
+class TestCascadeSchedule(test.bootstrap.IFC4):
+    def test_doing_nothing_if_the_task_has_no_successors(self):
+        task = ifcopenshell.api.run("sequence.add_task", self.file)
+        ifcopenshell.api.run("sequence.cascade_schedule", self.file, task=task)
+        assert task.TaskTime is None
+
+    def test_not_affecting_tasks_that_are_not_related(self):
+        task = self._create_task("P1D")
+        task2 = self._create_task("P1D")
+
+        ifcopenshell.api.run("sequence.cascade_schedule", self.file, task=task)
+        assert task.TaskTime.ScheduleStart == "2000-01-01T00:00:00"
+        assert task.TaskTime.ScheduleFinish == "2000-01-02T00:00:00"
+        assert task2.TaskTime.ScheduleStart == "2000-01-01T00:00:00"
+        assert task2.TaskTime.ScheduleFinish == "2000-01-02T00:00:00"
+
+    def test_only_cascading_to_successors_not_predecessors(self):
+        task = self._create_task("P1D")
+        task2 = self._create_task("P2D")
+        task3 = self._create_task("P3D")
+        self._create_sequence(task, task2, "FINISH_START")
+        self._create_sequence(task, task3, "FINISH_START", lag="P1D")
+
+        ifcopenshell.api.run("sequence.cascade_schedule", self.file, task=task2)
+        assert task.TaskTime.ScheduleStart == "2000-01-01T00:00:00"
+        assert task.TaskTime.ScheduleFinish == "2000-01-02T00:00:00"
+        assert task2.TaskTime.ScheduleStart == "2000-01-02T00:00:00"
+        assert task2.TaskTime.ScheduleFinish == "2000-01-04T00:00:00"
+        # We assert that these start finish times have not cascaded
+        assert task3.TaskTime.ScheduleStart == "2000-01-02T00:00:00"
+        assert task3.TaskTime.ScheduleFinish == "2000-01-05T00:00:00"
+
+    def test_cascading_finish_to_start(self):
+        task = self._create_task("P1D")
+        task2 = self._create_task("P2D")
+        task3 = self._create_task("P3D")
+        self._create_sequence(task, task2, "FINISH_START")
+        self._create_sequence(task, task3, "FINISH_START", lag="P1D")
+
+        ifcopenshell.api.run("sequence.cascade_schedule", self.file, task=task)
+        assert task.TaskTime.ScheduleStart == "2000-01-01T00:00:00"
+        assert task.TaskTime.ScheduleFinish == "2000-01-02T00:00:00"
+        assert task2.TaskTime.ScheduleStart == "2000-01-02T00:00:00"
+        assert task2.TaskTime.ScheduleFinish == "2000-01-04T00:00:00"
+        assert task3.TaskTime.ScheduleStart == "2000-01-03T00:00:00"
+        assert task3.TaskTime.ScheduleFinish == "2000-01-06T00:00:00"
+
+    def test_cascading_finish_to_finish(self):
+        task = self._create_task("P1D")
+        task2 = self._create_task("P2D")
+        task3 = self._create_task("P3D")
+        self._create_sequence(task, task2, "FINISH_FINISH")
+        self._create_sequence(task, task3, "FINISH_FINISH", lag="P1D")
+
+        ifcopenshell.api.run("sequence.cascade_schedule", self.file, task=task)
+        assert task.TaskTime.ScheduleStart == "2000-01-01T00:00:00"
+        assert task.TaskTime.ScheduleFinish == "2000-01-02T00:00:00"
+        assert task2.TaskTime.ScheduleStart == "1999-12-31T00:00:00"
+        assert task2.TaskTime.ScheduleFinish == "2000-01-02T00:00:00"
+        assert task3.TaskTime.ScheduleStart == "1999-12-31T00:00:00"
+        assert task3.TaskTime.ScheduleFinish == "2000-01-03T00:00:00"
+
+    def test_cascading_start_to_start(self):
+        task = self._create_task("P1D")
+        task2 = self._create_task("P2D")
+        task3 = self._create_task("P3D")
+        self._create_sequence(task, task2, "START_START")
+        self._create_sequence(task, task3, "START_START", lag="P1D")
+
+        ifcopenshell.api.run("sequence.cascade_schedule", self.file, task=task)
+        assert task.TaskTime.ScheduleStart == "2000-01-01T00:00:00"
+        assert task.TaskTime.ScheduleFinish == "2000-01-02T00:00:00"
+        assert task2.TaskTime.ScheduleStart == "2000-01-01T00:00:00"
+        assert task2.TaskTime.ScheduleFinish == "2000-01-03T00:00:00"
+        assert task3.TaskTime.ScheduleStart == "2000-01-02T00:00:00"
+        assert task3.TaskTime.ScheduleFinish == "2000-01-05T00:00:00"
+
+    def test_cascading_start_to_finish(self):
+        task = self._create_task("P1D")
+        task2 = self._create_task("P2D")
+        task3 = self._create_task("P3D")
+        self._create_sequence(task, task2, "START_FINISH")
+        self._create_sequence(task, task3, "START_FINISH", lag="P1D")
+
+        ifcopenshell.api.run("sequence.cascade_schedule", self.file, task=task)
+        assert task.TaskTime.ScheduleStart == "2000-01-01T00:00:00"
+        assert task.TaskTime.ScheduleFinish == "2000-01-02T00:00:00"
+        assert task2.TaskTime.ScheduleStart == "1999-12-30T00:00:00"
+        assert task2.TaskTime.ScheduleFinish == "2000-01-01T00:00:00"
+        assert task3.TaskTime.ScheduleStart == "1999-12-30T00:00:00"
+        assert task3.TaskTime.ScheduleFinish == "2000-01-02T00:00:00"
+
+    def _create_task(self, duration):
+        task = ifcopenshell.api.run("sequence.add_task", self.file)
+        task_time = ifcopenshell.api.run("sequence.add_task_time", self.file, task=task)
+        ifcopenshell.api.run(
+            "sequence.edit_task_time",
+            self.file,
+            task_time=task_time,
+            attributes={"ScheduleStart": datetime.date(2000, 1, 1), "ScheduleDuration": duration},
+        )
+        return task
+
+    def _create_sequence(self, predecessor, successor, relationship, lag=None):
+        rel = ifcopenshell.api.run(
+            "sequence.assign_sequence", self.file, relating_process=predecessor, related_process=successor
+        )
+        ifcopenshell.api.run(
+            "sequence.edit_sequence", self.file, rel_sequence=rel, attributes={"SequenceType": relationship}
+        )
+        if lag:
+            ifcopenshell.api.run(
+                "sequence.assign_lag_time", self.file, rel_sequence=rel, lag_value=lag, duration_type="WORKTIME"
+            )