Skip to content

Refactor enable/disable checkboxes #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kiall wants to merge 1 commit into
base: master
Choose a base branch
from
+114 −86
Open

Refactor enable/disable checkboxes #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions psng/psng.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@
</packing>
</child>
<child>
<object class="GtkFrame" id="frame4">
<object class="GtkFrame" id="frm_set_zero">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
Expand Down Expand Up @@ -1686,19 +1686,6 @@
<property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_set_zero">
<property name="label" translatable="yes">Auto Zero</property>
<property name="height_request">28</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="image_position">bottom</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_chk_set_zero_toggled" swapped="no"/>
</object>
</child>
<child>
<object class="HAL_LED" id="hal_led_set_zero">
<property name="width_request">28</property>
Expand Down Expand Up @@ -1738,6 +1725,23 @@
<property name="y">41</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_set_zero">
<property name="label" translatable="yes">Auto Zero</property>
<property name="height_request">20</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="image_position">bottom</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_chk_set_zero_toggled" swapped="no"/>
</object>
<packing>
<property name="x">780</property>
<property name="y">55</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame6">
<property name="visible">True</property>
Expand Down
32 changes: 18 additions & 14 deletions psng/psng_1024x768.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1516,7 +1516,7 @@
</packing>
</child>
<child>
<object class="GtkFrame" id="frame4">
<object class="GtkFrame" id="frm_set_zero">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
Expand Down Expand Up @@ -1687,19 +1687,6 @@
<property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_set_zero">
<property name="label" translatable="yes">Auto Zero</property>
<property name="height_request">16</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="image_position">bottom</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_chk_set_zero_toggled" swapped="no"/>
</object>
</child>
<child>
<object class="HAL_LED" id="hal_led_set_zero">
<property name="width_request">28</property>
Expand Down Expand Up @@ -1740,6 +1727,23 @@
<property name="y">39</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_set_zero">
<property name="label" translatable="yes">Auto Zero</property>
<property name="height_request">16</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="image_position">bottom</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_chk_set_zero_toggled" swapped="no"/>
</object>
<packing>
<property name="x">591</property>
<property name="y">55</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame6">
<property name="visible">True</property>
Expand Down
32 changes: 18 additions & 14 deletions psng/psng_scroll.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1521,7 +1521,7 @@
</packing>
</child>
<child>
<object class="GtkFrame" id="frame4">
<object class="GtkFrame" id="frm_set_zero">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
Expand Down Expand Up @@ -1692,19 +1692,6 @@
<property name="y_options">GTK_SHRINK</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_set_zero">
<property name="label" translatable="yes">Auto Zero</property>
<property name="height_request">28</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="image_position">bottom</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_chk_set_zero_toggled" swapped="no"/>
</object>
</child>
<child>
<object class="HAL_LED" id="hal_led_set_zero">
<property name="width_request">28</property>
Expand Down Expand Up @@ -1744,6 +1731,23 @@
<property name="y">41</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="chk_set_zero">
<property name="label" translatable="yes">Auto Zero</property>
<property name="height_request">20</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="image_position">bottom</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_chk_set_zero_toggled" swapped="no"/>
</object>
<packing>
<property name="x">780</property>
<property name="y">55</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame6">
<property name="visible">True</property>
Expand Down
66 changes: 31 additions & 35 deletions psng/python/tool_measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ def __init__(self, halcomp, builder, useropts):
self.chk_use_tool_measurement.set_active(
self.prefs.getpref("use_tool_measurement", False, bool)
)
self.spbtn_setter_height.set_value(
self.prefs.getpref("setterheight", 0.0, float)
)
self.spbtn_block_height.set_value(
self.prefs.getpref("blockheight", 0.0, float)
)

# make the pins for tool measurement
self.halcomp.newpin("use_tool_measurement", hal.HAL_BIT, hal.HAL_OUT)
Expand All @@ -61,11 +67,8 @@ def __init__(self, halcomp, builder, useropts):
pin = self.halcomp.newpin("toolchange-change", hal.HAL_BIT, hal.HAL_IN)
hal_glib.GPin(pin).connect("value_changed", self.on_tool_change)

if self.chk_use_tool_measurement.get_active():
self.halcomp["use_tool_measurement"] = True
self.hal_led_set_m6.hal_pin.set(1)

self._init_tool_sensor_data()
self._set_use_tool_measurement()

# Read the ini file config [TOOLSENSOR] section
def _init_tool_sensor_data(self):
Expand All @@ -82,10 +85,6 @@ def _init_tool_sensor_data(self):
or maxprobe is None
or tsdiam is None
):
self.chk_use_tool_measurement.set_active(False)
self.btn_tool_dia.set_sensitive(False)
self.btn_probe_tool_setter.set_sensitive(False)

self.error_dialog(
"Invalid INI Configuration",
secondary="Please check the TOOLSENSOR INI configurations",
Expand All @@ -97,39 +96,36 @@ def _init_tool_sensor_data(self):
self.maxprobe = float(maxprobe)
self.tsdiam = float(tsdiam)

self.spbtn_setter_height.set_value(
self.prefs.getpref("setterheight", 0.0, float)
)
self.spbtn_block_height.set_value(
self.prefs.getpref("blockheight", 0.0, float)
)
# to set the hal pin with correct values we emit a toogled
if self.chk_use_tool_measurement.get_active():
self.frm_probe_pos.set_sensitive(True)
self.halcomp["use_tool_measurement"] = True
self.halcomp["setterheight"] = self.spbtn_setter_height.get_value()
self.halcomp["blockheight"] = self.spbtn_block_height.get_value()
else:
self.frm_probe_pos.set_sensitive(False)
self.chk_use_tool_measurement.set_sensitive(True)
# --------------
# Helper Methods
# --------------
def _set_use_tool_measurement(self, enabled=None):
if enabled is None:
# If an enabled value is not supplied, read the current value
enabled = self.chk_use_tool_measurement.get_active()
else:
# If an enabled value is supplied, save the supplied value
self.prefs.putpref("use_tool_measurement", enabled, bool)
self.chk_use_tool_measurement.set_active(enabled)

# ----------------
# Remap M6 Buttons
# ----------------
# Tickbox from gui for enable disable remap (with saving pref)
def on_chk_use_tool_measurement_toggled(self, gtkcheckbutton, data=None):
if gtkcheckbutton.get_active():
self.frm_probe_pos.set_sensitive(True)
self.halcomp["use_tool_measurement"] = True
self.frm_probe_pos.set_sensitive(enabled)
self.hal_led_set_m6.hal_pin.set(enabled)

self.halcomp["use_tool_measurement"] = enabled

if enabled:
self.halcomp["setterheight"] = self.spbtn_setter_height.get_value()
self.halcomp["blockheight"] = self.spbtn_block_height.get_value()
else:
self.frm_probe_pos.set_sensitive(False)
self.halcomp["use_tool_measurement"] = False
self.halcomp["setterheight"] = 0.0
self.halcomp["blockheight"] = 0.0
self.prefs.putpref("use_tool_measurement", gtkcheckbutton.get_active(), bool)
self.hal_led_set_m6.hal_pin.set(gtkcheckbutton.get_active())

# ----------------
# Remap M6 Buttons
# ----------------
# Tickbox from gui for enable disable remap (with saving pref)
def on_chk_use_tool_measurement_toggled(self, gtkcheckbutton, data=None):
self._set_use_tool_measurement(gtkcheckbutton.get_active())

# Spinbox for setter height with autosave value inside machine pref file
def on_spbtn_setter_height_key_press_event(self, gtkspinbutton, data=None):
Expand Down
38 changes: 29 additions & 9 deletions psng/python/zero.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class ProbeScreenZero(ProbeScreenBase):
def __init__(self, halcomp, builder, useropts):
super(ProbeScreenZero, self).__init__(halcomp, builder, useropts)

self.frm_set_zero = self.builder.get_object("frm_set_zero")
self.chk_set_zero = self.builder.get_object("chk_set_zero")
self.hal_led_set_zero = self.builder.get_object("hal_led_set_zero")
self.spbtn_offs_x = self.builder.get_object("spbtn_offs_x")
Expand All @@ -46,20 +47,39 @@ def __init__(self, halcomp, builder, useropts):
self.halcomp.newpin("ps_offs_y", hal.HAL_FLOAT, hal.HAL_OUT)
self.halcomp.newpin("ps_offs_z", hal.HAL_FLOAT, hal.HAL_OUT)

if self.chk_set_zero.get_active():
self.halcomp["set_zero"] = True
self.hal_led_set_zero.hal_pin.set(1)
self.halcomp["ps_offs_x"] = self.spbtn_offs_x.get_value()
self.halcomp["ps_offs_y"] = self.spbtn_offs_y.get_value()
self.halcomp["ps_offs_z"] = self.spbtn_offs_z.get_value()
self._set_set_zero()

# --------------
# Helper Methods
# --------------
def _set_set_zero(self, enabled=None):
if enabled is None:
# If an enabled value is not supplied, read the current value
enabled = self.chk_set_zero.get_active()
else:
# If an enabled value is supplied, save the supplied value
self.prefs.putpref("set_zero", enabled, bool)
self.chk_set_zero.set_active(enabled)

self.frm_set_zero.set_sensitive(enabled)
self.hal_led_set_zero.hal_pin.set(enabled)

self.halcomp["set_zero"] = enabled

if enabled:
self.halcomp["ps_offs_x"] = self.spbtn_offs_x.get_value()
self.halcomp["ps_offs_y"] = self.spbtn_offs_y.get_value()
self.halcomp["ps_offs_z"] = self.spbtn_offs_z.get_value()
else:
self.halcomp["ps_offs_x"] = 0.0
self.halcomp["ps_offs_y"] = 0.0
self.halcomp["ps_offs_z"] = 0.0

# -----------------
# Touch Off Buttons
# -----------------
def on_chk_set_zero_toggled(self, gtkcheckbutton, data=None):
self.halcomp["set_zero"] = gtkcheckbutton.get_active()
self.hal_led_set_zero.hal_pin.set(gtkcheckbutton.get_active())
self.prefs.putpref("chk_set_zero", gtkcheckbutton.get_active(), bool)
self._set_set_zero(gtkcheckbutton.get_active())

def on_spbtn_offs_x_key_press_event(self, gtkspinbutton, data=None):
self.on_common_spbtn_key_press_event("ps_offs_x", gtkspinbutton, data)
Expand Down