snappy 3.1.1__cp39-cp39-win_amd64.whl → 3.2__cp39-cp39-win_amd64.whl

snappy/raytracing/geodesics_window.py

@@ -3,12 +3,30 @@ import tkinter
 from tkinter import ttk
 
 from .gui_utilities import UniformDictController, ScrollableFrame
+from .tooltip import ToolTip
 from .geodesics import geodesic_index_to_color, LengthSpectrumError
-from ..drilling.exceptions import WordAppearsToBeParabolic
+from ..geometric_structure.geodesic.exceptions import WordAppearsToBeParabolic
 from ..SnapPy import word_as_list # type: ignore
 
 
 class GeodesicsWindow(tkinter.Toplevel):
+    checkbox_column = 0
+    color_column = 1
+    words_column = 2
+    length_column = 3
+    radius_column = 5
+    view_column = 7
+
+    headings = (
+        # (text, column, weight, span)
+        ('Show', checkbox_column, 0, 1),
+        ('Color', color_column, 0, 1),
+        ('Word(s)', words_column, 0, 1),
+        ('Complex length', length_column, 0, 2),
+        ('Radius', radius_column, 0, 1),
+        ('    ', 6, 0, 1),
+        ('View', view_column, 0, 1))
+
     def __init__(self, inside_viewer, *args, **kwards):
         # Disable the minimize button when we get to use Tk 8.7
         tkinter.Toplevel.__init__(self, class_='snappy')
@@ -18,14 +36,6 @@ class GeodesicsWindow(tkinter.Toplevel):
 
         self.inside_viewer = inside_viewer
         self.raytracing_view = inside_viewer.widget
-        self.headings = (
-            # (text, column, weight, span)
-            ('Show', 0, 0, 1),
-            ('Color', 1, 0, 1),
-            ('Word(s)', 2, 0, 1),
-            ('Complex length', 3, 0, 2),
-            ('Radius', 5, 0, 1),
-            ('    ', 6, 0, 1))
 
         self.frame = ttk.Frame(self)
         self.frame.pack(expand=True, fill=tkinter.BOTH)
@@ -75,27 +85,24 @@ class GeodesicsWindow(tkinter.Toplevel):
         self.populate_geodesics_frame()
         self.scrollable_frame.headings(self.headings)
 
+    def _geodesics(self):
+        return self.raytracing_view.additional_structures['geodesics']
+
     def populate_geodesics_frame(self):
         for widget in self.geodesics_frame.grid_slaves():
             widget.destroy()
 
         row = 0
 
-        checkbox_column = 0
-        color_column = 1
-        words_column = 2
-        length_column = 3
-        radius_column = 5
-
-        for geodesic in self.raytracing_view.geodesics.geodesics_sorted_by_length():
-            if not geodesic.geodesic_info.core_curve_cusp:
+        for geodesic in self._geodesics().geodesics_sorted_by_length():
+            if not geodesic.geodesic_start_point_info.core_curve_cusp:
                 UniformDictController.create_checkbox(
                     self.geodesics_frame,
                     self.raytracing_view.ui_parameter_dict,
                     key='geodesicTubeEnables',
                     index=geodesic.index,
                     row=row,
-                    column=checkbox_column,
+                    column=self.checkbox_column,
                     update_function=self.geodesic_checkbox_clicked)
 
             text = ', '.join(geodesic.words)
@@ -103,11 +110,11 @@ class GeodesicsWindow(tkinter.Toplevel):
                 text += ' (not primitive)'
 
             l = ttk.Label(self.geodesics_frame, text=text)
-            l.grid(row=row, column=words_column)
+            l.grid(row=row, column=self.words_column)
 
             l = ttk.Label(self.geodesics_frame,
                           text='%.8f' % geodesic.complex_length.real())
-            l.grid(row=row, column=length_column)
+            l.grid(row=row, column=self.length_column)
 
             im_length = geodesic.complex_length.imag()
             abs_im_length = im_length.abs()
@@ -117,12 +124,12 @@ class GeodesicsWindow(tkinter.Toplevel):
 
                 l = ttk.Label(self.geodesics_frame,
                               text=s + ' %.8f * I' % abs_im_length)
-                l.grid(row=row, column=length_column + 1)
+                l.grid(row=row, column=self.length_column + 1)
 
             color = geodesic_index_to_color(geodesic.index)
 
-            if geodesic.geodesic_info.core_curve_cusp:
-                cusp_index = geodesic.geodesic_info.core_curve_cusp.Index
+            if geodesic.geodesic_start_point_info.core_curve_cusp:
+                cusp_index = geodesic.geodesic_start_point_info.core_curve_cusp.Index
                 l = tkinter.Label(self.geodesics_frame,
                                   text="Cusp %d" % cusp_index)
             else:
@@ -130,12 +137,12 @@ class GeodesicsWindow(tkinter.Toplevel):
                                   text="Color",
                                   fg=color_to_tkinter(color),
                                   bg=color_to_tkinter(color))
-            l.grid(row=row, column=color_column, padx=5)
+            l.grid(row=row, column=self.color_column, padx=5)
 
-            if geodesic.geodesic_info.core_curve_cusp:
+            if geodesic.geodesic_start_point_info.core_curve_cusp:
                 l = tkinter.Label(self.geodesics_frame,
                                   text="Use Cusp areas tab")
-                l.grid(row=row, column=radius_column, padx=5)
+                l.grid(row=row, column=self.radius_column, padx=5)
             else:
                 scale = UniformDictController.create_horizontal_scale(
                     self.geodesics_frame,
@@ -143,7 +150,7 @@ class GeodesicsWindow(tkinter.Toplevel):
                     key='geodesicTubeRadii',
                     index=geodesic.index,
                     row=row,
-                    column=radius_column,
+                    column=self.radius_column,
                     left_end=0.0,
                     right_end=1.0,
                     update_function=self.update_geodesic_data,
@@ -152,6 +159,16 @@ class GeodesicsWindow(tkinter.Toplevel):
                 # Need to color Scale - but the following code fails.
                 # scale.configure(background = color_to_tkinter(color))
 
+            if not geodesic.geodesic_start_point_info.core_curve_cusp:
+                btn = ttk.Button(
+                    self.geodesics_frame,
+                    text='View',
+                    takefocus=0,
+                    command=lambda i=geodesic.index: self.view_geodesic(i))
+                ToolTip(btn,
+                        msg="Move camera onto geodesic looking down the geodesic")
+                btn.grid(row=row, column=self.view_column)
+
             row += 1
         self.scrollable_frame.set_widths()
 
@@ -162,15 +179,15 @@ class GeodesicsWindow(tkinter.Toplevel):
                                         foreground='')
         else:
             self.status_label.configure(
-                text=('Limiting size of geodesic tube to prevent intersection '
-                      'with core curve.'),
+                text=('Geodesic tube intersects core curve. Dropping '
+                      'pieces/limiting size.'),
                 foreground='red')
 
     def add_length_spectrum(self, *args, **kwargs):
         self.status_label.configure(text=_default_status_msg, foreground='')
 
         try:
-            if not self.raytracing_view.geodesics.add_length_spectrum(
+            if not self._geodesics().add_length_spectrum(
                     float(self.length_box.get())):
                 self.status_label.configure(text='No new geodesics found.',
                                             foreground='')
@@ -196,7 +213,7 @@ class GeodesicsWindow(tkinter.Toplevel):
             return
 
         try:
-            n = self.raytracing_view.geodesics.get_mcomplex().num_generators
+            n = self._geodesics().get_mcomplex().num_generators
             word_as_list(word, n)
         except ValueError:
             self.status_label.configure(text=word + " contains non-generators",
@@ -204,7 +221,7 @@ class GeodesicsWindow(tkinter.Toplevel):
             return
 
         try:
-            index = self.raytracing_view.geodesics.add_word(word)
+            index = self._geodesics().add_word(word)
         except WordAppearsToBeParabolic:
             self.status_label.configure(text=word + " is parabolic",
                                         foreground='red')
@@ -218,15 +235,20 @@ class GeodesicsWindow(tkinter.Toplevel):
         if self.raytracing_view.disable_edges_for_geodesics():
             self.inside_viewer.update_edge_and_insphere_controllers()
 
-        self.raytracing_view.update_geodesic_data_and_redraw()
+        self.update_geodesic_data()
 
         self.populate_geodesics_frame()
 
     def geodesic_checkbox_clicked(self):
         if self.raytracing_view.disable_edges_for_geodesics():
             self.inside_viewer.update_edge_and_insphere_controllers()
-        self.raytracing_view.update_geodesic_data_and_redraw()
+        self.update_geodesic_data()
 
+    def view_geodesic(self, i):
+        self.raytracing_view.view_state = (
+            self.raytracing_view.raytracing_data.update_view_state(
+                self._geodesics().view_state_for_geodesic(i)))
+        self.inside_viewer.set_perspective_type_and_view_scale(1, 1.0)
 
 def color_to_tkinter(color):
     return "#%.3x%.3x%.3x" % tuple([min(max(int(x * 4095), 0), 4095)

snappy/raytracing/gui_utilities.py

@@ -15,6 +15,7 @@ class UniformDictController:
     def create_horizontal_scale(container, uniform_dict, key,
                                 row, left_end, right_end, update_function=None,
                                 column=0,
+                                columnspan=1,
                                 title=None,
                                 format_string=None,
                                 index=None, component_index=None):
@@ -26,8 +27,9 @@ class UniformDictController:
         scale = Slider(container=container,
                        left_end=left_end,
                        right_end=right_end)
-        scale.grid(row=row, column=column, sticky=slider_stick, padx=10)
-        column += 1
+        scale.grid(row=row, column=column, columnspan=columnspan,
+                   sticky=slider_stick, padx=10)
+        column += columnspan
         value_label = ttk.Label(container, padding=label_pad)
         value_label.grid(row=row, column=column, sticky=tkinter.NW, padx=20)
 
@@ -46,9 +48,10 @@ class UniformDictController:
                         column=0,
                         text='',
                         index=None,
-                        component_index=None):
+                        component_index=None,
+                        gridargs = {}):
         checkbox = ttk.Checkbutton(container, takefocus=0)
-        checkbox.grid(row=row, column=column)
+        checkbox.grid(row=row, column=column, **gridargs)
         checkbox.configure(text=text)
 
         return UniformDictController(
@@ -195,6 +198,17 @@ class FpsLabelUpdater:
         self.num_iterations = 0
         self.total_time = 0.0
         self.last_time = time.time()
+        self._visible = False
+        self._text = '-fps (-ms)'
+
+    def set_visible(self, visible):
+        if self._visible == visible:
+            return
+        self._visible = visible
+        if visible:
+            self.label.configure(text = self._text)
+        else:
+            self.label.configure(text = '')
 
     def __call__(self, t):
         self.num_iterations += 1
@@ -203,8 +217,9 @@ class FpsLabelUpdater:
             current_time = time.time()
             fps = self.num_iterations / (current_time - self.last_time)
             time_ms = 1000 * self.total_time / self.num_iterations
-
-            self.label.configure(text='%.1ffps (%dms)' % (fps, time_ms))
+            self._text = '%.1ffps (%dms)' % (fps, time_ms)
+            if self._visible:
+                self.label.configure(text=self._text)
             self.last_time = current_time
             self.num_iterations = 0
             self.total_time = 0.0

snappy/raytracing/hyperboloid_navigation.py

@@ -1,4 +1,5 @@
 from .hyperboloid_utilities import *
+from ..matrix import matrix
 import time
 import sys
 import tempfile
@@ -149,7 +150,7 @@ class HyperboloidNavigation:
       IdealRaytracingData. This is needed to update data
       such as the view matrix
       using self.raytracing_data.update_view_state(...).
-    - self.redraw_if_initialized() to redraw.
+    - self.draw() to redraw.
     - self.read_depth_value(x, y) to return the depth value at a pixel.
       It is used for orbiting about that point.
     - self.compute_translation_and_inverse_from_pick_point(size, xy, depth)
@@ -317,7 +318,7 @@ class HyperboloidNavigation:
             self.view_state, m)
 
         # Redraw
-        self.redraw_if_initialized()
+        self.draw()
 
         # And schedule another call of this function.
         # If we don't leave Tk a couple of milliseconds in between,
@@ -383,7 +384,7 @@ class HyperboloidNavigation:
             self.view = (self.view + 1) % 3
             print("Color for rays that have not hit geometry:",
                   _viewModes[self.view])
-            self.redraw_if_initialized()
+            self.draw()
 
         if event.keysym == 'p':
             from snappy.CyOpenGL import get_gl_string
@@ -507,7 +508,7 @@ class HyperboloidNavigation:
         else:
             return
 
-        self.redraw_if_initialized()
+        self.draw()
 
     def tkButtonRelease1(self, event):
         self.mouse_mode = None
@@ -529,3 +530,27 @@ class HyperboloidNavigation:
 
     def apply_settings(self, settings):
         self.setup_keymapping(settings.get('keyboard', 'QWERTY'))
+
+    def _start_flight_for_debugging_hitch(self):
+        """
+        On Mac OS, there is a hitch when flying. It is subtle, but when
+        keeping, say the w key pressed, every second or so there a brief
+        moment where we are not moving.
+
+        I couldn't figure out whether this is due to how we are processing
+        the key events or already a problem with calling self.after from
+        within the redraw code.
+
+        This function initiates a flight to isolate the problem to the
+        latter.
+
+        To use it, do:
+            >>> M = Manifold("m004") # doctest: +SKIP
+            >>> v = M.inside_view()
+            >>> v.view.widget._start_flight_for_debugging_hitch()
+
+        """
+
+        self.key_to_last_accounted_and_release_time['w'][0] = time.time()
+        self.schedule_process_key_events_and_redraw(1)
+

snappy/raytracing/hyperboloid_utilities.py

@@ -1,8 +1,8 @@
-from snappy.SnapPy import matrix, vector
-
-from snappy.hyperboloid import (r13_dot,
-                                unit_time_vector_to_o13_hyperbolic_translation,
-                                unnormalised_plane_eqn_from_r13_points)
+from ..hyperboloid import (r13_dot,
+                           unit_time_vector_to_o13_hyperbolic_translation,
+                           time_r13_normalise,
+                           space_r13_normalise)
+from ..matrix import make_vector, make_matrix
 
 """
 Helpers for the 1,3-hyperboloid model and conversion to upper half
@@ -43,7 +43,7 @@ def O13_x_rotation(angle):
 
     c = angle.cos()
     s = angle.sin()
-    return matrix(
+    return make_matrix(
         [[ 1, 0, 0, 0],
          [ 0, 1, 0, 0],
          [ 0, 0, c, s],
@@ -57,7 +57,7 @@ def O13_y_rotation(angle):
     """
     c = angle.cos()
     s = angle.sin()
-    return matrix(
+    return make_matrix(
         [[ 1, 0, 0, 0],
          [ 0, c, 0, -s],
          [ 0, 0, 1, 0],
@@ -71,7 +71,7 @@ def O13_z_rotation(angle):
     """
     c = angle.cos()
     s = angle.sin()
-    return matrix(
+    return make_matrix(
         [[ 1, 0, 0, 0],
          [ 0, c, s, 0],
          [ 0, -s, c, 0],
@@ -101,7 +101,7 @@ def complex_and_height_to_R13_time_vector(z, t):
     RF = z_re.parent()
 
     return R13_normalise(
-        vector(
+        make_vector(
             [ RF(1),
               klein_factor * poincare[0],
               klein_factor * poincare[1],
@@ -120,7 +120,7 @@ def R13_time_vector_to_upper_halfspace(v):
     klein = [ v[1] / v[0], v[2] / v[0], v[3] / v[0] ]
     klein_sqr = sum([x**2 for x in klein])
     poincare_factor = 1.0 / (1.0 + (1.0 - klein_sqr).sqrt())
-    a, b, c = [ x * poincare_factor for x in klein ]
+    a, b, c = ( x * poincare_factor for x in klein )
 
     denom = (a - 1.0) ** 2 + b ** 2 + c ** 2
     return [                         2.0 * b / denom,
@@ -139,85 +139,85 @@ def R13_normalise(v, sign=0):
 
     return v / denom
 
+def _is_vector_sane(v):
+    return all(-10000.0 < c and c < 10000.0 for c in v)
 
-def _is_row_sane(r):
-    for c in r:
-        if not (c < 10000.0 and c > -10000.0):
-            return False
-    return True
-
+def _check_vector_sane(v):
+    if _is_vector_sane(v):
+        return v
+    raise ValueError()
 
 _signature = [-1, +1, +1, +1]
 
+def _unit_four_vector(i, ring):
+    return make_vector([ring(1.0 if i == j else 0.0)
+                        for j in range(4)])
 
-def _orthonormalize_row(row, other_rows, row_sign):
-    result = row
-    for sign, other_row in zip(_signature, other_rows):
-        s = sign * r13_dot(row, other_row)
-        result = [ c - s * other_c
-                   for c, other_c in zip(result, other_row) ]
+def _time_r13_normalise_sane(v):
     try:
-        result = R13_normalise(vector(result), sign=row_sign)
+        return _check_vector_sane(
+            time_r13_normalise(v))
     except ValueError:
-        return None
-    if not _is_row_sane(result):
-        return None
-    return result
-
-
-def _orthonormalize_row_sane(row, fallback_value, other_rows, sign):
-    r = _orthonormalize_row(row, other_rows, sign)
-    if r is not None:
-        return r
-    r = _orthonormalize_row(fallback_value, other_rows, sign)
-    if r is not None:
-        return r
-    return fallback_value
+        pass
+    return _unit_four_vector(0, ring=v[0].parent())
 
+def _orthonormalise_row(row, previous_rows):
+    result = row
+    for j, previous_row in enumerate(previous_rows):
+        s = _signature[j] * r13_dot(row, previous_row)
+        result = result - s * previous_row
+    return space_r13_normalise(result)
 
-def O13_orthonormalize(m):
+def _orthonormalise_row_sane(row, previous_rows):
     try:
-        ring = m[0][0].parent()
-    except AttributeError:
-        ring = None
-    id_matrix = matrix([[1.0, 0.0, 0.0, 0.0],
-                        [0.0, 1.0, 0.0, 0.0],
-                        [0.0, 0.0, 1.0, 0.0],
-                        [0.0, 0.0, 0.0, 1.0]],
-                       ring=ring)
-
-    result = [ ]
-    for row, id_row, sign in zip(m, id_matrix, _signature):
-        result.append(_orthonormalize_row_sane(row, id_row, result, sign))
-    return matrix(result, ring=ring)
-
-
-def R13_plane_from_R13_light_vectors(pts):
-    return R13_normalise(unnormalised_plane_eqn_from_r13_points(pts))
-
-
-def make_tet_planes(tet_vert_positions):
-    """
-    Given four light-like vectors, returns the four normals for the
-    for faces of the ideal tetrahedron spanned by the corresponding
-    ideal points in the 1,3-hyperboloid model.
-
-    Outward facing for positively oriented tetrahedra.
-    """
-
-    v0, v1, v2, v3 = tet_vert_positions
-    return [ R13_plane_from_R13_light_vectors([v1, v3, v2]),
-             R13_plane_from_R13_light_vectors([v0, v2, v3]),
-             R13_plane_from_R13_light_vectors([v0, v3, v1]),
-             R13_plane_from_R13_light_vectors([v0, v1, v2]) ]
-
+        return _check_vector_sane(
+            _orthonormalise_row(row, previous_rows))
+    except ValueError:
+        pass
+    ring = row[0].parent()
+    for i in range(3):
+        try:
+            v = _unit_four_vector(
+                (i + len(previous_rows) - 1) % 3 + 1,
+                ring)
+            return _check_vector_sane(
+                _orthonormalise_row(v, previous_rows))
+        except ValueError:
+            pass
+    return _unit_four_vector(len(previous_rows), ring)
+
+def O13_orthonormalise(m):
+    """
+    The goal of the implementation here is to stably produce a sane
+    result (without large entries) so that no matter how badly the
+    camera view matrix gets beaten up, we will recover.
+
+    Also note that we operate on columns so that the position (image of
+    (1,0,0,0)) of the camera (unless it is way off and we fall back to
+    the origin for the position) is preserved (that is, just normalized).
+
+    We also preserve the x-axis (image of (0,1,0,0)) of the camera
+    frame as best as possible (project it into the tangent space of
+    the hyperboloid at the camera position). Note that the view
+    direction of the camera is the z-axis (image of (0,0,0,1).
+    So if the view direction of the camera needs to be preserved, you might
+    need to apply a matrix shuffling the x-, y-, and z-axis of the
+    camera before and after orthonormalisation.
+    """
+    
+    t = m.transpose() # Transpose to operate on columns
+
+    result = [ _time_r13_normalise_sane(make_vector(t[0])) ]
+    for row in t[1:]:
+        result.append(_orthonormalise_row_sane(make_vector(row), result))
+    return make_matrix(result).transpose()
 
 def complex_to_pair(z):
     """
     Returns a vector (x,y) given z = x + y * i.
     """
 
-    return vector([z.real(), z.imag()])
+    return make_vector([z.real(), z.imag()])
 
 
 def _dist_from_projection(p, dir):