- Allow to hide path in GUIEddy

- Iter obs on intern field or outter array

Author: AntSimi

src/py_eddy_tracker/appli/gui.py

@@ -44,7 +44,7 @@ def setup(self, cmap="jet", nb_step=25, figsize=(8, 6), **kwargs):
         self.fig = pyplot.figure(figsize=figsize, **kwargs)
         t0, t1 = self.period
         self.fig.suptitle(f"{t0} -> {t1}")
-        self.ax = self.fig.add_axes((0.05, 0.05, 0.9, 0.9))
+        self.ax = self.fig.add_axes((0.05, 0.05, 0.9, 0.9), projection="full_axes")
         self.ax.set_xlim(x_min, x_max), self.ax.set_ylim(y_min, y_max)
         self.ax.set_aspect("equal")
         self.ax.grid()
@@ -192,6 +192,11 @@ def anim():
     parser.add_argument(
         "--infinity_loop", action="store_true", help="Press Escape key to stop loop"
     )
+    parser.add_argument(
+        "--first_centered",
+        action="store_true",
+        help="Longitude will be centered on first obs, if there are only one group.",
+    )
     args = parser.parse_args()
     variables = ["time", "track", "longitude", "latitude"]
     variables.extend(TrackEddiesObservations.intern(args.intern, public_label=True))
@@ -203,6 +208,14 @@ def anim():
                 "You need to specify id to display or ask explicity all with --all option"
             )
         eddies = eddies.extract_ids(args.id)
+        if args.first_centered:
+            # TODO: include observatin class
+            x0 = eddies.lon[0]
+            eddies.lon[:] = (eddies.lon - x0 + 180) % 360 + x0 - 180
+            eddies.contour_lon_e[:] = (
+                (eddies.contour_lon_e.T - eddies.lon + 180) % 360 + eddies.lon - 180
+            ).T
+
     a = Anim(
         eddies,
         intern=args.intern,
@@ -217,6 +230,7 @@ def gui_parser():
     parser = EddyParser("Eddy atlas GUI")
     parser.add_argument("atlas", nargs="+")
     parser.add_argument("--med", action="store_true")
+    parser.add_argument("--nopath", action="store_true", help="Don't draw path")
     return parser.parse_args()
 
 
@@ -228,4 +242,5 @@ def guieddy():
     g = GUI(**atlas)
     if args.med:
         g.med()
+    g.hide_path(not args.nopath)
     g.show()

src/py_eddy_tracker/appli/network.py

@@ -53,10 +53,10 @@ def divide_network():
     args = parser.parse_args()
     contour_name = TrackEddiesObservations.intern(args.intern, public_label=True)
     e = TrackEddiesObservations.load_file(
-        args.input, include_vars=("time", "track", *contour_name)
+        args.input,
+        include_vars=("time", "track", "latitude", "longitude", *contour_name),
     )
-    e.split_network(intern=args.intern, window=args.window)
-    # split_network(args.input, args.out)
+    ids = e.split_network(intern=args.intern, window=args.window)
 
 
 def split_network(input, output):

src/py_eddy_tracker/dataset/grid.py

@@ -1163,6 +1163,9 @@ def setup_coordinates(self):
 
     @classmethod
     def with_array(cls, coordinates, datas, variables_description=None, **kwargs):
+        """
+        Geo matrix data must be ordered like this (X,Y) and masked with numpy.ma.array
+        """
         vd = dict() if variables_description is None else variables_description
         x_name, y_name = coordinates[0], coordinates[1]
         obj = cls("array", x_name, y_name, unset=True, **kwargs)

src/py_eddy_tracker/gui.py

@@ -146,6 +146,11 @@ def setup(self):
         # param
         self.param_ax = self.figure.add_axes((0, 0, 1, 0.15), facecolor="0.2")
 
+    def hide_path(self, state):
+        for name in self.datasets:
+            self.m[name]["path_previous"].set_visible(state)
+            self.m[name]["path_future"].set_visible(state)
+
     def draw(self):
         self.m["mini_ax"] = self.figure.add_axes((0.3, 0.85, 0.4, 0.15), zorder=80)
         self.m["mini_ax"].grid()

src/py_eddy_tracker/observations/observation.py

@@ -456,16 +456,16 @@ def __iter__(self):
         for obs in self.obs:
             yield obs
 
-    def iter_on(self, xname: str, bins=None):
+    def iter_on(self, xname, bins=None):
         """
         Yield observation group for each bin.
 
-        :param str xname:
+        :param str,array xname:
         :param array bins: bounds of each bin ,
         :return: Group observations
         :rtype: self.__class__
         """
-        x = self[xname]
+        x = self[xname] if isinstance(xname, str) else xname
         d = x[1:] - x[:-1]
         if bins is None:
             bins = arange(x.min(), x.max() + 2)