update rigidfoils

Author: hiaselhans

openglider/glider/parametric/table/rigidfoil.py

@@ -31,15 +31,19 @@ class RigidFoil5(RigidFoil3):
 class RigidFoil6(RigidFoil5):
     inner_allowance: Length
 
+class RigidFoil8(RigidFoil6):
+    material: str
+    diameter: Length
+
 class RibRigidTable(RibTable):
     dtos = {
         "RIGIDFOIL": RigidFoilDTO,
         "RIGIDFOIL3": RigidFoil3,
         "RIGIDFOIL5": RigidFoil5,
-        "RIGIDFOIL6": RigidFoil6
+        "RIGIDFOIL6": RigidFoil6,
+        "RIGIDFOIL8": RigidFoil8
     }
 
-
 class CellRigidTable(CellTable):
     keywords = {
         "RIGIDFOIL": Keyword(["x_start", "x_end", "y"], target_cls=PanelRigidFoil)

openglider/glider/rib/sharknose.py

@@ -98,6 +98,8 @@ def update_rigidfoil(self, rib: Rib, rigidfoil: RigidFoilBase) -> tuple[RigidFoi
                 start=rigidfoil.start,
                 end=position,
                 distance=rigidfoil.distance,
+                material=rigidfoil.material,
+                diameter=rigidfoil.diameter,
                 cap_length=rigidfoil.cap_length,
                 tension=rigidfoil.tension,
                 inner_allowance=rigidfoil.inner_allowance
@@ -115,6 +117,8 @@ def update_rigidfoil(self, rib: Rib, rigidfoil: RigidFoilBase) -> tuple[RigidFoi
                 start=position,
                 end=rigidfoil.end,
                 distance=rigidfoil.distance,
+                material=rigidfoil.material,
+                diameter=rigidfoil.diameter,
                 cap_length=rigidfoil.cap_length,
                 tension=rigidfoil.tension,
                 inner_allowance=rigidfoil.inner_allowance

openglider/plots/glider/ribs.py

@@ -100,7 +100,7 @@ def setup(self, glider: Glider) -> tuple[euklid.vector.PolyLine2D, euklid.vector
             d_inner = self.get_inner_distance()
 
 
-            self.center_curve = curve
+            self.center_curve = curve.fix_errors()
             self.inner_curve = curve.offset(-d_inner.si)
             self.outer_curve = curve.offset(d_outer.si)
 
@@ -146,6 +146,7 @@ def flatten(self, glider: Glider) -> PlotPart:
 
         plotpart.layers[self.ribplot.layer_name_outline].append(outline.fix_errors().close())
 
+        self.insert_mark()
         self.add_text()
 
         return plotpart

openglider/plots/patterns.py

@@ -140,7 +140,7 @@ def unwrap(self, outdir: Path | str) -> None:
         self.project.get_glider_3d().lineset.rename_lines()
         excel = get_glider_data(self.project, consumption=self.weight)
         excel_internal = get_glider_data_internal(self.project)
-        excel.saveas(outdir / f"{self.project.name}_production.ods")
+        excel.saveas(str(outdir / f"{self.project.name}_production.ods"))
         excel_internal.saveas(outdir / f"{self.project.name}_internal.ods")
 
 

openglider/plots/spreadsheets/rigidfoils.py

@@ -13,35 +13,54 @@ def get_length_table(glider: Glider) -> Table:
     return rib_table
 
 def get_rib_length_table(glider: Glider) -> Table:
-    table = Table(name="Rigidfoils")
-    num = 0
+    table = Table(name="Rigidfoils (rib)")
+
+    current_row = 1
+
+    table[0, 0] = "Name"
+    table[0, 1] = "Rib no."
+    table[0, 2] = "Start"
+    table[0, 3] = "Stop"
+    table[0, 4] = "Length"
+    table[0, 5] = "Material"
+    table[0, 6] = "Diameter"
+    table[0, 7] = "Offset"
 
     for rib_no, rib in enumerate(glider.ribs):
-        num = max(num, len(rib.get_rigidfoils()))
-        table[rib_no+1, 0] = f"Rib_{rib_no}"
-        for rigid_no, rigidfoil in enumerate(rib.get_rigidfoils()):
-            table[rib_no+1, 2*rigid_no+1] = f"{rigidfoil.start:02f}/{rigidfoil.end:02f}"
-            table[rib_no+1, 2*rigid_no+2] = round(1000*rigidfoil.get_length(rib), 1)
+        for rigidfoil in rib.get_rigidfoils():
+            table[current_row, 0] = rigidfoil.name
+            table[current_row, 1] = rib_no
+            table[current_row, 2] = rigidfoil.start
+            table[current_row, 3] = rigidfoil.end
+            table[current_row, 4] = round(1000*rigidfoil.get_length(rib), 1)
+            table[current_row, 5] = rigidfoil.material
+            table[current_row, 6] = rigidfoil.diameter
+            table[current_row, 7] = rigidfoil.distance
 
-    for i in range(num):
-        table[0, 2*i+1] = "start/stop"
-        table[0, 2*i+2] = "length"
+            current_row += 1
 
     return table
 
 def get_cell_length_table(glider: Glider) -> Table:
-    table = Table(name="Rigidfoils")
-    num = 0
+    table = Table(name="Rigidfoils (cell)")
+    current_row = 1
+
+    table[0, 0] = "Name"
+    table[0, 1] = "Cell no."
+    table[0, 2] = "Cell position"
+    table[0, 3] = "Start"
+    table[0, 4] = "Stop"
+    table[0, 5] = "Length"
 
     for cell_no, cell in enumerate(glider.cells):
-        num = max(num, len(cell.rigidfoils))
-        table[cell_no+1, 0] = f"Cell_{cell_no}"
-        for rigid_no, rigidfoil in enumerate(cell.rigidfoils):
-            table[cell_no+1, 2*rigid_no+1] = f"{rigidfoil.x_start}/{rigidfoil.x_end} ({rigidfoil.y})"
-            table[cell_no+1, 2*rigid_no+2] = round(1000*rigidfoil.get_length(cell), 1)
-
-    for i in range(num):
-        table[0, 2*i+1] = "start/stop"
-        table[0, 2*i+2] = "length"
+        for rigidfoil in cell.rigidfoils:
+            table[current_row, 0] = f"{cell.name} {rigidfoil.y}"
+            table[current_row, 1] = cell_no
+            table[current_row, 2] = rigidfoil.y
+            table[current_row, 3] = rigidfoil.x_start
+            table[current_row, 4] = rigidfoil.x_end
+            table[current_row, 5] = round(1000*rigidfoil.get_length(cell), 1)
+
+            current_row += 1
 
     return table