flightplotting 0.2.5__tar.gz → 0.2.7__tar.gz

{flightplotting-0.2.5 → flightplotting-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.2.5
+Version: 0.2.7
 Summary: Tools for Plotting Flight Data in Plotly
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -11,9 +11,9 @@ License-File: COPYING
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: plotly
-Requires-Dist: pfc-geometry>=0.2.4
-Requires-Dist: flightdata>=0.2.6
-Requires-Dist: flightanalysis>=0.2.6
+Requires-Dist: pfc-geometry>=0.2.8
+Requires-Dist: flightdata>=0.2.16
+Requires-Dist: flightanalysis>=0.2.17
 
 # FlightPlotting
 

{flightplotting-0.2.5 → flightplotting-0.2.7}/flightplotting/plots.py

@@ -17,35 +17,55 @@ from flightplotting.traces import (
 from flightdata import State
 from flightdata.base.labeling import get_appended_id
 from geometry import Coord
-from flightplotting.model import obj, OBJ
+from flightplotting.model import obj
 import numpy as np
 from typing import List, Union
 
 
-def plotsec(secs: Union[State, list[State]], scale=5, nmodels=0, fig=None, 
-            color: Union[str, list[str]]=None, obj: OBJ=obj, cg=False, width=None, 
+def plotsec(secs: State | list[State] | dict[str, State], scale=5, nmodels=0, fig=None, 
+            color: Union[str, list[str]]=None, cg=False, width=None, 
             height=None, show_axes=False, ribb: bool=False, tips: bool=True, origin=False):
 
     traces = []
-
+    keys = None
     if isinstance(secs, State):
         secs = [secs]
 
+    if isinstance(secs, dict):
+        keys = list(secs.keys())
+        secs = list(secs.values())
+        showkeys=True
+    else:
+        keys = list(range(len(secs)))
+        showkeys=False
+
     for i, sec in enumerate(secs):
         text = ["{:.1f}".format(val) for val in sec.data.index]
         _color = color if color is not None else px.colors.qualitative.Plotly[i]
         if ribb:
-            traces += ribbon(sec, scale * 1.85, _color)
+            traces += ribbon(sec, scale * 1.85, _color, name=keys[i])
         if tips:
-            traces += tiptrace(sec, scale * 1.85, text=text)
+            traces += tiptrace(sec, scale * 1.85, text=text, name=keys[i])
         if nmodels > 0:
-            traces += meshes(nmodels, sec, _color, obj.scale(scale))
+            traces += meshes(nmodels, sec, _color, scale)
         if cg:
-            traces.append(cgtrace(sec, line=dict(color=_color, width=2)))
+            traces.append(cgtrace(sec, line=dict(color=_color, width=2), name=keys[i]))
 
     if origin:
         traces += axestrace(Coord.zero(), 50)
 
+    if showkeys:
+        for i, key in enumerate(keys):
+            traces.append(go.Scatter3d(
+                x=[],
+                y=[],
+                z=[],
+                mode='markers',
+                marker=dict(size=5, color=px.colors.qualitative.Plotly[i]),
+                name=key,
+                showlegend=True
+            ))
+
     if fig is None:
 
         fig = go.Figure(

{flightplotting-0.2.5 → flightplotting-0.2.7}/flightplotting/traces.py

@@ -24,14 +24,18 @@ def boxtrace():
     )]
 
 
-def meshes(npoints, seq: State, colour, obj: OBJ=obj):
+def meshes(npoints, seq: State, colour, scale=1, _obj: OBJ=None):
+    _obj = obj if _obj is None else _obj
+    if scale != 1:
+        _obj = _obj.scale(scale)
     step = int(len(seq.data) / max(npoints, 1))
     
     ms = []
 
-    sts = [seq[0]] + [ st for st in seq[::step]] + [seq[-1]]
-    for st in sts:
-        ms.append(obj.transform(Transformation(st.pos, st.att)).create_mesh(colour,f"{st.time.t[0]:.1f}"))
+    for st in seq[::step]:
+        ms.append(_obj.transform(
+            Transformation(st.pos, st.att)
+        ).create_mesh(colour,f"{st.time.t[0]:.1f}"))
     return ms
 
 def vector(origin, direction, **kwargs):
@@ -154,11 +158,12 @@ def axis_rate_traces(sts: dict[str, State], cols='pqr'):
     cols = px.colors.qualitative.D3
     traces = []
     dashes = ['solid', 'dot', 'dash', 'longdash', 'dashdot', 'longdashdot']
+    st0 = list(sts.values())[0]
     for i, rv in enumerate(list('pqr')):
         for k, st in sts.items():
 
             traces.append(go.Scatter(
-                x=st.data.index, y=getattr(st, rv), name=f'{k} {rv}', line=dict(color=cols[i], dash=dashes[list(sts.keys()).index(k)])
+                x=st0.data.index - st0.data.index[0], y=getattr(st, rv), name=f'{k} {rv}', line=dict(color=cols[i], dash=dashes[list(sts.keys()).index(k)])
             ))
     return traces
 

{flightplotting-0.2.5 → flightplotting-0.2.7}/flightplotting.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.2.5
+Version: 0.2.7
 Summary: Tools for Plotting Flight Data in Plotly
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -11,9 +11,9 @@ License-File: COPYING
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: plotly
-Requires-Dist: pfc-geometry>=0.2.4
-Requires-Dist: flightdata>=0.2.6
-Requires-Dist: flightanalysis>=0.2.6
+Requires-Dist: pfc-geometry>=0.2.8
+Requires-Dist: flightdata>=0.2.16
+Requires-Dist: flightanalysis>=0.2.17
 
 # FlightPlotting
 

flightplotting-0.2.7/flightplotting.egg-info/requires.txt

@@ -0,0 +1,6 @@
+numpy
+pandas
+plotly
+pfc-geometry>=0.2.8
+flightdata>=0.2.16
+flightanalysis>=0.2.17

flightplotting-0.2.7/requirements.txt

@@ -0,0 +1,6 @@
+numpy
+pandas
+plotly
+pfc-geometry>=0.2.8
+flightdata>=0.2.16
+flightanalysis>=0.2.17

flightplotting-0.2.5/flightplotting.egg-info/requires.txt

@@ -1,6 +0,0 @@
-numpy
-pandas
-plotly
-pfc-geometry>=0.2.4
-flightdata>=0.2.6
-flightanalysis>=0.2.6

flightplotting-0.2.5/requirements.txt

@@ -1,6 +0,0 @@
-numpy
-pandas
-plotly
-pfc-geometry>=0.2.4
-flightdata>=0.2.6
-flightanalysis>=0.2.6