get weight of ribs & diagonals

Author: hiaselhans

openglider/glider/cell/diagonals.py

@@ -327,6 +327,18 @@ def get_flattened(self, cell: Cell, ribs_flattened: Any=None) -> tuple[euklid.ve
         inner, outer = self.get_3d(cell)
 
         return flatten_list(inner, outer)
+    
+    def get_area(self, cell: Cell) -> float:
+        inner, outer = self.get_flattened(cell)
+
+        inner_offset = inner.offset(-cell.rib1.seam_allowance.si)
+        outer_offset = outer.offset(cell.rib2.seam_allowance.si)
+
+        outline = (inner_offset + outer_offset.reverse()).close()
+
+        area = outline.get_area() - sum([hole.get_area() for hole in self.get_holes(cell)[0]])
+
+        return area
 
     def get_average_x(self) -> Percentage:
         """

openglider/glider/rib/rib.py

@@ -191,6 +191,16 @@ def get_hull(self) -> pyfoil.Airfoil:
             return self.sharknose.get_modified_airfoil(self)
 
         return self.profile_2d
+    
+    def get_weight(self):
+        outline = self.get_hull().curve * self.chord
+        crossports = [hole.get_flattened(self, layer_name="cuts") for hole in self.holes]
+
+        area = outline.get_area() - sum([
+            sum([line.get_area() for line in crossport.layers["cuts"].polylines]) for crossport in crossports
+        ])
+
+        return area * self.material.weight
 
     @property
     def normalized_normale(self) -> euklid.vector.Vector3D:

openglider/plots/spreadsheets/__init__.py

@@ -14,7 +14,7 @@
 if TYPE_CHECKING:
     from openglider.glider import GliderProject
 
-def get_glider_data(project: GliderProject, consumption: dict[str, MaterialUsage]=None) -> ezodf.document.PackagedDocument:
+def get_glider_data(project: GliderProject, consumption: dict[str, MaterialUsage] | None=None) -> ezodf.document.PackagedDocument:
     specsheet = project.get_data_table()
     glider = project.get_glider_3d()
     #specsheet = get_specs(glider)