bspy 4.0__py3-none-any.whl → 4.1__py3-none-any.whl

bspy/viewer.py

@@ -1,10 +1,10 @@
 import numpy as np
 import tkinter as tk
+from tkinter.ttk import Treeview
 from tkinter.colorchooser import askcolor
 from tkinter import filedialog
 import queue, threading
-from bspy import SplineOpenGLFrame
-from bspy import Spline
+from bspy import SplineOpenGLFrame, Solid, Boundary, Hyperplane, Spline
 
 class _BitCheckbutton(tk.Checkbutton):
     """A tkinter `CheckButton` that gets/sets its variable based on a given `bitmask`."""
@@ -37,7 +37,7 @@ class _BitCheckbutton(tk.Checkbutton):
 
 class Viewer(tk.Tk):
     """
-    A tkinter viewer (`tkinter.Tk`) that hosts a `SplineOpenGLFrame`, a listbox full of 
+    A tkinter viewer (`tkinter.Tk`) that hosts a `SplineOpenGLFrame`, a treeview full of 
     splines, and a set of controls to adjust and view the selected splines.
 
     See Also
@@ -46,11 +46,11 @@ class Viewer(tk.Tk):
 
     Examples
     --------
-    Creates a Viewer, show some splines, and launches the viewer (blocks on the main loop).
+    Creates a Viewer, lists three splines, drawing (selecting) the third, and launches the viewer (blocks on the main loop).
     >>> viewer = Viewer()
-    >>> viewer.show(spline1)
-    >>> viewer.show(spline2)
-    >>> viewer.show(spline3)
+    >>> viewer.list(spline1)
+    >>> viewer.list(spline2)
+    >>> viewer.draw(spline3)
     >>> viewer.mainloop()
     """
 
@@ -76,17 +76,20 @@ class Viewer(tk.Tk):
         horizontalScroll = tk.Scrollbar(controls, orient=tk.HORIZONTAL)
         horizontalScroll.pack(side=tk.BOTTOM, fill=tk.X)
 
-        self.listBox = tk.Listbox(controls, selectmode=tk.EXTENDED)
-        self.listBox.pack(side=tk.LEFT, fill=tk.Y)
-        self.listBox.bind('<<ListboxSelect>>', self._ListSelectionChanged)
-
+        treeFrame = tk.Frame(controls, width=120)
+        treeFrame.pack(side=tk.LEFT, fill=tk.Y)
+        treeFrame.pack_propagate(0)
+        self.treeview = Treeview(treeFrame, show='tree')
+        self.treeview.pack(side=tk.LEFT, fill=tk.Y)
+        self.treeview.bind('<<TreeviewSelect>>', self._ListSelectionChanged)
+        self.bind('<Control-a>', lambda *args: self.treeview.selection_add(self.treeview.get_children()))
         verticalScroll = tk.Scrollbar(controls, orient=tk.VERTICAL)
         verticalScroll.pack(side=tk.LEFT, fill=tk.Y)
 
-        horizontalScroll.config(command=self.listBox.xview)
-        self.listBox.configure(xscrollcommand=horizontalScroll.set)
-        verticalScroll.config(command=self.listBox.yview)
-        self.listBox.configure(yscrollcommand=verticalScroll.set)
+        horizontalScroll.config(command=self.treeview.xview)
+        self.treeview.configure(xscrollcommand=horizontalScroll.set)
+        verticalScroll.config(command=self.treeview.yview)
+        self.treeview.configure(yscrollcommand=verticalScroll.set)
 
         # Controls on the right
         controls = tk.Frame(self)
@@ -107,15 +110,15 @@ class Viewer(tk.Tk):
         self.scale.pack(side=tk.LEFT)
         self.scale.set(0.5)
 
-        self.splineList = []
+        self.splineList = {}
+        self.solidList = []
         self.splineDrawList = []
         self.splineRadius = 0.0
         self.adjust = None
         self.workQueue = workQueue
         if self.workQueue is not None:
             self.work = {
-                "show" : self.show,
-                "draw" : self.draw,
+                "list" : self.list,
                 "erase_all" : self.erase_all,
                 "empty" : self.empty,
                 "set_background_color" : self.set_background_color,
@@ -135,61 +138,99 @@ class Viewer(tk.Tk):
                     self.work[work[0]](*work[1])
         self.after(200, self._check_for_work)
 
-    def list(self, spline, name = None):
-        """List a `Spline` in the listbox. Can be called before viewer is running."""
-        self.frame.make_drawable(spline)
-        if name is not None:
-            spline.metadata["Name"] = name
-        self.splineList.append(spline)
-        self.listBox.insert(tk.END, spline.metadata.get("Name", f"Spline({spline.nInd}, {spline.nDep})"))
-
-    def show(self, spline, name = None):
-        """Show a `Spline` in the listbox (calls the list method, kept for compatibility). Can be called before viewer is running."""
-        self.list(spline, name)
-        
-    def draw(self, spline, name = None):
-        """Add a `Spline` to the listbox and draw it. Can be called before the viewer is running."""
-        self.list(spline, name)
-        self.listBox.selection_set(self.listBox.size() - 1)
-        self.update()
+    def list(self, spline, name = None, fillColor=None, lineColor=None, options=None, draw=False, parentIID = ''):
+        """List a `Spline`, `Boundary`, or `Solid` in the treeview. Can be called before viewer is running."""
+        if isinstance(spline, Solid):
+            solid = spline
+            if solid.dimension != 3:
+                return
+            if name is None:
+                name = "Solid"
+            iid = self.treeview.insert('', 'end', text=name, open=False)
+            self.splineList[iid] = solid
+            self.solidList.append(solid)
+            if draw:
+                self.treeview.selection_add(iid)
+            for i, boundary in enumerate(solid.boundaries):
+                self.list(boundary, f"{name} boundary {i+1}", fillColor, lineColor, options, False, iid)
+        elif isinstance(spline, Boundary):
+            boundary = spline
+            if isinstance(boundary.manifold, Hyperplane):
+                uvMin = boundary.domain.bounds[:,0]
+                uvMax = boundary.domain.bounds[:,1]
+                xyzMinMin = boundary.manifold.evaluate(uvMin)
+                xyzMinMax = boundary.manifold.evaluate((uvMin[0], uvMax[1]))
+                xyzMaxMin = boundary.manifold.evaluate((uvMax[0], uvMin[1]))
+                xyzMaxMax = boundary.manifold.evaluate(uvMax)
+                spline = Spline(2, 3, (2, 2), (2, 2), 
+                    np.array((uvMin, uvMin, uvMax, uvMax), np.float32).T,
+                    np.array(((xyzMinMin, xyzMaxMin), (xyzMinMax, xyzMaxMax)), np.float32).T)
+            elif isinstance(boundary.manifold, Spline):
+                spline = boundary.manifold
+            if not hasattr(spline, "cache"):
+                spline.cache = {}
+            spline.cache["trim"] = self.frame.tessellate2DSolid(boundary.domain)
+            self.list(spline, name, fillColor, lineColor, options, draw, parentIID)
+        else:
+            if "Name" not in spline.metadata:
+                spline.metadata["Name"] = f"Spline({spline.nInd}, {spline.nDep})" if name is None else name
+            if fillColor is not None:
+                spline.metadata["fillColor"] = fillColor
+            if lineColor is not None:
+                spline.metadata["lineColor"] = lineColor
+            if options is not None:
+                spline.metadata["options"] = options
+            self.frame.make_drawable(spline)
+            iid = self.treeview.insert(parentIID, 'end', text=spline.metadata["Name"])
+            self.splineList[iid] = spline
+            if draw:
+                self.treeview.selection_add(iid)
+
+    show = list
+
+    def draw(self, spline, name = None, fillColor=None, lineColor=None, options=None):
+        """List a `Spline`, `Boundary`, or `Solid` in the treeview and draw it in the viewer. Can be called before viewer is running."""
+        self.list(spline, name, fillColor, lineColor, options, True)
 
     def save_splines(self):
-        if self.splineDrawList:
-            initialName = self.splineDrawList[0].metadata.get("Name", "spline") + ".json"
+        splines = [self.splineList[item] for item in self.treeview.selection()]
+        if splines:
+            initialName = self.treeview.item(self.treeview.selection()[0])["text"] + ".json"
             fileName = filedialog.asksaveasfilename(title="Save splines", initialfile=initialName,
                 defaultextension=".json", filetypes=(('Json files', '*.json'),('All files', '*.*')))
             if fileName:
-                self.splineDrawList[0].save(fileName, *self.splineDrawList[1:])
+                Solid.save(fileName, *splines)
 
     def load_splines(self):
         fileName = filedialog.askopenfilename(title="Load splines", 
             defaultextension=".json", filetypes=(('Json files', '*.json'),('All files', '*.*')))
         if fileName:
-            splines = Spline.load(fileName)
+            splines = Solid.load(fileName)
             for spline in splines:
-                self.list(spline)
+                if isinstance(spline, Spline):
+                    self.list(spline)
+                else:
+                    self.list_solid(spline)
     
     def erase_all(self):
-        """Stop drawing all splines. Splines remain in the listbox."""
-        self.listBox.selection_clear(0, self.listBox.size() - 1)
+        """Stop drawing all splines. Splines remain in the treeview."""
+        self.treeview.selection_set()
         self.splineRadius = 0.0
         self.frame.ResetView()
         self.update()
 
     def remove(self):
-        """Remove splines from the listbox."""
-        while self.listBox.curselection():
-            item = self.listBox.curselection()[0]
-            spline = self.splineList[item]
-            del self.splineList[item]
+        """Remove splines from the treeview."""
+        for item in self.treeview.selection():
+            spline = self.splineList.pop(item)
             self.splineDrawList.remove(spline)
-            self.listBox.delete(item, item)
+        self.treeview.delete(*self.treeview.selection())
         self.update()
 
     def empty(self):
-        """Stop drawing all splines and remove them from the listbox."""
-        self.splineList = []
-        self.listBox.delete(0, self.listBox.size() - 1)
+        """Stop drawing all splines and remove them from the treeview."""
+        self.splineList = {}
+        self.treeview.delete(*self.treeview.get_children())
         self.splineRadius = 0.0
         self.frame.ResetView()
         self.update()
@@ -219,18 +260,32 @@ class Viewer(tk.Tk):
         """Update the spline draw list, set the default view, reset the bounds, and refresh the frame."""
         self.splineDrawList = []
         gotOne = False
-        for item in self.listBox.curselection():
+        for item in self.treeview.selection():
             spline = self.splineList[item]
-            coefs = spline.cache["coefs32"].T[:3]
-            coefsAxis = tuple(range(1, spline.nInd + 1))
-            if gotOne:
-                splineMin = np.minimum(splineMin, coefs.min(axis=coefsAxis))
-                splineMax = np.maximum(splineMax, coefs.max(axis=coefsAxis))
-            else:
-                splineMin = coefs.min(axis=coefsAxis)
-                splineMax = coefs.max(axis=coefsAxis)
-                gotOne = True
-            self.splineDrawList.append(spline)
+            if isinstance(spline, Spline):
+                coefs = spline.cache["coefs32"].T[:3]
+                coefsAxis = tuple(range(1, spline.nInd + 1))
+                if gotOne:
+                    splineMin = np.minimum(splineMin, coefs.min(axis=coefsAxis))
+                    splineMax = np.maximum(splineMax, coefs.max(axis=coefsAxis))
+                else:
+                    splineMin = coefs.min(axis=coefsAxis)
+                    splineMax = coefs.max(axis=coefsAxis)
+                    gotOne = True
+                self.splineDrawList.append(spline)
+            elif isinstance(spline, Solid):
+                for subitem in self.treeview.get_children(item):
+                    spline = self.splineList[subitem]
+                    coefs = spline.cache["coefs32"].T[:3]
+                    coefsAxis = tuple(range(1, spline.nInd + 1))
+                    if gotOne:
+                        splineMin = np.minimum(splineMin, coefs.min(axis=coefsAxis))
+                        splineMax = np.maximum(splineMax, coefs.max(axis=coefsAxis))
+                    else:
+                        splineMin = coefs.min(axis=coefsAxis)
+                        splineMax = coefs.max(axis=coefsAxis)
+                        gotOne = True
+                    self.splineDrawList.append(spline)
 
         if gotOne:
             newRadius = 0.5 * np.max(splineMax - splineMin)
@@ -263,7 +318,7 @@ class Viewer(tk.Tk):
             frame.DrawSpline(spline, transform)
 
     def _ListSelectionChanged(self, event):
-        """Handle when the listbox selection has changed."""
+        """Handle when the treeview selection has changed."""
         self.update()
     
     def _ChangeFrameMode(self):
@@ -519,7 +574,7 @@ class Graphics:
 
     See Also
     --------
-    `Viewer` : A tkinter app (`tkinter.Tk`) that hosts a `SplineOpenGLFrame`, a listbox full of 
+    `Viewer` : A tkinter app (`tkinter.Tk`) that hosts a `SplineOpenGLFrame`, a treeview full of 
         splines, and a set of controls to adjust and view the selected splines.
 
     Examples
@@ -541,38 +596,26 @@ class Graphics:
         viewer = Viewer(workQueue=self.workQueue)
         viewer.mainloop()        
 
-    def list(self, spline, name = None):
-        """List a `Spline` in the listbox."""
-        if name is not None:
-            spline.metadata["Name"] = name
-        elif "Name" not in spline.metadata:
+    def list(self, spline, name = None, fillColor=None, lineColor=None, options=None, draw=False):
+        """List a `Spline`, `Boundary`, or `Solid` in the treeview. Can be called before viewer is running."""
+        if name is None:
             for name, value in self.variableDictionary.items():
                 if value is spline:
-                    spline.metadata["Name"] = name
                     break
-        self.workQueue.put(("show", (spline,)))
-
-    def show(self, spline, name = None):
-        """Show a `Spline` in the listbox (calls list method, kept for compatibility)."""
-        self.list(spline, name)
+        self.workQueue.put(("list", (spline, name, fillColor, lineColor, options, draw)))
 
-    def draw(self, spline, name = None):
-        """Add a `Spline` to the listbox and draw it."""
-        if name is not None:
-            spline.metadata["Name"] = name
-        elif "Name" not in spline.metadata:
-            for name, value in self.variableDictionary.items():
-                if value is spline:
-                    spline.metadata["Name"] = name
-                    break
-        self.workQueue.put(("draw", (spline,)))
+    show = list
+    
+    def draw(self, spline, name = None, fillColor=None, lineColor=None, options=None):
+        """List a `Spline`, `Boundary`, or `Solid` in the treeview and draw it in the viewer. Can be called before viewer is running."""
+        self.list(spline, name, fillColor, lineColor, options, True)
 
     def erase_all(self):
-        """Stop drawing all splines. Splines remain in the listbox."""
+        """Stop drawing all splines. Splines remain in the treeview."""
         self.workQueue.put(("erase_all", ()))
 
     def empty(self):
-        """Stop drawing all splines and remove them from the listbox."""
+        """Stop drawing all splines and remove them from the treeview."""
         self.workQueue.put(("empty", ()))
 
     def set_background_color(self, r, g=None, b=None, a=None):

{bspy-4.0.dist-info → bspy-4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bspy
-Version: 4.0
+Version: 4.1
 Summary: Library for manipulating and rendering non-uniform B-splines
 Home-page: http://github.com/ericbrec/BSpy
 Author: Eric Brechner
@@ -32,20 +32,25 @@ Requires-Dist: pyopengltk
 # BSpy
 Library for manipulating and rendering B-spline curves, surfaces, and multidimensional manifolds with non-uniform knots in each dimension.
 
+The [Manifold](https://ericbrec.github.io/BSpy/bspy/manifold.html) abstract base class for [Hyperplane](https://ericbrec.github.io/BSpy/bspy/hyperplane.html) and [Spline](https://ericbrec.github.io/BSpy/bspy/spline.html).
+
 The [Spline](https://ericbrec.github.io/BSpy/bspy/spline.html) class has a method to fit multidimensional data for 
 scalar and vector functions of single and multiple variables. It also has methods to create points, lines, circular arcs, spheres, cones, cylinders, tori, ruled surfaces, surfaces of revolution, and four-sided patches. 
 Other methods add, subtract, and multiply splines, as well as confine spline curves to a given range. 
 There are methods to evaluate spline values, derivatives, integrals, normals, curvature, and the Jacobian, as well as methods that return spline representations of derivatives, normals, integrals, graphs, and convolutions. In addition, there are methods to manipulate the domain of splines, including trim, join, reparametrize, transpose, reverse, add and remove knots, elevate and extrapolate, and fold and unfold. There are methods to manipulate the range of splines, including dot product, cross product, translate, rotate, scale, and transform. Finally, there are methods to compute the zeros and contours of a spline and to intersect two splines.
 
+The [Hyperplane](https://ericbrec.github.io/BSpy/bspy/hyperplane.html) class has methods to create individual hyperplanes in any dimension, along with axis-aligned hyperplanes and hypercubes.
+
+The [Solid](https://ericbrec.github.io/BSpy/bspy/solid.html) class has methods to construct n-dimensional solids from trimmed [Manifold](https://ericbrec.github.io/BSpy/bspy/manifold.html) boundaries. Each solid consists of a list of boundaries and a Boolean value that indicates if the solid contains infinity. Each [Boundary](https://ericbrec.github.io/BSpy/bspy/solid.html) consists of a manifold (currently a [Hyperplane](https://ericbrec.github.io/BSpy/bspy/hyperplane.html) or [Spline](https://ericbrec.github.io/BSpy/bspy/spline.html)) and a domain solid that trims the manifold. Solids have methods to form the intersection, union, difference, and complement of solids. There are methods to compute point containment, winding numbers, surface integrals, and volume integrals. There are also methods to translate, transform, and slice solids.
+
 The [SplineOpenGLFrame](https://ericbrec.github.io/BSpy/bspy/splineOpenGLFrame.html) class is an 
 [OpenGLFrame](https://pypi.org/project/pyopengltk/) with custom shaders to render spline curves and surfaces. Spline surfaces with more 
 than 3 dependent variables will have their added dimensions rendered as colors (up to 6 dependent variables are supported). Only tested on Windows systems.
 
-
 The [Viewer](https://ericbrec.github.io/BSpy/bspy/viewer.html) class is a 
 [tkinter.Tk](https://docs.python.org/3/library/tkinter.html) app that hosts a 
 [SplineOpenGLFrame](https://ericbrec.github.io/BSpy/bspy/splineOpenGLFrame.html), 
-a listbox full of splines, and a set of controls to adjust and view the selected splines. Only tested on Windows systems.
+a tree view full of solids and splines, and a set of controls to adjust and view the selected solids and splines. Only tested on Windows systems.
 
 The [Graphics](https://ericbrec.github.io/BSpy/bspy/viewer.html#Graphics) class is a graphics engine to display splines.
 It launches a [Viewer](https://ericbrec.github.io/BSpy/bspy/viewer.html) and issues commands to the viewer for use 

bspy-4.1.dist-info/RECORD

@@ -0,0 +1,17 @@
+bspy/__init__.py,sha256=q8XOJK3FsbHybfy2CSPufY5Z5SQJNxK_tH-d9zXR5vY,1308
+bspy/_spline_domain.py,sha256=kklvRrSeEEUUQ48yXvCCDzHMRPd4_BHICxAsOhyxhjk,30178
+bspy/_spline_evaluation.py,sha256=3cWD3sL4odnZ4w1DBQFmUnPg2PuPpSfaGfNcBl8ZrW0,7079
+bspy/_spline_fitting.py,sha256=hFhPyL39d87IGZiAs8teFhYZHxPN1EvzQYxHcDTeBLw,45318
+bspy/_spline_intersection.py,sha256=EV19Qt-kccr5K17aB1EETJXENdz-_UJlYTKWjK-ueJU,58324
+bspy/_spline_operations.py,sha256=y98zl-r31xsZzD6X0VYbuEPUabg3UNC_ERCbkXZRZXU,42530
+bspy/hyperplane.py,sha256=gRConjCEdMAjP8UXA7kaYU--NQHr1tYiVHtmZzLNnqY,24639
+bspy/manifold.py,sha256=29KkZXvv759-aywGd7Ek4Egm-DCBNDTEfusW_Az1kC4,14244
+bspy/solid.py,sha256=qbHofcdNbMTaoCCfKfxloYiEqZDsxfOIJD3MwZguEJ8,36444
+bspy/spline.py,sha256=747e_kChnGnN2Y93EcP9XymDrf2T4NFFweFB_YghEvw,94776
+bspy/splineOpenGLFrame.py,sha256=ezPUyDr9QKF0KU7H6XjHL-HhN23ffC8KbxGhGgGJhQ0,95843
+bspy/viewer.py,sha256=HdtjAj5CZnv4VKcfS8MhT-ciPEPRVNUTp-02TW1NQSU,33717
+bspy-4.1.dist-info/LICENSE,sha256=nLfJULN68Jw6GfCJp4xeMksGuRdyWNdgEsZGjw2twig,1091
+bspy-4.1.dist-info/METADATA,sha256=Fe5wy39gSJOVk7Z3Ruz1Utm3oYZQlPyyJJMYGu6YvP4,6152
+bspy-4.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+bspy-4.1.dist-info/top_level.txt,sha256=fotZnJn6aCwgUbBEV3hslIko7Nw-eqtHLq2eyJLlFsY,5
+bspy-4.1.dist-info/RECORD,,

bspy-4.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-bspy/__init__.py,sha256=p2tWAqZDc7JQ6-9-N-RLjscETpU5UPxgPB03Yc6Divk,923
-bspy/_spline_domain.py,sha256=-DWbiUdYkG9AX-_IILWIe6Alj-U3QJ9vcOi3jp7jCv0,29737
-bspy/_spline_evaluation.py,sha256=DErClOQrvXlK6uBZTwsGxAd6GXxBwXF9FIVnt57dOWI,6904
-bspy/_spline_fitting.py,sha256=H5yWhYHwrpoqb7dN2lF7eDNhSHH5XngG7TYVCYyydlQ,46778
-bspy/_spline_intersection.py,sha256=0aoUB5vKKObOM5B6W2U6MjqB91o3xXBPJr8j5a-hZ8U,47777
-bspy/_spline_operations.py,sha256=C3O-v8FlQbUc3szKZJIKS0RkjjbqV38aQL-IDSqMVL8,42222
-bspy/manifold.py,sha256=l2mOKBe-ejvXIIi3S3VpZ1ONuVZI1DPbdpibRwR1fu8,4343
-bspy/spline.py,sha256=RH-OSleMxFgTyv9nCyOSmzSZIKU1R3Esh_R1nKFrekI,89834
-bspy/splineOpenGLFrame.py,sha256=1-xaw4LnAqpu4DbSDDquRiN7eQe1bu6A5QLrreLy35Y,82849
-bspy/viewer.py,sha256=CrPLdhPmCSuUeScAjxbb19iSbfxb2Ft9KBWx-K4IjLs,30727
-bspy-4.0.dist-info/LICENSE,sha256=nLfJULN68Jw6GfCJp4xeMksGuRdyWNdgEsZGjw2twig,1091
-bspy-4.0.dist-info/METADATA,sha256=CKnqv9yg3KJayKnOrPu_eC-W5hWsgeBi89eYtQj50l0,4857
-bspy-4.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-bspy-4.0.dist-info/top_level.txt,sha256=fotZnJn6aCwgUbBEV3hslIko7Nw-eqtHLq2eyJLlFsY,5
-bspy-4.0.dist-info/RECORD,,