From fea989c1f856d38caef28c755af2bc5bbc19b66e Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Fri, 22 Nov 2024 00:56:33 +0100 Subject: [PATCH] Update comments --- novelwriter/core/itemmodel.py | 13 ++++++++----- novelwriter/core/tree.py | 3 ++- novelwriter/gui/projtree.py | 3 ++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/novelwriter/core/itemmodel.py b/novelwriter/core/itemmodel.py index 6da4360f..34579b95 100644 --- a/novelwriter/core/itemmodel.py +++ b/novelwriter/core/itemmodel.py @@ -3,8 +3,8 @@ novelWriter – Project Item Model ================================ File History: -Created: 2024-11-16 [2.7b1] ProjectNode -Created: 2024-11-16 [2.7b1] ProjectModel +Created: 2024-11-16 [2.6b2] ProjectNode +Created: 2024-11-16 [2.6b2] ProjectModel This file is a part of novelWriter Copyright 2018–2024, Veronica Berglyd Olsen @@ -42,7 +42,7 @@ if TYPE_CHECKING: # pragma: no cover logger = logging.getLogger(__name__) -COL_MASK = 0x0100 +C_FACTOR = 0x0100 C_LABEL_TEXT = 0x0000 | Qt.ItemDataRole.DisplayRole C_LABEL_ICON = 0x0000 | Qt.ItemDataRole.DecorationRole @@ -138,7 +138,6 @@ class ProjectNode: def updateCount(self, propagate: bool = True) -> None: """Update counts, and propagate upwards in the tree.""" - # print("Counting", self._item.itemHandle) self._count = self._item.wordCount + sum(c._count for c in self._children) self._cache[C_COUNT_TEXT] = f"{self._count:n}" if propagate and (parent := self._parent): @@ -159,7 +158,7 @@ class ProjectNode: def data(self, column: int, role: Qt.ItemDataRole) -> T_NodeData: """Return cached node data.""" - return self._cache.get(COL_MASK*column | role) + return self._cache.get(C_FACTOR*column | role) def flags(self) -> Qt.ItemFlag: """Return cached node flags.""" @@ -262,6 +261,10 @@ class ProjectModel(QAbstractItemModel): logger.debug("Delete: ProjectModel") return + ## + # Properties + ## + @property def root(self) -> ProjectNode: """Return the model root item.""" diff --git a/novelwriter/core/tree.py b/novelwriter/core/tree.py index 4bc6df60..e97b8931 100644 --- a/novelwriter/core/tree.py +++ b/novelwriter/core/tree.py @@ -3,7 +3,8 @@ novelWriter – Project Tree Class ================================ File History: -Created: 2020-05-07 [0.4.5] NWTree +Created: 2020-05-07 [0.4.5] NWTree +Rewritten: 2024-11-16 [2.6b2] NWTree This file is a part of novelWriter Copyright 2018–2024, Veronica Berglyd Olsen diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py index 373f9275..4f996c1b 100644 --- a/novelwriter/gui/projtree.py +++ b/novelwriter/gui/projtree.py @@ -7,7 +7,8 @@ Created: 2018-09-29 [0.0.1] GuiProjectTree Created: 2022-06-06 [2.0rc1] GuiProjectView Created: 2022-06-06 [2.0rc1] GuiProjectToolBar Created: 2023-11-22 [2.2rc1] _TreeContextMenu -Rewritten: 2024-11-17 [2.7b1] GuiProjectTree +Rewritten: 2024-11-17 [2.6b2] GuiProjectTree +Rewritten: 2024-11-20 [2.6b2] _TreeContextMenu This file is a part of novelWriter Copyright 2018–2024, Veronica Berglyd Olsen