flightplotting 0.2.12__tar.gz → 0.2.13__tar.gz

{flightplotting-0.2.12 → flightplotting-0.2.13}/PKG-INFO

@@ -1,12 +1,15 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: flightplotting
-Version: 0.2.12
+Version: 0.2.13
 Summary: Add your description here
 Author-email: Thomas David <thomasdavid0@gmail.com>
+License-File: COPYING
 Requires-Python: >=3.12
-Requires-Dist: flightanalysis>=0.3.14
+Requires-Dist: flightdata>=0.3.0
 Requires-Dist: numpy>=2.1.3
 Requires-Dist: pandas>=2.2.3
+Requires-Dist: pfc-geometry
+Requires-Dist: pfcschemas
 Requires-Dist: plotly>=5.24.1
 Description-Content-Type: text/markdown
 

{flightplotting-0.2.12 → flightplotting-0.2.13}/pyproject.toml

@@ -1,15 +1,17 @@
 [project]
 name = "flightplotting"
-version="v0.2.12"
+version="v0.2.13"
 description = "Add your description here"
 readme = "README.md"
 authors = [{ name = "Thomas David", email = "thomasdavid0@gmail.com" }]
 requires-python = ">=3.12"
 dependencies = [
-    "flightanalysis>=0.3.14",
     "numpy>=2.1.3",
     "pandas>=2.2.3",
     "plotly>=5.24.1",
+    "flightdata>=0.3.0",
+    "pfc-geometry",
+    "pfcschemas",
 ]
 
 [build-system]

{flightplotting-0.2.12 → flightplotting-0.2.13}/src/plotting/plots.py

@@ -15,14 +15,12 @@ from plotting.traces import (
 )
 
 from flightdata import State
-from flightdata.base.labeling import get_appended_id
 from geometry import Coord
 from plotting.model import obj
 import numpy.typing as npt
 import numpy as np
 import pandas as pd
 from typing import List, Union
-from flightanalysis.scoring.box import Box
 
 
 def plotsec(
@@ -37,6 +35,7 @@ def plotsec(
     show_axes=False,
     ribb: bool = False,
     tips: bool = True,
+    ribbonhover="t",    
     origin=False,
 ):
     traces = []
@@ -53,16 +52,18 @@ def plotsec(
         showkeys = False
 
     for i, sec in enumerate(secs):
-        text = sec.data.t #- sec.data.t.iloc[0]
+        text = sec.data.t  # - sec.data.t.iloc[0]
         _color = color if color is not None else px.colors.qualitative.Plotly[i]
         if ribb:
-            traces += ribbon(sec, scale * 1.85, _color, name=keys[i])
+            traces += ribbon(sec, 0.5 * scale * 1.85, "grey", name=keys[i], opacity=0.5, hover=ribbonhover)
         if tips:
             traces += tiptrace(sec, scale * 1.85, text=text, name=keys[i])
         if nmodels > 0:
             traces += meshes(nmodels, sec, _color, scale)
         if cg:
-            traces.append(cgtrace(sec, line=dict(color=_color, width=2), name=keys[i], text=text))
+            traces.append(
+                cgtrace(sec, line=dict(color=_color, width=2), name=keys[i], text=text)
+            )
 
     if origin:
         traces += axestrace(Coord.zero(), 50)
@@ -136,47 +137,33 @@ def plotdtw(sec: State, manoeuvres: List[str], span=3, fig=None):
 
 
 def plot_regions(
-    st: State, lab_cols: list[str], span=3, colours=None, fig=None, box:Box=None, **kwargs
+    st: State,
+    label_group_name: str,
+    span=3,
+    colours=None,
+    fig=None,
+    ribbonhover="t",
+    **kwargs,
 ):
     colours = px.colors.qualitative.Plotly if colours is None else colours
-    lab_cols = [lab_cols] if isinstance(lab_cols, str) else lab_cols
-
-    st = st.label(clabs=st.cumulative_labels(*lab_cols))
-
-    colmap = {}
 
     traces = []
-    for i, (k, seg) in enumerate(st.split_labels("clabs").items()):
+    for i, k in enumerate(st.labels[label_group_name].keys()):
+        seg = getattr(st, label_group_name)[k]
         if len(seg) < 3:
             continue
-        blab, id = get_appended_id(k)
-        if blab not in colmap:
-            colmap[blab] = colours[len(colmap) % len(colours)]
         traces += ribbon(
             seg,
             span,
-            colmap[blab],
-            name=blab,
-            showlegend=int(id) == 0,
-            **kwargs[blab] if blab in kwargs else {},
-        )
-        traces.append(
-            go.Scatter3d(
-                x=seg.pos.x,
-                y=seg.pos.y,
-                z=seg.pos.z,
-                mode="lines",
-                line=dict(width=0, color=colmap[blab]),
-                name=k,
-                showlegend=False,
-            )
+            colours[i%len(colours)],
+            name=k,
+            hover=ribbonhover
         )
 
+
     if fig is None:
         fig = go.Figure(layout=go.Layout(template="flight3d+judge_view"))
     fig.add_traces(traces)
-    if box:
-        fig.add_traces(box.plot())
     return fig
 
 
@@ -316,7 +303,7 @@ def multi_y_subplots(data: dict[str, pd.DataFrame], x: npt.NDArray = None):
         cols=1,
         shared_xaxes=True,
         vertical_spacing=0.01,
-        #subplot_titles=list(data.keys()),
+        # subplot_titles=list(data.keys()),
     )
 
     for row, (k, v) in enumerate(data.items(), 1):
@@ -352,7 +339,7 @@ def multi_y_subplots(data: dict[str, pd.DataFrame], x: npt.NDArray = None):
                     yanchor="top",
                 ),
                 f"yaxis{i}": dict(
-                    title=list(data.keys())[i-1],
+                    title=list(data.keys())[i - 1],
                     showline=True,
                 ),
             }

{flightplotting-0.2.12 → flightplotting-0.2.13}/src/plotting/templates.py

@@ -2,21 +2,14 @@
 import plotly.graph_objects as go
 import plotly.io as pio
 
-flight3d_template = go.layout.Template(layout=go.Layout(
+
+generic3d_template = go.layout.Template(layout=go.Layout(
     margin=dict(l=0, r=0, t=0, b=0),
-    scene=dict(
-        aspectmode='data',
-    ),
-    legend=dict(
-        font=dict(size=20),
-        yanchor="top",
-        y=0.99,
-        xanchor="left",
-        x=0.01
-    )
+    scene=dict(aspectmode='data')
 ))
 
-pio.templates["flight3d"] = flight3d_template
+pio.templates["generic3d"] = generic3d_template
+pio.templates["flight3d"] = generic3d_template
 
 judges_view_template = go.layout.Template(layout=go.Layout(scene_camera=dict(
     up=dict(x=0, y=0, z=1),
@@ -32,10 +25,9 @@ pio.templates["judge_view"] = judges_view_template
 clean_paper_template = go.layout.Template(layout=go.Layout(
     margin=dict(l=0, r=0, t=0, b=0),
     scene=dict(
-        aspectmode='data',
         xaxis = dict(visible=False),
         yaxis = dict(visible=False),
-        zaxis =dict(visible=False)
+        zaxis = dict(visible=False)
     ),
     legend=dict(
         font=dict(size=20),

{flightplotting-0.2.12 → flightplotting-0.2.13}/src/plotting/traces.py

@@ -1,3 +1,4 @@
+from typing import Literal
 import plotly.graph_objects as go
 import plotting.templates
 from geometry import Point, Coord, Transformation
@@ -23,7 +24,7 @@ def boxtrace():
     )]
 
 
-def meshes(npoints, seq: State, colour, scale=1, _obj: OBJ=None):
+def meshes(npoints, seq: State | Transformation, colour: str=None, scale=1, _obj: OBJ=None):
     _obj = obj if _obj is None else _obj
     if scale != 1:
         _obj = _obj.scale(scale)
@@ -36,10 +37,10 @@ def meshes(npoints, seq: State, colour, scale=1, _obj: OBJ=None):
         locs = locs + list(np.cumsum(np.full(npoints-2, len(seq) / (npoints-1))).astype(int))
         
     ms = []
-    for loc in locs:
+    for i, loc in enumerate(locs):
         ms.append(_obj.transform(
-            Transformation(seq.pos[loc], seq.att[loc])
-        ).create_mesh(colour,f"{seq.time.t[loc]:.1f}"))
+            seq.iloc[loc].transform if isinstance(seq, State) else seq[loc]
+        ).create_mesh(colour or "grey",f"{(seq.time.t[loc] if isinstance(seq, State) else i):.1f}"))
     return ms
 
 def vector(origin, direction, **kwargs):
@@ -201,24 +202,25 @@ def aoa_trace(sec, dash="dash", colours = px.colors.qualitative.Plotly):
     #sec = sec.append_columns(sec.aoa())
     return sec_col_trace(sec, ["alpha", "beta"], dash, colours, np.degrees)
 
-def axestrace(cid: Coord, length:float=20.0):
+def axestrace(cid: Coord | Transformation, length:float=20.0, **kwargs):
     ntraces = []
     colours = {"x":"red", "y":"blue", "z":"green"}
     for i, ci in enumerate(cid):
+        if isinstance(ci, Transformation):
+            ci = ci.apply(Coord.zero())
         for ax, col in zip([ci.x_axis, ci.y_axis, ci.z_axis], list("xyz")):
             axis = Point.concatenate([ci.origin, ci.origin + ax * length])
             ntraces.append(go.Scatter3d(
                 x=axis.x, y=axis.y, z=axis.z, mode="lines", 
                 line=dict(color=colours[col]),
-                name=col,
-                showlegend=True if i==0 else False
+                name=f"{i}_{col}",
+                **kwargs
             ))
         
     return ntraces
 
 
 
-
 def _npinterzip(a, b):
     """
     takes two numpy arrays and zips them.
@@ -243,7 +245,7 @@ def _npinterzip(a, b):
     return c
 
 
-def ribbon(sec: State, span: float, color, **kwargs):
+def ribbon(sec: State, span: float, color, hover: Literal["i", "t"]='i', **kwargs):
     """TODO make the colouring more generic
     """
 
@@ -252,7 +254,13 @@ def ribbon(sec: State, span: float, color, **kwargs):
 
     points = Point(_npinterzip(left.data, right.data))
 
-    
+    match hover:
+        case "i":
+            text=[f"{i}" for i in np.arange(len(sec)*2)]
+        case _:
+            text=[f"{t:.1f}" for t in _npinterzip(sec.t, sec.t)]
+        
+
     _i = np.array(range(len(points) - 2))   # 1 2 3 4 5
 
     _js = np.array(range(1, len(points), 2))
@@ -265,5 +273,7 @@ def ribbon(sec: State, span: float, color, **kwargs):
         x=points.x, y=points.y, z=points.z, i=_i, j=_j, k=_k,
         intensitymode="cell",
         facecolor=np.full(len(_i), color),
+        text=text,
+        hovertemplate='i:%{text}<br>',
         **kwargs
     )]