From 0a6ced74e54a60fbeb70c7b0fa835f624e91c9cf Mon Sep 17 00:00:00 2001 From: copper Date: Mon, 23 May 2022 21:14:24 +0800 Subject: [PATCH] add del --- log.txt | 8 ++++---- rscder/utils/project.py | 12 ++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/log.txt b/log.txt index d59c2a5..d551d01 100644 --- a/log.txt +++ b/log.txt @@ -1,4 +1,4 @@ -2022-05-23 19:52:34,008 - root - INFO - lic data:2022-12-01 00:00:00 -2022-05-23 19:52:34,012 - root - INFO - remain_days: 191 -2022-05-23 19:52:35,282 - root - INFO - lic data:2022-12-01 00:00:00 -2022-05-23 19:52:35,282 - root - INFO - remain_days: 191 +2022-05-23 21:09:46,286 - root - INFO - lic data:2022-12-01 00:00:00 +2022-05-23 21:09:46,286 - root - INFO - remain_days: 191 +2022-05-23 21:09:47,553 - root - INFO - lic data:2022-12-01 00:00:00 +2022-05-23 21:09:47,553 - root - INFO - remain_days: 191 diff --git a/rscder/utils/project.py b/rscder/utils/project.py index bbae413..953abb8 100644 --- a/rscder/utils/project.py +++ b/rscder/utils/project.py @@ -240,6 +240,7 @@ class BasicLayer(QObject): self.path_mode = path_mode self.view_mode = view_mode self.layer = None + self.layer_parent = None self.layer_tree_update.connect(Project().layer_tree_update) self.layer_show_update.connect(Project().layer_show_update) self.zoom_to_layer.connect(Project().zoom_to_layer) @@ -289,7 +290,12 @@ class BasicLayer(QObject): del_action = QAction(IconInstance().DELETE, '删除图层', self) def del_layer(): - Project().remove_layer(self) + if self.layer_parent is None: + Project().layers.pop(self.id) + else: + self.layer_parent.remove_layer(self) + self.layer_tree_update.emit() + self.layer_show_update.emit() del_action.triggered.connect(del_layer) actions.append(del_action) @@ -359,9 +365,7 @@ class GridLayer(BasicLayer): lines_layer.commitChanges() self.layer = lines_layer - self.set_render() - - + self.set_render() class RasterLayer(BasicLayer):