minor fixes, add resolver to attachment points

Author: hiaselhans

openglider/glider/parametric/glider.py

@@ -478,7 +478,7 @@ def get_glider_3d(self, glider: Glider=None, num: int=50, num_profile: int | Non
                 ballooning_modifiers=self.tables.ballooning_modifiers.get_modifiers(cell_no, resolvers=resolvers)
                 )
 
-            attachment_points = self.tables.attachment_points_cell.get(cell_no, curves=curves, cell=cell)
+            attachment_points = self.tables.attachment_points_cell.get(cell_no, resolvers=resolvers, cell=cell)
             cell.attachment_points = attachment_points
 
             cell.rigidfoils = self.tables.rigidfoils_cell.get(cell_no)

openglider/glider/parametric/table/attachment_points.py

@@ -157,7 +157,7 @@ class CellAttachmentPointTable(CellTable):
         "ATPDIFF": Keyword([("name", str), ("cell_pos", float), ("rib_pos", float), ("force", Union[float, str]), ("offset", float)], target_cls=CellAttachmentPoint)
     }
 
-    def get_element(self, row: int, keyword: str, data: list[Any], curves: dict[str, GliderCurveType]={}, cell: Cell=None, **kwargs: Any) -> CellAttachmentPoint:
+    def get_element(self, row: int, keyword: str, data: list[Any], resolvers: list[Parser], cell: Cell=None, **kwargs: Any) -> CellAttachmentPoint:
         force = data[3]
 
         if isinstance(force, str):
@@ -169,9 +169,7 @@ def get_element(self, row: int, keyword: str, data: list[Any], curves: dict[str,
         node = CellAttachmentPoint(name=data[0], cell_pos=data[1], rib_pos=data[2], force=force)
 
         if len(data) > 4:
-            offset = data[4]
-            if isinstance(offset, str):
-                offset = curves[offset].get(row)
+            offset = resolvers[row].parse(data[4])
 
             node.offset = offset
 

openglider/gui/state/glider_list.py

@@ -44,6 +44,7 @@ def scan(self) -> bool:
 
                 if project.mtime is not None:
                     if mtime > project.mtime:
+                        logger.info(f"detected update: {project_name}")
                         try:
                             project.element = self.import_glider(project.element.filename)
                             project.failed = False

openglider/gui/views/compare/table/lines_diff.py

@@ -1,7 +1,6 @@
 import logging
 from openglider.glider.project import GliderProject
-from openglider.gui.qt import QtCore, QtWidgets
-from openglider.gui.qt import QClipboard
+from openglider.gui.qt import QtWidgets
 
 from openglider.gui.app.app import GliderApp
 from openglider.utils.table import Table
@@ -69,6 +68,7 @@ def __init__(self, app: GliderApp, parent: QtWidgets.QWidget=None):
 
         super().__init__(parent)
 
+        self.app = app
         layout = QtWidgets.QVBoxLayout()
         self.setLayout(layout)
         self.table_widget = QTable()
@@ -99,6 +99,6 @@ def copy_to_clipboard(self) -> None:
             for col in range(0, self.table.num_columns):
                 copied += self.table_widget.item(row, col).text() + '\t'
             copied = copied[:-1] + '\n'
-
-        clipboard = QClipboard()
+        
+        clipboard = self.app.clipboard()
         clipboard.setText(copied)

openglider/gui/views/help.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Any
 
-from openglider.gui.qt import QtWidgets, QClipboard, QtCore
+from openglider.gui.qt import QtWidgets, QtCore
 
 from openglider.gui.widgets.select import AutoComplete
 from openglider.glider.parametric.table import GliderTables
@@ -89,8 +89,7 @@ def copy_header(self) -> None:
         ]
 
         text += "\t".join(annotations)
-
-        clipboard = QClipboard()
+        clipboard = QtWidgets.QApplication.clipboard()
         clipboard.setText(text)
         logger.info(f"copied header for {dto_name}")
 

openglider/lines/line_types/edelrid.py

@@ -17,6 +17,14 @@ def A8001(strength: int, diameter: float, weight: float) -> None:
         }
     )
 
+edelrid_colors = {
+    "sky": Color.parse_hex("0095D8"),
+    "yellow": Color.parse_hex("FFDD00"),
+    "green": Color.parse_hex("009037"),
+    "fluored": Color.parse_hex("EB6A27"),
+    "red": Color.parse_hex("E2001A"),
+}
+
 def A6843(strength: int, diameter: float, weight: float) -> None:
     LineType(
         f"edelrid.A-6843-{strength:03d}",
@@ -25,13 +33,7 @@ def A6843(strength: int, diameter: float, weight: float) -> None:
         10*strength,
         weight,
         sheated=True,
-        colors={
-            "sky": Color.parse_hex("0095D8"),
-            "yellow": Color.parse_hex("FFDD00"),
-            "green": Color.parse_hex("009037"),
-            "fluored": Color.parse_hex("EB6A27"),
-            "red": Color.parse_hex("E2001A"),
-        }
+        colors=edelrid_colors.copy()
     )
 
 
@@ -53,7 +55,7 @@ def A6843(strength: int, diameter: float, weight: float) -> None:
 A6843(280, 2.1, 3.2)
 A6843(370, 2.4, 4.6)
 
-LineType("edelrid.7850-240", 1.58, 2.8, 2120, 1, True)
+LineType("edelrid.7850-240", 1.58, 2.8, 2120, 1, True, colors=edelrid_colors.copy())
 
 def A7343(strength: int, diameter: float, weight: float) -> None:
     LineType(

openglider/lines/line_types/liros.py

@@ -88,6 +88,7 @@ def dfl(name: str, diameter: float, elongation: float, strength: float, weight:
             "yellow": Color.parse_hex("FFDD00"),
             "orange": Color.parse_hex("EB6A27"),
             "red": Color.parse_hex("E2001A"),
+            "pink": Color.parse_hex("E30066")
         }
     )
 
@@ -99,20 +100,35 @@ def dfl(name: str, diameter: float, elongation: float, strength: float, weight:
 
 dfl("350", 2.7, 3.5, 3500, 4.98)
 
+def dsl(name: str, diameter: float, elongation: list[list[float]], strength: float, weight: float) -> None:
+    LineType(
+        f"liros.dsl{name}",
+        diameter,
+        elongation,
+        strength,
+        weight,
+        sheated=True,
+        colors={
+            "yellow": Color.parse_hex("FFDD00"),
+            "orange": Color.parse_hex("EB6A27"),
+            "red": Color.parse_hex("E2001A"),
+            "pink": Color.parse_hex("E30066")
+        }
+    )
 
-LineType("liros.dsl25", 0.8, [[340, 3.7]], 250, 0.53, True)
+dsl("25", 0.8, [[340, 3.7]], 250, 0.53)
 
-LineType("liros.dsl35", 0.9, [[380, 3.6]], 350, 0.64, True)
+dsl("35", 0.9, [[380, 3.6]], 350, 0.64)
 
-LineType("liros.dsl70", 0.95, [[100, 0.19], [300, 0.41]], 700, 0.67, True)
+dsl("70", 0.95, [[100, 0.19], [300, 0.41]], 700, 0.67)
 
-LineType("liros.dsl110", 1.2, [[100, 0.23], [300, 0.73]], 1100, 1.02, True)
+dsl("110", 1.2, [[100, 0.23], [300, 0.73]], 1100, 1.02)
 
-LineType("liros.dsl140", 1.25, [[100, 0.54], [300, 0.42]], 1400, 1.14, True)
+dsl("140", 1.25, [[100, 0.54], [300, 0.42]], 1400, 1.14)
 
-LineType("liros.dsl350", 2., [[100, 0.15], [300, 0.33]], 3500, 3.25, True)
+dsl("350", 2., [[100, 0.15], [300, 0.33]], 3500, 3.25)
 
-LineType("liros.dsl600", 2.4, [[100, 0.08], [300, 0.24]], 6000, 4.3, True)
+dsl("600", 2.4, [[100, 0.08], [300, 0.24]], 6000, 4.3)
 
 def lirosdc(name: int, thickness: float, elongation: float, break_load: float, weight: float) -> None:
     LineType(

openglider/plots/sketches/shapeplot.py

@@ -227,15 +227,15 @@ def draw_grid(self, num: int=11, left: bool=False) -> ShapePlot:
         self.draw_cells(left=left)
         return self
 
-    def draw_en_marks(self):
+    def draw_en_marks(self) -> None:
         part = PlotPart()
         shapes = self._get_shapes()
 
         front, back = shapes[1].ribs[0]
 
         dist = abs(front[1]-back[1])
 
-        def baseline(pct):
+        def baseline(pct: float) -> euklid.vector.PolyLine2D:
             return euklid.vector.PolyLine2D(
                 [shapes[0].get_point(rib, pct) for rib in self._get_rib_range(True)][::-1] +
                 [shapes[1].get_point(rib, pct) for rib in self._get_rib_range(False)]
@@ -250,17 +250,18 @@ def baseline(pct):
             euklid.vector.Vector2D((dist, front[1]))
         ])
 
+        diff = euklid.vector.Vector2D([self.glider_2d.shape.span*0.025, 0])
+
         part.layers["marks"] +=  [
             collapse_side_50,
-            collapse_side_75,
+            collapse_side_75.move(diff*-1),
+            collapse_side_75.move(diff),
             baseline(0.25),
             baseline(0.5)
         ]
 
         self.drawing.parts.append(part)
 
-
-
     def _get_attachment_point_positions(self, left: bool=False) -> dict[str, euklid.vector.Vector2D]:
 
         points = {}