Menu
▾
▴
[Emc-commit] master: gmoccapy - changed screen size requierment and warning from G95 bug
|
From: Norbert S. <gi...@gi...> - 2013-05-28 02:53:30
|
gmoccapy - changed screen size requierment and warning from G95 bug ver. 0.9.3.1 - A message window will warn the user in case he try to use G95 - Changed the requiered screen size to fit on 979 x 750 Signed-off-by: Chris Morley <chr...@ho...> http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=67c9a5b --- configs/sim/gmoccapy/gmoccapy.glade | 23 +++++++------- configs/sim/gmoccapy/gmoccapy_handler.py | 51 ++++++++++---------------------- configs/sim/gmoccapy/release_notes.txt | 3 ++ 3 files changed, 30 insertions(+), 47 deletions(-) diff --git a/configs/sim/gmoccapy/gmoccapy.glade b/configs/sim/gmoccapy/gmoccapy.glade index a3b2225..3d487ab 100755 --- a/configs/sim/gmoccapy/gmoccapy.glade +++ b/configs/sim/gmoccapy/gmoccapy.glade @@ -5,7 +5,7 @@ <!-- interface-naming-policy project-wide --> <object class="GtkWindow" id="window1"> <property name="width_request">979</property> - <property name="height_request">782</property> + <property name="height_request">750</property> <property name="title" translatable="yes">moccapy</property> <property name="icon">icon/Logo.png</property> <signal name="show" handler="on_window1_show"/> @@ -56,9 +56,9 @@ <object class="HAL_Gremlin" id="gremlin"> <property name="visible">True</property> <property name="double_buffered">False</property> - <property name="enable_dro">False</property> - <property name="use_commanded">False</property> <property name="show_dtg">False</property> + <property name="use_commanded">False</property> + <property name="enable_dro">False</property> </object> </child> </object> @@ -575,7 +575,6 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="padding">5</property> <property name="position">1</property> </packing> </child> @@ -1182,7 +1181,7 @@ </packing> </child> <child> - <object class="GtkLabel" id="active_feed_label"> + <object class="GtkLabel" id="lbl_active_feed"> <property name="width_request">50</property> <property name="visible">True</property> <property name="xalign">1</property> @@ -1730,16 +1729,16 @@ <child> <object class="HAL_HBar" id="hal_hbar_spindle_feedback"> <property name="visible">True</property> - <property name="max">6000</property> - <property name="z1_border">0.80000001192092896</property> + <property name="text_template">%i</property> + <property name="target_color">#0000ffff0000</property> + <property name="target_value">-0.039999999105930328</property> <property name="bg_color">#bebebebebebe</property> <property name="z0_color">#0000ffff0000</property> - <property name="text_template">%i</property> + <property name="max">6000</property> <property name="z0_border">0.40000000596046448</property> + <property name="z1_border">0.80000001192092896</property> <property name="z1_color">#0000ffff0000</property> - <property name="target_color">#0000ffff0000</property> <property name="z2_color">#0000ffff0000</property> - <property name="target_value">-0.039999999105930328</property> <signal name="hal_pin_changed" handler="on_hal_hbar_spindle_feedback_hal_pin_changed"/> </object> <packing> @@ -6328,8 +6327,8 @@ Down</property> <signal name="value_changed" handler="on_adj_width_value_changed"/> </object> <object class="GtkAdjustment" id="adj_height"> - <property name="value">782</property> - <property name="lower">782</property> + <property name="value">750</property> + <property name="lower">750</property> <property name="upper">2000</property> <property name="step_increment">1</property> <property name="page_increment">10</property> diff --git a/configs/sim/gmoccapy/gmoccapy_handler.py b/configs/sim/gmoccapy/gmoccapy_handler.py index 014bbd5..c871175 100755 --- a/configs/sim/gmoccapy/gmoccapy_handler.py +++ b/configs/sim/gmoccapy/gmoccapy_handler.py @@ -42,7 +42,7 @@ color = gtk.gdk.Color() INVISABLE = gtk.gdk.Cursor(pixmap, pixmap, color, color, 0, 0) # constants -_RELEASE = "0.9.3" +_RELEASE = "0.9.3.1" _MM = 1 # Metric units are used _IMPERIAL = 0 # Imperial Units are used _MANUAL = 1 # Check for the mode Manual @@ -152,7 +152,7 @@ class HandlerClass: self.widgets.adj_x_pos.set_value(self.gscreen.prefs.getpref('x_pos', 10, float)) self.widgets.adj_y_pos.set_value(self.gscreen.prefs.getpref('y_pos', 10, float)) self.widgets.adj_width.set_value(self.gscreen.prefs.getpref('width', 979, float)) - self.widgets.adj_height.set_value(self.gscreen.prefs.getpref('height', 782, float)) + self.widgets.adj_height.set_value(self.gscreen.prefs.getpref('height', 750, float)) # this sets the background colors of several buttons # the colors are different for the states of the button @@ -1078,7 +1078,7 @@ class HandlerClass: def on_scl_spindle_value_changed(self, widget, data = None): spindle_override = self.widgets.scl_spindle.get_value() / 100 - real_spindle_speed = round(int(self.widgets.active_speed_label.get_text()) * spindle_override) + real_spindle_speed = int(self.widgets.active_speed_label.get_text()) * spindle_override # if real_spindle_speed > self.widgets.adj_spindle_bar_max.get_value(): # widget.set_value(100.0) self.widgets.lbl_spindle_act.set_text("S %d" %real_spindle_speed) @@ -1158,8 +1158,8 @@ class HandlerClass: # feed stuff def on_scl_feed_value_changed(self, widget, data=None): feed_override = self.widgets.scl_feed.get_value() / 100 - real_feed = round(int(self.widgets.active_feed_label.get_text()) * feed_override) - self.widgets.lbl_feed_act.set_text("F %d" %real_feed) + real_feed = float(self.widgets.lbl_active_feed.get_text()) * feed_override + self.widgets.lbl_feed_act.set_text("F %.1f" %real_feed) self.emc.feed_override(feed_override) def on_btn_feed_100_clicked(self, widget, data=None): @@ -2105,35 +2105,6 @@ class HandlerClass: self.widgets.dialog_from_line.destroy() # ToDo end -# def on_hal_status_mode_auto(self,widget): -# self.gscreen.add_alarm_entry("mode_auto") -# self.widgets.ntb_main.set_current_page(0) -# self.widgets.ntb_jog.set_current_page(2) -# self.widgets.ntb_button.set_current_page(2) -# self.widgets.ntb_preview.set_current_page(0) -# self.widgets.ntb_info.set_current_page(0) -# -# def on_hal_status_mode_manual(self,widget): -# self.gscreen.add_alarm_entry("mode_manual") -# self.widgets.ntb_main.set_current_page(0) -# self.widgets.ntb_jog.set_current_page(0) -# self.widgets.ntb_button.set_current_page(0) -# self.widgets.ntb_preview.set_current_page(0) -# self.widgets.ntb_info.set_current_page(0) -# -# def on_hal_status_mode_mdi(self,widget): -# if self.wait_tool_change: -# return -# self.gscreen.add_alarm_entry("mode_mdi") -# self.widgets.ntb_main.set_current_page(0) -# self.widgets.ntb_jog.set_current_page(1) -# self.widgets.ntb_button.set_current_page(1) -# if self.widgets.chk_use_kb_on_mdi.get_active(): -# self.widgets.ntb_info.set_current_page(1) -# else: -# self.widgets.ntb_info.set_current_page(0) -# self.widgets.hal_mdihistory.entry.grab_focus() - def on_hal_status_tool_in_spindle_changed(self, object, new_tool_no): self.gscreen.add_alarm_entry(_("tool_in_spindle has changed to %s"%new_tool_no)) print("tool_in_spindle has changed to %s"%new_tool_no) @@ -2213,7 +2184,17 @@ class HandlerClass: self._update_vel() self._update_coolant() self._update_spindle_btn() - self.widgets.active_feed_label.set_label(self.data.active_feed_command) + if "G95" in self.data.active_gcodes: + self.widgets.lbl_active_feed.set_label("%.2f"%float(self.data.active_feed_command)) + if self.g95 == False: + message = _("You are trying to use G95, please do not do this in this development state \n") + message += _("there is an error in gscreen / gmoccapy witch will result in wrong values!! \n") + message += _("\n We are looking for a solution!") + self.gscreen.warning_dialog(_("Very important Warning"), True, message) + self.g95 = True + else: + self.g95 = False + self.widgets.lbl_active_feed.set_label(self.data.active_feed_command) self.widgets.active_speed_label.set_label(self.data.active_spindle_command) self.on_scl_feed_value_changed(self.data.active_feed_command) diff --git a/configs/sim/gmoccapy/release_notes.txt b/configs/sim/gmoccapy/release_notes.txt index 6b7dee2..bee3820 100755 --- a/configs/sim/gmoccapy/release_notes.txt +++ b/configs/sim/gmoccapy/release_notes.txt @@ -1,3 +1,6 @@ +ver. 0.9.3.1 +- A message window will warn the user in case he try to use G95 +- Changed the requiered screen size to fit on 979 x 750 ver. 0.9.3 - included the patch for key_jogging from Chris - support now also back tool lathes |