Skip to content
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

Gmoccapy 3.4.9 - several bugfixes for 2.9 #3269

Merged
merged 6 commits into from
Jan 11, 2025
Merged

Gmoccapy 3.4.9 - several bugfixes for 2.9 #3269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27e76fd
gmoccapy: fix wrong states of spindle button images after program abort
hansu Jan 11, 2025
5862ea0
gmoccapy: revert "added Gtk.Paned for upper main area"
hansu Jan 11, 2025
3bb59c9
offsetpage-widget: don't translate column 0
hansu Jan 11, 2025
9b1c22a
gmoccapy: get offset names directly from offsetpage-widget
hansu Jan 11, 2025
86850d6
gmoccapy: ensure usage of lowercase for settings in pref file (#3181)
hansu Jan 11, 2025
50b05ef
gmoccapy_3_4_9: set version number and update release notes
hansu Jan 11, 2025
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
4 changes: 2 additions & 2 deletions lib/python/gladevcp/offsetpage.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</columns>
<data>
<row>
<col id="0" translatable="yes">Tool</col>
<col id="0">Tool</col>
<col id="1">0</col>
<col id="2">0</col>
<col id="3">0</col>
Expand Down Expand Up @@ -71,7 +71,7 @@
<col id="14">G5x</col>
</row>
<row>
<col id="0" translatable="yes">Rot</col>
<col id="0">Rot</col>
<col id="1">0</col>
<col id="2">0</col>
<col id="3">0</col>
Expand Down
16 changes: 9 additions & 7 deletions src/emc/usr_intf/gmoccapy/gmoccapy.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,14 +799,14 @@
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkPaned" id="hbox2">
<object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="wide-handle">True</property>
<property name="can-focus">False</property>
<child>
<object class="GtkBox" id="vbox14">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-end">3</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkNotebook" id="ntb_preview">
Expand Down Expand Up @@ -1238,8 +1238,9 @@
</child>
</object>
<packing>
<property name="resize">True</property>
<property name="shrink">True</property>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
Expand Down Expand Up @@ -1783,8 +1784,9 @@
</child>
</object>
<packing>
<property name="resize">False</property>
<property name="shrink">False</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
Expand Down
42 changes: 19 additions & 23 deletions src/emc/usr_intf/gmoccapy/gmoccapy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def excepthook(exc_type, exc_obj, exc_tb):

# constants
# # gmoccapy #"
_RELEASE = " 3.4.8"
_RELEASE = " 3.4.9"
_INCH = 0 # imperial units are active
_MM = 1 # metric units are active

Expand Down Expand Up @@ -1960,7 +1960,7 @@ def _init_themes(self):
except:
pass
temp = 0
theme_name = self.prefs.getpref("Gtk_theme", "Follow System Theme", str)
theme_name = self.prefs.getpref("gtk_theme", "Follow System Theme", str)
for index, theme in enumerate(themes):
model.append((theme,))
if theme == theme_name:
Expand Down Expand Up @@ -2203,12 +2203,11 @@ def _init_offsetpage(self):
self.widgets.offsetpage1.set_font("sans 12")
self.widgets.offsetpage1.set_foreground_color(self._get_RGBA_color("#28D0D9"))
self.widgets.offsetpage1.selection_mask = ("Tool", "G5x", "Rot")
systemlist = ["Tool", "G5x", "Rot", "G92", "G54", "G55", "G56", "G57", "G58", "G59", "G59.1",
"G59.2", "G59.3"]
names = []
for system in systemlist:
system_name = "system_name_{0}".format(system)
name = self.prefs.getpref(system_name, system, str)
default_names = self.widgets.offsetpage1.get_names()
for system, name in default_names:
system_name = "system_name_{0}".format(system).lower()
name = self.prefs.getpref(system_name, name, str)
names.append([system, name])
self.widgets.offsetpage1.set_names(names)

Expand Down Expand Up @@ -2328,7 +2327,7 @@ def _show_offset_tab(self, state):
else:
names = self.widgets.offsetpage1.get_names()
for system, name in names:
system_name = "system_name_{0}".format(system)
system_name = "system_name_{0}".format(system).lower()
self.prefs.putpref(system_name, name)
page.hide()

Expand Down Expand Up @@ -3985,21 +3984,30 @@ def on_rbt_forward_clicked(self, widget, data=None):
widget.set_image(self.widgets.img_spindle_forward_on)
self._set_spindle("forward")
else:
self.widgets.rbt_forward.set_image(self.widgets.img_spindle_forward)
widget.set_image(self.widgets.img_spindle_forward)
# Toggling the sensitive property is important here! See the commit description.
widget.set_sensitive(not widget.get_sensitive())
widget.set_sensitive(not widget.get_sensitive())

def on_rbt_reverse_clicked(self, widget, data=None):
if widget.get_active():
widget.set_image(self.widgets.img_spindle_reverse_on)
self._set_spindle("reverse")
else:
widget.set_image(self.widgets.img_spindle_reverse)
# Toggling the sensitive property is important here! See the commit description.
widget.set_sensitive(not widget.get_sensitive())
widget.set_sensitive(not widget.get_sensitive())

def on_rbt_stop_clicked(self, widget, data=None):
if widget.get_active():
widget.set_image(self.widgets.img_spindle_stop_on)
self._set_spindle("stop")
else:
self.widgets.rbt_stop.set_image(self.widgets.img_spindle_stop)
widget.set_image(self.widgets.img_spindle_stop)
# Toggling the sensitive property is important here! See the commit description.
widget.set_sensitive(not widget.get_sensitive())
widget.set_sensitive(not widget.get_sensitive())

def _set_spindle(self, command):
# if we are in estop state, we will have to leave here, otherwise
Expand All @@ -4012,18 +4020,6 @@ def _set_spindle(self, command):
# be set to the commanded value due to the next code part
if self.stat.task_mode != linuxcnc.MODE_MANUAL:
if self.stat.interp_state == linuxcnc.INTERP_READING or self.stat.interp_state == linuxcnc.INTERP_WAITING:
if self.stat.spindle[0]['direction'] > 0:
self.widgets.rbt_forward.set_sensitive(False)
self.widgets.rbt_reverse.set_sensitive(True)
self.widgets.rbt_stop.set_sensitive(True)
elif self.stat.spindle[0]['direction'] < 0:
self.widgets.rbt_forward.set_sensitive(True)
self.widgets.rbt_reverse.set_sensitive(False)
self.widgets.rbt_stop.set_sensitive(True)
else:
self.widgets.rbt_forward.set_sensitive(True)
self.widgets.rbt_reverse.set_sensitive(True)
self.widgets.rbt_stop.set_sensitive(False)
return

rpm = self._check_spindle_range()
Expand Down Expand Up @@ -4409,7 +4405,7 @@ def on_theme_choice_changed(self, widget):
if active is None:
return
theme = widget.get_model()[active][0]
self.prefs.putpref('Gtk_theme', theme)
self.prefs.putpref("gtk_theme", theme)
if theme == "Follow System Theme":
theme = self.default_theme
settings = Gtk.Settings.get_default()
Expand Down
5 changes: 5 additions & 0 deletions src/emc/usr_intf/gmoccapy/release_notes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
ver 3.4.9
- Fix problems with duplicated entries in the preferences file
- Remove Gtk.Paned for upper main area (introduced in 3.4.0)
- Fix wrong states of spindle button images after program abort

ver 3.4.8
- Remove some deprecation warnings (#3130)
- Migrate to GtKSourceview 4 (#3083)
Expand Down
Loading