Merge pull request #78 from AntSimi/visvalingam

Visvalingam

Author: ludwigVonKoopa

.github/workflows/python-app.yml

@@ -3,11 +3,7 @@
 
 name: Pytest & Flake8
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
   build:

examples/06_grid_manipulation/pet_advect.py

@@ -10,9 +10,9 @@
 from matplotlib.animation import FuncAnimation
 from numpy import arange, isnan, meshgrid, ones
 
-import py_eddy_tracker.gui
 from py_eddy_tracker.data import get_demo_path
 from py_eddy_tracker.dataset.grid import RegularGridDataset
+from py_eddy_tracker.gui import GUI_AXES
 from py_eddy_tracker.observations.observation import EddiesObservations
 
 # %%
@@ -32,7 +32,7 @@
 # %%
 # Quiver from u/v with eddies
 fig = plt.figure(figsize=(10, 5))
-ax = fig.add_axes([0, 0, 1, 1], projection="full_axes")
+ax = fig.add_axes([0, 0, 1, 1], projection=GUI_AXES)
 ax.set_xlim(19, 30), ax.set_ylim(31, 36.5), ax.grid()
 x, y = meshgrid(g.x_c, g.y_c)
 a.filled(ax, facecolors="r", alpha=0.1), c.filled(ax, facecolors="b", alpha=0.1)
@@ -82,7 +82,7 @@ def save(self, *args, **kwargs):
 def anim_ax(**kw):
     t = 0
     fig = plt.figure(figsize=(10, 5), dpi=55)
-    axes = fig.add_axes([0, 0, 1, 1], projection="full_axes")
+    axes = fig.add_axes([0, 0, 1, 1], projection=GUI_AXES)
     axes.set_xlim(19, 30), axes.set_ylim(31, 36.5), axes.grid()
     a.filled(axes, facecolors="r", alpha=0.1), c.filled(axes, facecolors="b", alpha=0.1)
     line = axes.plot([], [], "k", **kw)[0]

examples/06_grid_manipulation/pet_lavd.py

@@ -24,16 +24,16 @@
 from matplotlib.animation import FuncAnimation
 from numpy import arange, meshgrid, zeros
 
-import py_eddy_tracker.gui
 from py_eddy_tracker.data import get_demo_path
 from py_eddy_tracker.dataset.grid import RegularGridDataset
+from py_eddy_tracker.gui import GUI_AXES
 from py_eddy_tracker.observations.observation import EddiesObservations
 
 
 # %%
 def start_ax(title="", dpi=90):
     fig = plt.figure(figsize=(16, 9), dpi=dpi)
-    ax = fig.add_axes([0, 0, 1, 1], projection="full_axes")
+    ax = fig.add_axes([0, 0, 1, 1], projection=GUI_AXES)
     ax.set_xlim(0, 32), ax.set_ylim(28, 46)
     ax.set_title(title)
     return fig, ax, ax.text(3, 32, "", fontsize=20)

examples/07_cube_manipulation/pet_cube.py

@@ -12,10 +12,10 @@
 from matplotlib.animation import FuncAnimation
 from numpy import arange, isnan, meshgrid, ones
 
-import py_eddy_tracker.gui
 from py_eddy_tracker import start_logger
 from py_eddy_tracker.data import get_demo_path
 from py_eddy_tracker.dataset.grid import GridCollection
+from py_eddy_tracker.gui import GUI_AXES
 
 start_logger().setLevel("ERROR")
 
@@ -70,7 +70,7 @@ def save(self, *args, **kwargs):
 # Function
 def anim_ax(**kw):
     fig = plt.figure(figsize=(10, 5), dpi=55)
-    axes = fig.add_axes([0, 0, 1, 1], projection="full_axes")
+    axes = fig.add_axes([0, 0, 1, 1], projection=GUI_AXES)
     axes.set_xlim(19, 30), axes.set_ylim(31, 36.5), axes.grid()
     line = axes.plot([], [], "k", **kw)[0]
     return fig, axes.text(21, 32.1, ""), line

examples/07_cube_manipulation/pet_lavd_detection.py

@@ -23,10 +23,10 @@
 from matplotlib import pyplot as plt
 from numpy import arange, isnan, ma, meshgrid, zeros
 
-import py_eddy_tracker.gui
 from py_eddy_tracker import start_logger
 from py_eddy_tracker.data import get_demo_path
 from py_eddy_tracker.dataset.grid import GridCollection, RegularGridDataset
+from py_eddy_tracker.gui import GUI_AXES
 
 start_logger().setLevel("ERROR")
 
@@ -47,7 +47,7 @@ def from_(cls, x, y, z):
 # %%
 def start_ax(title="", dpi=90):
     fig = plt.figure(figsize=(12, 5), dpi=dpi)
-    ax = fig.add_axes([0.05, 0.08, 0.9, 0.9], projection="full_axes")
+    ax = fig.add_axes([0.05, 0.08, 0.9, 0.9], projection=GUI_AXES)
     ax.set_xlim(-6, 36), ax.set_ylim(31, 45)
     ax.set_title(title)
     return fig, ax, ax.text(3, 32, "", fontsize=20)

examples/16_network/pet_atlas.py

@@ -5,8 +5,8 @@
 from matplotlib import pyplot as plt
 from numpy import ma
 
-import py_eddy_tracker.gui
 from py_eddy_tracker.data import get_remote_demo_sample
+from py_eddy_tracker.gui import GUI_AXES
 from py_eddy_tracker.observations.network import NetworkObservations
 
 n = NetworkObservations.load_file(
@@ -26,7 +26,7 @@
 # Functions
 def start_axes(title):
     fig = plt.figure(figsize=(13, 5))
-    ax = fig.add_axes([0.03, 0.03, 0.90, 0.94], projection="full_axes")
+    ax = fig.add_axes([0.03, 0.03, 0.90, 0.94], projection=GUI_AXES)
     ax.set_xlim(-6, 36.5), ax.set_ylim(30, 46)
     ax.set_aspect("equal")
     ax.set_title(title, weight="bold")

examples/16_network/pet_ioannou_2017_case.py

@@ -16,9 +16,9 @@
 from matplotlib.ticker import FuncFormatter
 from numpy import arange, where, array, pi
 
-import py_eddy_tracker.gui
 from py_eddy_tracker.appli.gui import Anim
 from py_eddy_tracker.data import get_demo_path
+from py_eddy_tracker.gui import GUI_AXES
 from py_eddy_tracker.observations.network import NetworkObservations
 
 from py_eddy_tracker.generic import coordinates_to_local, local_to_coordinates
@@ -52,7 +52,7 @@ def formatter(x, pos):
 
 def start_axes(title=""):
     fig = plt.figure(figsize=(13, 6))
-    ax = fig.add_axes([0.03, 0.03, 0.90, 0.94], projection="full_axes")
+    ax = fig.add_axes([0.03, 0.03, 0.90, 0.94], projection=GUI_AXES)
     ax.set_xlim(19, 29), ax.set_ylim(31, 35.5)
     ax.set_aspect("equal")
     ax.set_title(title, weight="bold")

examples/16_network/pet_relative.py

@@ -5,8 +5,8 @@
 from matplotlib import pyplot as plt
 from numpy import where
 
-import py_eddy_tracker.gui
 from py_eddy_tracker import data
+from py_eddy_tracker.gui import GUI_AXES
 from py_eddy_tracker.observations.network import NetworkObservations
 
 # %%
@@ -266,7 +266,7 @@
 # %%
 # Only a map can be tricky to understand, with a timeline it's easier!
 fig = plt.figure(figsize=(15, 8))
-ax = fig.add_axes([0.04, 0.06, 0.94, 0.88], projection="full_axes")
+ax = fig.add_axes([0.04, 0.06, 0.94, 0.88], projection=GUI_AXES)
 n.plot(ax, color_cycle=n.COLORS)
 ax.set_xlim(17.5, 27.5), ax.set_ylim(31, 36), ax.grid()
 ax = fig.add_axes([0.08, 0.7, 0.7, 0.3])
@@ -278,7 +278,7 @@
 # -----------------
 # Display the position of the eddies after a merging
 fig = plt.figure(figsize=(15, 8))
-ax = fig.add_axes([0.04, 0.06, 0.90, 0.88], projection="full_axes")
+ax = fig.add_axes([0.04, 0.06, 0.90, 0.88], projection=GUI_AXES)
 n.plot(ax, color_cycle=n.COLORS)
 m1, m0, m0_stop = n.merging_event(triplet=True)
 m1.display(ax, color="violet", lw=2, label="Eddies after merging")
@@ -296,7 +296,7 @@
 # ------------------
 # Display the position of the eddies before a splitting
 fig = plt.figure(figsize=(15, 8))
-ax = fig.add_axes([0.04, 0.06, 0.90, 0.88], projection="full_axes")
+ax = fig.add_axes([0.04, 0.06, 0.90, 0.88], projection=GUI_AXES)
 n.plot(ax, color_cycle=n.COLORS)
 s0, s1, s1_start = n.spliting_event(triplet=True)
 s0.display(ax, color="violet", lw=2, label="Eddies before splitting")
@@ -314,7 +314,7 @@
 # ---------------
 # Display the starting position of non-splitted eddies
 fig = plt.figure(figsize=(15, 8))
-ax = fig.add_axes([0.04, 0.06, 0.90, 0.88], projection="full_axes")
+ax = fig.add_axes([0.04, 0.06, 0.90, 0.88], projection=GUI_AXES)
 birth = n.birth_event()
 birth.display(ax)
 ax.set_xlim(17.5, 27.5), ax.set_ylim(31, 36), ax.grid()
@@ -325,7 +325,7 @@
 # ---------------
 # Display the last position of non-merged eddies
 fig = plt.figure(figsize=(15, 8))
-ax = fig.add_axes([0.04, 0.06, 0.90, 0.88], projection="full_axes")
+ax = fig.add_axes([0.04, 0.06, 0.90, 0.88], projection=GUI_AXES)
 death = n.death_event()
 death.display(ax)
 ax.set_xlim(17.5, 27.5), ax.set_ylim(31, 36), ax.grid()

examples/16_network/pet_replay_segmentation.py

@@ -11,8 +11,8 @@
 from matplotlib.ticker import FuncFormatter
 from numpy import where
 
-import py_eddy_tracker.gui
 from py_eddy_tracker.data import get_demo_path
+from py_eddy_tracker.gui import GUI_AXES
 from py_eddy_tracker.observations.network import NetworkObservations
 from py_eddy_tracker.observations.tracking import TrackEddiesObservations
 
@@ -24,7 +24,7 @@ def formatter(x, pos):
 
 def start_axes(title=""):
     fig = plt.figure(figsize=(13, 6))
-    ax = fig.add_axes([0.03, 0.03, 0.90, 0.94], projection="full_axes")
+    ax = fig.add_axes([0.03, 0.03, 0.90, 0.94], projection=GUI_AXES)
     ax.set_xlim(19, 29), ax.set_ylim(31, 35.5)
     ax.set_aspect("equal")
     ax.set_title(title, weight="bold")

examples/16_network/pet_segmentation_anim.py

@@ -10,8 +10,8 @@
 from matplotlib.colors import ListedColormap
 from numpy import ones, where
 
-import py_eddy_tracker.gui
 from py_eddy_tracker.data import get_demo_path
+from py_eddy_tracker.gui import GUI_AXES
 from py_eddy_tracker.observations.network import NetworkObservations
 from py_eddy_tracker.observations.tracking import TrackEddiesObservations
 
@@ -104,7 +104,7 @@ def update(i_frame):
 
 
 fig = plt.figure(figsize=(16, 9), dpi=60)
-ax = fig.add_axes([0.04, 0.06, 0.94, 0.88], projection="full_axes")
+ax = fig.add_axes([0.04, 0.06, 0.94, 0.88], projection=GUI_AXES)
 ax.set_title(f"{len(e)} observations to segment")
 ax.set_xlim(19, 29), ax.set_ylim(31, 35.5), ax.grid()
 vmax = TRACKS[-1].max()
@@ -121,6 +121,6 @@ def update(i_frame):
 # Final Result
 # ------------
 fig = plt.figure(figsize=(16, 9))
-ax = fig.add_axes([0.04, 0.06, 0.94, 0.88], projection="full_axes")
+ax = fig.add_axes([0.04, 0.06, 0.94, 0.88], projection=GUI_AXES)
 ax.set_xlim(19, 29), ax.set_ylim(31, 35.5), ax.grid()
 _ = ax.scatter(e.lon, e.lat, c=TRACKS[-1], cmap=cmap, vmin=0, vmax=vmax, s=20)