flightplotting 0.1.3__tar.gz → 0.2.1__tar.gz

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

@@ -1,12 +1,16 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.1.3
+Version: 0.2.1
 Summary: Tools for Plotting Flight Data in Plotly
 Home-page: https://github.com/PyFlightCoach/FlightPlotting
 Author: Thomas David
 Author-email: thomasdavid0@gmail.com
 Description-Content-Type: text/markdown
 License-File: COPYING
+Requires-Dist: setuptools
+Requires-Dist: flightdata
+Requires-Dist: pfc-geometry
+Requires-Dist: plotly
 
 # FlightPlotting
 

{flightplotting-0.1.3 → flightplotting-0.2.1}/flightplotting/__init__.py

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

{flightplotting-0.1.3 → flightplotting-0.2.1}/flightplotting/model.py

@@ -2,42 +2,25 @@ import numpy as np
 import plotly.graph_objects as go
 from geometry import Transformation, Quaternion, Point
 from pkg_resources import resource_stream
+from dataclasses import dataclass
+import numpy.typing as npt
+
+@dataclass
+class OBJ:
+    vertices: Point
+    faces: npt.NDArray
+    normals: npt.NDArray = None
 
-class OBJ(object):
-    def __init__(self, vertices: Point, faces: np.ndarray):
-        self.vertices = vertices
-        self.faces = faces
     
     @staticmethod
     def from_obj_data(odata):
-        """[summary]
-        lifted in its entirity from here: https://chart-studio.plotly.com/~empet/15040/plotly-mesh3d-from-a-wavefront-obj-f/#/
-        odata is the string read from an obj file
-        """
-        vertices = []
-        faces = []
         lines = odata.splitlines()
 
-        for line in lines:
-            slist = line.split()
-            if slist:
-                if slist[0] == 'v':
-                    vertex = np.array(slist[1:], dtype=float)
-                    vertices.append(vertex)
-                elif slist[0] == 'f':
-                    face = []
-                    for k in range(1, len(slist)):
-                        face.append([int(s)
-                                    for s in slist[k].replace('//', '/').split('/')])
-                    if len(face) > 3:  # triangulate the n-polyonal face, n>3
-                        faces.extend([[face[0][0]-1, face[k][0]-1, face[k+1][0]-1]
-                                    for k in range(1, len(face)-1)])
-                    else:
-                        faces.append([face[j][0]-1 for j in range(len(face))])
-                else:
-                    pass
+        vertices = np.array([l.split(' ')[1:] for l in lines if l[:2]=='v '] , dtype=float)
+        normals = [l.split(' ')[1:] for l in lines if l[:3]=='vn ']
+        faces = np.array([[fn.split('//')[0] for fn in l.split(' ')[1:]] for l in lines if l[:2]=='f '], dtype=int)-1
 
-        return OBJ(Point(np.array(vertices)), np.array(faces))
+        return OBJ(Point(vertices),faces, normals)
 
     @staticmethod
     def from_obj_file(file):

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

@@ -16,10 +16,9 @@ from flightplotting.traces import (
     axestrace
 )
     
-from flightanalysis import State, Manoeuvre
+from flightdata import State
 from geometry import Coord
 from flightplotting.model import obj, OBJ
-from flightanalysis import State
 import numpy as np
 from typing import List, Union
 
@@ -43,7 +42,7 @@ def plotsec(secs: Union[State, list[State]], scale=5, nmodels=0, fig=None,
         if nmodels > 0:
             traces += meshes(nmodels, sec, _color, obj.scale(scale))
         if cg:
-            traces += cgtrace(sec, text=text, color=_color)
+            traces.append(cgtrace(sec, line=dict(color=_color, width=2)))
 
     if origin:
         traces += axestrace(Coord.zero(), 50)
@@ -73,8 +72,9 @@ def plotsec(secs: Union[State, list[State]], scale=5, nmodels=0, fig=None,
 
 
 
-def plotdtw(sec: State, manoeuvres: List[str], span=3):
-    fig = go.Figure()
+def plotdtw(sec: State, manoeuvres: List[str], span=3, fig=None):
+    if fig is None:
+        fig = go.Figure(layout=go.Layout(template="flight3d+judge_view"))
 
     traces = []#tiptrace(sec, span)
 
@@ -95,10 +95,9 @@ def plotdtw(sec: State, manoeuvres: List[str], span=3):
         except Exception as ex:
             pass
             print("no data for manoeuvre {}, {}".format(name, ex))
-    fig = go.Figure(
-        data=traces,
-        layout=go.Layout(template="flight3d+judge_view"),
-    )
+    
+    fig.add_traces(traces)
+    
 
     return fig
 

{flightplotting-0.1.3 → flightplotting-0.2.1}/flightplotting/templates.py

@@ -2,13 +2,10 @@
 import plotly.graph_objects as go
 import plotly.io as pio
 
-pio.templates["flight3d"] = go.layout.Template(layout=go.Layout(
+flight3d_template = go.layout.Template(layout=go.Layout(
     margin=dict(l=0, r=0, t=0, b=0),
     scene=dict(
         aspectmode='data',
-        #xaxis=dict(visible=True, showticklabels=True),
-        #yaxis=dict(visible=True, showticklabels=True),
-        #zaxis=dict(visible=True, showticklabels=True),
     ),
     legend=dict(
         font=dict(size=20),
@@ -19,10 +16,14 @@ pio.templates["flight3d"] = go.layout.Template(layout=go.Layout(
     )
 ))
 
+pio.templates["flight3d"] = flight3d_template
 
-pio.templates["judge_view"] = go.layout.Template(layout=go.Layout(scene_camera=dict(
+judges_view_template = go.layout.Template(layout=go.Layout(scene_camera=dict(
     up=dict(x=0, y=0, z=1),
     center=dict(x=0, y=0, z=-0.2),
     eye=dict(x=0.0, y=-3, z=-0.8),
     projection=dict(type='perspective')
 )))
+
+
+pio.templates["judge_view"] = judges_view_template

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

@@ -5,8 +5,7 @@ from geometry import Point, Coord, Transformation
 import numpy as np
 from typing import List, Union
 
-from flightanalysis import State
-from flightanalysis.schedule import Manoeuvre, Schedule
+from flightdata import State
 from flightplotting.model import obj, OBJ
 import plotly.express as px
 
@@ -53,19 +52,15 @@ def vectors(npoints: int, seq: State, vectors: Point, **kwargs):
 
 
 def trace3d(datax, datay, dataz, **kwargs):
-    return go.Scatter3d(
-        x=datax,
-        y=datay,
-        z=dataz,
-        **dict(
-            dict(
-                mode='lines',
-                line=dict(color="black", width=2, dash="solid"),
-                showlegend=False
-            ),
-            **kwargs
-        )
-    )
+
+    if not 'mode' in kwargs:
+        kwargs['mode'] = 'lines'
+    if kwargs['mode'] == 'lines' and not 'line' in kwargs:
+        kwargs['line']=dict(width=2, dash="solid")
+    if not 'showlegend' in kwargs:
+        kwargs['showlegend'] = False
+
+    return go.Scatter3d(x=datax,y=datay,z=dataz,**kwargs)
 
 
 def cgtrace(seq, **kwargs):
@@ -80,7 +75,7 @@ def cgtrace(seq, **kwargs):
     )
 
 
-def manoeuvretraces(schedule: Schedule, section: State, colours = px.colors.qualitative.Plotly):
+def manoeuvretraces(schedule, section: State, colours = px.colors.qualitative.Plotly):
     traces = []
     for man, color in zip(schedule.manoeuvres, colours):
         st = man.get_data(section)
@@ -89,7 +84,7 @@ def manoeuvretraces(schedule: Schedule, section: State, colours = px.colors.qual
     return traces
 
 
-def elementtraces(manoeuvre: Manoeuvre, sec: State):
+def elementtraces(manoeuvre, sec: State):
     traces = []
     for id, element in enumerate(manoeuvre.elements):
         elm = element.get_data(sec)
@@ -152,6 +147,21 @@ def dtwtrace(sec: State, elms, showlegend = True):
 
 
 
+
+def axis_rate_traces(sts: dict[str, State], cols='pqr'):
+    cols = px.colors.qualitative.D3
+    traces = []
+    dashes = ['solid', 'dot', 'dash', 'longdash', 'dashdot', 'longdashdot']
+    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)])
+            ))
+    return traces
+
+
+
 def sec_col_trace(sec, columns, dash="solid", colours = px.colors.qualitative.Plotly, yfunc=lambda x: x):
     trs = []
     for i, axis in enumerate(columns):

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

@@ -1,12 +1,16 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.1.3
+Version: 0.2.1
 Summary: Tools for Plotting Flight Data in Plotly
 Home-page: https://github.com/PyFlightCoach/FlightPlotting
 Author: Thomas David
 Author-email: thomasdavid0@gmail.com
 Description-Content-Type: text/markdown
 License-File: COPYING
+Requires-Dist: setuptools
+Requires-Dist: flightdata
+Requires-Dist: pfc-geometry
+Requires-Dist: plotly
 
 # FlightPlotting
 

{flightplotting-0.1.3 → flightplotting-0.2.1}/flightplotting.egg-info/SOURCES.txt

@@ -16,4 +16,4 @@ flightplotting.egg-info/requires.txt
 flightplotting.egg-info/top_level.txt
 flightplotting/data/ColdDraftF3APlane.obj
 flightplotting/data/__init__.py
-tests/test_traces.py
+tests/test_plots.py

{flightplotting-0.1.3 → flightplotting-0.2.1}/flightplotting.egg-info/requires.txt

@@ -1,5 +1,4 @@
 setuptools
 flightdata
 pfc-geometry
-flightanalysis
 plotly

{flightplotting-0.1.3 → flightplotting-0.2.1}/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.3
+version = 0.2.1
 url = https://github.com/PyFlightCoach/FlightPlotting
 
 [options]
@@ -13,7 +13,6 @@ install_requires =
 	setuptools
 	flightdata
 	pfc-geometry
-	flightanalysis
 	plotly
 include_package_data = True
 

flightplotting-0.2.1/tests/test_plots.py

@@ -0,0 +1,18 @@
+from flightdata import Flight, State
+from pytest import fixture
+from flightplotting import plotsec
+from flightplotting.traces import cgtrace
+import plotly.graph_objects as go
+
+@fixture
+def state():
+    return State.from_flight(Flight.from_json('tests/data/p23_flight.json'))
+
+
+def test_plotsec_cg(state):
+    fig = plotsec(state, tips=False, cg=True)
+    assert isinstance(fig, go.Figure)
+
+def test_cgtrace(state):
+    trace = cgtrace(state)
+    assert isinstance(trace, go.Scatter3d)

flightplotting-0.1.3/tests/test_traces.py

@@ -1,10 +0,0 @@
-from flightanalysis import State, Loop
-from geometry import Transformation, Euler, P0
-import numpy as np
-
-st = Loop(100, 1, 1).create_template(Transformation(P0(), Euler(np.pi, 0, 0)), 20)
-
-
-from flightplotting import plotsec
-
-plotsec(st, nmodels=5).show()