flightplotting 0.2.2__tar.gz → 0.2.4__tar.gz

{flightplotting-0.2.2/flightplotting.egg-info → flightplotting-0.2.4}/PKG-INFO

@@ -1,16 +1,18 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.2.2
+Version: 0.2.4
 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: 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
 
 # FlightPlotting
 

{flightplotting-0.2.2 → flightplotting-0.2.4}/flightplotting/__init__.py

@@ -1,4 +1,4 @@
 
 
 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
+from flightplotting.traces import axestrace, trace3d, dtwtrace, vector, vectors, boxtrace, axis_rate_traces, colour_from_scale, get_colour

{flightplotting-0.2.2 → flightplotting-0.2.4}/flightplotting/plots.py

@@ -15,6 +15,7 @@ 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
 import numpy as np
@@ -99,23 +100,44 @@ 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):
-    if isinstance(lab_cols, str):
-        lab_cols = [lab_cols]
-    traces = []
-    if colours is None:
-        colours = px.colors.qualitative.Plotly
-    for i, (k, seg) in enumerate(st.split_labels(lab_cols).items()):
-        colour = colours[i % len(colours)]
-        traces += ribbon(seg, span, colour, k)
+def plot_regions(st: State, lab_cols: list[str], span=3, colours=None, fig=None, **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))
+    
+    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()):
+        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=6, color=colour), 
-            name=k
+            line=dict(width=0, color=colmap[blab]), 
+            name=k,
+            showlegend=False
         ))
     
     if fig is None:

{flightplotting-0.2.2 → flightplotting-0.2.4}/flightplotting/traces.py

@@ -236,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))
@@ -262,10 +254,9 @@ def ribbon(sec: State, span: float, color: str, name="none"):
     _ks = np.array(range(2, len(points) -1 , 2))
     _k = _npinterzip(_ks, _ks) # 2 2 4 4 6 6 
 
-
     return [go.Mesh3d(
         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.2 → flightplotting-0.2.4/flightplotting.egg-info}/PKG-INFO

@@ -1,16 +1,18 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.2.2
+Version: 0.2.4
 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: 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
 
 # FlightPlotting
 

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

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

{flightplotting-0.2.2 → flightplotting-0.2.4}/setup.cfg

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

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

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