jepler/linuxcnc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gmoccapy_1_0_1 - solved jog button bug

Browse source 
ver 1.0.1
- solved a bug, because I forgot to include some signals
  in glade file, so no jogging with button was possible
This commit is contained in:
Norbert Schechner 2014-03-01 17:06:16 +01:00
parent 5ccf94a91e
commit 57a170a977
6 changed files with 94 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/sim/gmoccapy/gmoccapy_development.pref
View file

@ -28,7 +28,7 @@ show_dtg = False
show_keyboard_on_mdi = False
spindle_start_rpm = 300.0
view_dimension = True
show_dro_btn = False
gremlin_view = rbt_view_p
scale_spindle_override = 1.0
system_name_g55 = G55
system_name_g54 = G54
@ -45,7 +45,7 @@ spindle_bar_max = 6000.0
use_auto_units = True
unhomed_color = red
enable_dro = False
gremlin_view = rbt_view_p
show_dro_btn = False
use_screen2 = False
opstop = True
show_keyboard_on_file_selection = False

30
configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy.pref
View file

@ -5,7 +5,7 @@ max_messages = 10.0
show_preview_on_offset = False
jump_to_dir = /home/emcmesa
show_keyboard_on_offset = True
spindle_bar_max = 6000.0
x_pos_popup = 15.0
homed_color = green
height = 750.0
system_name_g92 = G92
@ -16,12 +16,14 @@ audio_error = /usr/share/sounds/ubuntu/stereo/dialog-question.ogg
log_actions = False
view_tool_path = True
scale_max_vel = 140.166
width = 979.0
system_name_g58 = G58
open_file =
abs_color = blue
show_offsets = False
system_name_g59 = G59
system_name_g58 = G58
width = 979.0
spindle_bar_min = 0.0
show_dtg = False
show_keyboard_on_mdi = True
spindle_start_rpm = 300.0
view_dimension = True
@ -31,16 +33,15 @@ system_name_tool = Tool
system_name_g54 = G54
system_name_rot = Rot
system_name_g56 = G56
message_font = sans 10
x_pos = 10.0
y_pos = 10.0
dtg_color = yellow
unlock_code = 123
unhomed_color = red
x_pos = 10.0
dtg_color = yellow
message_font = sans 10
show_keyboard_on_tooledit = False
screen1 = window
use_keyboard_shortcuts = False
x_pos_popup = 15.0
spindle_bar_min = 0.0
spindle_bar_max = 6000.0
use_auto_units = True
unhomed_color = red
enable_dro = False
audio_alert = /usr/share/sounds/ubuntu/stereo/bell.ogg
use_screen2 = False
@ -53,17 +54,16 @@ system_name_g55 = G55
y_pos_popup = 55.0
show_keyboard_on_edit = True
run_from_line = no_run
blockdel = False
gtk_theme = Follow System Theme
system_name_g5x = G5x
system_name_g57 = G57
hide_cursor = False
use_auto_units = True
y_pos = 10.0
width_popup = 250.0
show_keyboard_on_tooledit = False
use_keyboard_shortcuts = False
show_dro_btn = False
system_name_g59.1 = G59.1
show_dtg = False
blockdel = False
scale_jog_vel = 99.6
view = p

56
share/gmoccapy/gmoccapy.glade
View file

@ -57,8 +57,8 @@
<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="use_commanded">False</property>
<property name="show_dtg">False</property>
<signal name="button_press_event" handler="on_gremlin_button_press_event"/>
<signal name="line_clicked" handler="on_gremlin_line_clicked"/>
@ -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="abs_color">#00000000ffff</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="font_size">28</property>
<property name="homed_color">#0000ffff0000</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="font_size">28</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="joint_number">1</property>
<property name="abs_color">#00000000ffff</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="font_size">28</property>
<property name="homed_color">#0000ffff0000</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="font_size">28</property>
<property name="joint_number">1</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="joint_number">2</property>
<property name="abs_color">#00000000ffff</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="font_size">28</property>
<property name="homed_color">#0000ffff0000</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="font_size">28</property>
<property name="joint_number">2</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="joint_number">3</property>
<property name="abs_color">#00000000ffff</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="font_size">28</property>
<property name="homed_color">#0000ffff0000</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="font_size">28</property>
<property name="joint_number">3</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@ -636,6 +636,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">1</property>
@ -652,6 +654,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">1</property>
@ -670,6 +674,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="top_attach">1</property>
@ -686,6 +692,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">2</property>
@ -704,6 +712,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">3</property>
@ -719,6 +729,8 @@
<property name="height_request">50</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">2</property>
@ -735,6 +747,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">3</property>
@ -753,6 +767,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="xalign">0.47999998927116394</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">2</property>
@ -1765,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="z0_border">0.40000000596046448</property>
<property name="target_color">#0000ffff0000</property>
<property name="z1_color">#0000ffff0000</property>
<property name="target_value">-0.039999999105930328</property>
<property name="z2_color">#0000ffff0000</property>
<property name="max">6000</property>
<property name="text_template">%i</property>
<property name="z1_border">0.80000001192092896</property>
<property name="bg_color">#bebebebebebe</property>
<property name="z0_color">#0000ffff0000</property>
<property name="z0_border">0.40000000596046448</property>
<property name="z1_color">#0000ffff0000</property>
<property name="z1_border">0.80000001192092896</property>
<property name="target_color">#0000ffff0000</property>
<property name="z2_color">#0000ffff0000</property>
<property name="target_value">-0.039999999105930328</property>
<property name="max">6000</property>
<property name="text_template">%i</property>
<signal name="hal_pin_changed" handler="on_spindle_feedback_bar_hal_pin_changed"/>
</object>
<packing>

56
src/emc/usr_intf/gmoccapy/gmoccapy.glade
View file

@ -57,8 +57,8 @@
<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="use_commanded">False</property>
<property name="show_dtg">False</property>
<signal name="button_press_event" handler="on_gremlin_button_press_event"/>
<signal name="line_clicked" handler="on_gremlin_line_clicked"/>
@ -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="abs_color">#00000000ffff</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="font_size">28</property>
<property name="homed_color">#0000ffff0000</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="font_size">28</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="joint_number">1</property>
<property name="abs_color">#00000000ffff</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="font_size">28</property>
<property name="homed_color">#0000ffff0000</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="font_size">28</property>
<property name="joint_number">1</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="joint_number">2</property>
<property name="abs_color">#00000000ffff</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="font_size">28</property>
<property name="homed_color">#0000ffff0000</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="font_size">28</property>
<property name="joint_number">2</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="joint_number">3</property>
<property name="abs_color">#00000000ffff</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="font_size">28</property>
<property name="homed_color">#0000ffff0000</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
<property name="abs_color">#00000000ffff</property>
<property name="font_size">28</property>
<property name="joint_number">3</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@ -636,6 +636,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">1</property>
@ -652,6 +654,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">1</property>
@ -670,6 +674,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="top_attach">1</property>
@ -686,6 +692,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">2</property>
@ -704,6 +712,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">3</property>
@ -719,6 +729,8 @@
<property name="height_request">50</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">2</property>
@ -735,6 +747,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">3</property>
@ -753,6 +767,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="xalign">0.47999998927116394</property>
<signal name="pressed" handler="on_btn_jog_pressed"/>
<signal name="released" handler="on_btn_jog_released"/>
</object>
<packing>
<property name="left_attach">2</property>
@ -1765,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="z0_border">0.40000000596046448</property>
<property name="target_color">#0000ffff0000</property>
<property name="z1_color">#0000ffff0000</property>
<property name="target_value">-0.039999999105930328</property>
<property name="z2_color">#0000ffff0000</property>
<property name="max">6000</property>
<property name="text_template">%i</property>
<property name="z1_border">0.80000001192092896</property>
<property name="bg_color">#bebebebebebe</property>
<property name="z0_color">#0000ffff0000</property>
<property name="z0_border">0.40000000596046448</property>
<property name="z1_color">#0000ffff0000</property>
<property name="z1_border">0.80000001192092896</property>
<property name="target_color">#0000ffff0000</property>
<property name="z2_color">#0000ffff0000</property>
<property name="target_value">-0.039999999105930328</property>
<property name="max">6000</property>
<property name="text_template">%i</property>
<signal name="hal_pin_changed" handler="on_spindle_feedback_bar_hal_pin_changed"/>
</object>
<packing>

2
src/emc/usr_intf/gmoccapy/gmoccapy.py
View file

@ -84,7 +84,7 @@ if debug:
pass
# constants
_RELEASE = "1.0"
_RELEASE = "1.0.1"
_INCH = 0 # imperial units are active
_MM = 1 # metric units are active
_MANUAL = 1 # Check for the mode Manual

4
src/emc/usr_intf/gmoccapy/release_notes.txt
View file

@ -1,3 +1,7 @@
ver 1.0.1
- solved a bug, because I forgot to include some signals
in glade file, so no jogging with button was possible
ver 1.0
- we reached the stable state!
gmoccapy get completely separated from gsvreen, resultng