Skip to content

Commit 202dccc

Browse files
committed
Gmoccapy: Fix 'spindle.0.speed-out' pins being reset to wrong value when using G96
This is part of fixing issue #3447
1 parent ba65e41 commit 202dccc

2 files changed

Lines changed: 26 additions & 2 deletions

File tree

src/emc/usr_intf/gmoccapy/gmoccapy.glade

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2670,6 +2670,7 @@
26702670
<property name="draw-indicator">False</property>
26712671
<property name="group">rbt_stop</property>
26722672
<signal name="clicked" handler="on_rbt_reverse_clicked" swapped="no"/>
2673+
<signal name="released" handler="on_rbt_reverse_released" swapped="no"/>
26732674
</object>
26742675
<packing>
26752676
<property name="expand">True</property>
@@ -2708,6 +2709,7 @@
27082709
<property name="draw-indicator">False</property>
27092710
<property name="group">rbt_stop</property>
27102711
<signal name="clicked" handler="on_rbt_forward_clicked" swapped="no"/>
2712+
<signal name="released" handler="on_rbt_forward_released" swapped="no"/>
27112713
</object>
27122714
<packing>
27132715
<property name="expand">False</property>

src/emc/usr_intf/gmoccapy/gmoccapy.py

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3982,7 +3982,8 @@ def _update_vc(self):
39823982
text = "Vc= {0:.2f}".format(vc)
39833983
self.widgets.lbl_vc.set_text(text)
39843984

3985-
def on_rbt_forward_clicked(self, widget, data=None):
3985+
# This is for handling mouse clicks on the GUI button
3986+
def on_rbt_forward_released(self, widget, data=None):
39863987
if widget.get_active():
39873988
widget.set_image(self.widgets.img_spindle_forward_on)
39883989
self._set_spindle("forward")
@@ -3992,7 +3993,8 @@ def on_rbt_forward_clicked(self, widget, data=None):
39923993
widget.set_sensitive(not widget.get_sensitive())
39933994
widget.set_sensitive(not widget.get_sensitive())
39943995

3995-
def on_rbt_reverse_clicked(self, widget, data=None):
3996+
# This is for handling mouse clicks on the GUI button
3997+
def on_rbt_reverse_released(self, widget, data=None):
39963998
if widget.get_active():
39973999
widget.set_image(self.widgets.img_spindle_reverse_on)
39984000
self._set_spindle("reverse")
@@ -4002,6 +4004,26 @@ def on_rbt_reverse_clicked(self, widget, data=None):
40024004
widget.set_sensitive(not widget.get_sensitive())
40034005
widget.set_sensitive(not widget.get_sensitive())
40044006

4007+
# This is for handling self.widgets.rbt_forward.set_active(True)
4008+
def on_rbt_forward_clicked(self, widget, data=None):
4009+
if widget.get_active():
4010+
widget.set_image(self.widgets.img_spindle_forward_on)
4011+
else:
4012+
widget.set_image(self.widgets.img_spindle_forward)
4013+
# Toggling the sensitive property is important here! See the commit description.
4014+
widget.set_sensitive(not widget.get_sensitive())
4015+
widget.set_sensitive(not widget.get_sensitive())
4016+
4017+
# This is for handling self.widgets.rbt_reverse.set_active(True)
4018+
def on_rbt_reverse_clicked(self, widget, data=None):
4019+
if widget.get_active():
4020+
widget.set_image(self.widgets.img_spindle_reverse_on)
4021+
else:
4022+
widget.set_image(self.widgets.img_spindle_reverse)
4023+
# Toggling the sensitive property is important here! See the commit description.
4024+
widget.set_sensitive(not widget.get_sensitive())
4025+
widget.set_sensitive(not widget.get_sensitive())
4026+
40054027
def on_rbt_stop_clicked(self, widget, data=None):
40064028
if widget.get_active():
40074029
widget.set_image(self.widgets.img_spindle_stop_on)

0 commit comments

Comments
 (0)