flightplotting 0.2.1__tar.gz → 0.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.2.1
+Version: 0.2.3
 Summary: Tools for Plotting Flight Data in Plotly
 Home-page: https://github.com/PyFlightCoach/FlightPlotting
 Author: Thomas David
@@ -8,9 +8,12 @@ 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
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: pfc-geometry>=0.2.4
+Requires-Dist: flightdata>=0.2.6
+Requires-Dist: flightanalysis>=0.2.6
 
 # FlightPlotting
 

{flightplotting-0.2.1 → flightplotting-0.2.3}/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, boxtrace, axis_rate_traces
+from flightplotting.plots import plotsec, plot_analysis, plotdtw, create_3d_plot, plot_regions
+from flightplotting.traces import axestrace, trace3d, dtwtrace, vector, vectors, boxtrace, axis_rate_traces, colour_from_scale

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

@@ -8,8 +8,6 @@ from flightplotting.traces import (
     control_input_trace, 
     axis_rate_trace, 
     aoa_trace, 
-    dtwtrace,
-    control_inputs,
     cgtrace,
     ribbon,
     vectors,
@@ -34,7 +32,7 @@ def plotsec(secs: Union[State, list[State]], scale=5, nmodels=0, fig=None,
 
     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]
+        _color = color if color is not None else px.colors.qualitative.Plotly[i]
         if ribb:
             traces += ribbon(sec, scale * 1.85, _color)
         if tips:
@@ -62,9 +60,9 @@ def plotsec(secs: Union[State, list[State]], scale=5, nmodels=0, fig=None,
                 zaxis=dict(visible=True, showticklabels=True)
             )
             )
-        if not width is None:
+        if width is not None:
             fig.update_layout(width=width)
-        if not height is None:
+        if height is not None:
             fig.update_layout(height=height)
     else:
         fig.add_traces(traces)
@@ -101,7 +99,48 @@ def plotdtw(sec: State, manoeuvres: List[str], span=3, fig=None):
 
     return fig
 
+def plot_regions(st: State, lab_cols: list[str], span=3, colours=None, fig=None):
+    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))
+    
+    def get_base_label(clab):
+        base = clab
+        try:
+            id = int(clab.split('_')[-1])
+            base = clab[:-len(f'_{id}')]
+        except Exception:
+            pass
+        return base
+    
+    colmap = {}
+
+    traces = []
+    for i, (k, seg) in enumerate(st.split_labels('clabs').items()):
+        blab = get_base_label(k)
+        if blab not in colmap:
+            colmap[blab] = colours[len(colmap) % len(colours)]
+            leg = True
+        else:
+            leg = False
+
+        traces += ribbon(seg, span, colmap[blab], name=k, showlegend=leg)
+
+        traces.append(go.Scatter3d(
+            x=seg.pos.x, 
+            y=seg.pos.y, 
+            z=seg.pos.z,
+            mode='lines', 
+            line=dict(width=6, color=colmap[blab]), 
+            name=k,
+            showlegend=False
+        ))
+    
+    if fig is None:
+        fig = go.Figure(layout=go.Layout(template="flight3d+judge_view"))
+    fig.add_traces(traces)
+    return fig
 
 def create_3d_plot(traces):
     return go.Figure(
@@ -221,23 +260,3 @@ axis = dict(
     showline=True
 )
 
-
-aiaa_layout = dict(
-    margin=dict(l=1, r=1, t=5, b=1), 
-    legend=dict(yanchor="top", xanchor="left", x=0.8, y=0.99),
-    font_family="Times New Roman",
-    font_size=18,plot_bgcolor='rgba(0,0,0,0)',
- #   xaxis=dict(**axis),
- #   yaxis=dict(range=(-100,700), **axis),
- #   yaxis2=dict(range=(-100/20,700/20), **axis),
-)
-
-aiaa_full_width = dict(width=1200,**aiaa_layout)
-aiaa_half_width = dict(width=600,**aiaa_layout)
-
-aiaa_axis_rates = dict(
-    xaxis=dict(range=(0,1.1), **axis),
-    yaxis=dict(range=(-100,700), **axis),
-    yaxis2=dict(range=(-100/20,700/20), **axis),
-    **aiaa_half_width
-)

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

@@ -1,10 +1,8 @@
 import plotly.graph_objects as go
 import flightplotting.templates
-from .model import OBJ
 from geometry import Point, Coord, Transformation
 import numpy as np
-from typing import List, Union
-
+from plotly.colors import DEFAULT_PLOTLY_COLORS
 from flightdata import State
 from flightplotting.model import obj, OBJ
 import plotly.express as px
@@ -53,11 +51,11 @@ def vectors(npoints: int, seq: State, vectors: Point, **kwargs):
 
 def trace3d(datax, datay, dataz, **kwargs):
 
-    if not 'mode' in kwargs:
+    if 'mode' not in kwargs:
         kwargs['mode'] = 'lines'
-    if kwargs['mode'] == 'lines' and not 'line' in kwargs:
+    if kwargs['mode'] == 'lines' and 'line' not in kwargs:
         kwargs['line']=dict(width=2, dash="solid")
-    if not 'showlegend' in kwargs:
+    if 'showlegend' not in kwargs:
         kwargs['showlegend'] = False
 
     return go.Scatter3d(x=datax,y=datay,z=dataz,**kwargs)
@@ -103,8 +101,7 @@ def elementtraces(manoeuvre, sec: State):
 
 
 def tiptrace(seq, span, **kwargs):
-    text = ["{:.1f}".format(val) for val in seq.data.index]
-
+    
     def make_offset_trace(pos, colour):
         tr =  trace3d(
             *seq.body_to_world(pos).data.T,
@@ -119,8 +116,13 @@ def tiptrace(seq, span, **kwargs):
     ]
 
 
-get_colour = lambda i : DEFAULT_PLOTLY_COLORS[i % len(DEFAULT_PLOTLY_COLORS)]  
-from plotly.colors import DEFAULT_PLOTLY_COLORS
+def get_colour(i):
+    return DEFAULT_PLOTLY_COLORS[i % len(DEFAULT_PLOTLY_COLORS)]  
+
+
+def colour_from_scale(v, vmax, scale=px.colors.sequential.Burg):
+    return scale[int((len(scale) - 1) * v / vmax)]
+
 
 def dtwtrace(sec: State, elms, showlegend = True):
     traces = tiptrace(sec, 10)
@@ -234,16 +236,8 @@ def _npinterzip(a, b):
     return c
 
 
-def ribbon(sec: State, span: float, color: str, name="none"):
-    """WIP Vectorised version of ribbon, borrowed from kdoaij/FlightPlotting
-
-        refactoring ribbon, objectives:
-            speed it up by avoiding looping over array - done
-            make the colouring more generic - not yet
-        minor mod - 2 triangles per pair of points: - done
-            current pair to next left
-            current right to next pair
-        
+def ribbon(sec: State, span: float, color, **kwargs):
+    """TODO make the colouring more generic
     """
 
     left = sec.body_to_world(Point(0, span/2, 0))
@@ -265,5 +259,5 @@ def ribbon(sec: State, span: float, color: str, name="none"):
         x=points.x, y=points.y, z=points.z, i=_i, j=_j, k=_k,
         intensitymode="cell",
         facecolor=np.full(len(_i), color),
-        name=name,
+        **kwargs
     )]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.2.1
+Version: 0.2.3
 Summary: Tools for Plotting Flight Data in Plotly
 Home-page: https://github.com/PyFlightCoach/FlightPlotting
 Author: Thomas David
@@ -8,9 +8,12 @@ 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
+Requires-Dist: numpy
+Requires-Dist: pandas
+Requires-Dist: pfc-geometry>=0.2.4
+Requires-Dist: flightdata>=0.2.6
+Requires-Dist: flightanalysis>=0.2.6
 
 # FlightPlotting
 

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

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

{flightplotting-0.2.1 → flightplotting-0.2.3}/setup.cfg

@@ -5,15 +5,18 @@ 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.2.1
+version = 0.2.3
 url = https://github.com/PyFlightCoach/FlightPlotting
 
 [options]
 install_requires = 
 	setuptools
-	flightdata
-	pfc-geometry
 	plotly
+	numpy
+	pandas
+	pfc-geometry>=0.2.4
+	flightdata>=0.2.6
+	flightanalysis>=0.2.6
 include_package_data = True
 
 [egg_info]

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

@@ -1,4 +0,0 @@
-setuptools
-flightdata
-pfc-geometry
-plotly