Menu
▾
▴
[Emc-commit] master: gmoccapy_0_9_7_3 - states of gremlinview now saved and restored
|
From: Norbert S. <gi...@gi...> - 2013-09-15 17:56:45
|
gmoccapy_0_9_7_3 - states of gremlinview now saved and restored - the buttons tbtn_view_dimension and tbtn_view_tool_path of the gremlin view was in an undefined state after the start of gmoccapy. Now the state will be set according to the state when leaving the GUI, default is show both - the state view of gremlinwas by default "p" no the state on leaving the gui will be restored after restarting the GUI Signed-off-by: Chris Morley <chr...@ho...> http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=dc2a9a0 --- share/gscreen/skins/gmoccapy/gmoccapy_handler.py | 15 ++++++++++++++- share/gscreen/skins/gmoccapy/release_notes.txt | 7 +++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/share/gscreen/skins/gmoccapy/gmoccapy_handler.py b/share/gscreen/skins/gmoccapy/gmoccapy_handler.py index df60e3a..d60833e 100755 --- a/share/gscreen/skins/gmoccapy/gmoccapy_handler.py +++ b/share/gscreen/skins/gmoccapy/gmoccapy_handler.py @@ -44,7 +44,7 @@ color = gtk.gdk.Color() INVISABLE = gtk.gdk.Cursor(pixmap, pixmap, color, color, 0, 0) # constants -_RELEASE = "0.9.7.2" +_RELEASE = "0.9.7.3" _MM = 1 # Metric units are used _IMPERIAL = 0 # Imperial Units are used _MANUAL = 1 # Check for the mode Manual @@ -330,6 +330,12 @@ class HandlerClass: self.widgets.chk_show_dtg.set_active(self.gscreen.prefs.getpref("show_dtg", False)) self.widgets.chk_show_offsets.set_sensitive(self.widgets.chk_show_dro.get_active()) self.widgets.chk_show_dtg.set_sensitive(self.widgets.chk_show_dro.get_active()) + self.widgets.tbtn_view_tool_path.set_active(self.gscreen.prefs.getpref("view_tool_path",True)) + self.widgets.tbtn_view_dimension.set_active(self.gscreen.prefs.getpref("view_dimension",True)) + print(self.gscreen.prefs.getpref("gremlin_view","rbt_view_p",str)) + view = self.gscreen.prefs.getpref("gremlin_view","rbt_view_p",str) + self.widgets[view].set_active(True) + if "ntb_preview" in self.gscreen.inifile.findall("DISPLAY", "EMBED_TAB_LOCATION"): self.widgets.ntb_preview.set_property("show-tabs", True) # page_offset = self.widgets.ntb_preview.get_nth_page(1) @@ -2096,26 +2102,31 @@ class HandlerClass: if self.log: self.gscreen.add_alarm_entry("rbt_view_p_toggled") if self.widgets.rbt_view_p.get_active(): self.widgets.gremlin.set_property("view","p") + self.gscreen.prefs.putpref("gremlin_view", "rbt_view_p", str) def on_rbt_view_x_toggled(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("rbt_view_x_toggled") if self.widgets.rbt_view_x.get_active(): self.widgets.gremlin.set_property("view","x") + self.gscreen.prefs.putpref("gremlin_view", "rbt_view_x", str) def on_rbt_view_y_toggled(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("rbt_view_y_toggled") if self.widgets.rbt_view_y.get_active(): self.widgets.gremlin.set_property("view","y") + self.gscreen.prefs.putpref("gremlin_view", "rbt_view_y", str) def on_rbt_view_z_toggled(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("rbt_view_z_toggled") if self.widgets.rbt_view_z.get_active(): self.widgets.gremlin.set_property("view","z") + self.gscreen.prefs.putpref("gremlin_view", "rbt_view_z", str) def on_rbt_view_y2_toggled(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("rbt_view_y2_toggled") if self.widgets.rbt_view_y2.get_active(): self.widgets.gremlin.set_property("view","y2") + self.gscreen.prefs.putpref("gremlin_view", "rbt_view_y2", str) def on_btn_zoom_in_clicked(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("btn_zoom_in_clicked") @@ -2132,10 +2143,12 @@ class HandlerClass: def on_tbtn_view_dimension_toggled(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("btn_view_dimensions_clicked") self.widgets.gremlin.set_property("show_extents_option", widget.get_active()) + self.gscreen.prefs.putpref("view_dimension", self.widgets.tbtn_view_dimension.get_active(), bool) def on_tbtn_view_tool_path_toggled(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("btn_view_tool_path_clicked") self.widgets.gremlin.set_property("show_live_plot", widget.get_active()) + self.gscreen.prefs.putpref("view_tool_path", self.widgets.tbtn_view_tool_path.get_active(), bool) def _show_iconview_tab(self,state): page = self.widgets.ntb_preview.get_nth_page(3) diff --git a/share/gscreen/skins/gmoccapy/release_notes.txt b/share/gscreen/skins/gmoccapy/release_notes.txt index 66bfa70..879fbef 100755 --- a/share/gscreen/skins/gmoccapy/release_notes.txt +++ b/share/gscreen/skins/gmoccapy/release_notes.txt @@ -1,3 +1,10 @@ +ver 0.9.7.3 +- the buttons tbtn_view_dimension and tbtn_view_tool_path of the gremlin view + was in an undefined state after the start of gmoccapy. Now the state will be + set according to the state when leaving the GUI, default is show both +- the state view of gremlinwas by default "p" no the state on leaving the gui + will be restored after restarting the GUI + ver 0.9.7.2 - check for NO_FORCE_HOMING included |