fix unwrap / shape

Author: hiaselhans

openglider/glider/parametric/glider.py

@@ -79,7 +79,7 @@ def get_geomentry_table(self) -> Table:
         for rib_no, p in enumerate(self.shape.baseline):
             table[1+rib_no, 3] = p[0]
             table[1+rib_no, 4] = p[1]
-            table[1+rib_no, 5] = self.shape.baseline_pos
+            table[1+rib_no, 5] = self.config.baseline_pct
 
         last_angle = 0.
         for cell_no, angle in enumerate(self.get_arc_angles()):

openglider/glider/parametric/table/__init__.py

@@ -97,8 +97,8 @@ def get_rib_sheet(self) -> Table:
         table.append_right(self.rib_modifiers.table)
         table.append_right(self.material_ribs.table)
 
-        for i in range(1, table.num_rows+1):
-            table[i, 0] = str(i)
+        for i in range(2, table.num_rows+1):
+            table[i, 0] = f"rib {i-1}"
 
         return table
 
@@ -116,8 +116,8 @@ def get_cell_sheet(self) -> Table:
         table.append_right(self.attachment_points_cell.table)
         table.append_right(self.ballooning_modifiers.table)
 
-        for i in range(1, table.num_rows+1):
-            table[i, 0] = str(i)
+        for i in range(2, table.num_rows+1):
+            table[i, 0] = f"cell {i-1}"
 
         return table
 

openglider/gui/wizzards/input/curves.py

@@ -21,7 +21,7 @@
 from openglider.utils.table import Table
 
 from openglider.gui.app.main_window import MainWindow
-from openglider.vector.unit import Angle, Length, Percentage, Quantity
+from openglider.vector.unit import Angle, Length, Percentage
 
 logger = logging.getLogger(__name__)
 # TODO: Show & change data: Area, Aspect ratio, Span, Tip Chord, Tip center
@@ -256,7 +256,10 @@ def add_curve(self) -> None:
         p1 = euklid.vector.Vector2D([1., 0.5])
         p2 = euklid.vector.Vector2D([2., 0.5])
         p3 = euklid.vector.Vector2D([self.shape.rib_no-1, 0.5])
-        self.curve_list.add("unnamed", ShapeBSplineCurve([p1, p2, p3], shape=self.shape))
+        self.curve_list.add(
+            "unnamed",
+            ShapeBSplineCurve([p1, p2, p3], shape=self.shape)  # type: ignore
+        )
         self.curve_list_selector.render()
         self.selection_changed()
 

openglider/gui/wizzards/input/shape.py

@@ -284,8 +284,8 @@ def normalize_span(self) -> bool:
         return self.input_scale.currentIndex() == 2
 
     def update_zrot(self, value: bool=False) -> None:
-        self.zrot = not self.zrot
-        self.input_zrot.setChecked(self.zrot)
+        self.settings.zrot = not self.settings.zrot
+        self.input_zrot.setChecked(self.settings.zrot)
         self.changed.emit()
 
     def update_shape(self, shape: ParametricShape) -> None:

openglider/plots/patterns.py

@@ -3,7 +3,7 @@
 import euklid
 import string
 import subprocess
-from typing import Any
+from typing import Any, Iterable
 from pathlib import Path
 
 import openglider.glider
@@ -206,7 +206,7 @@ def get_name(position: DiagonalSide, rib: Rib) -> str:
 
                 return f"{name}{layers_between[name]}"
 
-            def rename_straps(straps: list[DiagonalRib], prefix: str = ""):
+            def rename_straps(straps: Iterable[DiagonalRib], prefix: str = "") -> None:
                 straps = list(straps)
                 straps.sort(key=lambda strap: abs(strap.get_average_x()))
                 for strap in straps:

openglider/plots/sketches/__init__.py

@@ -14,7 +14,7 @@ def get_all_plots(project: GliderProject) -> dict[str, ShapePlot]:
     design_lower.draw_cells()
     design_lower.draw_cells(left=True)
 
-    lineplan = LinePlan(project)  #.draw_shape().draw_attachment_points()
+    lineplan = LinePlan(project)
     lineplan.draw_cells()
     lineplan.draw_cells(left=True)
     lineplan.draw_attachment_points(add_text=False)

openglider/plots/sketches/shapeplot.py

@@ -72,7 +72,9 @@ class ShapePlot:
     attachment_point_mark = marks.Cross(name="attachment_point", rotation=np.pi/4)
 
     config: ShapePlotConfig | None = None
+
     shapes: tuple[Shape, Shape] | None = None
+    shapes_rot: tuple[Shape, Shape] | None = None
 
     def __init__(self, project: GliderProject, drawing: Layout | None=None):
         super().__init__()
@@ -84,37 +86,46 @@ def __init__(self, project: GliderProject, drawing: Layout | None=None):
         self.reference_area = self.glider_2d.shape.area
         self.reference_span = self.glider_2d.shape.span
 
-    def _get_shapes(self, config: ShapePlotConfig, force: bool=False) -> tuple[Shape, Shape]:
-        if force or self.config is None or self.shapes is None or config.apply_zrot != self.config.apply_zrot:
-            if config.apply_zrot:
-                zrot = [rib.zrot for rib in self.glider_3d.ribs]
+    def _get_shapes(self, config: ShapePlotConfig | None = None, force: bool=False) -> tuple[Shape, Shape]:
+        if config is None:
+            if self.config is not None:
+                config = self.config
             else:
-                zrot = None
-            shape_r = self.glider_2d.shape.get_half_shape(zrot=zrot)
-            shape_l = shape_r.copy().scale(x=-1)
-            self.shapes = (shape_r, shape_l)
+                config = ShapePlotConfig()
+
+        if config.apply_zrot:
+            if force or self.shapes_rot is None:
+                zrot = [rib.zrot for rib in self.glider_3d.ribs]
+                shape_r = self.glider_2d.shape.get_half_shape(zrot=zrot)
+                shape_l = shape_r.copy().scale(x=-1)
+                self.shapes_rot = (shape_r, shape_l)
+            
+            return self.shapes_rot
 
-        return self.shapes
+        else:
+            if force or self.shapes is None:
+                shape_r = self.glider_2d.shape.get_half_shape(zrot=None)
+                shape_l = shape_r.copy().scale(x=-1)
+                self.shapes = (shape_r, shape_l)
 
+            return self.shapes
 
     def redraw(self, config: ShapePlotConfig, force: bool=False) -> Layout:
-        shapes = self._get_shapes(config, force)
-        
         if config != self.config or force:
+            self.config = config
             self.drawing = Layout()
 
             for layer_name, show_layer in config.view_layers().items():
                 if show_layer:
                     f = getattr(self, f"draw_{layer_name}")
-                    f(shapes, left=True)
-                    f(shapes, left=False)
+                    f(left=True)
+                    f(left=False)
 
             if config.scale_area:
                 self.drawing.scale(math.sqrt(config.scale_area/self.reference_area))
             elif config.scale_span:
                 self.drawing.scale(config.scale_span/self.reference_span)
 
-            self.config = config
 
         return self.drawing
 
@@ -140,13 +151,14 @@ def _get_cell_range(self, left_side: bool) -> range:
 
         return range(start, end)
 
-    def draw_design_lower(self, shapes: tuple[Shape, Shape], left: bool=False) -> ShapePlot:
-        return self.draw_design(shapes, True, left)
+    def draw_design_lower(self, left: bool=False) -> ShapePlot:
+        return self.draw_design(True, left)
 
-    def draw_design_upper(self, shapes: tuple[Shape, Shape], left: bool=False) -> ShapePlot:
-        return self.draw_design(shapes, False, left)
+    def draw_design_upper(self, left: bool=False) -> ShapePlot:
+        return self.draw_design(False, left)
 
-    def draw_design(self, shapes: tuple[Shape, Shape], lower: bool=True, left: bool=False) -> ShapePlot:
+    def draw_design(self, lower: bool=True, left: bool=False) -> ShapePlot:
+        shapes = self._get_shapes()
         shape = shapes[left]
 
         panels = self.glider_2d.get_panels()
@@ -191,30 +203,32 @@ def get_cut_line(cut: PanelCut) -> euklid.vector.PolyLine2D:
 
         return self
 
-    def draw_baseline(self, shapes: tuple[Shape, Shape], pct: float | None=None, left: bool=False) -> None:
+    def draw_baseline(self, pct: float | None=None, left: bool=False) -> None:
+        shapes = self._get_shapes()
         shape = shapes[left]
 
         if pct is None:
-            pct = self.glider_2d.shape.baseline_pos.si
+            pct = self.glider_2d.config.baseline_pct.si
 
         part = PlotPart()
 
         line = euklid.vector.PolyLine2D([shape.get_point(rib, pct) for rib in self._get_rib_range(left)])
         part.layers["marks"].append(line)
         self.drawing.parts.append(part)
 
-    def draw_grid(self, shapes: tuple[Shape, Shape], num: int=11, left: bool=False) -> ShapePlot:
+    def draw_grid(self, num: int=11, left: bool=False) -> ShapePlot:
         import numpy as np
 
         for x in np.linspace(0, 1, num):
             self.draw_baseline(x, left=left)
 
-        self.draw_cells(shapes, left=left)
+        self.draw_cells(left=left)
         return self
 
-    def _get_attachment_point_positions(self, shapes: tuple[Shape, Shape], left: bool=False) -> dict[str, euklid.vector.Vector2D]:
+    def _get_attachment_point_positions(self, left: bool=False) -> dict[str, euklid.vector.Vector2D]:
 
         points = {}
+        shapes = self._get_shapes()
         shape = shapes[left]
 
         for rib_no, rib in enumerate(self.glider_3d.ribs):
@@ -228,9 +242,9 @@ def _get_attachment_point_positions(self, shapes: tuple[Shape, Shape], left: boo
         return points
 
 
-    def draw_attachment_points(self, shapes: tuple[Shape, Shape], add_text: bool=True, left: bool=False) -> None:
+    def draw_attachment_points(self, add_text: bool=True, left: bool=False) -> None:
         part = PlotPart()
-        points = self._get_attachment_point_positions(shapes, left=left)
+        points = self._get_attachment_point_positions(left=left)
 
         for name, p1 in points.items():
             p2 = p1 + euklid.vector.Vector2D([0.1, 0])
@@ -252,7 +266,8 @@ def draw_attachment_points(self, shapes: tuple[Shape, Shape], add_text: bool=Tru
 
         self.drawing.parts.append(part)
 
-    def draw_cells(self, shapes: tuple[Shape, Shape], left: bool=False) -> None:
+    def draw_cells(self, left: bool=False) -> None:
+        shapes = self._get_shapes()
         shape = shapes[left]
 
         cells = []
@@ -269,7 +284,8 @@ def draw_cells(self, shapes: tuple[Shape, Shape], left: bool=False) -> None:
             material_code="cell_numbers")
         )
 
-    def draw_cell_names(self, shapes: tuple[Shape, Shape], left: bool=False) -> None:
+    def draw_cell_names(self, left: bool=False) -> None:
+        shapes = self._get_shapes()
         shape = shapes[left]
         names = []
 
@@ -287,7 +303,8 @@ def draw_cell_names(self, shapes: tuple[Shape, Shape], left: bool=False) -> None
             material_code="cell_numbers")
         )
 
-    def draw_rib_names(self, shapes: tuple[Shape, Shape], left: bool=False) -> ShapePlot:
+    def draw_rib_names(self, left: bool=False) -> ShapePlot:
+        shapes = self._get_shapes()
         shape = shapes[left]
         names = []
 
@@ -312,7 +329,8 @@ def draw_rib_names(self, shapes: tuple[Shape, Shape], left: bool=False) -> Shape
         )
         return self
 
-    def draw_straps(self, shapes: tuple[Shape, Shape], left: bool=False) -> ShapePlot:
+    def draw_straps(self, left: bool=False) -> ShapePlot:
+        shapes = self._get_shapes()
         shape = shapes[left]
 
         for cell_no in self._get_cell_range(left):
@@ -328,7 +346,8 @@ def draw_straps(self, shapes: tuple[Shape, Shape], left: bool=False) -> ShapePlo
 
         return self
 
-    def draw_diagonals(self, shapes: tuple[Shape, Shape], left: bool=False) -> ShapePlot:
+    def draw_diagonals(self, left: bool=False) -> ShapePlot:
+        shapes = self._get_shapes()
         shape = shapes[left]
 
         for cell_no in self._get_cell_range(left):
@@ -344,14 +363,14 @@ def draw_diagonals(self, shapes: tuple[Shape, Shape], left: bool=False) -> Shape
 
         return self
 
-    def draw_lines(self, shapes: tuple[Shape, Shape], left: bool=True, add_text: bool=False) -> ShapePlot:
+    def draw_lines(self, left: bool=True, add_text: bool=False) -> ShapePlot:
         #self.draw_design(lower=True)
         #self.draw_design(lower=True, left=True)
         #self.draw_attachment_points(True)
         #self.draw_attachment_points(True, left=True)
         lower = self.glider_3d.lineset.lower_attachment_points
 
-        attachment_point_positions = self._get_attachment_point_positions(shapes, left=False)
+        attachment_point_positions = self._get_attachment_point_positions(left=False)
         all_nodes = {}
         for node in self.glider_3d.lineset.nodes:
             if node.node_type == node.NODE_TYPE.UPPER: