flightplotting 0.1.1__tar.gz → 0.1.3__tar.gz

{flightplotting-0.1.1/flightplotting.egg-info → flightplotting-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.1.1
+Version: 0.1.3
 Summary: Tools for Plotting Flight Data in Plotly
 Home-page: https://github.com/PyFlightCoach/FlightPlotting
 Author: Thomas David

flightplotting-0.1.3/flightplotting/__init__.py

@@ -0,0 +1,4 @@
+
+
+from flightplotting.plots import plotsec, plot_analysis, plotdtw, create_3d_plot
+from flightplotting.traces import axestrace, trace3d, dtwtrace, vector, vectors

{flightplotting-0.1.1 → flightplotting-0.1.3}/flightplotting/plots.py

@@ -12,28 +12,41 @@ from flightplotting.traces import (
     control_inputs,
     cgtrace,
     ribbon,
-    vectors
+    vectors,
+    axestrace
 )
     
 from flightanalysis import State, Manoeuvre
+from geometry import Coord
 from flightplotting.model import obj, OBJ
+from flightanalysis import State
 import numpy as np
+from typing import List, Union
 
 
-def plotsec(sec, scale=5, nmodels=0, fig=None, color="orange", obj: OBJ=obj, cg=False, width=None, height=None, show_axes=False, ribb: bool=False, tips: bool=True):
-    text = ["{:.1f}".format(val) for val in sec.data.index]
+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, 
+            height=None, show_axes=False, ribb: bool=False, tips: bool=True, origin=False):
+
     traces = []
-    if ribb:
-        traces += ribbon(sec, scale * 1.85, color)
-    
-    if tips:
-        traces += tiptrace(sec, scale * 1.85, text=text)
-    
-    if nmodels > 0:
-        traces += meshes(nmodels, sec, color, obj.scale(scale))
 
-    if cg:
-        traces += cgtrace(sec, text=text)
+    if isinstance(secs, State):
+        secs = [secs]
+
+    for i, sec in enumerate(secs):
+        text = ["{:.1f}".format(val) for val in sec.data.index]
+        _color = color if not color is None else px.colors.qualitative.Plotly[i]
+        if ribb:
+            traces += ribbon(sec, scale * 1.85, _color)
+        if tips:
+            traces += tiptrace(sec, scale * 1.85, text=text)
+        if nmodels > 0:
+            traces += meshes(nmodels, sec, _color, obj.scale(scale))
+        if cg:
+            traces += cgtrace(sec, text=text, color=_color)
+
+    if origin:
+        traces += axestrace(Coord.zero(), 50)
 
     if fig is None:
 
@@ -60,21 +73,15 @@ def plotsec(sec, scale=5, nmodels=0, fig=None, color="orange", obj: OBJ=obj, cg=
 
 
 
-def plotdtw(sec: State, manoeuvres, span=3):
+def plotdtw(sec: State, manoeuvres: List[str], span=3):
     fig = go.Figure()
 
     traces = []#tiptrace(sec, span)
 
-    for i, man in enumerate(manoeuvres):
-        name = f"el {i}"
-        if hasattr(man, 'name'):
-            name=man.name
-        elif hasattr(man, "uid"): 
-            name = man.uid
-
+    for i, name in enumerate(manoeuvres):
         try:
-            seg = man.get_data(sec)
-        
+            seg = sec.get_man_or_el(name)
+
             traces += ribbon(seg, span, px.colors.qualitative.Alphabet[i], name)
 
             traces.append(go.Scatter3d(
@@ -90,7 +97,7 @@ def plotdtw(sec: State, manoeuvres, span=3):
             print("no data for manoeuvre {}, {}".format(name, ex))
     fig = go.Figure(
         data=traces,
-        layout=go.Layout(template="flight3d+judge_view")
+        layout=go.Layout(template="flight3d+judge_view"),
     )
 
     return fig

{flightplotting-0.1.1 → flightplotting-0.1.3}/flightplotting/traces.py

@@ -27,10 +27,19 @@ def boxtrace():
     )]
 
 
-def meshes(npoints, seq, colour, obj: OBJ=obj):
-    step = int(len(seq.data) / (npoints+1))
+def meshes(npoints, seq: State, colour, obj: OBJ=obj):
+    step = int(len(seq.data) / max(npoints, 1))
     
-    return [obj.transform(Transformation(st.pos, st.att)).create_mesh(colour,f"{st.time.t[0]:.1f}") for st in seq[::step]]
+    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}"))
+    return ms
+
+def vector(origin, direction, **kwargs):
+    pdata = Point.concatenate([origin, origin+direction])
+    return trace3d(*pdata.data.T, **kwargs)
 
 
 def vectors(npoints: int, seq: State, vectors: Point, **kwargs):
@@ -38,7 +47,7 @@ def vectors(npoints: int, seq: State, vectors: Point, **kwargs):
     step = int(len(seq.data) / (npoints+1))
     for pos, wind in zip(seq.pos[::step], vectors[::step]):
         pdata = Point.concatenate([pos, pos+wind])
-        trs.append(trace3d(*pdata.data.T, **kwargs))    
+        trs.append(trace3d(*pdata.data.T, text=abs(vectors), **kwargs))    
     return trs
 
 
@@ -161,9 +170,6 @@ def axis_rate_trace(sec, dash="solid", colours = px.colors.qualitative.Plotly):
 
 
 
-
-
-
 control_inputs =  ["aileron_1", "aileron_2", "elevator", "rudder", "throttle"]
 
 def control_input_trace(sec, dash="solid", colours = px.colors.qualitative.Plotly, control_inputs = None):
@@ -176,24 +182,21 @@ 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 _axistrace(cid: Coord, length:float=20.0):
+def axestrace(cid: Coord, length:float=20.0):
     ntraces = []
     colours = {"x":"red", "y":"blue", "z":"green"}
-    for ax, col in zip([cid.x_axis, cid.y_axis, cid.z_axis], list("xyz")):
-        axis = Point.concatenate([cid.origin, cid.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
-        ))
+    for i, ci in enumerate(cid):
+        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
+            ))
         
     return ntraces
 
-def axestrace(cids: Union[Coord, List[Coord]]):
-    if isinstance(cids, List):
-        return [_axistrace(cid) for cid in cids]
-    elif isinstance(cids, Coord):
-        return _axistrace(cids)
 
 
 
@@ -238,8 +241,8 @@ def ribbon(sec: State, span: float, color: str, name="none"):
 
     points = Point(_npinterzip(left.data, right.data))
 
-    triids = np.array(range(len(points) - 2))
-    _i = triids   # 1 2 3 4 5
+    
+    _i = np.array(range(len(points) - 2))   # 1 2 3 4 5
 
     _js = np.array(range(1, len(points), 2))
     _j = _npinterzip(_js, _js)[1:-1] # 1 3 3 4 4 5 
@@ -251,7 +254,6 @@ def ribbon(sec: State, span: float, color: str, name="none"):
     return [go.Mesh3d(
         x=points.x, y=points.y, z=points.z, i=_i, j=_j, k=_k,
         intensitymode="cell",
-        facecolor=np.full(len(triids), color),
-        #hoverinfo=name,
+        facecolor=np.full(len(_i), color),
         name=name,
     )]

{flightplotting-0.1.1 → flightplotting-0.1.3/flightplotting.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.1.1
+Version: 0.1.3
 Summary: Tools for Plotting Flight Data in Plotly
 Home-page: https://github.com/PyFlightCoach/FlightPlotting
 Author: Thomas David

{flightplotting-0.1.1 → flightplotting-0.1.3}/setup.cfg

@@ -5,7 +5,7 @@ author_email = thomasdavid0@gmail.com
 description = Tools for Plotting Flight Data in Plotly
 long_description = file: README.md
 long_description_content_type = text/markdown
-version = 0.1.1
+version = 0.1.3
 url = https://github.com/PyFlightCoach/FlightPlotting
 
 [options]

flightplotting-0.1.1/flightplotting/__init__.py

@@ -1,3 +0,0 @@
-
-
-from flightplotting.plots import plotsec, plot_analysis, plotdtw