summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Schechner <nieson@web.de>2014-03-02 18:10:03 +0100
committerNorbert Schechner <nieson@web.de>2014-03-02 18:10:03 +0100
commitb208034967e81e00c6140c7f34584caf4ba6e8c9 (patch)
tree4b995869731c069cadf544f962533ce69f4c7098
parent0a70d3f0601eed7d54cf2bc847fc93dc7bc9d9e0 (diff)
downloadlinuxcnc-b208034967e81e00c6140c7f34584caf4ba6e8c9.tar.gz
linuxcnc-b208034967e81e00c6140c7f34584caf4ba6e8c9.zip
gmoccapy_1_0_4 - corrected excecuting program by step
ver. 1.0.4 - corrected the way of excecuting a program step by step
Diffstat
-rw-r--r--share/gmoccapy/gmoccapy.glade44
-rw-r--r--src/emc/usr_intf/gmoccapy/gmoccapy.glade44
-rwxr-xr-xsrc/emc/usr_intf/gmoccapy/gmoccapy.py18
-rwxr-xr-xsrc/emc/usr_intf/gmoccapy/release_notes.txt3
4 files changed, 65 insertions, 44 deletions
diff --git a/share/gmoccapy/gmoccapy.glade b/share/gmoccapy/gmoccapy.glade
index 5ba678b2b..5265b3045 100644
--- a/share/gmoccapy/gmoccapy.glade
+++ b/share/gmoccapy/gmoccapy.glade
@@ -57,9 +57,9 @@
<object class="HAL_Gremlin" id="gremlin">
<property name="visible">True</property>
<property name="double_buffered">False</property>
- <property name="use_commanded">False</property>
<property name="enable_dro">False</property>
<property name="show_dtg">False</property>
+ <property name="use_commanded">False</property>
<signal name="button_press_event" handler="on_gremlin_button_press_event"/>
<signal name="line_clicked" handler="on_gremlin_line_clicked"/>
</object>
@@ -336,8 +336,8 @@
<child>
<object class="OffsetPage" id="offsetpage1">
<property name="visible">True</property>
- <property name="foreground_color">#ffff00000000</property>
<property name="highlight_color">#adadd8d8e6e6</property>
+ <property name="foreground_color">#ffff00000000</property>
</object>
<packing>
<property name="position">1</property>
@@ -483,12 +483,12 @@
<object class="Combi_DRO" id="Combi_DRO_x">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
+ <property name="dtg_color">#ffffffff0000</property>
+ <property name="rel_color">#000000000000</property>
<property name="font_size">28</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="homed_color">#0000ffff0000</property>
- <property name="dtg_color">#ffffffff0000</property>
- <property name="rel_color">#000000000000</property>
<signal name="system_changed" handler="on_Combi_DRO_system_changed"/>
<signal name="units_changed" handler="on_Combi_DRO_units_changed"/>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
@@ -501,13 +501,13 @@
<object class="Combi_DRO" id="Combi_DRO_y">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
+ <property name="dtg_color">#ffffffff0000</property>
+ <property name="rel_color">#000000000000</property>
<property name="font_size">28</property>
<property name="joint_number">1</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="homed_color">#0000ffff0000</property>
- <property name="dtg_color">#ffffffff0000</property>
- <property name="rel_color">#000000000000</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@@ -518,13 +518,13 @@
<object class="Combi_DRO" id="Combi_DRO_z">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
+ <property name="dtg_color">#ffffffff0000</property>
+ <property name="rel_color">#000000000000</property>
<property name="font_size">28</property>
<property name="joint_number">2</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="homed_color">#0000ffff0000</property>
- <property name="dtg_color">#ffffffff0000</property>
- <property name="rel_color">#000000000000</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@@ -535,13 +535,13 @@
<object class="Combi_DRO" id="Combi_DRO_4">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
+ <property name="dtg_color">#ffffffff0000</property>
+ <property name="rel_color">#000000000000</property>
<property name="font_size">28</property>
<property name="joint_number">3</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="homed_color">#0000ffff0000</property>
- <property name="dtg_color">#ffffffff0000</property>
- <property name="rel_color">#000000000000</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@@ -1781,16 +1781,16 @@
<object class="HAL_HBar" id="spindle_feedback_bar">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">The feedback spindle speed</property>
- <property name="z1_color">#0000ffff0000</property>
+ <property name="text_template">%i</property>
+ <property name="z0_color">#0000ffff0000</property>
<property name="target_color">#0000ffff0000</property>
- <property name="z2_color">#0000ffff0000</property>
+ <property name="z1_color">#0000ffff0000</property>
<property name="target_value">-0.039999999105930328</property>
- <property name="z1_border">0.80000001192092896</property>
- <property name="z0_color">#0000ffff0000</property>
- <property name="text_template">%i</property>
- <property name="z0_border">0.40000000596046448</property>
<property name="bg_color">#bebebebebebe</property>
<property name="max">6000</property>
+ <property name="z2_color">#0000ffff0000</property>
+ <property name="z0_border">0.40000000596046448</property>
+ <property name="z1_border">0.80000001192092896</property>
<signal name="hal_pin_changed" handler="on_spindle_feedback_bar_hal_pin_changed"/>
</object>
<packing>
@@ -4792,6 +4792,7 @@ actions</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Load a new program</property>
<property name="image">img_open</property>
+ <signal name="state_changed" handler="on_btn_load_state_changed"/>
<signal name="clicked" handler="on_btn_load_clicked"/>
</object>
<packing>
@@ -4868,8 +4869,8 @@ actions</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Run the loaded program step by step</property>
- <property name="related_action">hal_action_step</property>
<property name="image">img_step</property>
+ <signal name="clicked" handler="on_btn_step_clicked"/>
</object>
<packing>
<property name="expand">False</property>
@@ -6308,7 +6309,6 @@ selected</property>
<property name="visible">True</property>
<property name="pixbuf">images/refall.png</property>
</object>
- <object class="EMC_Action_Step" id="hal_action_step"/>
<object class="EMC_Action_Stop" id="hal_action_stop"/>
<object class="EMC_Action_Open" id="hal_action_open"/>
<object class="GtkImage" id="img_unhome">
@@ -6609,10 +6609,6 @@ selected</property>
<property name="visible">True</property>
<property name="pixbuf">images/stop.png</property>
</object>
- <object class="GtkImage" id="img_step">
- <property name="visible">True</property>
- <property name="pixbuf">images/step.png</property>
- </object>
<object class="GtkImage" id="img_run_from">
<property name="visible">True</property>
<property name="sensitive">False</property>
@@ -6676,4 +6672,8 @@ selected</property>
<property name="upper">100</property>
<property name="step_increment">1</property>
</object>
+ <object class="GtkImage" id="img_step">
+ <property name="visible">True</property>
+ <property name="pixbuf">images/step.png</property>
+ </object>
</interface>
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.glade b/src/emc/usr_intf/gmoccapy/gmoccapy.glade
index 5ba678b2b..5265b3045 100644
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.glade
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.glade
@@ -57,9 +57,9 @@
<object class="HAL_Gremlin" id="gremlin">
<property name="visible">True</property>
<property name="double_buffered">False</property>
- <property name="use_commanded">False</property>
<property name="enable_dro">False</property>
<property name="show_dtg">False</property>
+ <property name="use_commanded">False</property>
<signal name="button_press_event" handler="on_gremlin_button_press_event"/>
<signal name="line_clicked" handler="on_gremlin_line_clicked"/>
</object>
@@ -336,8 +336,8 @@
<child>
<object class="OffsetPage" id="offsetpage1">
<property name="visible">True</property>
- <property name="foreground_color">#ffff00000000</property>
<property name="highlight_color">#adadd8d8e6e6</property>
+ <property name="foreground_color">#ffff00000000</property>
</object>
<packing>
<property name="position">1</property>
@@ -483,12 +483,12 @@
<object class="Combi_DRO" id="Combi_DRO_x">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
+ <property name="dtg_color">#ffffffff0000</property>
+ <property name="rel_color">#000000000000</property>
<property name="font_size">28</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="homed_color">#0000ffff0000</property>
- <property name="dtg_color">#ffffffff0000</property>
- <property name="rel_color">#000000000000</property>
<signal name="system_changed" handler="on_Combi_DRO_system_changed"/>
<signal name="units_changed" handler="on_Combi_DRO_units_changed"/>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
@@ -501,13 +501,13 @@
<object class="Combi_DRO" id="Combi_DRO_y">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
+ <property name="dtg_color">#ffffffff0000</property>
+ <property name="rel_color">#000000000000</property>
<property name="font_size">28</property>
<property name="joint_number">1</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="homed_color">#0000ffff0000</property>
- <property name="dtg_color">#ffffffff0000</property>
- <property name="rel_color">#000000000000</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@@ -518,13 +518,13 @@
<object class="Combi_DRO" id="Combi_DRO_z">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
+ <property name="dtg_color">#ffffffff0000</property>
+ <property name="rel_color">#000000000000</property>
<property name="font_size">28</property>
<property name="joint_number">2</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="homed_color">#0000ffff0000</property>
- <property name="dtg_color">#ffffffff0000</property>
- <property name="rel_color">#000000000000</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@@ -535,13 +535,13 @@
<object class="Combi_DRO" id="Combi_DRO_4">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
+ <property name="dtg_color">#ffffffff0000</property>
+ <property name="rel_color">#000000000000</property>
<property name="font_size">28</property>
<property name="joint_number">3</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="homed_color">#0000ffff0000</property>
- <property name="dtg_color">#ffffffff0000</property>
- <property name="rel_color">#000000000000</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@@ -1781,16 +1781,16 @@
<object class="HAL_HBar" id="spindle_feedback_bar">
<property name="visible">True</property>
<property name="tooltip_text" translatable="yes">The feedback spindle speed</property>
- <property name="z1_color">#0000ffff0000</property>
+ <property name="text_template">%i</property>
+ <property name="z0_color">#0000ffff0000</property>
<property name="target_color">#0000ffff0000</property>
- <property name="z2_color">#0000ffff0000</property>
+ <property name="z1_color">#0000ffff0000</property>
<property name="target_value">-0.039999999105930328</property>
- <property name="z1_border">0.80000001192092896</property>
- <property name="z0_color">#0000ffff0000</property>
- <property name="text_template">%i</property>
- <property name="z0_border">0.40000000596046448</property>
<property name="bg_color">#bebebebebebe</property>
<property name="max">6000</property>
+ <property name="z2_color">#0000ffff0000</property>
+ <property name="z0_border">0.40000000596046448</property>
+ <property name="z1_border">0.80000001192092896</property>
<signal name="hal_pin_changed" handler="on_spindle_feedback_bar_hal_pin_changed"/>
</object>
<packing>
@@ -4792,6 +4792,7 @@ actions</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Load a new program</property>
<property name="image">img_open</property>
+ <signal name="state_changed" handler="on_btn_load_state_changed"/>
<signal name="clicked" handler="on_btn_load_clicked"/>
</object>
<packing>
@@ -4868,8 +4869,8 @@ actions</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Run the loaded program step by step</property>
- <property name="related_action">hal_action_step</property>
<property name="image">img_step</property>
+ <signal name="clicked" handler="on_btn_step_clicked"/>
</object>
<packing>
<property name="expand">False</property>
@@ -6308,7 +6309,6 @@ selected</property>
<property name="visible">True</property>
<property name="pixbuf">images/refall.png</property>
</object>
- <object class="EMC_Action_Step" id="hal_action_step"/>
<object class="EMC_Action_Stop" id="hal_action_stop"/>
<object class="EMC_Action_Open" id="hal_action_open"/>
<object class="GtkImage" id="img_unhome">
@@ -6609,10 +6609,6 @@ selected</property>
<property name="visible">True</property>
<property name="pixbuf">images/stop.png</property>
</object>
- <object class="GtkImage" id="img_step">
- <property name="visible">True</property>
- <property name="pixbuf">images/step.png</property>
- </object>
<object class="GtkImage" id="img_run_from">
<property name="visible">True</property>
<property name="sensitive">False</property>
@@ -6676,4 +6672,8 @@ selected</property>
<property name="upper">100</property>
<property name="step_increment">1</property>
</object>
+ <object class="GtkImage" id="img_step">
+ <property name="visible">True</property>
+ <property name="pixbuf">images/step.png</property>
+ </object>
</interface>
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
index 33d6cabf0..cb6c2f514 100755
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.py
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -151,6 +151,8 @@ class gmoccapy(object):
self.widgets = widgets.Widgets(self.builder)
+ self.stepping = False
+
self.active_gcodes = [] # this are the formated G code values
self.active_mcodes = [] # this are the formated M code values
self.gcodes = [] # this are the unformated G code values to check if an update is requiered
@@ -1287,6 +1289,11 @@ class gmoccapy(object):
self._sensitize_widgets(widgetlist, False)
self.widgets.btn_run.set_sensitive(False)
+ # the user want to run step by step
+ if self.stepping == True:
+ self.widgets.btn_step.set_sensitive(True)
+ self.widgets.tbtn_pause.set_sensitive(False)
+
self.interpreter = _RUN
self.widgets.btn_show_kbd.set_image(self.widgets.img_brake_macro)
@@ -3301,6 +3308,17 @@ class gmoccapy(object):
# self.command.auto( linuxcnc.AUTO_RUN, 0 )
pass
+ def on_btn_step_clicked(self, widget, data = None):
+ self.command.auto(linuxcnc.AUTO_STEP)
+ self.stepping = True
+
+ # this is needed only for stepping through a program, to
+ # sensitize the widgets according to that mode
+ def on_btn_load_state_changed(self, widget, state):
+ if state == gtk.STATE_INSENSITIVE:
+ self.stepping = False
+ self.widgets.tbtn_pause.set_sensitive(True)
+
def on_btn_stop_clicked(self, widget, data = None):
# self.command.abort()
# self.command.wait_complete()
diff --git a/src/emc/usr_intf/gmoccapy/release_notes.txt b/src/emc/usr_intf/gmoccapy/release_notes.txt
index 2b6df50c5..242d31d8c 100755
--- a/src/emc/usr_intf/gmoccapy/release_notes.txt
+++ b/src/emc/usr_intf/gmoccapy/release_notes.txt
@@ -1,3 +1,6 @@
+ver. 1.0.4
+- corrected the way of excecuting a program step by step
+
ver. 1.0.3
- pressing the OFF button will bring you back to manual
mode, because there is the "EXIT" button
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-02 04:13:15 +0000