Skip to content

Commit d254d31

Browse files
hansuhansu
committed
gmoccapy: add settings for usage of calculator in toolpage/offsetpage
1 parent 78dc28a commit d254d31

File tree

2 files changed

+64
-4
lines changed

2 files changed

+64
-4
lines changed

‎src/emc/usr_intf/gmoccapy/gmoccapy.glade‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4007,6 +4007,55 @@ uncomment selection</property>
40074007
<property name="position">1</property>
40084008
</packing>
40094009
</child>
4010+
<child>
4011+
<object class="GtkFrame" id="frm_use_calc">
4012+
<property name="visible">True</property>
4013+
<property name="can-focus">False</property>
4014+
<property name="label-xalign">0.5</property>
4015+
<child>
4016+
<object class="GtkBox" id="vbox_use_calc">
4017+
<property name="visible">True</property>
4018+
<property name="can-focus">False</property>
4019+
<property name="margin-start">3</property>
4020+
<property name="margin-end">3</property>
4021+
<property name="margin-top">5</property>
4022+
<property name="margin-bottom">5</property>
4023+
<property name="orientation">vertical</property>
4024+
<child>
4025+
<object class="GtkCheckButton" id="chk_offsetpage_use_calc">
4026+
<property name="label" translatable="yes">Use calculator for offset page</property>
4027+
<property name="use-action-appearance">True</property>
4028+
<property name="visible">True</property>
4029+
<property name="can-focus">True</property>
4030+
<property name="receives-default">False</property>
4031+
<property name="tooltip-text" translatable="yes">Pup up the calculator when editing numerical values in the offset page</property>
4032+
<property name="active">True</property>
4033+
<property name="draw-indicator">True</property>
4034+
<signal name="toggled" handler="on_chk_offsetpage_use_calc_toggled" swapped="no"/>
4035+
</object>
4036+
<packing>
4037+
<property name="expand">False</property>
4038+
<property name="fill">True</property>
4039+
<property name="position">0</property>
4040+
</packing>
4041+
</child>
4042+
</object>
4043+
</child>
4044+
<child type="label">
4045+
<object class="GtkLabel" id="lbl_frm_use_calc">
4046+
<property name="visible">True</property>
4047+
<property name="can-focus">False</property>
4048+
<property name="label" translatable="yes">&lt;b&gt;Calculator&lt;/b&gt;</property>
4049+
<property name="use-markup">True</property>
4050+
</object>
4051+
</child>
4052+
</object>
4053+
<packing>
4054+
<property name="expand">False</property>
4055+
<property name="fill">True</property>
4056+
<property name="position">2</property>
4057+
</packing>
4058+
</child>
40104059
<child>
40114060
<object class="GtkFrame" id="frm_ntb_preview">
40124061
<property name="visible">True</property>
@@ -4068,7 +4117,7 @@ uncomment selection</property>
40684117
<packing>
40694118
<property name="expand">False</property>
40704119
<property name="fill">False</property>
4071-
<property name="position">2</property>
4120+
<property name="position">3</property>
40724121
</packing>
40734122
</child>
40744123
</object>

‎src/emc/usr_intf/gmoccapy/gmoccapy.py‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ def __init__(self, argv):
222222
self.incr_rbt_list = [] # we use this list to add hal pin to the button later
223223
self.jog_increments = [] # This holds the increment values
224224
self.unlock = False # this value will be set using the hal pin unlock settings
225-
self.toolpage_use_calc = True # enable/disable calculator widget to edit numeric values in the tool editor
226225

227226
# needed to display the labels
228227
self.system_list = ("0", "G54", "G55", "G56", "G57", "G58", "G59", "G59.1", "G59.2", "G59.3")
@@ -654,6 +653,11 @@ def _get_pref_data(self):
654653
jog_box_width = self.prefs.getpref("jog_box_width", 360, int)
655654
self.widgets.adj_jog_box_width.set_value(jog_box_width)
656655
self.widgets.vbx_jog.set_size_request(jog_box_width, -1)
656+
657+
# enable/disable calculator widget for tooltable/offsetpage
658+
self.toolpage_use_calc = self.prefs.getpref("toolpage_use_calc", True, bool)
659+
self.offsetpage_use_calc = self.prefs.getpref("offsetpage_use_calc", True, bool)
660+
self.widgets.chk_offsetpage_use_calc.set_active(self.offsetpage_use_calc)
657661

658662
###############################################################################
659663
## create widgets dynamically ##
@@ -2022,7 +2026,7 @@ def _init_tooleditor(self):
20222026
btn_calculator.set_tooltip_text(_("Use calculator to edit numeric values"))
20232027
btn_calculator.show_all()
20242028
btn_calculator.set_active(self.toolpage_use_calc)
2025-
btn_calculator.connect("toggled", self.on_use_calculator_toggled)
2029+
btn_calculator.connect("toggled", self.on_toolpage_use_calc_toggled)
20262030
buttonbox.pack_start(btn_calculator,False,False,50)
20272031
column_cell_ids = ["toggle", "tool#1", "pos1", "x1", "y1", "z1", "a1", "b1", "c1", "u1", "v1", "w1",
20282032
"d1", "front1", "back1", "orient1", "cell_comments1"]
@@ -2078,8 +2082,9 @@ def on_tree_navigate_key_press(self, treeview, event, filter):
20782082
else:
20792083
pass
20802084

2081-
def on_use_calculator_toggled(self,widget):
2085+
def on_toolpage_use_calc_toggled(self, widget):
20822086
self.toolpage_use_calc = widget.get_active()
2087+
self.prefs.putpref("toolpage_use_calc", widget.get_active())
20832088

20842089
def on_tool_col_edit_started(self, widget, filtered_path, new_text, col):
20852090
if not self.toolpage_use_calc:
@@ -2400,6 +2405,8 @@ def _init_offsetpage(self):
24002405

24012406

24022407
def on_offset_col_edit_started(self, widget, filtered_path, new_text, col):
2408+
if not self.offsetpage_use_calc:
2409+
return
24032410
offsetpage = self.widgets.offsetpage1
24042411
offsetview = offsetpage.view2
24052412
model, treeiter = offsetview.get_selection().get_selected()
@@ -5110,6 +5117,10 @@ def on_chk_use_kb_on_mdi_toggled(self, widget, data=None):
51105117

51115118
def on_chk_use_kb_on_file_selection_toggled(self, widget, data=None):
51125119
self.prefs.putpref("show_keyboard_on_file_selection", widget.get_active())
5120+
5121+
def on_chk_offsetpage_use_calc_toggled(self, widget, data=None):
5122+
self.offsetpage_use_calc = widget.get_active()
5123+
self.prefs.putpref("offsetpage_use_calc", self.offsetpage_use_calc)
51135124

51145125
def on_chk_use_kb_shortcuts_toggled(self, widget, data=None):
51155126
self.prefs.putpref("use_keyboard_shortcuts", widget.get_active())

0 commit comments

Comments
 (0)