Merge branch 'hiaselhans:develop' into cutback2

Author: NikolausKurcz

openglider/glider/cell/attachment_point.py

@@ -4,10 +4,11 @@
 from typing import TYPE_CHECKING, Any
 
 import euklid
+from pydantic import Field
 from openglider.glider.shape import Shape
 from openglider.lines.node import Node, NODE_TYPE_ENUM
 from openglider.utils import table
-from openglider.vector.unit import Percentage
+from openglider.vector.unit import Length, Percentage
 
 if TYPE_CHECKING:
     from openglider.glider.cell.cell import Cell
@@ -21,7 +22,7 @@ class CellAttachmentPoint(Node):
     rib_pos: Percentage
     node_type: NODE_TYPE_ENUM = Node.NODE_TYPE.UPPER
     ballooned: bool=False
-    offset: float = 0.
+    offset: Length = Field(default_factory=Length.zero)
 
     def __repr__(self) -> str:
         return f"<Attachment point '{self.name}' ({self.rib_pos})>"

openglider/glider/curve.py

@@ -1,15 +1,37 @@
-from typing import Any
+from typing import Any, ClassVar
 
 import euklid
 import enum
 
 from openglider.glider.shape import Shape
 from openglider.utils.cache import cached_property
+from openglider.utils.dataclass import BaseModel
+from openglider.vector.unit import Angle, Length, Percentage, Quantity
 
-class FreeCurve:
+class CurveBase(BaseModel):
+    unit: str | None = None
+    interpolation: euklid.vector.Interpolation
+    shape: Shape
+
+    def to_unit(self, value: float) -> Quantity | float:
+        if self.unit is None:
+            return value
+        
+        if self.unit in Angle.unit_variants or self.unit == Angle.unit:
+            return Angle(value, unit=self.unit)
+        if self.unit in Length.unit_variants or self.unit == Length.unit:
+            return Length(value, unit=self.unit)
+        if self.unit in Percentage.unit_variants:
+            return Percentage(value, self.unit)
+
+        raise ValueError()
+
+class FreeCurve(CurveBase):
     def __init__(self, points: list[euklid.vector.Vector2D], shape: Shape):
-        self.shape = shape
-        self.interpolation = euklid.vector.Interpolation(points)
+        super().__init__(
+            shape = shape,
+            interpolation = euklid.vector.Interpolation(points)
+        )
 
     @property
     def controlpoints(self) -> list[euklid.vector.Vector2D]:
@@ -67,11 +89,12 @@ def to_controlpoints(self, points: list[euklid.vector.Vector2D]) -> list[euklid.
     def points_2d(self) -> list[euklid.vector.Vector2D]:
         return self.to_2d(self.interpolation.nodes)
 
-    def get(self, rib_no: int) -> float:
+    def get(self, rib_no: int) -> float | Quantity:
         if rib_no == 0 and self.shape.has_center_cell:
             rib_no = 1
 
-        return self.interpolation.get_value(rib_no)
+        value = self.interpolation.get_value(rib_no)
+        return self.to_unit(value)
 
     def draw(self) -> euklid.vector.PolyLine2D:
         x_values = [p[0] for p in self.controlpoints]
@@ -92,11 +115,12 @@ def draw(self) -> euklid.vector.PolyLine2D:
         return euklid.vector.PolyLine2D(self.to_2d([euklid.vector.Vector2D([x, self.interpolation.get_value(x)]) for x in x_values_lst]))
 
 
-class Curve:
-    upper = False
+class Curve(CurveBase):
     def __init__(self, points: list[euklid.vector.Vector2D], shape: Shape):
-        self.interpolation = euklid.vector.Interpolation(points)
-        self.shape = shape
+        super().__init__(
+            interpolation = euklid.vector.Interpolation(points),
+            shape=shape
+        )
 
     @property
     def controlpoints(self) -> list[euklid.vector.Vector2D]:
@@ -154,16 +178,13 @@ def points_2d(self) -> euklid.vector.PolyLine2D:
             self.shape.get_point(*p) for p in self.interpolation.nodes
         ])
 
-    def get(self, rib_no: int) -> float:
+    def get(self, rib_no: int) -> float | Quantity:
         if rib_no == 0 and self.shape.has_center_cell:
             rib_no = 1
 
         y = self.interpolation.get_value(rib_no)
 
-        if self.upper:
-            y = -y
-
-        return y
+        return self.to_unit(y)
 
     def draw(self) -> euklid.vector.PolyLine2D:
         x_values = [p[0] for p in self.controlpoints]
@@ -181,7 +202,19 @@ def draw(self) -> euklid.vector.PolyLine2D:
         if end % 1:
             x_values_lst.append(end)
 
-        points = [self.shape.get_point(x, self.get(x)) for x in x_values_lst]
+        percentage_lst: list[Percentage | float] = []
+        for x in x_values_lst:
+            y = self.get(x)
+            if not isinstance(y, (Percentage, float)):
+                raise ValueError()
+
+            percentage_lst.append(y)
+
+        for p in percentage_lst:
+            if not isinstance(p, (Percentage, float)):
+                raise ValueError()
+
+        points = [self.shape.get_point(x, y) for x, y in zip(x_values_lst, percentage_lst)]
 
         if start == 1 and self.shape.has_center_cell:
             points.insert(0, points[0] * euklid.vector.Vector2D([-1,1]))
@@ -191,8 +224,7 @@ def draw(self) -> euklid.vector.PolyLine2D:
 
 
 class ShapeCurve(Curve):
-    
-    def get(self, rib_no: int) -> float:
+    def get(self, rib_no: int) -> float | Quantity:
         if rib_no == 0 and self.shape.has_center_cell:
             rib_no = 1
 
@@ -203,17 +235,11 @@ def get(self, rib_no: int) -> float:
         if len(results) != 1:
             raise Exception(f"wrong number of cut results: {len(results)}")
 
-        return results[0][1]
+        return self.to_unit(results[0][1])
 
 
 class ShapeBSplineCurve(ShapeCurve):
-    curve_cls = euklid.spline.BSplineCurve
-
-    def __init__(self, points: list[euklid.vector.Vector2D], shape: Shape, curve_cls: Any=None):
-        if curve_cls is not None:
-            self.curve_cls = curve_cls
-        
-        super().__init__(points, shape)
+    curve_cls: ClassVar[type] = euklid.spline.BSplineCurve
 
     @cached_property('shape', 'interpolation')
     def points_2d(self) -> euklid.vector.PolyLine2D:

openglider/glider/parametric/config.py

@@ -1,6 +1,7 @@
 import re
 from typing import Any, ClassVar, Self
 
+from packaging.version import Version
 import euklid
 import pydantic
 
@@ -121,7 +122,7 @@ class ParametricGliderConfig(ConfigTable):
 
     use_sag: bool = True
 
-    version: str = __version__
+    version: Version = Version(__version__)
 
     @classmethod
     def __from_json__(cls, **data: Any) -> Self:

openglider/glider/parametric/export_ods.py

@@ -185,9 +185,8 @@ def add_curve(name: str, curve: CurveType, column_no: int) -> None:
     add_curve("rib_distribution", glider.shape.rib_distribution, 4)
     add_curve("arc", glider.arc.curve, 6)
     add_curve("aoa", glider.aoa, 8)
-    add_curve("zrot", glider.zrot, 10)
-    add_curve("ballooning_merge_curve", glider.ballooning_merge_curve, 12)
-    add_curve("profile_merge_curve", glider.profile_merge_curve, 14)
+    add_curve("ballooning_merge_curve", glider.ballooning_merge_curve, 10)
+    add_curve("profile_merge_curve", glider.profile_merge_curve, 12)
 
     return table
 

openglider/glider/parametric/fitglider.py

@@ -18,7 +18,6 @@
 from openglider.glider.glider import Glider
 from openglider.glider.parametric.arc import ArcCurve
 from openglider.glider.parametric.export_ods import export_ods_2d
-from openglider.glider.parametric.fitglider import fit_glider_3d
 from openglider.glider.parametric.import_ods import import_ods_2d
 from openglider.glider.parametric.shape import ParametricShape
 from openglider.glider.parametric.table import GliderTables
@@ -29,7 +28,7 @@
 from openglider.utils.distribution import Distribution
 from openglider.utils.table import Table
 from openglider.utils.types import CurveType, SymmetricCurveType
-from openglider.vector.unit import Percentage
+from openglider.vector.unit import Percentage, Quantity
 
 if TYPE_CHECKING:
     from openglider.glider.curve import GliderCurveType
@@ -54,7 +53,6 @@ class ParametricGlider:
     speed: float
     glide: float
     tables: GliderTables = Field(default_factory=lambda: GliderTables())
-    zrot: SymmetricCurveType = Field(default_factory=lambda: euklid.spline.SymmetricBSplineCurve([[0,0],[1,0]]))
 
     num_interpolate: int=30
     num_profile: int | None=None
@@ -227,10 +225,6 @@ def apply_diagonals(self, glider: Glider) -> None:
             for strap_no, strap in enumerate(cell.diagonals):
                 strap.name = "c{}{}{}".format(cell_no+1, "s", strap_no)
 
-    @classmethod
-    def fit_glider_3d(cls, glider: Glider, numpoints: int=3) -> ParametricGlider:
-        return fit_glider_3d(cls, glider, numpoints)
-
     def get_aoa(self, interpolation_num: int | None=None) -> list[float]:
         aoa_interpolation = euklid.vector.Interpolation(self.aoa.get_sequence(interpolation_num or self.num_interpolate).nodes)
 
@@ -283,8 +277,8 @@ def resolvers(self) -> list[Parser]:
         parsers = []
         curves=self.get_curves()
 
-        def resolver_factory(rib_no: int) -> Callable[[str], float]:
-            def resolve(name: str) -> float:
+        def resolver_factory(rib_no: int) -> Callable[[str], float | Quantity]:
+            def resolve(name: str) -> float | Quantity:
                 if name not in curves:
                     raise ValueError(
                         f"could not resolve name '{name}' "+
@@ -391,7 +385,6 @@ def get_glider_3d(self, glider: Glider=None, num: int=50, num_profile: int | Non
         shape_ribs = self.shape.ribs
 
         aoa_values = self.get_aoa()
-        zrot_int = euklid.vector.Interpolation(self.zrot.get_sequence(num).nodes)
 
         arc_pos = self.arc.get_arc_positions(x_values).tolist()
         rib_angles = self.arc.get_rib_angles(x_values)
@@ -426,16 +419,18 @@ def get_glider_3d(self, glider: Glider=None, num: int=50, num_profile: int | Non
             }
             data.update(self.tables.rib_modifiers.get_rib_args(rib_no, resolvers=resolvers))
 
+            rotation = self.tables.rib_modifiers.get_rotation(rib_no, resolvers=resolvers)
+
             rib = Rib(
                 profile_2d=profile,
                 pos=startpoint,
                 chord=chord,
                 arcang=rib_angles[rib_no],
-                xrot=self.tables.rib_modifiers.get_xrot(rib_no),
+                xrot=rotation.x,
                 offset=self.tables.rib_modifiers.get_offset(rib_no, resolvers=resolvers),
                 glide=self.glide,
                 aoa_absolute=aoa_values[rib_no],
-                zrot=zrot_int.get_value(abs(x_value)),
+                zrot=rotation.z,
                 holes=this_rib_holes,
                 rigidfoils=this_rigid_foils,
                 name=f"rib{rib_no}",
@@ -573,5 +568,4 @@ def rescale(curve: CurveType) -> None:
         rescale(self.ballooning_merge_curve)
         rescale(self.profile_merge_curve)
         rescale(self.aoa)
-        rescale(self.zrot)
         self.arc.rescale(self.shape.rib_x_values)