flightplotting 0.2.10__tar.gz → 0.2.11__tar.gz

flightplotting-0.2.11/.github/workflows/publish_pypi.yml

@@ -0,0 +1,26 @@
+name: Publish to PyPI and TestPyPI
+on:
+  push:
+    branches:
+      - 'main'   
+jobs:
+  build:
+    name: Build and publish distribution
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      
+      - name: Install uv
+        uses: astral-sh/setup-uv@v3
+        with:
+          enable-cache: true
+          cache-dependency-glob: uv.lock
+      - name: Set up Python
+        run: uv python install 3.12
+          
+      - name: Build
+        run: uv build
+      
+      - name: Publish to PyPI
+        run: uv publish -t ${{ secrets.PYPI_TOKEN }}

flightplotting-0.2.11/MANIFEST.in

@@ -0,0 +1 @@
+include plotting/data/*.obj

flightplotting-0.2.11/PKG-INFO

@@ -0,0 +1,27 @@
+Metadata-Version: 2.3
+Name: flightplotting
+Version: 0.2.11
+Summary: Add your description here
+Author-email: Thomas David <thomasdavid0@gmail.com>
+Requires-Python: >=3.12
+Requires-Dist: flightanalysis>=0.3.13
+Requires-Dist: flightdata>=0.2.24
+Requires-Dist: numpy>=2.1.3
+Requires-Dist: pandas>=2.2.3
+Requires-Dist: pfc-geometry
+Requires-Dist: plotly>=5.24.1
+Description-Content-Type: text/markdown
+
+# plotting
+
+
+This module contains utilities for plotting flight data using plotly
+
+
+```bash
+pip install plotting
+```
+
+```bash
+pip install -e .
+```

{flightplotting-0.2.10 → flightplotting-0.2.11}/README.md

@@ -1,11 +1,11 @@
-# FlightPlotting
+# plotting
 
 
 This module contains utilities for plotting flight data using plotly
 
 
 ```bash
-pip install flightplotting
+pip install plotting
 ```
 
 ```bash

flightplotting-0.2.11/pyproject.toml

@@ -0,0 +1,31 @@
+[project]
+name = "flightplotting"
+version="v0.2.11"
+description = "Add your description here"
+readme = "README.md"
+authors = [{ name = "Thomas David", email = "thomasdavid0@gmail.com" }]
+requires-python = ">=3.12"
+dependencies = [
+    "flightanalysis>=0.3.13",
+    "flightdata>=0.2.24",
+    "numpy>=2.1.3",
+    "pandas>=2.2.3",
+    "pfc-geometry",
+    "plotly>=5.24.1",
+]
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/plotting"]
+
+[tool.uv.sources]
+pfc-geometry = { path = "../geometry" , editable = true}
+flightdata = { path = "../FlightData" , editable = true}
+flightanalysis = {  path = "../FlightAnalysis" , editable = true}
+ardupilot_log_reader = { path = "../ArdupilotLogReader" , editable = true}
+
+[dependency-groups]
+dev = ["ardupilot_log_reader>=0.3.5", "pymavlink>=2.4.42", "pytest>=8.3.3"]

{flightplotting-0.2.10/flightplotting → flightplotting-0.2.11/src/plotting}/__init__.py

@@ -1,11 +1,11 @@
-from flightplotting.plots import (
+from plotting.plots import (
     plotsec,
     plot_analysis,
     plotdtw,
     create_3d_plot,
     plot_regions,
 )
-from flightplotting.traces import (
+from plotting.traces import (
     axestrace,
     trace3d,
     dtwtrace,

flightplotting-0.2.11/src/plotting/model.py

@@ -0,0 +1,90 @@
+from dataclasses import dataclass
+from importlib.resources import files
+
+import numpy as np
+import numpy.typing as npt
+import plotly.graph_objects as go
+from geometry import Point, Quaternion, Transformation
+
+
+@dataclass
+class OBJ:
+    vertices: Point
+    faces: npt.NDArray
+    normals: npt.NDArray = None
+
+    @staticmethod
+    def from_obj_data(odata):
+        lines = odata.splitlines()
+
+        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(vertices), faces, normals)
+
+    @staticmethod
+    def from_obj_file(file):
+        if isinstance(file, str):
+            file = open(file, encoding="utf-8")
+        obj_data = file.read()
+        return OBJ.from_obj_data(obj_data)
+
+    def transform(
+        self,
+        transformantion: Transformation = Transformation(
+            Point(0.75, 0, 0), Quaternion.from_euler(Point(np.pi, 0, -np.pi / 2))
+        ),
+    ):
+        return OBJ(transformantion.point(self.vertices), self.faces)
+
+    def scale(self, scale_factor):
+        return OBJ(self.vertices * scale_factor, self.faces)
+
+    def create_mesh(self, colour="orange", name: str = ""):
+        """Generate a Mesh3d of my plane transformed by the requested transformation.
+
+        Args:
+            name (str, optional): The name of the series. Defaults to ''.
+
+        Returns:
+            go.Mesh3d: a plotly Mesh3d containing the model
+        """
+
+        x, y, z = self.vertices.data[:, :3].T
+        I, J, K = self.faces.T
+        return go.Mesh3d(
+            x=x,
+            y=y,
+            z=z,
+            i=I,
+            j=J,
+            k=K,
+            name=name,
+            showscale=False,
+            hoverinfo="name",
+            color=colour,
+        )  # vertexcolor=vertices[:, 3:], #the color codes must be triplets of floats  in [0,1]!!
+
+
+_obj_string = (
+    files("plotting.data").joinpath("ColdDraftF3APlane.obj").open("r").read()
+)
+
+obj = OBJ.from_obj_data(_obj_string).transform(
+    Transformation(
+        Point(0.75, 0, 0), Quaternion.from_euler(Point(np.pi, 0, -np.pi / 2))
+    )
+)

{flightplotting-0.2.10/flightplotting → flightplotting-0.2.11/src/plotting}/plots.py

@@ -1,8 +1,8 @@
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
 import plotly.express as px
-import flightplotting.templates
-from flightplotting.traces import (
+import plotting.templates
+from plotting.traces import (
     tiptrace,
     meshes,
     control_input_trace,
@@ -17,11 +17,12 @@ 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
+from plotting.model import obj
 import numpy.typing as npt
 import numpy as np
 import pandas as pd
 from typing import List, Union
+from flightanalysis.scoring.box import Box
 
 
 def plotsec(
@@ -135,7 +136,7 @@ def plotdtw(sec: State, manoeuvres: List[str], span=3, fig=None):
 
 
 def plot_regions(
-    st: State, lab_cols: list[str], span=3, colours=None, fig=None, **kwargs
+    st: State, lab_cols: list[str], span=3, colours=None, fig=None, box:Box=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
@@ -174,6 +175,8 @@ def plot_regions(
     if fig is None:
         fig = go.Figure(layout=go.Layout(template="flight3d+judge_view"))
     fig.add_traces(traces)
+    if box:
+        fig.add_traces(box.plot())
     return fig
 
 

{flightplotting-0.2.10/flightplotting → flightplotting-0.2.11/src/plotting}/templates.py

@@ -27,3 +27,23 @@ judges_view_template = go.layout.Template(layout=go.Layout(scene_camera=dict(
 
 
 pio.templates["judge_view"] = judges_view_template
+
+
+clean_paper_template = go.layout.Template(layout=go.Layout(
+    margin=dict(l=0, r=0, t=0, b=0),
+    scene=dict(
+        aspectmode='data',
+        xaxis = dict(visible=False),
+        yaxis = dict(visible=False),
+        zaxis =dict(visible=False)
+    ),
+    legend=dict(
+        font=dict(size=20),
+        yanchor="top",
+        y=0.99,
+        xanchor="left",
+        x=0.01
+    )
+))
+
+pio.templates["clean_paper"] = judges_view_template

{flightplotting-0.2.10/flightplotting → flightplotting-0.2.11/src/plotting}/traces.py

@@ -1,10 +1,10 @@
 import plotly.graph_objects as go
-import flightplotting.templates
+import plotting.templates
 from geometry import Point, Coord, Transformation
 import numpy as np
 from plotly.colors import DEFAULT_PLOTLY_COLORS
 from flightdata import State
-from flightplotting.model import obj, OBJ
+from plotting.model import obj, OBJ
 import plotly.express as px
 
 

{flightplotting-0.2.10 → flightplotting-0.2.11}/tests/test_plots.py

@@ -1,7 +1,7 @@
 from flightdata import Flight, State
 from pytest import fixture
-from flightplotting import plotsec
-from flightplotting.traces import cgtrace
+from plotting import plotsec
+from plotting.traces import cgtrace
 import plotly.graph_objects as go
 
 @fixture