tksheet 7.1.1__py3-none-any.whl → 7.1.2__py3-none-any.whl

tksheet/__init__.py

@@ -4,7 +4,7 @@
 tksheet - A Python tkinter table widget
 """
 
-__version__ = "7.1.1"
+__version__ = "7.1.2"
 
 from .colors import (
     color_map,

tksheet/main_table.py

@@ -1099,29 +1099,16 @@ class MainTable(tk.Canvas):
     def get_max_column_idx(self, maxidx: int | None = None) -> int:
         if maxidx is None:
             maxidx = len_to_idx(self.total_data_cols())
-        # max column number in cell_options
-        if maxidx < (maxk := max(self.cell_options, key=itemgetter(1), default=(0, 0))[1]):
-            maxidx = maxk
-        # max column number in column_options, index cell options
-        for d in (self.col_options, self.CH.cell_options):
-            if maxidx < (maxk := max(d, default=0)):
-                maxidx = maxk
-        # max column number in named spans
-        if maxidx < (
-            maxk := max(
-                (d["from_c"] for d in self.named_spans.values() if isinstance(d["from_c"], int)),
-                default=0,
-            )
-        ):
-            maxidx = maxk
-        if maxidx < (
-            maxk := max(
-                (d["upto_c"] for d in self.named_spans.values() if isinstance(d["upto_c"], int)),
-                default=0,
-            )
-        ):
-            maxidx = maxk
-        return maxidx
+        maxiget = partial(max, key=itemgetter(1))
+        return max(
+            max(self.cell_options, key=itemgetter(1), default=(0, maxidx))[1],
+            max(self.col_options, default=maxidx),
+            max(self.CH.cell_options, default=maxidx),
+            maxiget(map(maxiget, self.tagged_cells.values()), default=(0, maxidx))[1],
+            max(map(max, self.tagged_columns.values()), default=maxidx),
+            max((d.from_c for d in self.named_spans.values() if isinstance(d.from_c, int)), default=maxidx),
+            max((d.upto_c for d in self.named_spans.values() if isinstance(d.upto_c, int)), default=maxidx),
+        )
 
     def get_args_for_move_rows(
         self,
@@ -1329,28 +1316,16 @@ class MainTable(tk.Canvas):
     def get_max_row_idx(self, maxidx: int | None = None) -> int:
         if maxidx is None:
             maxidx = len_to_idx(self.total_data_rows())
-        if maxidx < (maxk := max(self.cell_options, key=itemgetter(0), default=(0, 0))[0]):
-            maxidx = maxk
-        # max row number in row_options, index cell options
-        for d in (self.row_options, self.RI.cell_options):
-            if maxidx < (maxk := max(d, default=0)):
-                maxidx = maxk
-        # max row number in named spans
-        if maxidx < (
-            maxk := max(
-                (d["from_r"] for d in self.named_spans.values() if isinstance(d["from_r"], int)),
-                default=0,
-            )
-        ):
-            maxidx = maxk
-        if maxidx < (
-            maxk := max(
-                (d["upto_r"] for d in self.named_spans.values() if isinstance(d["upto_r"], int)),
-                default=0,
-            )
-        ):
-            maxidx = maxk
-        return maxidx
+        maxiget = partial(max, key=itemgetter(0))
+        return max(
+            max(self.cell_options, key=itemgetter(0), default=(maxidx, 0))[0],
+            max(self.row_options, default=maxidx),
+            max(self.RI.cell_options, default=maxidx),
+            maxiget(map(maxiget, self.tagged_cells.values()), default=(maxidx, 0))[0],
+            max(map(max, self.tagged_rows.values()), default=maxidx),
+            max((d.from_r for d in self.named_spans.values() if isinstance(d.from_r, int)), default=maxidx),
+            max((d.upto_r for d in self.named_spans.values() if isinstance(d.upto_r, int)), default=maxidx),
+        )
 
     def get_full_new_idxs(
         self,
@@ -3982,7 +3957,7 @@ class MainTable(tk.Canvas):
                         # if to_add then it's an undo/redo and don't
                         # need to create fresh options
                         if create_ops:
-                            # if rows are none it's a row options span
+                            # if cols are none it's a row options span
                             if span["from_c"] is None:
                                 new_ops(
                                     mod_span(
@@ -6293,7 +6268,7 @@ class MainTable(tk.Canvas):
             box.coords.from_c <= c and box.coords.upto_c > c
             for item, box in self.get_selection_items(
                 cells=False,
-                columns=False,
+                rows=False,
             )
         )
 

tksheet/row_index.py

@@ -129,7 +129,7 @@ class RowIndex(tk.Canvas):
         self.align = kwargs["row_index_align"]
         self.default_index = kwargs["default_row_index"].lower()
 
-        self.reset_tree()
+        self.tree_reset()
         self.basic_bindings()
 
     def basic_bindings(self, enable: bool = True) -> None:
@@ -148,7 +148,7 @@ class RowIndex(tk.Canvas):
             self.unbind("<Double-Button-1>")
             self.unbind(rc_binding)
 
-    def reset_tree(self) -> None:
+    def tree_reset(self) -> None:
         # treeview mode
         self.tree = {}
         self.tree_open_ids = set()

tksheet/sheet.py

@@ -1476,7 +1476,7 @@ class Sheet(tk.Frame):
         if sheet_options:
             self.ops = new_sheet_options()
         if tree:
-            self.RI.reset_tree()
+            self.RI.tree_reset()
         self.set_refresh_timer(redraw)
         return self
 
@@ -2998,9 +2998,10 @@ class Sheet(tk.Frame):
 
     def get_selected_min_max(
         self,
-    ) -> (
-        tuple[int, int, int, int] | tuple[None, None, None, None]
-    ):  # returns (min_y, min_x, max_y, max_x) of any selections including rows/columns
+    ) -> tuple[int, int, int, int] | tuple[None, None, None, None]:
+        """
+        Returns (min_y, min_x, max_y, max_x) of all selection boxes
+        """
         return self.MT.get_selected_min_max()
 
     # Modifying Selected Cells
@@ -3286,12 +3287,12 @@ class Sheet(tk.Frame):
 
     def get_column_widths(self, canvas_positions: bool = False) -> list[float]:
         if canvas_positions:
-            return [int(n) for n in self.MT.col_positions]
+            return self.MT.col_positions
         return self.MT.get_column_widths()
 
     def get_row_heights(self, canvas_positions: bool = False) -> list[float]:
         if canvas_positions:
-            return [int(n) for n in self.MT.row_positions]
+            return self.MT.row_positions
         return self.MT.get_row_heights()
 
     def set_column_widths(
@@ -4391,6 +4392,61 @@ class Sheet(tk.Frame):
         )
         return self
 
+    def tree_reset(self) -> Sheet:
+        self.deselect()
+        self.RI.tree_reset()
+        return self
+
+    def tree_get_open(self) -> set[str]:
+        """
+        Returns the set[str] of iids that are open in the treeview
+        """
+        return self.RI.tree_open_ids
+
+    def tree_set_open(self, open_ids: set[str]) -> Sheet:
+        """
+        Accepts set[str] of iids that are open in the treeview
+        Closes everything else
+        """
+        self.RI.tree_open_ids = open_ids
+        self.hide_rows(
+            set(self.MT.displayed_rows),
+            redraw=False,
+            deselect_all=False,
+            data_indexes=True,
+        )
+        self.show_rows(
+            (self.RI.tree_rns[iid] for iid in self.get_children("")),
+            redraw=False,
+            deselect_all=True,
+        )
+        self.tree_open(*open_ids)
+        return self
+
+    def tree_open(self, *items) -> Sheet:
+        """
+        If used without args all items are opened
+        """
+        if items:
+            for item in items:
+                self.item(item, open_=True)
+        else:
+            for item in self.get_children():
+                self.item(item, open_=True)
+        return self
+
+    def tree_close(self, *items) -> Sheet:
+        """
+        If used without args all items are closed
+        """
+        if items:
+            for item in items:
+                self.item(item, open_=False)
+        else:
+            for item in self.get_children():
+                self.item(item, open_=False)
+        return self
+
     def insert(
         self,
         parent: str = "",
@@ -4460,7 +4516,12 @@ class Sheet(tk.Frame):
         text: str | None = None,
         values: list | None = None,
         open_: bool | None = None,
-    ) -> DotDict:
+    ) -> DotDict | Sheet:
+        """
+        Modify options for item
+        If no options are set then returns DotDict of options for item
+        Else returns Sheet
+        """
         if not (item := item.lower()) or item not in self.RI.tree:
             raise ValueError(f"Item '{item}' does not exist.")
         if isinstance(iid, str):
@@ -4479,28 +4540,33 @@ class Sheet(tk.Frame):
         if isinstance(values, list):
             self.set_data(self.RI.tree_rns[item], values)
         if isinstance(open_, bool):
-            if not self.RI.tree[item].children or not open_:
+            if self.RI.tree[item].children:
+                if open_:
+                    self.RI.tree_open_ids.add(item)
+                    self.show_rows(
+                        (self.RI.tree_rns[did] for did in self.RI.get_iid_descendants(item, check_open=True)),
+                        redraw=False,
+                        deselect_all=False,
+                    )
+                else:
+                    self.RI.tree_open_ids.discard(item)
+                    self.hide_rows(
+                        (self.RI.tree_rns[did] for did in self.RI.get_iid_descendants(item)),
+                        redraw=False,
+                        deselect_all=False,
+                        data_indexes=True,
+                    )
+            else:
                 self.RI.tree_open_ids.discard(item)
-            if open_:
-                self.RI.tree_open_ids.add(item)
-                self.show_rows(
-                    (self.RI.tree_rns[did] for did in self.RI.get_iid_descendants(item, check_open=True)),
-                    redraw=False,
-                    deselect_all=False,
-                )
-            elif self.RI.tree[item].children:
-                self.hide_rows(
-                    (self.RI.tree_rns[did] for did in self.RI.get_iid_descendants(item)),
-                    redraw=False,
-                    deselect_all=False,
-                    data_indexes=True,
-                )
-        self.set_refresh_timer(isinstance(text, str) or isinstance(values, list) or isinstance(open_, bool))
-        return DotDict(
-            text=self.RI.tree[item].text,
-            values=self[self.RI.tree_rns[item]].options(ndim=1).data,
-            open_=item in self.RI.tree_open_ids,
-        )
+        get = not (isinstance(iid, str) or isinstance(text, str) or isinstance(values, list) or isinstance(open_, bool))
+        self.set_refresh_timer(redraw=not get)
+        if get:
+            return DotDict(
+                text=self.RI.tree[item].text,
+                values=self[self.RI.tree_rns[item]].options(ndim=1).data,
+                open_=item in self.RI.tree_open_ids,
+            )
+        return self
 
     def itemrow(self, item: str) -> int:
         return self.RI.tree_rns[item.lower()]
@@ -4522,11 +4588,6 @@ class Sheet(tk.Frame):
         else:
             yield from (n.iid for n in self.RI.tree[item].children)
 
-    def reset_tree(self) -> Sheet:
-        self.deselect()
-        self.RI.reset_tree()
-        return self
-
     def del_items(self, *items) -> Sheet:
         """
         Also deletes all descendants of items

{tksheet-7.1.1.dist-info → tksheet-7.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tksheet
-Version: 7.1.1
+Version: 7.1.2
 Summary: Tkinter table / sheet widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors

{tksheet-7.1.1.dist-info → tksheet-7.1.2.dist-info}/RECORD

@@ -1,20 +1,20 @@
-tksheet/__init__.py,sha256=-P8w8KS0O82elJMwvIYsdoTCWYEV3mRGX_60GToTxWI,1874
+tksheet/__init__.py,sha256=XdNk6UqANLa3RfjSgcbjOXH8Rjtf-9LLCGU8EESkoMY,1874
 tksheet/colors.py,sha256=1k06VorynLmnC4FdJg8H4reIA6rXaeXBpdMwXLhN8oc,51594
 tksheet/column_headers.py,sha256=1I49CQS4unBcJ-y044R-DtYhJ4zUplrOfImOk8qHIj8,99396
 tksheet/formatters.py,sha256=DXif00aq9DgFpXwkbiqD86KxtDg0Meop51hLY-KcGNQ,10037
 tksheet/functions.py,sha256=NnBFBvTqT6VhCK8pFlXqTwKekKpcsCYeuxaALcJeVzw,38651
-tksheet/main_table.py,sha256=SwJVPoivJuu8D37lvoo1Hn52P75TvjFwg-E2QHILhuw,319302
+tksheet/main_table.py,sha256=Kh8ND0JnVHVeiwTt07FJkbP2GTlen3qCS5bt0xpbrdA,318848
 tksheet/other_classes.py,sha256=s559IxoFEeAgxTKrrHZnAeXUXWIEmiP4tBncIdQIXSQ,13544
-tksheet/row_index.py,sha256=4Q_J83AKKZhajeK23_deby9CXfL4wl1MOWnSu8LW2PU,104428
-tksheet/sheet.py,sha256=66AKMY-wNiLi2briyUlbUHtsVNwEWKnljx58q1c1tKU,254086
+tksheet/row_index.py,sha256=GzK6Gfi4v6zwALn5IvBz22SdSFLUgxS1yLX4bm7z3sg,104428
+tksheet/sheet.py,sha256=ZoxxO1VZZzgshmp_3eJkkzXjx6S3M5T95sw3CTfUqHo,255904
 tksheet/sheet_options.py,sha256=Vcy4RxTKvf2HM-Yc53ex0lpBe6ATXc_pdx4oLhfjDgU,11906
 tksheet/text_editor.py,sha256=7xsEbgIyAWHDBWroh2wk1VeoVftFALlPZC9OANgD6LA,6662
 tksheet/themes.py,sha256=OwUe31NRbosjw3ZoZsMyB8lNVyYin9YcKLhCturi5q8,13398
 tksheet/top_left_rectangle.py,sha256=-2u9GfOvcqhkKwHEtbqdFvXCY3RbvL5k2Sh9l3r_k04,8275
 tksheet/types.py,sha256=IgoEHMbceKpakcZtanxKaKJ4RdCq7UW6EoEIIz5O59k,340
 tksheet/vars.py,sha256=Iukk7-MMT9X7vv0m3nQPKzbp2Iw2Pg1wJEW7js919Mo,2092
-tksheet-7.1.1.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.1.1.dist-info/METADATA,sha256=2PCCoZogg-1iMfDoYbKCV6a_2N8Tf0kYgIX4o908q98,6013
-tksheet-7.1.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-tksheet-7.1.1.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.1.1.dist-info/RECORD,,
+tksheet-7.1.2.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.1.2.dist-info/METADATA,sha256=plUvLhmwtF-WEveHRmf99r4YViVdRJDZTCCJ6noYtZU,6013
+tksheet-7.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+tksheet-7.1.2.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.1.2.dist-info/RECORD,,