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

snappy/raytracing/inside_viewer.py

@@ -1,9 +1,17 @@
-import tkinter, math, sys, time
+import tkinter
+import math
+import sys
+import time
 from tkinter import ttk
+from . import gui_utilities
 from .gui_utilities import UniformDictController, FpsLabelUpdater
+from .view_scale_controller import ViewScaleController
 from .raytracing_view import *
+from .geodesics_window import GeodesicsWindow
 from .hyperboloid_utilities import unit_3_vector_and_distance_to_O13_hyperbolic_translation
+from .tooltip import ToolTip
 from .zoom_slider import Slider, ZoomSlider
+from .eyeball import eyeball_type_none, eyeball_type_paper_plane, eyeball_type_eyeball
 
 try:
     from math import gcd as _gcd
@@ -13,99 +21,123 @@ except ImportError:
 ###############################################################################
 # Main widget
 
+
 class InsideViewer(ttk.Frame):
-    def __init__(self, master, manifold,
-                 fillings_changed_callback = None,
-                 weights = None,
-                 cohomology_basis = None,
-                 cohomology_class = None,
-                 main_window = None):
-        ttk.Frame.__init__(self, master)
-        self.main_window = main_window
+    def __init__(self, container, manifold,
+                 fillings_changed_callback=None,
+                 weights=None,
+                 cohomology_basis=None,
+                 cohomology_class=None,
+                 geodesics=[]):
+        ttk.Frame.__init__(self, container)
         self.bindtags(self.bindtags() + ('inside',))
         self.fillings_changed_callback = fillings_changed_callback
         self.has_weights = bool(weights or cohomology_class)
+        self.geodesics_window = None
+        toplevel = self.winfo_toplevel()
+        toplevel.protocol("WM_DELETE_WINDOW", self.close_toplevel)
 
         main_frame = self.create_frame_with_main_widget(
-            self, manifold, weights, cohomology_basis, cohomology_class)
+            self,
+            manifold,
+            weights, cohomology_basis, cohomology_class,
+            geodesics)
+
         self.filling_dict = { 'fillings' : self._fillings_from_manifold() }
         row = 0
         self.notebook = ttk.Notebook(self)
-        self.notebook.grid(row = row, column = 0, sticky = tkinter.NSEW,
-                           padx = 0, pady = 0, ipady = 0)
+        self.notebook.grid(row=row, column=0, sticky=tkinter.NSEW,
+                           padx=0, pady=0, ipady=0)
 
         if cohomology_class:
             self.notebook.add(self.create_cohomology_class_frame(self),
-                              text = 'Cohomology class')
+                              text='Cohomology class')
 
-        self.notebook.add(self.create_cusp_areas_frame(self),
-                          text = 'Cusp areas')
+        self.notebook.add(self.create_eyeball_frame(self),
+                          text='Camera')
+
+        self.notebook.add(self.create_cusps_frame(self),
+                          text='Cusps/Geodesics')
 
         self.notebook.add(self.create_fillings_frame(self),
-                          text = 'Fillings')
+                          text='Fillings')
 
         self.notebook.add(self.create_skeleton_frame(self),
-                          text = 'Skeleton')
+                          text='Skeleton')
 
         self.notebook.add(self.create_quality_frame(self),
-                          text = 'Quality')
+                          text='Quality')
 
         self.notebook.add(self.create_light_frame(self),
-                          text = 'Light')
+                          text='Light')
 
         self.notebook.add(self.create_navigation_frame(self),
-                          text = 'Navigation')
+                          text='Navigation')
 
         self.notebook.bind('<<NotebookTabChanged>>', self.focus_viewer)
 
         row += 1
-        main_frame.grid(row = row, column = 0, sticky = tkinter.NSEW)
-        self.columnconfigure(0, weight = 1)
-        self.rowconfigure(row, weight = 1)
+        main_frame.grid(row=row, column=0, sticky=tkinter.NSEW)
+        self.columnconfigure(0, weight=1)
+        self.rowconfigure(row, weight=1)
 
         row += 1
         status_frame = self.create_status_frame(self)
-        status_frame.grid(row = row, column = 0, sticky = tkinter.NSEW)
+        status_frame.grid(row=row, column=0, sticky=tkinter.NSEW)
 
-        UniformDictController(
-            self.widget.ui_uniform_dict, 'fov',
-            update_function = self.widget.redraw_if_initialized,
-            scale = self.fov_scale,
-            label = self.fov_label,
-            format_string = '%.1f')
+        self.view_scale_controller = ViewScaleController(
+            self.widget.ui_uniform_dict,
+            self.view_scale_slider,
+            self.view_scale_label,
+            self.view_scale_value_label,
+            update_function=self.widget.draw)
 
-        self.widget.report_time_callback = FpsLabelUpdater(
+        self.widget.fps_label_updater = FpsLabelUpdater(
             self.fps_label)
+        self.widget.report_time_callback = self.widget.fps_label_updater
 
         self.update_volume_label()
 
         self.menubar = None
         self.build_menus()
-        if isinstance(master, tkinter.Toplevel) and self.menubar:
-            master.config(menu=self.menubar)
+        if isinstance(container, tkinter.Toplevel) and self.menubar:
+            container.config(menu=self.menubar)
         self.update_idletasks()
         self.focus_viewer()
 
+    def show_failed_dirichlet(self, show):
+        if show:
+            self.geodesics_status_label.configure(
+                text='Constructing Dirichlet domain failed. Cannot compute length spectrum.',
+                foreground='red')
+            self.geodesics_button.configure(
+                state='disabled')
+        else:
+            self.geodesics_status_label.configure(
+                text='')
+            self.geodesics_button.configure(
+                state='normal')
+
     def focus_viewer(self, event=None):
         self.widget.focus_set()
 
-    def apply_prefs(self, prefs):
+    def apply_settings(self, settings):
         # Update labels
-        keyboard = prefs.get('keyboard', 'QWERTY')
+        keyboard = settings.get('keyboard', 'QWERTY')
         self.translate_key_label.configure(
-            text = _translate_key_labels[keyboard])
+            text=_translate_key_labels[keyboard])
         self.rotate_key_label.configure(
-            text = _rotate_key_labels[keyboard])
+            text=_rotate_key_labels[keyboard])
 
         # Update keymapping performed by hyperbolic navigation
-        self.widget.apply_prefs(prefs)
+        self.widget.apply_settings(settings)
 
     def create_cohomology_class_frame(self, parent):
         frame = ttk.Frame(parent)
 
-        frame.columnconfigure(0, weight = 0)
-        frame.columnconfigure(1, weight = 1)
-        frame.columnconfigure(2, weight = 0)
+        frame.columnconfigure(0, weight=0)
+        frame.columnconfigure(1, weight=1)
+        frame.columnconfigure(2, weight=0)
 
         row = 0
 
@@ -115,247 +147,425 @@ class InsideViewer(ttk.Frame):
         for i in range(n):
             button = ttk.Button(
                 frame,
-                text = 'Class %d' % i,
-                takefocus = 0,
-                command = lambda i = i: self.pick_cohomology_class(i))
-            button.grid(row = row, column = 0)
+                text='Class %d' % i,
+                takefocus=0,
+                command=lambda i=i: self.pick_cohomology_class(i))
+            button.grid(row=row, column=0)
 
             self.class_controllers.append(
                 UniformDictController.create_horizontal_scale(
                     frame,
-                    column = 1,
-                    uniform_dict = self.widget.ui_parameter_dict,
-                    key = 'cohomology_class',
-                    left_end = -1.0,
-                    right_end = 1.0,
-                    row = row,
-                    update_function = self.widget.recompute_raytracing_data_and_redraw,
-                    index = i))
+                    column=1,
+                    uniform_dict=self.widget.ui_parameter_dict,
+                    key='cohomology_class',
+                    left_end=-1.0,
+                    right_end=1.0,
+                    row=row,
+                    update_function=self.widget.recompute_raytracing_data_and_redraw,
+                    index=i))
             row += 1
 
-        frame.rowconfigure(row, weight = 1)
+        frame.rowconfigure(row, weight=1)
 
         UniformDictController.create_checkbox(
             frame,
             self.widget.ui_uniform_dict,
             'showElevation',
-            update_function = self.checkbox_update,
-            text = "Elevation",
-            row = row, column = 1)
-        
+            update_function=self.checkbox_update,
+            text="Elevation",
+            row=row, column=1)
+
         return frame
 
-    def create_cusp_areas_frame(self, parent):
+    def create_cusps_frame(self, parent):
         frame = ttk.Frame(parent)
 
-        frame.columnconfigure(0, weight = 0)
-        frame.columnconfigure(1, weight = 1)
-        frame.columnconfigure(2, weight = 0)
+        frame.columnconfigure(0, weight=0)
+        frame.columnconfigure(1, weight=1)
+        frame.columnconfigure(2, weight=0)
 
         row = 0
 
         cusp_area_maximum = 1.05 * _maximal_cusp_area(self.widget.manifold)
 
+        self.cusp_scales = []
+
         for i in range(self.widget.manifold.num_cusps()):
-            UniformDictController.create_horizontal_scale(
+            self.cusp_scales.append(
+                UniformDictController.create_horizontal_scale(
+                    frame,
+                    uniform_dict=self.widget.ui_parameter_dict,
+                    key='cuspAreas',
+                    title='Cusp %d' % i,
+                    left_end=0.0,
+                    right_end=cusp_area_maximum,
+                    row=row,
+                    update_function=self.widget.recompute_raytracing_data_and_redraw,
+                    index=i))
+            cusp_button = ttk.Button(
                 frame,
-                uniform_dict = self.widget.ui_parameter_dict,
-                key = 'cuspAreas',
-                title = 'Cusp %d' % i,
-                left_end = 0.0,
-                right_end = cusp_area_maximum,
-                row = row,
-                update_function = self.widget.recompute_raytracing_data_and_redraw,
-                index = i)
+                text='View',
+                takefocus=0,
+                command=(
+                    lambda which_cusp=i:
+                        self.set_camera_cusp_view(which_cusp)))
+            ToolTip(cusp_button,
+                    msg="Move camera into cusp neighborhood and look out")
+            cusp_button.grid(row=row, column=3)
             row += 1
 
-        frame.rowconfigure(row, weight = 1)
-
-        view_frame = ttk.Frame(frame)
-        view_frame.grid(row = row, column = 1)
-        self.view_var = tkinter.IntVar(value = 0)
+        frame.rowconfigure(row, weight=1)
 
-        view_label = ttk.Label(view_frame, text = "View:")
-        view_label.grid(row = 0, column = 0)
+        self.geodesics_button = ttk.Button(
+            frame,
+            text="Geodesics ...",
+            takefocus=0,
+            command=self.show_geodesics_window)
+        self.geodesics_button.grid(row=row, column=3)
+        row += 1
 
-        for i, text in enumerate(["Material", "Ideal", "Hyperideal"]):
-            button = ttk.Radiobutton(view_frame,
-                                     variable = self.view_var,
-                                     value = i,
-                                     text = text,
-                                     command = lambda i = i: self.set_view(i))
-            button.grid(row = 0, column = i + 1)
+        self.geodesics_status_label = ttk.Label(frame, text="")
+        self.geodesics_status_label.grid(row=row, column=0, columnspan=4)
 
         return frame
 
-    def set_view(self, i):
-        self.widget.ui_parameter_dict['perspectiveType'][1] = i
-        self.widget.redraw_if_initialized()
-        self.focus_viewer()
+    def perspective_type_changed(self):
+        self.view_scale_controller.update()
+        self.widget.draw()
+
+    def set_perspective_type_and_view_scale(self, perspective_type, view_scale):
+        self.widget.ui_uniform_dict['perspectiveType'][1] = perspective_type
+        self.widget.ui_uniform_dict['viewScale'][1] = float(view_scale)
+        self.perspective_type_controller.update()
+        self.perspective_type_changed()
+
+    def set_camera_cusp_view(self, which_cusp):
+        if self.widget.ui_parameter_dict['cuspAreas'][1][which_cusp] < 0.05:
+            self.widget.ui_parameter_dict['cuspAreas'][1][which_cusp] = 0.05
+            self.widget.recompute_raytracing_data_and_redraw()
+            self.cusp_scales[which_cusp].update()
+
+        self.widget.view_state, view_scale = (
+            self.widget.raytracing_data.cusp_view_state_and_scale(
+                which_cusp))
+
+        extra_scale = 1.1
+        self.set_perspective_type_and_view_scale(1, extra_scale * view_scale)
 
     def checkbox_update(self):
-        self.widget.redraw_if_initialized()
+        self.widget.draw()
         self.focus_viewer()
 
     def create_fillings_frame(self, parent):
         frame = ttk.Frame(parent)
 
-        frame.columnconfigure(0, weight = 1)
-        frame.columnconfigure(1, weight = 1)
+        frame.columnconfigure(0, weight=1)
+        frame.columnconfigure(1, weight=1)
 
         row = 0
 
         self.filling_controllers = []
 
         for i in range(self.widget.manifold.num_cusps()):
-            scale_m = ZoomSlider(frame, left_end = -15.0, right_end = 15.0,
-                                 label_text = 'Cusp %d' %i,
+            scale_m = ZoomSlider(frame, left_end=-15.0, right_end=15.0,
+                                 label_text='Cusp %d' % i,
                                  on_change=self.focus_viewer)
-            scale_m.grid(row = row, column = 0, sticky = tkinter.NSEW)
+            scale_m.grid(row=row, column=0, sticky=tkinter.NSEW)
 
             self.filling_controllers.append(
                 UniformDictController(
                     self.filling_dict,
-                    key = 'fillings',
-                    index = i,
-                    component_index = 0,
-                    update_function = self.push_fillings_to_manifold,
-                    scale = scale_m))
+                    key='fillings',
+                    index=i,
+                    component_index=0,
+                    update_function=self.push_fillings_to_manifold,
+                    scale=scale_m))
 
-            scale_l = ZoomSlider(frame, left_end = -15.0, right_end = 15.0,
+            scale_l = ZoomSlider(frame, left_end=-15.0, right_end=15.0,
                                      on_change=self.focus_viewer)
-            scale_l.grid(row = row, column = 1, sticky = tkinter.NSEW)
+            scale_l.grid(row=row, column=1, sticky=tkinter.NSEW)
 
             self.filling_controllers.append(
                 UniformDictController(
                     self.filling_dict,
-                    key = 'fillings',
-                    index = i,
-                    component_index = 1,
-                    update_function = self.push_fillings_to_manifold,
-                    scale = scale_l))
+                    key='fillings',
+                    index=i,
+                    component_index=1,
+                    update_function=self.push_fillings_to_manifold,
+                    scale=scale_l))
 
             row += 1
 
-        frame.rowconfigure(row, weight = 1)
+        frame.rowconfigure(row, weight=1)
 
         subframe = ttk.Frame(frame)
-        subframe.grid(row = row, column = 0, columnspan = 5)
-        subframe.columnconfigure(0, weight = 1)
-        subframe.columnconfigure(1, weight = 0)
-        subframe.columnconfigure(2, weight = 0)
-        subframe.columnconfigure(3, weight = 0)
-        subframe.columnconfigure(4, weight = 1)
+        subframe.grid(row=row, column=0, columnspan=5)
+        subframe.columnconfigure(0, weight=1)
+        subframe.columnconfigure(1, weight=0)
+        subframe.columnconfigure(2, weight=0)
+        subframe.columnconfigure(3, weight=0)
+        subframe.columnconfigure(4, weight=1)
 
         recompute_button = ttk.Button(
-            subframe, text = "Recompute hyp. structure", takefocus=0,
-            command = self.recompute_hyperbolic_structure)
-        recompute_button.grid(row = 0, column = 1)
+            subframe, text="Recompute hyp. structure", takefocus=0,
+            command=self.recompute_hyperbolic_structure)
+        recompute_button.grid(row=0, column=1)
 
         orb_button = ttk.Button(
-            subframe, text = "Make orbifold", takefocus=0,
-            command = self.make_orbifold)
-        orb_button.grid(row = 0, column = 2)
+            subframe, text="Make orbifold", takefocus=0,
+            command=self.make_orbifold)
+        ToolTip(orb_button,
+                msg="Make filling coefficients integers")
+        orb_button.grid(row=0, column=2)
 
         mfd_button = ttk.Button(
-            subframe, text = "Make manifold", takefocus=0,
-            command = self.make_manifold)
-        mfd_button.grid(row = 0, column = 3)
+            subframe, text="Make manifold", takefocus=0,
+            command=self.make_manifold)
+        ToolTip(mfd_button,
+                msg="Make filling coefficients co-prime integers")
+        mfd_button.grid(row=0, column=3)
 
         return frame
 
-    def create_skeleton_frame(self, parent):
+    def create_eyeball_frame(self, parent):
         frame = ttk.Frame(parent)
 
-        frame.columnconfigure(0, weight = 0)
-        frame.columnconfigure(1, weight = 1)
-        frame.columnconfigure(2, weight = 0)
+        frame.columnconfigure(0, weight=0)
+        frame.columnconfigure(4, weight=1)
 
         row = 0
-        UniformDictController.create_horizontal_scale(
-            frame,
+
+        view_label = ttk.Label(frame, text="View")
+        view_label.grid(row=row, column=0)
+
+        radio_buttons = []
+        for i, text, tooltip in [
+                (0,
+                 "Material",
+                 "Camera rays leave from the same point"),
+                (1,
+                 "Ideal",
+                 "Camera rays leave orthogonally from a horosphere"),
+                (2,
+                 "Hyperideal",
+                 "Camera rays leave orthogonally from a (hyperbolic) plane")]:
+            button = ttk.Radiobutton(frame,
+                                     value=i,
+                                     text=text,
+                                     takefocus=0)
+            button.grid(row=row, column=i + 1, padx=8, sticky=tkinter.NW)
+            ToolTip(button, msg=tooltip)
+            radio_buttons.append(button)
+
+        self.perspective_type_controller = UniformDictController(
             self.widget.ui_uniform_dict,
-            key = 'edgeThickness',
-            title = 'Face boundary thickness',
-            row = row,
-            left_end = 0.0,
-            right_end = 0.35,
-            update_function = self.widget.redraw_if_initialized,
-            format_string = '%.3f')
+            key='perspectiveType',
+            radio_buttons=radio_buttons,
+            update_function=self.perspective_type_changed)
 
         row += 1
+
+        self_type_label = ttk.Label(frame, text="Camera body")
+        self_type_label.grid(row=row, column=0)
+
+        ToolTip(self_type_label,
+                msg="Shows your position and orientation in the manifold")
+        
+        radio_buttons = []
+        for i, (eyeball_type, text, tooltip) in enumerate([
+                (eyeball_type_none,
+                 "None",
+                 ""),
+                (eyeball_type_paper_plane,
+                 "Paper plane",
+                 "Paper plane shows your position and orientation in the manifold"),
+                (eyeball_type_eyeball,
+                 "Eyeball",
+                 "Eyeball shows your position and orientation in the manifold")]):
+            button = ttk.Radiobutton(frame,
+                                     value=eyeball_type,
+                                     text=text,
+                                     takefocus=0)
+            button.grid(row=row, column=1 + i, padx=8, sticky=tkinter.NW)
+            if tooltip:
+                ToolTip(button, msg=tooltip)
+            radio_buttons.append(button)
+        self.self_type_controller = UniformDictController(
+            self.widget.ui_parameter_dict,
+            key='eyeballType',
+            radio_buttons=radio_buttons,
+            update_function=self.widget.update_shader_and_redraw)
+
+        row += 1
+
         UniformDictController.create_horizontal_scale(
             frame,
             self.widget.ui_parameter_dict,
-            key = 'insphere_scale',
-            title = 'Insphere scale',
-            row = row,
-            left_end = 0.0,
-            right_end = 1.25,
-            update_function = self.widget.recompute_raytracing_data_and_redraw,
-            format_string = '%.2f')
+            key='eyeballSize',
+            title='Camera body size',
+            row=row,
+            columnspan=4,
+            left_end=0.0,
+            right_end=1.5,
+            update_function=self.widget.update_shader_and_redraw,
+            format_string='%.3f')
+        row += 1
+
+        misc_frame = ttk.Frame(frame)
+        misc_frame.grid(row=row, column=1, columnspan=3)
+
+        freeze_checkbox = UniformDictController.create_checkbox(
+            misc_frame,
+            self.widget.ui_parameter_dict,
+            key='freezeEyeball',
+            text='Freeze camera body',
+            row=row,
+            column=0,
+            update_function=self.widget.draw,
+            gridargs = {'padx' : 8}).checkbox
+        ToolTip(freeze_checkbox,
+                msg=("Keep paper plane/eyeball at the same position "
+                     "and attitude even when you are moving through the "
+                     "manifold"))
+
+        UniformDictController.create_checkbox(
+            misc_frame,
+            self.widget.ui_uniform_dict,
+            key='crosshairs',
+            text='Crosshairs',
+            row=row,
+            column=1,
+            update_function=self.widget.draw,
+            gridargs = {'padx' : 8})
 
         row += 1
-        UniformDictController.create_horizontal_scale(
+
+        return frame
+
+    def create_skeleton_frame(self, parent):
+        frame = ttk.Frame(parent)
+
+        frame.columnconfigure(0, weight=0)
+        frame.columnconfigure(1, weight=1)
+        frame.columnconfigure(2, weight=0)
+
+        row = 0
+
+        scale = UniformDictController.create_horizontal_scale(
             frame,
             self.widget.ui_parameter_dict,
-            key = 'edgeTubeRadius',
-            title = 'Edge thickness',
-            row = row,
-            left_end = 0.0,
-            right_end = 0.5,
-            update_function = self.widget.redraw_if_initialized)
+            key='edgeThickness',
+            title='Face boundary thickness',
+            row=row,
+            left_end=0.0,
+            right_end=0.65,
+            update_function=self.widget.draw,
+            format_string='%.3f').scale
+        ToolTip(scale,
+                msg=("Partially show faces of the tetrahedra."))
+        row += 1
+
+        self.insphereScaleController = (
+            UniformDictController.create_horizontal_scale(
+                frame,
+                self.widget.ui_parameter_dict,
+                key='insphere_scale',
+                title='Insphere scale',
+                row=row,
+                left_end=0.0,
+                right_end=1.25,
+                update_function=self.widget.recompute_raytracing_data_and_redraw,
+                format_string='%.3f'))
+        row += 1
+
+        self.edgeTubeRadiusController = (
+            UniformDictController.create_horizontal_scale(
+                frame,
+                self.widget.ui_parameter_dict,
+                key='edgeTubeRadius',
+                title='Edge thickness',
+                row=row,
+                left_end=0.0,
+                right_end=0.2,
+                update_function=self.widget.draw,
+                format_string='%.3f'))
+        row += 1
+
+        label = ttk.Label(frame, text="Edge colors", padding=gui_utilities.label_pad)
+        label.grid(row=row, column=0)
+        self.edgeColorController = UniformDictController.create_checkbox(
+            frame,
+            self.widget.ui_uniform_dict,
+            key='desaturate_edges',
+            text='desaturate',
+            row=row,
+            column=1,
+            update_function=self.widget.draw)
+        row += 1
 
         return frame
 
     def create_quality_frame(self, parent):
         frame = ttk.Frame(parent)
 
-        frame.columnconfigure(0, weight = 0)
-        frame.columnconfigure(1, weight = 1)
-        frame.columnconfigure(2, weight = 0)
+        frame.columnconfigure(0, weight=0)
+        frame.columnconfigure(1, weight=1)
+        frame.columnconfigure(2, weight=0)
 
         row = 0
         UniformDictController.create_horizontal_scale(
             frame,
             self.widget.ui_uniform_dict,
-            key = 'maxSteps',
-            title = 'Max Steps',
-            row = row,
-            left_end = 1,
-            right_end = 100,
-            update_function = self.widget.redraw_if_initialized)
+            key='maxSteps',
+            title='Max Steps',
+            row=row,
+            left_end=1,
+            right_end=150,
+            update_function=self.widget.draw)
 
         row += 1
         UniformDictController.create_horizontal_scale(
             frame,
             self.widget.ui_uniform_dict,
-            key = 'maxDist',
-            title = 'Max Distance',
-            row = row,
-            left_end = 1.0,
-            right_end = 28.0,
-            update_function = self.widget.redraw_if_initialized)
+            key='maxDist',
+            title='Max Distance',
+            row=row,
+            left_end=1.0,
+            right_end=28.0,
+            update_function=self.widget.draw)
 
         row += 1
         UniformDictController.create_horizontal_scale(
             frame,
             self.widget.ui_uniform_dict,
-            key = 'subpixelCount',
-            title = 'Subpixel count',
-            row = row,
-            left_end = 1.0,
-            right_end = 4.25,
-            update_function = self.widget.redraw_if_initialized)
+            key='subpixelCount',
+            title='Subpixel count',
+            row=row,
+            left_end=1.0,
+            right_end=4.25,
+            update_function=self.widget.draw)
+        row += 1
+
+        misc_frame = ttk.Frame(frame)
+        misc_frame.grid(row=row, column=1, columnspan=3)
+
+        self.fps_box_var = tkinter.BooleanVar()
+        self.fps_box_var.set(False)
+        fps_box = ttk.Checkbutton(misc_frame, takefocus=0)
+        fps_box.grid(row=0, column=0)
+        fps_box.configure(
+            variable = self.fps_box_var,
+            text='Show fps',
+            command=self.show_fps)
 
         return frame
 
     def create_light_frame(self, parent):
         frame = ttk.Frame(parent)
 
-        frame.columnconfigure(0, weight = 0)
-        frame.columnconfigure(1, weight = 1)
-        frame.columnconfigure(2, weight = 0)
+        frame.columnconfigure(0, weight=0)
+        frame.columnconfigure(1, weight=1)
+        frame.columnconfigure(2, weight=0)
 
         row = 0
 
@@ -363,86 +573,88 @@ class InsideViewer(ttk.Frame):
             UniformDictController.create_horizontal_scale(
                 frame,
                 self.widget.ui_uniform_dict,
-                key = 'contrast',
-                title = 'Contrast',
-                row = row,
-                left_end = 0.0,
-                right_end = 0.25,
-                update_function = self.widget.redraw_if_initialized,
-                format_string = '%.3f')
+                key='contrast',
+                title='Contrast',
+                row=row,
+                left_end=0.0,
+                right_end=0.25,
+                update_function=self.widget.draw,
+                format_string='%.3f')
             row += 1
 
         UniformDictController.create_horizontal_scale(
             frame,
             self.widget.ui_uniform_dict,
-            key = 'lightBias',
-            title = 'Light bias',
-            row = row,
-            left_end = 0.3,
-            right_end = 4.0,
-            update_function = self.widget.redraw_if_initialized)
+            key='lightBias',
+            title='Light bias',
+            row=row,
+            left_end=0.3,
+            right_end=4.0,
+            update_function=self.widget.draw)
 
         row += 1
         UniformDictController.create_horizontal_scale(
             frame,
             self.widget.ui_uniform_dict,
-            key = 'lightFalloff',
-            title = 'Light falloff',
-            row = row,
-            left_end = 0.1,
-            right_end = 2.0,
-            update_function = self.widget.redraw_if_initialized)
+            key='lightFalloff',
+            title='Light falloff',
+            row=row,
+            left_end=0.1,
+            right_end=2.0,
+            update_function=self.widget.draw)
 
         row += 1
         UniformDictController.create_horizontal_scale(
             frame,
             self.widget.ui_uniform_dict,
-            key = 'brightness',
-            title = 'Brightness',
-            row = row,
-            left_end = 0.3,
-            right_end = 3.0,
-            update_function = self.widget.redraw_if_initialized)
+            key='brightness',
+            title='Brightness',
+            row=row,
+            left_end=0.3,
+            right_end=3.0,
+            update_function=self.widget.draw)
 
         return frame
 
     def create_navigation_frame(self, parent):
         frame = ttk.Frame(parent)
 
-        frame.columnconfigure(0, weight = 0)
-        frame.columnconfigure(1, weight = 1)
-        frame.columnconfigure(2, weight = 0)
-        frame.columnconfigure(3, weight = 0)
+        frame.columnconfigure(0, weight=0)
+        frame.columnconfigure(1, weight=1)
+        frame.columnconfigure(2, weight=0)
+        frame.columnconfigure(3, weight=0)
 
         row = 0
         UniformDictController.create_horizontal_scale(
             frame,
             self.widget.navigation_dict,
-            key = 'translationVelocity',
-            title = 'Translation Speed',
-            row = row,
-            left_end = 0.1,
-            right_end = 1.0)
+            key='translationVelocity',
+            title='Translation Speed',
+            row=row,
+            left_end=0.1,
+            right_end=1.0)
 
-        self.translate_key_label = ttk.Label(frame, text = _translate_key_labels['QWERTY'])
-        self.translate_key_label.grid(row = row, column = 3, sticky = tkinter.NSEW)
+        self.translate_key_label = ttk.Label(frame,
+            text=_translate_key_labels['QWERTY'])
+        self.translate_key_label.grid(row=row, column=3, sticky=tkinter.NSEW)
 
         row += 1
         UniformDictController.create_horizontal_scale(
             frame,
             self.widget.navigation_dict,
-            key = 'rotationVelocity',
-            title = 'Rotation Speed',
-            row = row,
-            left_end = 0.1,
-            right_end = 1.0)
+            key='rotationVelocity',
+            title='Rotation Speed',
+            row=row,
+            left_end=0.1,
+            right_end=1.0)
 
-        self.rotate_key_label = ttk.Label(frame, text = _rotate_key_labels['QWERTY'])
-        self.rotate_key_label.grid(row = row, column = 3, sticky = tkinter.NSEW)
+        self.rotate_key_label = ttk.Label(frame,
+            text=_rotate_key_labels['QWERTY'])
+        self.rotate_key_label.grid(row=row, column=3, sticky=tkinter.NSEW)
 
-        row +=1
-        label = ttk.Label(frame, text = _mouse_gestures_text())
-        label.grid(row = row, column = 0, columnspan = 4)
+        row += 1
+        label = ttk.Label(frame, text=_mouse_gestures_text())
+        label.grid(row=row, column=0, columnspan=4)
 
         return frame
 
@@ -451,7 +663,8 @@ class InsideViewer(ttk.Frame):
                                       manifold,
                                       weights,
                                       cohomology_basis,
-                                      cohomology_class):
+                                      cohomology_class,
+                                      geodesics):
         frame = ttk.Frame(parent)
 
         column = 0
@@ -459,20 +672,23 @@ class InsideViewer(ttk.Frame):
         self.widget = RaytracingView(
             'ideal',
             manifold,
-            weights = weights,
-            cohomology_basis = cohomology_basis,
-            cohomology_class = cohomology_class,
-            master = frame,
-            width = 600, height = 500, double = 1, depth = 1)
-        self.widget.grid(row = 0, column = column, sticky = tkinter.NSEW)
+            weights=weights,
+            cohomology_basis=cohomology_basis,
+            cohomology_class=cohomology_class,
+            geodesics=geodesics,
+            container=frame,
+            width=600, height=500, double=1, depth=1)
+        self.widget.grid(row=0, column=column, sticky=tkinter.NSEW)
         self.widget.make_current()
-        frame.columnconfigure(column, weight = 1)
-        frame.rowconfigure(0, weight = 1)
+        frame.columnconfigure(column, weight=1)
+        frame.rowconfigure(0, weight=1)
 
         column += 1
-        self.fov_scale = Slider(frame, left_end = 20, right_end = 120,
-                                orient = tkinter.VERTICAL)
-        self.fov_scale.grid(row = 0, column = column, sticky = tkinter.NSEW)
+        self.view_scale_slider = Slider(
+            frame, left_end=-100.0, right_end=100.0,
+            orient=tkinter.VERTICAL)
+        self.view_scale_slider.grid(
+            row=0, column=column, sticky=tkinter.NSEW)
 
         return frame
 
@@ -480,20 +696,20 @@ class InsideViewer(ttk.Frame):
         frame = ttk.Frame(parent)
 
         column = 0
-        label = ttk.Label(frame, text = "FOV:")
-        label.grid(row = 0, column = column)
+        self.view_scale_label = ttk.Label(frame, text="FOV:")
+        self.view_scale_label.grid(row=0, column=column)
 
         column += 1
-        self.fov_label = ttk.Label(frame)
-        self.fov_label.grid(row = 0, column = column)
+        self.view_scale_value_label = ttk.Label(frame)
+        self.view_scale_value_label.grid(row=0, column=column)
 
         column += 1
         self.vol_label = ttk.Label(frame)
-        self.vol_label.grid(row = 0, column = column)
+        self.vol_label.grid(row=0, column=column)
 
         column += 1
         self.fps_label = ttk.Label(frame)
-        self.fps_label.grid(row = 0, column = column)
+        self.fps_label.grid(row=0, column=column)
 
         return frame
 
@@ -502,17 +718,52 @@ class InsideViewer(ttk.Frame):
             vol_text = '%.3f' % self.widget.manifold.volume()
         except ValueError:
             vol_text = '-'
-        sol_type = self.widget.manifold.solution_type(enum = True)
+        sol_type = self.widget.manifold.solution_type(enum=True)
         sol_text = _solution_type_text[sol_type]
         try:
-            self.vol_label.configure(text = 'Vol: %s (%s)' % (vol_text, sol_text))
+            self.vol_label.configure(text='Vol: %s (%s)' % (vol_text, sol_text))
         except AttributeError:
             pass
 
+    def delete_resource(self):
+        self.destroy()
+
+    # Called when the close button of the containing toplevel is pressed.
+    def close_toplevel(self):
+        if self.geodesics_window:
+            self.geodesics_window.destroy()
+            self.geodesics_window = None
+        self.winfo_toplevel().close()
+
+    # Called when the close button of the geodesics window is pressed. 
+    def close_geodesics_window(self):
+        self.geodesics_window.destroy()
+        self.geodesics_window = None
+
+    def show_geodesics_window(self):
+        try:
+            self.widget.manifold.dirichlet_domain()
+        except RuntimeError:
+            self.show_failed_dirichlet(True)
+            return
+        if self.geodesics_window is None:
+            self.geodesics_window = GeodesicsWindow(self)
+            self.geodesics_window.transient(self)
+            self.geodesics_window.protocol('WM_DELETE_WINDOW',
+                self.close_geodesics_window)
+        else:
+            self.geodesics_window.deiconify()
+            self.geodesics_window.wm_attributes('-topmost', True)
+
     def update_filling_sliders(self):
         for filling_controller in self.filling_controllers:
             filling_controller.update()
 
+    def update_edge_and_insphere_controllers(self):
+        self.edgeTubeRadiusController.update()
+        self.edgeColorController.update()
+        self.insphereScaleController.update()
+
     def _fillings_from_manifold(self):
         return [ 'vec2[]',
                  [ [ d['filling'][0], d['filling'][1] ]
@@ -524,21 +775,25 @@ class InsideViewer(ttk.Frame):
         self.update_filling_sliders()
         self.widget.recompute_raytracing_data_and_redraw()
         self.update_volume_label()
+        self.reset_geodesics()
 
     def push_fillings_to_manifold(self):
+        self.show_failed_dirichlet(show=False)
+
         self.widget.manifold.dehn_fill(
             self.filling_dict['fillings'][1])
 
-        self.widget.recompute_raytracing_data_and_redraw()
+        self.widget.recompute_raytracing_data_update_shader_and_redraw()
         self.update_volume_label()
+        self.reset_geodesics()
 
         if self.fillings_changed_callback:
             self.fillings_changed_callback()
 
     def recompute_hyperbolic_structure(self):
         self.widget.manifold.init_hyperbolic_structure(
-            force_recompute = True)
-        self.widget.recompute_raytracing_data_and_redraw()
+            force_recompute=True)
+        self.widget.recompute_raytracing_data_update_shader_and_redraw()
 
         # Should we reset the view state since it might
         # be corrupted?
@@ -551,6 +806,11 @@ class InsideViewer(ttk.Frame):
         if self.fillings_changed_callback:
             self.fillings_changed_callback()
 
+    def reset_geodesics(self):
+        self.widget.reset_geodesics()
+        if self.geodesics_window:
+            self.geodesics_window.populate_geodesics_frame()
+
     def make_orbifold(self):
         for f in self.filling_dict['fillings'][1]:
             for i in [0, 1]:
@@ -576,14 +836,18 @@ class InsideViewer(ttk.Frame):
     def pick_cohomology_class(self, i):
         cohomology_class = self.widget.ui_parameter_dict['cohomology_class'][1]
         for j in range(len(cohomology_class)):
-            cohomology_class[j] = 1.0 if i ==j else 0.0
+            cohomology_class[j] = 1.0 if i == j else 0.0
         self.widget.recompute_raytracing_data_and_redraw()
         for controller in self.class_controllers:
             controller.update()
 
     def build_menus(self):
         pass
-    
+
+    def show_fps(self):
+        self.widget.fps_label_updater.set_visible(
+            self.fps_box_var.get())
+
     def test(self):
         X = 100
         self.widget.event_generate('<Button-1>', x=X, y=300, warp=True)
@@ -598,6 +862,7 @@ class InsideViewer(ttk.Frame):
 ###############################################################################
 # Helpers
 
+
 _solution_type_text = [
     'degenerate',
     'geometric',
@@ -607,6 +872,7 @@ _solution_type_text = [
     'degenerate',
     'degenerate']
 
+
 def _maximal_cusp_area(mfd):
     # Hack to prevent doctest failure M.browse() where
     # M is a SnapPy.Manifold instead of a snappy.Manifold.
@@ -616,7 +882,7 @@ def _maximal_cusp_area(mfd):
     try:
         mfd = mfd.copy()
         mfd.dehn_fill(mfd.num_cusps() * [(0,0)])
-        mfd.init_hyperbolic_structure(force_recompute = True)
+        mfd.init_hyperbolic_structure(force_recompute=True)
 
         # Using sqrt of maximum of diagonal of cusp area matrix.
         #
@@ -642,12 +908,14 @@ def _maximal_cusp_area(mfd):
         print("Exception while trying to compute maximal cusp area:", e)
         return 5.0
 
+
 def _mouse_gestures_text():
     if sys.platform == 'darwin':
-        return u"Move: Click & Drag     Rotate: Shift-Click & Drag     Orbit: \u2318-Click & Drag"
+        return "Move: Click & Drag     Rotate: Shift-Click & Drag     Orbit: \u2318-Click & Drag"
     else:
         return "Move: Click & Drag     Rotate: Shift-Click & Drag     Orbit: Alt-Click & Drag"
 
+
 _translate_key_labels = {
     'QWERTY': "Keys: wasdec",
     'AZERTY': "Keys: zqsdec",
@@ -655,16 +923,17 @@ _translate_key_labels = {
 }
 
 _rotate_key_labels = {
-    'QWERTY': u"Keys: \u2190\u2191\u2192\u2193xz",
-    'AZERTY': u"Keys: \u2190\u2191\u2192\u2193xw",
-    'QWERTZ': u"Keys: \u2190\u2191\u2192\u2193xy"
+    'QWERTY': "Keys: \u2190\u2191\u2192\u2193xz",
+    'AZERTY': "Keys: \u2190\u2191\u2192\u2193xw",
+    'QWERTZ': "Keys: \u2190\u2191\u2192\u2193xy"
 }
 
 ###############################################################################
 # Performance test
 
+
 class PerfTest:
-    def __init__(self, widget, num_iterations = 20):
+    def __init__(self, widget, num_iterations=20):
         self.widget = widget
         self.m = unit_3_vector_and_distance_to_O13_hyperbolic_translation(
             [ 0.3 * math.sqrt(2.0), 0.4 * math.sqrt(2.0), 0.5 * math.sqrt(2.0) ],
@@ -680,7 +949,6 @@ class PerfTest:
         self.widget.focus_set()
         self.widget.mainloop()
 
-
     def report_time(self, t):
         self.total_time += t
 
@@ -694,9 +962,10 @@ class PerfTest:
         self.widget.view_state = self.widget.raytracing_data.update_view_state(
             self.widget.view_state, self.m)
 
-        self.widget.redraw_if_initialized()
+        self.widget.draw()
         self.widget.after(250, self.redraw)
 
+
 def run_perf_test():
     from snappy import Manifold