added way to preserve state when recreating shapes

mxcube · Oct 23, 2024 · 567bc52 · 567bc52
1 parent 7f17a3e
commit 567bc52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/mxcubecore/HardwareObjects/SampleView.py b/mxcubecore/HardwareObjects/SampleView.py
@@ -183,7 +183,7 @@ def add_shape(self, shape):
         shape.shapes_hw_object = self
 
     def add_shape_from_mpos(
-        self, mpos_list, screen_coord, t, user_state: ShapeState = "SAVED"
+        self, mpos_list, screen_coord, t, state: ShapeState = "SAVED",  user_state: ShapeState = "SAVED"
     ):
         """
         Adds a shape of type <t>, with motor positions from mpos_list and
@@ -203,15 +203,15 @@ def add_shape_from_mpos(
 
         if _cls:
             shape = _cls(mpos_list, screen_coord)
-            # In case the shape is being recreated, we need to restore it.
-            shape.state = user_state
+            # In case the shape is being recreated, we need to restore it's state.
+            shape.state = state
             shape.user_state = user_state
 
             self.add_shape(shape)
 
         return shape
 
-    def add_shape_from_refs(self, refs, t, user_state: ShapeState = "SAVED"):
+    def add_shape_from_refs(self, refs, t, state: ShapeState = "SAVED",  user_state: ShapeState = "SAVED"):
         """
         Adds a shape of type <t>, taking motor positions and screen positions
         from reference points in refs.
@@ -226,7 +226,7 @@ def add_shape_from_refs(self, refs, t, user_state: ShapeState = "SAVED"):
         mpos = [self.get_shape(refid).mpos() for refid in refs]
         spos_list = [self.get_shape(refid).screen_coord for refid in refs]
         spos = reduce((lambda x, y: tuple(x) + tuple(y)), spos_list, ())
-        shape = self.add_shape_from_mpos(mpos, spos, t, user_state)
+        shape = self.add_shape_from_mpos(mpos, spos, t, state, user_state)
         shape.refs = refs
 
         return shape

diff --git a/mxcubecore/HardwareObjects/abstract/AbstractSampleView.py b/mxcubecore/HardwareObjects/abstract/AbstractSampleView.py
@@ -159,7 +159,7 @@ def add_shape(self, shape):
 
     @abc.abstractmethod
     def add_shape_from_mpos(
-        self, mpos_list, screen_cord, _type, user_state: ShapeState = "SAVED"
+        self, mpos_list, screen_cord, _type, state: ShapeState = "SAVED", user_state: ShapeState = "SAVED"
     ):
         """Add a shape of type <t>, with motor positions from mpos_list and
         screen position screen_coord.