Merge pull request #278 from Carvera-Community/pr_fix_set_origin

fixed the set origin popup to calculate the offsets on pressing the different options

Author: WARIO2412

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fix: Resolve the keysboard_mode config load error that occurs when reconnecting the Controller after it loses connection
 - Fix: Red origin dot in preview visualisation on config-and-run screen returned
 - Fix: Last open folder was using temp directory instead of actual user selected location
+- Fix: Set origin popup now properly shows the current offset to the anchors when switching options. When set to 'current pos' the offset default to 0.
 
 [0.9.1]
 - Fix: 3D Probe tool number missing a "9". Should be 999990 not 99990

carveracontroller/main.py

@@ -315,9 +315,12 @@ def on_open(self):
             if self.coord_popup.config['origin']['anchor'] == 2:
                 x = round(CNC.vars['wcox'] + laser_x - CNC.vars["anchor1_x"] - CNC.vars["anchor2_offset_x"], 4)
                 y = round(CNC.vars['wcoy'] + laser_y - CNC.vars["anchor1_y"] - CNC.vars["anchor2_offset_y"], 4)
-            else:
+            elif self.coord_popup.config['origin']['anchor'] == 1:
                 x = round(CNC.vars['wcox'] + laser_x - CNC.vars["anchor1_x"], 4)
                 y = round(CNC.vars['wcoy'] + laser_y - CNC.vars["anchor1_y"], 4)
+            else:
+                x = 0
+                y = 0
         self.txt_x_offset.text = str(x)
         Utils.bind_auto_select_to_text_input(self.txt_x_offset)
         self.txt_y_offset.text = str(y)
@@ -331,6 +334,29 @@ def selected_anchor(self):
         elif self.cbx_current_position.active:
             return 4
         return 1
+    
+    def update_offsets(self):
+        # Use the same logic as CoordPopup.load_origin_label to set offsets
+        app = App.get_running_app()
+        x = 0
+        y = 0
+        if app.has_4axis:
+            x = round(CNC.vars["wcox"] - CNC.vars['anchor1_x'] - CNC.vars['rotation_offset_x'], 4)
+            y = round(CNC.vars['wcoy'] - CNC.vars['anchor1_y'] - CNC.vars['rotation_offset_y'], 4)
+        else:
+            laser_x = CNC.vars['laser_module_offset_x'] if CNC.vars['lasermode'] else 0.0
+            laser_y = CNC.vars['laser_module_offset_y'] if CNC.vars['lasermode'] else 0.0
+            if self.cbx_anchor1.active:
+                x = round(CNC.vars['wcox'] + laser_x - CNC.vars["anchor1_x"], 4)
+                y = round(CNC.vars['wcoy'] + laser_y - CNC.vars["anchor1_y"], 4)
+            elif self.cbx_anchor2.active:
+                x = round(CNC.vars['wcox'] + laser_x - CNC.vars["anchor1_x"] - CNC.vars["anchor2_offset_x"], 4)
+                y = round(CNC.vars['wcoy'] + laser_y - CNC.vars["anchor1_y"] - CNC.vars["anchor2_offset_y"], 4)
+            elif self.cbx_current_position.active:
+                x = 0
+                y = 0
+        self.txt_x_offset.text = str(x)
+        self.txt_y_offset.text = str(y)
 
 class ZProbePopup(ModalView):
     def __init__(self, coord_popup, **kwargs):

carveracontroller/makera.kv

@@ -1402,36 +1402,48 @@
                         id: cbx_anchor1
                         group: 'anchor'
                         active: True
+                        on_press: root.update_offsets()
                         disabled: app.has_4axis
                     MCQLabel:
-                        on_press: cbx_anchor1._do_press()
+                        on_press: 
+                            cbx_anchor1._do_press()
+                            root.update_offsets()
                         text: tr._('Anchor1')
                         disabled: app.has_4axis
                     MCQCheckBox:
                         id: cbx_anchor2
                         group: 'anchor'
                         active: False
+                        on_press: root.update_offsets()
                         disabled: app.has_4axis
                     MCQLabel:
-                        on_press: cbx_anchor2._do_press()
+                        on_press: 
+                            cbx_anchor2._do_press()
+                            root.update_offsets()
                         text: tr._('Anchor2')
                         disabled: app.has_4axis
                     MCQCheckBox:
                         id: cbx_4axis_origin
                         group: 'anchor'
                         active: False
+                        on_press: root.update_offsets()
                         disabled: not app.has_4axis
                     MCQLabel:
-                        on_press: cbx_4axis_origin._do_press()
+                        on_press: 
+                            cbx_4axis_origin._do_press()
+                            root.update_offsets()
                         text: tr._('4Axis Origin')
                         disabled: not app.has_4axis
                     MCQCheckBox:
                         id: cbx_current_position
                         group: 'anchor'
                         active: False
+                        on_press: root.update_offsets()
                         disabled: app.has_4axis
                     MCQLabel:
-                        on_press: cbx_current_position._do_press()
+                        on_press: 
+                            cbx_current_position._do_press()
+                            root.update_offsets()
                         text: tr._('Current Pos')
                         disabled: app.has_4axis
                     # Label: