Set system to configuration base units before any moves or probes

psng/python/base.py

@@ -24,9 +24,12 @@
 from functools import wraps
 from subprocess import PIPE, Popen
 
-import gtk
 import linuxcnc
-import pango
+
+import gi
+gi.require_version("Gtk", "3.0")
+gi.require_version("PangoCairo", "1.0")
+from gi.repository import Gtk, Gdk, cairo, Pango, PangoCairo
 
 from .configparser import ProbeScreenConfigParser
 from .util import restore_task_mode
@@ -59,6 +62,10 @@ def __init__(self, halcomp, builder, useropts):
         self.command = linuxcnc.command()
         self.stat = linuxcnc.stat()
         self.stat.poll()
+        if self.stat.linear_units == 1.0:
+            self.setunits = "G21"
+        else:
+            self.setunits = "G20"
 
         # History Area
         textarea = builder.get_object("textview1")
@@ -262,9 +269,9 @@ def _dialog(
         self, gtk_type, gtk_buttons, message, secondary=None, title=_("Probe Screen NG")
     ):
         """ displays a dialog """
-        dialog = gtk.MessageDialog(
+        dialog = Gtk.MessageDialog(
             self.window,
-            gtk.DIALOG_DESTROY_WITH_PARENT,
+            Gtk.DialogFlags.DESTROY_WITH_PARENT,
             gtk_type,
             gtk_buttons,
             message,
@@ -277,17 +284,17 @@ def _dialog(
         dialog.set_title(title)
         responce = dialog.run()
         dialog.destroy()
-        return responce == gtk.RESPONSE_OK
+        return responce == Gtk.ResponseType.OK
 
     def warning_dialog(self, message, secondary=None, title=_("Probe Screen NG")):
         """ displays a warning dialog """
         return self._dialog(
-            gtk.MESSAGE_WARNING, gtk.BUTTONS_OK, message, secondary, title
+            Gtk.MessageType.WARNING, Gtk.ButtonsType.OK, message, secondary, title
         )
 
     def error_dialog(self, message, secondary=None, title=_("Probe Screen NG")):
         """ displays a warning dialog and exits the probe screen"""
-        self._dialog(gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, message, secondary, title)
+        self._dialog(Gtk.MessageType.ERROR, Gtk.ButtonsType.CLOSE, message, secondary, title)
         sys.exit(1)
 
     def display_result_a(self, value):
@@ -301,9 +308,11 @@ def display_result_a(self, value):
     # --------------------------
     def z_clearance_down(self, data=None):
         # move Z - z_clearance
-        s = """G91
+        s = """%s
+        G91
         G1 Z-%f
         G90""" % (
+            self.setunits, 
             self.halcomp["ps_z_clearance"]
         )
         if self.gcode(s) == -1:
@@ -312,9 +321,11 @@ def z_clearance_down(self, data=None):
 
     def z_clearance_up(self, data=None):
         # move Z + z_clearance
-        s = """G91
+        s = """%s
+        G91
         G1 Z%f
         G90""" % (
+            self.setunits, 
             self.halcomp["ps_z_clearance"]
         )
         if self.gcode(s) == -1:
@@ -448,25 +459,25 @@ def length_y(self, ym=None, yp=None):
     #
     # --------------------------
     def on_common_spbtn_key_press_event(self, pin_name, gtkspinbutton, data=None):
-        keyname = gtk.gdk.keyval_name(data.keyval)
+        keyname = Gdk.keyval_name(data.keyval)
         if keyname == "Return":
             # Drop the Italics
-            gtkspinbutton.modify_font(pango.FontDescription("normal"))
+            gtkspinbutton.modify_font(Pango.FontDescription("normal"))
         elif keyname == "Escape":
             # Restore the original value
             gtkspinbutton.set_value(self.halcomp[pin_name])
 
             # Drop the Italics
-            gtkspinbutton.modify_font(pango.FontDescription("normal"))
+            gtkspinbutton.modify_font(Pango.FontDescription("normal"))
         else:
             # Set to Italics
-            gtkspinbutton.modify_font(pango.FontDescription("italic"))
+            gtkspinbutton.modify_font(Pango.FontDescription("italic"))
 
     def on_common_spbtn_value_changed(
         self, pin_name, gtkspinbutton, data=None, _type=float
     ):
         # Drop the Italics
-        gtkspinbutton.modify_font(pango.FontDescription("normal"))
+        gtkspinbutton.modify_font(Pango.FontDescription("normal"))
 
         # Update the pin
         self.halcomp[pin_name] = gtkspinbutton.get_value()

psng/python/configparser.py

@@ -17,7 +17,7 @@
 
 import os
 
-from ConfigParser import RawConfigParser
+from configparser import RawConfigParser
 
 
 class ProbeScreenConfigParser(RawConfigParser):

psng/python/jog.py

@@ -15,7 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; If not, see <http://www.gnu.org/licenses/>.
 
-import gtk  # base for pygtk widgets and constants
+import gi
+gi.require_version("Gtk", "3.0")
+gi.require_version("PangoCairo", "1.0")
+from gi.repository import Gtk, Gdk
+
 import hal  # base hal class to react to hal signals
 import linuxcnc
 
@@ -71,24 +75,24 @@ def _init_jog_increments(self):
         # One from the released button and one from the pressed button
         # we make a list of the buttons to later add the hardware pins to them
         label = "Cont"
-        rbt0 = gtk.RadioButton(None, label)
+        rbt0 = Gtk.RadioButton(None, label)
         rbt0.connect("pressed", self.on_increment_changed, 0)
         self.steps.pack_start(rbt0, True, True, 0)
         rbt0.set_property("draw_indicator", False)
         rbt0.show()
-        rbt0.modify_bg(gtk.STATE_ACTIVE, gtk.gdk.color_parse("#FFFF00"))
+        rbt0.modify_bg(Gtk.StateFlags.ACTIVE, Gdk.color_parse("#FFFF00"))
         rbt0.__name__ = "rbt0"
         self.incr_rbt_list.append(rbt0)
         # the rest of the buttons are now added to the group
         # self.no_increments is set while setting the hal pins with self._check_len_increments
         for item in range(1, len(self.jog_increments)):
             rbt = "rbt%d" % (item)
-            rbt = gtk.RadioButton(rbt0, self.jog_increments[item])
+            rbt = Gtk.RadioButton(rbt0, self.jog_increments[item])
             rbt.connect("pressed", self.on_increment_changed, self.jog_increments[item])
             self.steps.pack_start(rbt, True, True, 0)
             rbt.set_property("draw_indicator", False)
             rbt.show()
-            rbt.modify_bg(gtk.STATE_ACTIVE, gtk.gdk.color_parse("#FFFF00"))
+            rbt.modify_bg(Gtk.StateFlags.ACTIVE, Gdk.color_parse("#FFFF00"))
             rbt.__name__ = "rbt%d" % (item)
             self.incr_rbt_list.append(rbt)
         self.active_increment = "rbt0"

psng/python/length_measurement.py

@@ -42,11 +42,13 @@ def __init__(self, halcomp, builder, useropts):
     def on_lx_out_released(self, gtkbutton, data=None):
         # move X - edge_length- xy_clearance
         tmpx = self.halcomp["ps_edge_length"] + self.halcomp["ps_xy_clearance"]
-        s = """G91
+        s = """%s
+        G91
         G1 X-%f
         G90""" % (
-            tmpx
+            self.setunits, tmpx
         )
+        print(s)
         if self.gcode(s) == -1:
             return
         if self.z_clearance_down() == -1:
@@ -68,10 +70,11 @@ def on_lx_out_released(self, gtkbutton, data=None):
 
         # move X + 2 edge_length +  xy_clearance
         tmpx = 2 * self.halcomp["ps_edge_length"] + self.halcomp["ps_xy_clearance"]
-        s = """G91
+        s = """%s
+        G91
         G1 X%f
         G90""" % (
-            tmpx
+            self.setunits, tmpx
         )
         if self.gcode(s) == -1:
             return
@@ -107,10 +110,11 @@ def on_lx_out_released(self, gtkbutton, data=None):
     def on_ly_out_released(self, gtkbutton, data=None):
         # move Y - edge_length- xy_clearance
         tmpy = self.halcomp["ps_edge_length"] + self.halcomp["ps_xy_clearance"]
-        s = """G91
+        s = """%s
+        G91
         G1 Y-%f
         G90""" % (
-            tmpy
+            self.setunits, tmpy
         )
         if self.gcode(s) == -1:
             return
@@ -133,10 +137,11 @@ def on_ly_out_released(self, gtkbutton, data=None):
 
         # move Y + 2 edge_length +  xy_clearance
         tmpy = 2 * self.halcomp["ps_edge_length"] + self.halcomp["ps_xy_clearance"]
-        s = """G91
+        s = """%s
+        G91
         G1 Y%f
         G90""" % (
-            tmpy
+            self.setunits, tmpy
         )
         if self.gcode(s) == -1:
             return
@@ -176,10 +181,11 @@ def on_lx_in_released(self, gtkbutton, data=None):
             return
         # move X - edge_length Y + xy_clearance
         tmpx = self.halcomp["ps_edge_length"] - self.halcomp["ps_xy_clearance"]
-        s = """G91
+        s = """%s
+        G91
         G1 X-%f
         G90""" % (
-            tmpx
+            self.setunits, tmpx
         )
         if self.gcode(s) == -1:
             return
@@ -192,10 +198,11 @@ def on_lx_in_released(self, gtkbutton, data=None):
 
         # move X +2 edge_length - 2 xy_clearance
         tmpx = 2 * (self.halcomp["ps_edge_length"] - self.halcomp["ps_xy_clearance"])
-        s = """G91
+        s = """%s
+        G91
         G1 X%f
         G90""" % (
-            tmpx
+            self.setunits, tmpx
         )
         if self.gcode(s) == -1:
             return
@@ -231,10 +238,11 @@ def on_ly_in_released(self, gtkbutton, data=None):
             return
         # move Y - edge_length + xy_clearance
         tmpy = self.halcomp["ps_edge_length"] - self.halcomp["ps_xy_clearance"]
-        s = """G91
+        s = """%s
+        G91
         G1 Y-%f
         G90""" % (
-            tmpy
+            self.setunits, tmpy
         )
         if self.gcode(s) == -1:
             return
@@ -248,10 +256,11 @@ def on_ly_in_released(self, gtkbutton, data=None):
 
         # move Y +2 edge_length - 2 xy_clearance
         tmpy = 2 * (self.halcomp["ps_edge_length"] - self.halcomp["ps_xy_clearance"])
-        s = """G91
+        s = """%s
+        G91
         G1 Y%f
         G90""" % (
-            tmpy
+            self.setunits, tmpy
         )
         if self.gcode(s) == -1:
             return

psng/python/rotation.py

@@ -94,10 +94,11 @@ def on_angle_yp_released(self, gtkbutton, data=None):
             - self.stat.tool_offset[0]
         )
         # move Y - xy_clearance
-        s = """G91
+        s = """%s
+        G91
         G1 Y-%f
         G90""" % (
-            self.halcomp["ps_xy_clearance"]
+            self.setunits, self.halcomp["ps_xy_clearance"]
         )
         if self.gcode(s) == -1:
             return
@@ -114,10 +115,11 @@ def on_angle_yp_released(self, gtkbutton, data=None):
         if self.z_clearance_up() == -1:
             return
         # move X + edge_length
-        s = """G91
+        s = """%s
+        G91
         G1 X%f
         G90""" % (
-            self.halcomp["ps_edge_length"]
+            self.setunits, self.halcomp["ps_edge_length"]
         )
         if self.gcode(s) == -1:
             return
@@ -159,10 +161,11 @@ def on_angle_ym_released(self, gtkbutton, data=None):
             - self.stat.tool_offset[0]
         )
         # move Y + xy_clearance
-        s = """G91
+        s = """%s
+        G91
         G1 Y%f
         G90""" % (
-            self.halcomp["ps_xy_clearance"]
+            self.setunits, self.halcomp["ps_xy_clearance"]
         )
         if self.gcode(s) == -1:
             return
@@ -179,10 +182,11 @@ def on_angle_ym_released(self, gtkbutton, data=None):
         if self.z_clearance_up() == -1:
             return
         # move X - edge_length
-        s = """G91
+        s = """%s
+        G91
         G1 X-%f
         G90""" % (
-            self.halcomp["ps_edge_length"]
+            self.setunits, self.halcomp["ps_edge_length"]
         )
         if self.gcode(s) == -1:
             return
@@ -223,10 +227,11 @@ def on_angle_xp_released(self, gtkbutton, data=None):
             - self.stat.tool_offset[1]
         )
         # move X - xy_clearance
-        s = """G91
+        s = """%s
+        G91
         G1 X-%f
         G90""" % (
-            self.halcomp["ps_xy_clearance"]
+            self.setunits, self.halcomp["ps_xy_clearance"]
         )
         if self.gcode(s) == -1:
             return
@@ -243,10 +248,11 @@ def on_angle_xp_released(self, gtkbutton, data=None):
         if self.z_clearance_up() == -1:
             return
         # move Y - edge_length
-        s = """G91
+        s = """%s
+        G91
         G1 Y-%f
         G90""" % (
-            self.halcomp["ps_edge_length"]
+            self.setunits, self.halcomp["ps_edge_length"]
         )
         if self.gcode(s) == -1:
             return
@@ -287,10 +293,11 @@ def on_angle_xm_released(self, gtkbutton, data=None):
             - self.stat.tool_offset[1]
         )
         # move X + xy_clearance
-        s = """G91
+        s = """%s
+        G91
         G1 X%f
         G90""" % (
-            self.halcomp["ps_xy_clearance"]
+            self.setunits, self.halcomp["ps_xy_clearance"]
         )
         if self.gcode(s) == -1:
             return
@@ -307,10 +314,11 @@ def on_angle_xm_released(self, gtkbutton, data=None):
         if self.z_clearance_up() == -1:
             return
         # move Y + edge_length
-        s = """G91
+        s = """%s
+        G91
         G1 Y%f
         G90""" % (
-            self.halcomp["ps_edge_length"]
+            self.setunits, self.halcomp["ps_edge_length"]
         )
         if self.gcode(s) == -1:
             return