bugfix: as described in (#235) and another bug that deleted the comments field when Redo is applied

Author: manuelFragata

optiland/optic/optic_updater.py

@@ -77,6 +77,8 @@ def set_thickness(self, value, surface_number):
         positions = positions - positions[1]  # force surface 1 to be at zero
         for k, surface in enumerate(self.optic.surface_group.surfaces):
             surface.geometry.cs.z = be.array(positions[k])
+        if surface_number < len(self.optic.surface_group.surfaces):
+            self.optic.surface_group.surfaces[surface_number].thickness = value
 
     def set_index(self, value: float, surface_number: int) -> None:
         """Set the index of refraction of a surface.

optiland/surfaces/object_surface.py

@@ -99,6 +99,7 @@ def to_dict(self):
             "type": self.__class__.__name__,
             "geometry": self.geometry.to_dict(),
             "material_post": self.material_post.to_dict(),
+            "comment": self.comment,
         }
 
     @classmethod
@@ -114,4 +115,5 @@ def _from_dict(cls, data):
         """
         geometry = BaseGeometry.from_dict(data["geometry"])
         material_post = BaseMaterial.from_dict(data["material_post"])
-        return cls(geometry, material_post)
+        comment = data.get("comment", "")
+        return cls(geometry, material_post, comment=comment)

optiland/surfaces/paraxial_surface.py

@@ -163,6 +163,7 @@ def to_dict(self):
             "coating": self.coating.to_dict() if self.coating else None,
             "bsdf": self.bsdf.to_dict() if self.bsdf else None,
             "is_reflective": self.is_reflective,
+            "comment": self.comment,
         }
 
     @classmethod
@@ -196,4 +197,5 @@ def _from_dict(cls, data):
             coating,
             bsdf,
             data["is_reflective"],
+            comment=data.get("comment", ""),
         )

optiland/surfaces/standard_surface.py

@@ -289,6 +289,7 @@ def to_dict(self):
             "coating": self.coating.to_dict() if self.coating else None,
             "bsdf": self.bsdf.to_dict() if self.bsdf else None,
             "is_reflective": self.is_reflective,
+            "comment": self.comment,
         }
 
     @classmethod
@@ -341,4 +342,5 @@ def _from_dict(cls, data):
             coating,
             bsdf,
             data["is_reflective"],
+            comment=data.get("comment", ""),
         )

optiland_gui/optiland_connector.py

@@ -623,7 +623,7 @@ def add_surface(self, index: int = -1):
         params = {
             "surface_type": "standard",
             "radius": float("inf"),
-            "thickness": 5.0,
+            "thickness": 0.0,
             "material": "Air",
             "comment": "New Surface",
             "index": optic_insert_idx,