add first version of internal ods and PPSLS160

Author: NikolausKurcz

openglider/lines/line_types/liros.py

@@ -183,6 +183,7 @@ def ppsls(name: int, thickness: float, stretch: float, max_load: float, weight:
 
 ppsls(65, 0.76, 3.0, 650, 0.4)
 ppsls(125, 1.05, 2.7, 1250, 0.89)
+ppsls(160, 1.15, 3.0, 1600, 0.91)
 ppsls(180, 1.2, 3.2, 1800, 0.92)
 ppsls(200, 1.3, 3.0, 2000, 1.65)
 ppsls(260, 1.58, 2.8, 2600, 1.98)

openglider/lines/lineset.py

@@ -796,7 +796,7 @@ def get_line_force(line: Line) -> list[str]:
         return self._get_lines_table(get_line_force)
 
 
-    def get_table_2(self) -> Table:
+    def get_table_2(self, line_load: bool=False) -> Table:
         table = Table(name="lines_table")
 
         table[0, 0] = "Name"
@@ -810,6 +810,12 @@ def get_table_2(self) -> Table:
         table[0, 8] = "Manual Correction"
         table[0, 9] = "Cutting Length"
 
+        if line_load:
+            table[0, 10] = "Force"
+            table[0, 11] = "Min Break Load"
+            table[0, 12] = "Percentage"
+        
+
         lines = self.sort_lines(by_names=True)
         for i, line in enumerate(lines):
             line_length = self.get_line_length(line)
@@ -824,6 +830,11 @@ def get_table_2(self) -> Table:
             table[i+2, 7] = round(line_length.knot_correction * 1000)
             table[i+2, 8] = round(line_length.manual_correction * 1000)
             table[i+2, 9] = round(line_length.get_cutting_length() * 1000)
+            if line_load:
+                table[i+2, 10] = round(line.force)
+                table[i+2, 11] = round(line.line_type.min_break_load)
+                table[i+2, 12] = f"{100*line.force/line.line_type.min_break_load:.1f}%"
+
 
         return table
 

openglider/plots/patterns.py

@@ -18,7 +18,7 @@
 from openglider.glider.project import GliderProject
 from openglider.plots.config import PatternConfigOld
 from openglider.plots.glider import PlotMaker
-from openglider.plots.spreadsheets import get_glider_data
+from openglider.plots.spreadsheets import get_glider_data, get_glider_data_internal
 from openglider.plots.usage_stats import MaterialUsage
 from openglider.utils.config import Config
 from openglider.vector.drawing import Layout
@@ -139,7 +139,10 @@ def unwrap(self, outdir: Path | str) -> None:
         self.logger.info("create spreadsheets")
         self.project.get_glider_3d().lineset.rename_lines()
         excel = get_glider_data(self.project, consumption=self.weight)
-        excel.saveas(outdir / f"{self.project.name}.ods")
+        excel_internal = get_glider_data_internal(self.project)
+        excel.saveas(outdir / f"{self.project.name}_production.ods")
+        excel_internal.saveas(outdir / f"{self.project.name}_internal.ods")
+
 
         openglider.save(self.project, outdir / "project.json")
 

openglider/plots/spreadsheets/__init__.py

@@ -82,3 +82,42 @@ def append_sheet(table: Table) -> None:
         append_sheet(sheet)
 
     return out_ods
+
+def get_glider_data_internal(project: GliderProject) -> ezodf.document.PackagedDocument:
+    specsheet = project.get_data_table()
+    glider = project.get_glider_3d()
+    glider.lineset.recalc(glider=glider, iterations=30)
+
+    linesheet2 = glider.lineset.get_table_2(line_load=True)
+    
+    
+    
+    
+ 
+    out_ods = ezodf.newdoc(doctype="ods")
+    def append_sheet(table: Table) -> None:
+        now = datetime.now()
+        header = Table(name=table.name)
+        header["A1"] = table.name or "-"
+        header["B1"] = "Plotfiles date"
+        header["C1"] = now.strftime("%d.%m.%Y")
+        header["D1"] = now.strftime("%H:%M")
+        header["A2"] = project.name or "-"
+        header["B2"] = "Modification date"
+        header["C2"] = project.modified.strftime("%d.%m.%Y")
+        header["D2"] = project.modified.strftime("%H:%M")
+
+        header.append_bottom(table, space=1)
+        out_ods.sheets.append(header.get_ods_sheet())
+
+    sheets = (
+        specsheet,
+        linesheet2,
+        #linesheet_force
+    )
+    
+    for sheet in sheets:
+        append_sheet(sheet)
+
+    return out_ods
+