snappy 3.0.3__cp38-cp38-macosx_11_0_arm64.whl → 3.2__cp38-cp38-macosx_11_0_arm64.whl

snappy/browser.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-from builtins import range
-import sys, os
+import sys
+import os
 from .gui import *
 from .polyviewer import PolyhedronViewer
 from .horoviewer import HoroballViewer
@@ -14,10 +13,14 @@ from .exceptions import SnapPeaFatalError
 from plink import LinkViewer, LinkEditor
 from plink.ipython_tools import IPythonTkRoot
 from spherogram.links.orthogonal import OrthogonalLinkDiagram
+try:
+    from tkinter.simpledialog import _place_window
+except:
+    pass
 
 
 main_window = None
-#TODO:  Find these dimensions by introspection.
+# TODO:  Find these dimensions by introspection.
 cusp_box_height = 105
 if sys.platform == 'darwin':
     cusp_box_width = 180
@@ -34,9 +37,9 @@ class SelectableText(ttk.Frame):
     background color matches the background of a depth 2 LabelFrame
     by default.
     """
-    def __init__(self, master, labeltext='', width=18, depth=2):
-        ttk.Frame.__init__(self, master)
-        self.var = Tk_.StringVar(master)
+    def __init__(self, container, labeltext='', width=18, depth=2):
+        ttk.Frame.__init__(self, container)
+        self.var = Tk_.StringVar(container)
         style = SnapPyStyle()
         bg_color = style.groupBG if depth == 1 else style.subgroupBG
         self.label = label = ttk.Label(self, text=labeltext)
@@ -56,6 +59,7 @@ class SelectableText(ttk.Frame):
     def get(self):
         return self.var.get()
 
+
 class AutoScrollbar(Tk_.Scrollbar):
     # Frederick Lundh's scrollbar that hides itself if it's not needed.
     def set(self, lo, hi):
@@ -65,15 +69,16 @@ class AutoScrollbar(Tk_.Scrollbar):
             self.grid()
         Tk_.Scrollbar.set(self, lo, hi)
 
+
 class SelectableMessage(ttk.Frame):
     """
     A disabled Text widget which allows selection of text.  On the mac
     the selection does not highlight correctly unless the Text widget has
     focus and does not clear correctly unless the state is NORMAL.
     """
-    def __init__(self, master):
-        self.master = master
-        ttk.Frame.__init__(self, master)
+    def __init__(self, container):
+        self.container = container
+        ttk.Frame.__init__(self, container)
         self.scrollbar = AutoScrollbar(self, orient=Tk_.VERTICAL)
         self.text = text = Tk_.Text(self, width=60, height=12,
             highlightthickness=0, relief=Tk_.FLAT,
@@ -105,33 +110,37 @@ class SelectableMessage(ttk.Frame):
     def copy(self, event):
         self.text.selection_get(selection='CLIPBOARD')
 
+
 class DirichletTab(PolyhedronViewer):
-    def __init__(self, master, facedicts=[], title='Polyhedron Tab', parent=None):
+    def __init__(self, container, facedicts=[], title='Polyhedron Tab', parent=None):
         self.main_window = main_window
         self.style = style = SnapPyStyle()
-        PolyhedronViewer.__init__(self, master, facedicts=facedicts,
+        PolyhedronViewer.__init__(self, container, facedicts=facedicts,
                                   title=title, bgcolor=style.groupBG)
+
     def update_menus(self, menubar):
         menubar.children['help'].activate(
             [ app_menus.help_polyhedron_viewer_label,
               app_menus.help_report_bugs_label ])
 
+
 class CuspNeighborhoodTab(HoroballViewer):
     def __init__(self, nbhd, title='Polyhedron Tab'):
         self.main_window = main_window
         style = SnapPyStyle()
         if main_window:
             HoroballViewer.__init__(self, nbhd, title=title,
-                                    bgcolor=style.groupBG, prefs=main_window.prefs)
+                bgcolor=style.groupBG, settings=main_window.settings)
         else:
             HoroballViewer.__init__(self, nbhd, title=title,
-                                    bgcolor=style.groupBG)
+                bgcolor=style.groupBG)
 
     def update_menus(self, menubar):
         menubar.children['help'].activate(
             [ app_menus.help_horoball_viewer_label,
               app_menus.help_report_bugs_label])
 
+
 class LinkTab(LinkViewer):
     def __init__(self, data, window):
         self.style = style = SnapPyStyle()
@@ -143,13 +152,13 @@ class LinkTab(LinkViewer):
     def close(self, event=None):
         pass
 
+
 class Browser(Tk_.Toplevel):
     """
     Toplevel window displaying a Dehn filling control panel and
     a notebook with tabs that show numerical or graphical information
     about the manifold.
     """
-
     def __init__(self, manifold, root=None, main_window=None):
         if root is None:
             if Tk_._default_root:
@@ -181,16 +190,14 @@ class Browser(Tk_.Toplevel):
         self.protocol("WM_DELETE_WINDOW", self.close)
         if sys.platform == 'darwin':
             self.bind_all('<Command-Key-w>', self.close)
-        elif sys.platform == 'linux2' or sys.platform == 'linux':
+        elif sys.platform == 'linux':
             self.bind_all('<Alt-Key-F4>', self.close)
-
         self.side_panel = side_panel = self.build_side_panel()
 
         self.notebook = notebook = ttk.Notebook(self)
         self.invariants_tab = invariants_tab = self.build_invariants()
         self.dirichlet_viewer = DirichletTab(self)
         self.horoball_viewer = CuspNeighborhoodTab(self)
-
         self.fillings_changed_callback = None
 
         self.bottombar = bottombar = ttk.Frame(self, height=20)
@@ -216,7 +223,7 @@ class Browser(Tk_.Toplevel):
         notebook.add(invariants_tab, text='Invariants', padding=[0])
         notebook.add(self.dirichlet_viewer, text='Dirichlet')
         notebook.add(self.horoball_viewer, text='Cusp Nbhds')
-        notebook.add(self.build_inside_view(), text = 'Inside view')
+        notebook.add(self.build_inside_view(), text='Inside View')
         notebook.add(symmetry_tab, text='Symmetry', padding=[0])
         if link_tab:
             notebook.add(link_tab.canvas, text='Link')
@@ -232,9 +239,12 @@ class Browser(Tk_.Toplevel):
         self.modeline.pack(fill=Tk_.BOTH, expand=True, padx=30)
         self.update_modeline()
         self.update_idletasks()
+        self.wm_geometry(self.wm_geometry())
+        # Make sure the invariants get computed, even on Windows.
+        self.after_idle(self.update_current_tab)
 
     def __repr__(self):
-        return 'Browser window for %s\n'%self.manifold
+        return 'Browser window for %s\n' % self.manifold
 
     build_menus = browser_menus
 
@@ -263,15 +273,15 @@ class Browser(Tk_.Toplevel):
                 canvas.configure(background=self.style.groupBG)
             canvas.grid(row=0, column=0, sticky=Tk_.NSEW)
             filling_scrollbar.config(command=canvas.yview)
-        self.filling_vars=[]
+        self.filling_vars = []
 
         # Embedded windows in a canvas are clipped to their parent, not to
         # the canvas.
         cusp_parent = self.filling_canvas if self.filling_canvas else filling
         for n in range(num_cusps):
             R, G, B, A = GetColor(n)
-            color = '#%.3x%.3x%.3x'%(int(R*4095), int(G*4095), int(B*4095))
-            cusp = ttk.Labelframe(cusp_parent, text='Cusp %d'%n)
+            color = '#%.3x%.3x%.3x' % (int(R*4095), int(G*4095), int(B*4095))
+            cusp = ttk.Labelframe(cusp_parent, text='Cusp %d' % n)
             mer_var = Tk_.StringVar(self, value='0')
             long_var = Tk_.StringVar(self, value='0')
             self.filling_vars.append((mer_var, long_var))
@@ -283,14 +293,14 @@ class Browser(Tk_.Toplevel):
                 row=1, column=1, sticky=Tk_.E)
             meridian = Spinbox(cusp, width=4, textvariable=mer_var,
                 from_=-1000, to=1000, increment=1,
-                name=':%s:0'%n, validate='focusout',
+                name=':%s:0' % n, validate='focusout',
                 validatecommand=(self.register(self.validate_coeff),'%P','%W')
                 )
             meridian.bind('<Return>', self.do_filling)
             meridian.grid(row=0, column=2, sticky=Tk_.W, padx=0, pady=3)
             longitude = Spinbox(cusp, width=4, textvariable=long_var,
                 from_=-1000, to=1000, increment=1,
-                name=':%s:1'%n, validate='focusout',
+                name=':%s:1' % n, validate='focusout',
                 validatecommand=(self.register(self.validate_coeff),'%P','%W')
                 )
             longitude.bind('<Return>', self.do_filling)
@@ -337,7 +347,7 @@ class Browser(Tk_.Toplevel):
         self.aka_viewer = aka_viewer = ttk.Treeview(
             self.aka,
             selectmode='none',
-            height=4,
+            height=2 if sys.platform == 'linux' else 4,
             columns=['manifold', 'as_link'],
             show='headings')
         aka_viewer.heading('manifold', text='Manifold')
@@ -381,7 +391,7 @@ class Browser(Tk_.Toplevel):
         ttk.Label(self.length_spectrum_frame, text='Cutoff:').grid(
             row=0, column=0, sticky=Tk_.E, pady=5)
         self.length_cutoff = 1.0
-        self.cutoff_var=Tk_.StringVar(self, self.length_cutoff)
+        self.cutoff_var = Tk_.StringVar(self, self.length_cutoff)
         self.cutoff_entry = cutoff_entry = ttk.Entry(
             self.length_spectrum_frame,
             takefocus=False,
@@ -396,7 +406,7 @@ class Browser(Tk_.Toplevel):
             height=6, show='headings', selectmode='none',
             columns=['mult', 'length', 'topology', 'parity'],
             )
-        #TODO: compute column widths by measuring text.
+        # TODO: compute column widths by measuring text.
         geodesics.heading('mult', text='Mult.')
         geodesics.column('mult', stretch=False, width=60)
         geodesics.heading('length', text='Complex Length')
@@ -421,7 +431,7 @@ class Browser(Tk_.Toplevel):
         message1 = ttk.Label(frame,
             text='Future releases of SnapPy will show more information here.')
         message2 = ttk.Label(frame,
-            text = 'Type SymmetryGroup.<tab> in the command shell to see '
+            text='Type SymmetryGroup.<tab> in the command shell to see '
             'what is available.')
         message1.grid(row=1, column=0, pady=(40, 10))
         message2.grid(row=2, column=0)
@@ -442,7 +452,7 @@ class Browser(Tk_.Toplevel):
         if not self.manifold.is_orientable():
             text = ("Inside view for non-orientable manifolds such as %s "
                     "is not supported yet.") % self.manifold.name()
-            return ttk.Label(self, text = text)
+            return ttk.Label(self, text=text)
 
         try:
             # delayed import to avoid cycle
@@ -455,7 +465,7 @@ class Browser(Tk_.Toplevel):
             import traceback
             text = ("Could not instantiate inside view. "
                     "Error was:\n\n%s" % traceback.format_exc())
-            return ttk.Label(self, text = text)
+            return ttk.Label(self, text=text)
 
     def update_menus(self, menubar):
         """Default menus used by the Invariants, Symmetry and Link tabs."""
@@ -467,12 +477,12 @@ class Browser(Tk_.Toplevel):
         modeline.delete(1.0, Tk_.END)
         if not self.manifold.is_orientable():
             modeline.insert(Tk_.END, 'Non-orientable; ')
-        modeline.insert(Tk_.END, '%s tetrahedra; %s'%(
+        modeline.insert(Tk_.END, '%s tetrahedra; %s' % (
             self.manifold.num_tetrahedra(), self.manifold.solution_type()))
         if len(self.dirichlet) == 0:
-             modeline.insert(Tk_.END,
-                             '  * failed to compute Dirichlet domain!',
-                             'alert')
+            modeline.insert(Tk_.END,
+                            '  * failed to compute Dirichlet domain!',
+                            'alert')
         modeline.config(state=Tk_.DISABLED)
 
     def update_modeline_and_side_panel(self):
@@ -497,6 +507,8 @@ class Browser(Tk_.Toplevel):
         elif tab_name == 'Link':
             self.update_menus(self.menubar)
             self.link_tab.draw()
+        elif tab_name == 'Inside View':
+            self.inside_view.widget.focus_set()
         elif tab_name == 'Symmetry':
             self.update_menus(self.menubar)
             self.update_symmetry()
@@ -508,7 +520,7 @@ class Browser(Tk_.Toplevel):
         current_fillings = [c.filling for c in self.manifold.cusp_info()]
         for n, coeffs in enumerate(current_fillings):
             for m in (0,1):
-                value = '%g'%coeffs[m]
+                value = '%g' % coeffs[m]
                 value = '0' if value == '-0' else value
                 self.filling_vars[n][m].set(value)
 
@@ -530,8 +542,8 @@ class Browser(Tk_.Toplevel):
         except ValueError:
             self.homology.set('')
         self.compute_pi_one()
-        self.update_length_spectrum()
         self.update_dirichlet()
+        self.update_length_spectrum()
         self.update_aka()
         self.recompute_invariants = False
 
@@ -568,9 +580,10 @@ class Browser(Tk_.Toplevel):
 
     def update_aka(self):
         self._write_aka_info()
-        #self.identifier.identify(self.manifold)
-        #self.aka_after_id = self.after(100, self._aka_callback)
+        # self.identifier.identify(self.manifold)
+        # self.aka_after_id = self.after(100, self._aka_callback)
         M = self.manifold.copy()
+
         def format_name(N):
             if all(N.cusp_info('is_complete')):
                 return N.name()
@@ -619,6 +632,9 @@ class Browser(Tk_.Toplevel):
             self.dirichlet = []
         self.update_modeline()
         self.dirichlet_viewer.new_polyhedron(self.dirichlet)
+        if self.inside_view:
+            self.inside_view.show_failed_dirichlet(
+                show=len(self.dirichlet) == 0)
 
     def update_cusps(self):
         try:
@@ -647,7 +663,7 @@ class Browser(Tk_.Toplevel):
             if P == '':
                 var.set('0')
             else:
-                value = '%g'%self.manifold.cusp_info()[cusp].filling[curve]
+                value = '%g' % self.manifold.cusp_info()[cusp].filling[curve]
                 value = '0' if value == '-0' else value
                 var.set(value)
             return False
@@ -674,8 +690,8 @@ class Browser(Tk_.Toplevel):
         self.manifold.dehn_fill(filling_spec)
         current_fillings = [c.filling for c in self.manifold.cusp_info()]
         for n, coeffs in enumerate(current_fillings):
-            for m in (0,1):
-                value = '%g'%coeffs[m]
+            for m in (0, 1):
+                value = '%g' % coeffs[m]
                 value = '0' if value == '-0' else value
                 self.filling_vars[n][m].set(value)
         self.update_cusps()
@@ -719,11 +735,11 @@ class Browser(Tk_.Toplevel):
         tab_name = self.notebook.tab(self.notebook.select(), 'text')
         if tab_name in ('Invariants', 'Link', 'Symmetry'):
             try:
-                selected =  self.selection_get()
+                selected = self.selection_get()
             except:
                 selected = False
             if selected:
-                return {'Copy' : self.edit_copy}
+                return {'Copy': self.edit_copy}
         return {}
 
     def edit_copy(self):
@@ -734,12 +750,19 @@ class Browser(Tk_.Toplevel):
         except:
             pass
 
-    def test(self):
+    def dirichlet_help(self):
+        self.dirichlet_viewer.widget.help()
+
+    def horoball_help(self):
+        self.horoball_viewer.widget.help()
+
+    def test(self, use_modernopengl=True):
         self.update_idletasks()
         print('Testing browser')
         self.after(1000, self.notebook.select, self.dirichlet_viewer)
         self.after(2500, self.notebook.select, self.horoball_viewer)
-        self.after(4000, self.notebook.select, self.inside_view)
+        if use_modernopengl:
+            self.after(4000, self.notebook.select, self.inside_view)
         if self.link_tab:
             self.after(5500, self.notebook.select, self.link_tab.canvas)
             self.after(7000, self.close)
@@ -747,15 +770,15 @@ class Browser(Tk_.Toplevel):
             self.after(5500, self.close)
         self.wait_window(self)
 
+
 class Driller(SimpleDialog):
-    def __init__(self, master, manifold):
+    def __init__(self, parent, manifold):
         self.manifold = manifold
         self.num = 0 # make the superclass happy
         self.max_segments = 6
         self.result = []
         style = SnapPyStyle()
-        self.root = root = Tk_.Toplevel(master, class_='SnapPy',
-                                        bg=style.windowBG)
+        self.root = root = Tk_.Toplevel(parent, class_='SnapPy', bg=style.windowBG)
         title = 'Drill'
         root.title(title)
         root.iconname(title)
@@ -763,7 +786,7 @@ class Driller(SimpleDialog):
         top_frame = ttk.Frame(self.root)
         top_frame.grid_columnconfigure(0, weight=1)
         top_frame.grid_rowconfigure(2, weight=1)
-        msg_font = Font(family=style.font_info['family'],
+        msg_font = dict(family=style.font_info['family'],
                         weight='bold',
                         size=int(style.font_info['size']*1.2))
         msg = ttk.Label(top_frame, font=msg_font,
@@ -807,7 +830,7 @@ class Driller(SimpleDialog):
         button.pack(side=Tk_.LEFT, padx=6)
         button_frame.pack(pady=6)
         self.root.protocol('WM_DELETE_WINDOW', self.wm_delete_window)
-        self._set_transient(master)
+        _place_window(self.root, parent)
 
     def show_curves(self):
         self.curves.delete(*self.curves.get_children())
@@ -843,13 +866,14 @@ class Driller(SimpleDialog):
             return False
         return True
 
+
 class Coverer(SimpleDialog):
-    def __init__(self, master, manifold):
+    def __init__(self, parent, manifold):
         self.manifold = manifold.copy()
         self.num = 0 # make the superclass happy
         self.result = []
         style = SnapPyStyle()
-        self.root = root = Tk_.Toplevel(master, class_='SnapPy', bg=style.windowBG)
+        self.root = root = Tk_.Toplevel(parent, class_='SnapPy', bg=style.windowBG)
         title = 'Cover'
         root.title(title)
         root.iconname(title)
@@ -858,16 +882,15 @@ class Coverer(SimpleDialog):
         top_frame.grid_rowconfigure(2, weight=1)
         top_frame.grid_columnconfigure(0, weight=1)
         top_frame.grid_columnconfigure(1, weight=1)
-        msg_font = Font(family=style.font_info['family'],
+        msg_font = dict(family=style.font_info['family'],
                         weight='bold',
                         size=int(style.font_info['size']*1.2))
         msg = ttk.Label(top_frame, font=msg_font,
                         text='Choose covering spaces to browse:')
         msg.grid(row=0, column=0, columnspan=3, pady=10)
         degree_frame = ttk.Frame(top_frame)
-        degree_frame.grid_columnconfigure(1, weight=1)
+        degree_frame.grid_columnconfigure(2, weight=1)
         self.degree_var = degree_var = Tk_.StringVar()
-        degree_var.trace('w', self.show_covers)
         ttk.Label(degree_frame, text='Degree: ').grid(
             row=0, column=0, sticky=Tk_.E)
         self.degree_option = degree_option = ttk.OptionMenu(
@@ -878,15 +901,11 @@ class Coverer(SimpleDialog):
             )
         degree_option.grid(row=0, column=1)
         self.cyclic_var = cyclic_var = Tk_.BooleanVar()
-        cyclic_var.trace('w', self.show_covers)
         cyclic_or_not = ttk.Checkbutton(degree_frame,
                                         variable=cyclic_var,
                                         text='cyclic covers only',
                                        )
         cyclic_or_not.grid(row=0, column=2, padx=6, sticky=Tk_.W)
-        self.action = action = ttk.Button(degree_frame, text='Recompute',
-                                          command=self.show_covers)
-        action.grid(row=0, column=3, padx=8, sticky=Tk_.W)
         degree_frame.grid(row=1, column=0, pady=2, padx=6, sticky=Tk_.EW)
         self.covers = covers = ttk.Treeview(
             top_frame,
@@ -915,21 +934,25 @@ class Coverer(SimpleDialog):
         button.grid(row=0, column=1, sticky=Tk_.W, padx=6)
         button_frame.pack(pady=6, fill=Tk_.BOTH, expand=1)
         self.root.protocol('WM_DELETE_WINDOW', self.cancel)
-        self._set_transient(master)
+        try:
+            _place_window(self.root, parent)
+        except AttributeError:
+            self._set_transient(container)
         degree_var.set('2')
         cyclic_var.set(True)
         self.show_covers()
+        degree_var.trace_add('write', self.show_covers)
+        cyclic_var.trace_add('write', self.show_covers)
+
 
     def clear_list(self, *args):
         self.covers.delete(*self.covers.get_children())
         self.browse.config(default='normal')
-        self.action.config(default='active')
         self.state = 'not ready'
 
     def show_covers(self, *args):
         self.state = 'ready'
         self.browse.config(default='active')
-        self.action.config(default='normal')
         self.covers.delete(*self.covers.get_children())
         degree = int(self.degree_var.get())
         if self.cyclic_var.get():
@@ -964,6 +987,7 @@ class Coverer(SimpleDialog):
         self.root.grab_set()
         self.root.wait_window()
 
+
 if __name__ == '__main__':
     from snappy import Manifold
     root = Tk_.Tk()

snappy/cache.py

@@ -1,28 +1,25 @@
-from __future__ import print_function
-
 class SnapPyCache(dict):
     """
     Implementation of a simple cache used by the Manifold and Triangulation
     to save the results of methods which require a significant amount of
     computation.
-    
+
     This cache uses the tuple (method.__name, args, kwargs) as its key.
     """
     debug = False
     _clear = dict.clear
-    
+
     def save(self, answer, method_name, *args, **kwargs):
         self[(method_name, args, tuple(kwargs.items()))] = answer
         return answer
-        
+
     def lookup(self, method_name, *args, **kwargs):
         return self[(method_name, args, tuple(kwargs.items()))]
 
     def clear(self, key=None, message=''):
         if self.debug:
-            print('_clear_cache: %s'%message)
-        if key is None: 
+            print('_clear_cache: %s' % message)
+        if key is None:
             self._clear()
         else:
             self.pop(key)
-