removed dependency on matplotlib's griddata

Probably works, but need more extensive testing

Author: endarthur

openstereo/data_models.py

@@ -705,16 +705,17 @@ def plot_Eigenvectors(self):
         return plot_data
 
     def plot_Contours(self):
-        grid = self.auttitude_data.grid
-        grid.change_spacing(self.contour_calc_settings["spacing"])
-        nodes = self.auttitude_data.grid_nodes
+        # grid = self.auttitude_data.grid
+        # grid.change_spacing(self.contour_calc_settings["spacing"])
+        grid = au.stats.SphericalGrid(self.contour_calc_settings["spacing"])
+        nodes = grid.grid
         if self.contour_check_settings["fisher"]:
             if self.contour_check_settings["autocount"]:
                 if self.contour_check_settings["robinjowett"]:
                     k = None
                 else:
                     try:
-                        k = grid.optimize_k(self.auttitude_data.data)
+                        k = grid.optimize_k(self.au_object)
                     except ImportError:
                         QtWidgets.QMessageBox.warning(
                             self.parent(),
@@ -724,7 +725,7 @@ def plot_Contours(self):
                         k = None
             else:
                 k = self.contour_calc_settings["K"]
-            count = self.auttitude_data.grid_fisher(k)
+            count = self.au_object.count_fisher(k, grid=grid)
         else:
             if self.contour_check_settings["autocount"]:
                 if self.contour_check_settings["robinjowett"]:
@@ -735,7 +736,7 @@ def plot_Contours(self):
                             acos(
                                 1.0
                                 - 1.0
-                                / grid.optimize_k(self.auttitude_data.data)
+                                / grid.optimize_k(self.au_object)
                             )
                         )
                     except ImportError:
@@ -753,7 +754,7 @@ def plot_Contours(self):
                         0.141536 * self.contour_calc_settings["scperc"]
                     )
                 )
-            count = self.auttitude_data.grid_kamb(theta)
+            count = self.au_object.count_kamb(theta, grid=grid)
         return (
             ContourPlotData(
                 nodes,

openstereo/os_auttitude.py

@@ -119,16 +119,16 @@ def regular_grid(node_spacing):
 Builds a regular grid over the hemisphere, with the given average node spacing."""
     nodes = [(0.0, 90.0)]
     spacing = math.radians(node_spacing)
-    for phi in np.linspace(
-        node_spacing, 90.0, 90.0 / node_spacing, endpoint=False
+    for phi in np.arange(
+        node_spacing, 90.0, node_spacing
     ):
         azimuth_spacing = math.degrees(
             2
             * math.asin((math.sin(spacing / 2) / math.sin(math.radians(phi))))
         )
-        for theta in np.linspace(0.0, 360.0, 360.0 / azimuth_spacing):
+        for theta in np.arange(0.0, 360.0, azimuth_spacing):
             nodes.append((theta + phi + node_spacing / 2, 90.0 - phi))
-    for theta in np.linspace(0.0, 360.0, 360.0 / azimuth_spacing):
+    for theta in np.arange(0.0, 360.0, azimuth_spacing):
         nodes.append(((theta + 90.0 + node_spacing / 2) % 360.0, 0.0))
     return np.array(nodes)
 
@@ -138,17 +138,17 @@ def sphere_regular_grid(node_spacing):
 Builds a regular grid over the sphere, with the given average node spacing."""
     nodes = [(0.0, 90.0), (0, -90.0)]
     spacing = math.radians(node_spacing)
-    for phi in np.linspace(
-        node_spacing, 90.0, 90.0 / node_spacing, endpoint=False
+    for phi in np.arange(
+        node_spacing, 90.0,  node_spacing
     ):
         azimuth_spacing = math.degrees(
             2
             * math.asin((math.sin(spacing / 2) / math.sin(math.radians(phi))))
         )
-        for theta in np.linspace(0.0, 360.0, 360.0 / azimuth_spacing):
+        for theta in np.arange(0.0, 360.0, azimuth_spacing):
             nodes.append((theta + phi + node_spacing / 2, 90.0 - phi))
             nodes.append((theta + phi + node_spacing / 2, phi - 90.0))
-    for theta in np.linspace(0.0, 360.0, 360.0 / azimuth_spacing):
+    for theta in np.arange(0.0, 360.0, azimuth_spacing):
         nodes.append(((theta + 90.0 + node_spacing / 2) % 360.0, 0.0))
     return np.array(nodes)
 
@@ -630,13 +630,13 @@ def grid_rose(
             )
             if not self.kwargs.get("line"):
                 circular_data = -circular_data
-        if type(self.grid) == CircularGrid:
-            grid = self.grid
+    #    if type(self.grid) == CircularGrid:
+    #         grid = self.grid
+    #     else: 
+        if self._cgrid is None:
+            grid = self._cgrid = CircularGrid()
         else:
-            if self._cgrid is None:
-                grid = self._cgrid = CircularGrid()
-            else:
-                grid = self._cgrid
+            grid = self._cgrid
             # count(self, data, aperture=None,\
             #                        axial=False, spacing=None, offset=0, nodes=None)
         if direction:
@@ -1151,7 +1151,7 @@ def count_munro(
             1.0
             + 2.0
             * np.power(
-                weight, np.linspace(0.0, aperture, radians(spacing))
+                weight, np.arange(0.0, aperture, radians(spacing))
             ).sum()
         )
         return (

openstereo/os_plot.py

@@ -2,7 +2,7 @@
 from math import pi, sin, cos, acos, atan2, degrees, radians, sqrt
 import re
 
-from PyQt5 import QtWidgets
+from PyQt5 import QtWidgets, QtCore
 from matplotlib.pyplot import colorbar, imread, get_cmap
 from matplotlib.figure import Figure
 from matplotlib.backends.backend_qt5agg import (
@@ -16,7 +16,7 @@
     PolyCollection,
     LineCollection,
 )
-from matplotlib.mlab import griddata
+# from matplotlib.mlab import griddata
 import matplotlib.patheffects as PathEffects
 from matplotlib.font_manager import FontProperties
 from mpl_toolkits.axes_grid.axislines import Subplot
@@ -148,6 +148,7 @@ def __init__(self, settings, projection, parent=None):
         self.circle_elements = []
         self.drag_rotate_mode = False
         self.current_rotation = np.eye(3)
+        self.scroll_rotation = 0.0
         self.last_rotation = np.eye(3)
         self.last_rotation_I = np.eye(3)
 
@@ -162,6 +163,9 @@ def connect_measure(self):
         self.cidmotion = self.plotFigure.canvas.mpl_connect(
             "motion_notify_event", self.measure_motion
         )
+        self.cidmotion = self.plotFigure.canvas.mpl_connect(
+            "scroll_event", self.measure_motion
+        )
         # http://stackoverflow.com/a/18145817/1457481
 
     def measure_press(self, event):
@@ -208,6 +212,7 @@ def measure_release(self, event):
         self.last_rotation = self.current_rotation
         self.last_rotation_I = np.linalg.inv(self.current_rotation)
         self.current_rotation = np.eye(3)
+        self.scroll_rotation = 0.0
         self.plot_canvas.draw()
 
     # thanks forever to http://stackoverflow.com/a/8956211/1457481 for basics on blit
@@ -272,9 +277,25 @@ def measure_motion(self, event):
         c_sphere = sphere(*c)
 
         if self.drag_rotate_mode:
+            if event.name == "scroll_event":
+                # https://stackoverflow.com/q/49316067/1457481
+                self.scroll_rotation += (
+                    5 * event.step
+                    if QtWidgets.QApplication.keyboardModifiers()
+                    == QtCore.Qt.ControlModifier
+                    else event.step
+                )
             rotation_matrix = self.last_rotation.dot(
                 au_c.get_rotation_matrix(-theta)
-            )
+            ) if self.button_pressed == 1 else self.last_rotation
+            if self.button_pressed == 1:
+                rotation_matrix = rotation_matrix.dot(
+                    b.get_rotation_matrix(radians(self.scroll_rotation))
+                )
+            else:
+                rotation_matrix = rotation_matrix.dot(
+                    a.get_rotation_matrix(radians(self.scroll_rotation))
+                )
             self.current_rotation = rotation_matrix
             for point, element in self.point_elements:
                 Xp, Yp = self.project(*(point.dot(rotation_matrix)).T)
@@ -522,8 +543,7 @@ def plot_arrow(self, planes, lines, arrow_settings, has_sense, sliplinear):
                 if plane[-1] > 0:
                     plane = -plane
                 arrow_from = (
-                    cos(arrowsize / 2.0) * plane
-                    + sin(arrowsize / 2.0) * line
+                    cos(arrowsize / 2.0) * plane + sin(arrowsize / 2.0) * line
                 )
                 arrow_to = (
                     cos(-arrowsize / 2.0) * plane
@@ -536,8 +556,8 @@ def plot_arrow(self, planes, lines, arrow_settings, has_sense, sliplinear):
                     invert_positive=False
                 )
             else:
-                line_direction = line[:2]/np.linalg.norm(line[:2])
-                dx, dy = line_direction * arrow_settings["arrowsize"]*0.0075
+                line_direction = line[:2] / np.linalg.norm(line[:2])
+                dx, dy = line_direction * arrow_settings["arrowsize"] * 0.0075
                 x, y = self.project(*line, invert_positive=True)
                 X, Y = [x - dx, x + dx], [y - dy, y + dy]
             if not sense:
@@ -654,15 +674,16 @@ def plot_contours(
                     b"[^-\\d\\.]+", contour_settings["intervals"]
                 )
             ]
-        xi = yi = np.linspace(-1.1, 1.1, contour_settings["cresolution"])
-        X, Y = self.project(*nodes.T, ztol=0.1)
+        # xi = yi = np.linspace(-1.1, 1.1, contour_settings["cresolution"])
+        # X, Y = self.project(*nodes.T, ztol=0.1)
+        X, Y = self.project(*nodes.T, invert_positive=False)
 
-        zi = griddata(X, Y, count, xi, yi, interp="linear")
+        # zi = griddata(X, Y, count, xi, yi, interp="linear")
         if contour_check_settings["fillcontours"]:
-            contour_plot = axes.contourf(
-                xi,
-                yi,
-                zi,
+            contour_plot = axes.tricontourf(
+                X,
+                Y,
+                count,
                 intervals,
                 cmap=contour_settings["cmap"],
                 linestyles=contour_settings["linestyles"],
@@ -684,20 +705,20 @@ def plot_contours(
             or not contour_check_settings["fillcontours"]
         ):
             if contour_check_settings["solidline"]:
-                contour_lines_plot = axes.contour(
-                    xi,
-                    yi,
-                    zi,
+                contour_lines_plot = axes.tricontour(
+                    X,
+                    Y,
+                    count,
                     intervals,
                     colors=contour_line_settings["colors"],
                     linestyles=contour_settings["linestyles"],
                     linewidths=contour_line_settings["linewidths"],
                 )
             else:
-                contour_lines_plot = axes.contour(
-                    xi,
-                    yi,
-                    zi,
+                contour_lines_plot = axes.tricontour(
+                    X,
+                    Y,
+                    count,
                     intervals,
                     cmap=contour_line_settings["cmap"],
                     linestyles=contour_settings["linestyles"],

setup.py

@@ -78,7 +78,7 @@ def run(self):
         "PyShp",
         "networkx",
         "ply2atti",
-        "auttitude",
+        "auttitude==0.1.3",
         "chardet",
     ],
     cmdclass={