summaryrefslogtreecommitdiff
path: root/src/emc/usr_intf/gmoccapy
diff options
context:
space:
mode:
authorNorbert Schechner <nieson@web.de>2014-03-05 21:07:02 +0100
committerNorbert Schechner <nieson@web.de>2014-03-05 21:07:02 +0100
commitc4dc9c8441f7debfb761dc4819d4cdbf76de8a68 (patch)
tree4ddbfb3df8a9acc1c8d383396044a60d8ef09c31 /src/emc/usr_intf/gmoccapy
parent45d9d847ee827728046b4ee630407d7a85c5c324 (diff)
downloadlinuxcnc-c4dc9c8441f7debfb761dc4819d4cdbf76de8a68.tar.gz
linuxcnc-c4dc9c8441f7debfb761dc4819d4cdbf76de8a68.zip
gmoccapy_1_0_6 - made more options for EMBEDDED_TABS
ver. 1.0.6 - introduced new locations for EMBEDDED_TABS, it is possible to use in addition to the previous ones now also: * box_cooling (will hide the cooling frame and introduce your glade file) * box_spindle (will hide the spindle frame and introduce your glade file) * box_vel_info (will hide the velocity frames and introduce your glade file) * box_custom_1 (will introduce your glade file left of vel_frame) * box_custom_2 (will introduce your glade file left of cooling_frame) * box_custom_3 (will introduce your glade file left of spindle_frame) * box_custom_4 (will introduce your glade file right of spindle_frame) requested from verser
Diffstat (limited to 'src/emc/usr_intf/gmoccapy')
-rw-r--r--src/emc/usr_intf/gmoccapy/gmoccapy.glade418
-rwxr-xr-xsrc/emc/usr_intf/gmoccapy/gmoccapy.py33
-rwxr-xr-xsrc/emc/usr_intf/gmoccapy/release_notes.txt14
3 files changed, 276 insertions, 189 deletions
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.glade b/src/emc/usr_intf/gmoccapy/gmoccapy.glade
index 5265b3045..9e7363488 100644
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.glade
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.glade
@@ -57,9 +57,9 @@
<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="show_dtg">False</property>
- <property name="use_commanded">False</property>
<signal name="button_press_event" handler="on_gremlin_button_press_event"/>
<signal name="line_clicked" handler="on_gremlin_line_clicked"/>
</object>
@@ -485,10 +485,10 @@
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
+ <property name="homed_color">#0000ffff0000</property>
<property name="font_size">28</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
- <property name="homed_color">#0000ffff0000</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"/>
@@ -503,11 +503,11 @@
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
- <property name="font_size">28</property>
+ <property name="homed_color">#0000ffff0000</property>
<property name="joint_number">1</property>
+ <property name="font_size">28</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
- <property name="homed_color">#0000ffff0000</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@@ -520,11 +520,11 @@
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
- <property name="font_size">28</property>
+ <property name="homed_color">#0000ffff0000</property>
<property name="joint_number">2</property>
+ <property name="font_size">28</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
- <property name="homed_color">#0000ffff0000</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@@ -537,11 +537,11 @@
<property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property>
<property name="dtg_color">#ffffffff0000</property>
<property name="rel_color">#000000000000</property>
- <property name="font_size">28</property>
+ <property name="homed_color">#0000ffff0000</property>
<property name="joint_number">3</property>
+ <property name="font_size">28</property>
<property name="unhomed_color">#ffff00000000</property>
<property name="abs_color">#00000000ffff</property>
- <property name="homed_color">#0000ffff0000</property>
<signal name="clicked" handler="on_Combi_DRO_clicked"/>
</object>
<packing>
@@ -1336,7 +1336,17 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox_vel_info">
+ <object class="GtkHBox" id="box_custom_1">
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="box_vel_info">
<property name="width_request">175</property>
<property name="visible">True</property>
<child>
@@ -1513,189 +1523,214 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="position">1</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box_custom_2">
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="box_coolant_and_spindle">
<property name="visible">True</property>
<child>
- <object class="GtkFrame" id="frm_cooling">
- <property name="width_request">100</property>
+ <object class="GtkHBox" id="box_cooling">
<property name="visible">True</property>
- <property name="label_xalign">0.5</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkFrame" id="frm_cooling">
+ <property name="width_request">100</property>
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">5</property>
- <property name="bottom_padding">5</property>
- <property name="left_padding">5</property>
- <property name="right_padding">5</property>
+ <property name="label_xalign">0.5</property>
<child>
- <object class="GtkTable" id="tbl_cooling">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkToggleButton" id="tbtn_flood">
- <property name="width_request">56</property>
- <property name="height_request">56</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Toggle flood on / off</property>
- <property name="image">img_coolant_off</property>
- <signal name="toggled" handler="on_tbtn_flood_toggled"/>
- </object>
- <packing>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options">GTK_SHRINK</property>
- <property name="y_padding">5</property>
- </packing>
- </child>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
<child>
- <object class="GtkToggleButton" id="tbtn_mist">
- <property name="width_request">56</property>
- <property name="height_request">56</property>
+ <object class="GtkTable" id="tbl_cooling">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Toggle mist on / off</property>
- <property name="image">img_mist_off</property>
- <signal name="toggled" handler="on_tbtn_mist_toggled"/>
+ <property name="n_rows">2</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkToggleButton" id="tbtn_flood">
+ <property name="width_request">56</property>
+ <property name="height_request">56</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">img_coolant_off</property>
+ <signal name="toggled" handler="on_tbtn_flood_toggled"/>
+ </object>
+ <packing>
+ <property name="x_options">GTK_SHRINK</property>
+ <property name="y_options">GTK_SHRINK</property>
+ <property name="y_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="tbtn_mist">
+ <property name="width_request">56</property>
+ <property name="height_request">56</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="image">img_mist_off</property>
+ <signal name="toggled" handler="on_tbtn_mist_toggled"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_SHRINK</property>
+ <property name="y_options">GTK_SHRINK</property>
+ <property name="y_padding">5</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_SHRINK</property>
- <property name="y_options">GTK_SHRINK</property>
- <property name="y_padding">5</property>
- </packing>
</child>
</object>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="lbl_frame_coolant">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Cooling&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="lbl_frame_coolant">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Cooling&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frm_spindle">
- <property name="width_request">200</property>
+ <object class="GtkHBox" id="box_custom_3">
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box_spindle">
<property name="visible">True</property>
- <property name="label_xalign">0.5</property>
<child>
- <object class="GtkAlignment" id="alignment4">
+ <object class="GtkFrame" id="frm_spindle">
+ <property name="width_request">200</property>
<property name="visible">True</property>
- <property name="top_padding">5</property>
- <property name="bottom_padding">5</property>
- <property name="left_padding">5</property>
- <property name="right_padding">5</property>
+ <property name="label_xalign">0.5</property>
<child>
- <object class="GtkVBox" id="vbox8">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
+ <property name="top_padding">5</property>
+ <property name="bottom_padding">5</property>
+ <property name="left_padding">5</property>
+ <property name="right_padding">5</property>
<child>
- <object class="GtkVBox" id="vbox16">
+ <object class="GtkVBox" id="vbox8">
<property name="visible">True</property>
<child>
- <object class="GtkHBox" id="hbox6">
+ <object class="GtkVBox" id="vbox16">
<property name="visible">True</property>
<child>
- <object class="GtkLabel" id="lbl_spindle_act">
+ <object class="GtkHBox" id="hbox6">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="lbl_spindle_act">
<property name="visible">True</property>
- <property name="tooltip_text" translatable="yes">Displayes the actual spindle speed</property>
<property name="label">S 3500</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="scale" value="1.500000"/>
</attributes>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="lbl_actual_spindle_speed">
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lbl_actual_spindle_speed">
<property name="visible">True</property>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="btn_spindle_100">
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="btn_spindle_100">
<property name="label">100%</property>
<property name="width_request">48</property>
<property name="height_request">48</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Reset spindle overide to 100 %</property>
<signal name="clicked" handler="on_btn_spindle_100_clicked"/>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHScale" id="scl_spindle">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adj_spindle</property>
+ <property name="digits">0</property>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHScale" id="scl_spindle">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Adjust spindle override</property>
- <property name="adjustment">adj_spindle</property>
- <property name="digits">0</property>
- </object>
- <packing>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox_spindle_button">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkTable" id="tbl_spindle_button">
+ <object class="GtkVBox" id="vbox_spindle_button">
<property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">8</property>
- <property name="homogeneous">True</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkRadioButton" id="rbt_reverse">
+ <object class="GtkTable" id="tbl_spindle_button">
+ <property name="visible">True</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">8</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkRadioButton" id="rbt_reverse">
<property name="width_request">56</property>
<property name="height_request">56</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Switch on spindle in reverse </property>
<property name="draw_indicator">False</property>
<property name="group">rbt_stop</property>
<signal name="clicked" handler="on_rbt_reverse_clicked"/>
@@ -1707,20 +1742,19 @@
<property name="pixbuf">images/reverse.png</property>
</object>
</child>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="x_options">GTK_SHRINK</property>
<property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="rbt_forward">
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rbt_forward">
<property name="width_request">56</property>
<property name="height_request">56</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Turn on spindle clockwise</property>
<property name="draw_indicator">False</property>
<property name="group">rbt_stop</property>
<signal name="clicked" handler="on_rbt_forward_clicked"/>
@@ -1732,22 +1766,21 @@
<property name="pixbuf">images/forward.png</property>
</object>
</child>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
<property name="x_options">GTK_SHRINK</property>
<property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="rbt_stop">
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="rbt_stop">
<property name="width_request">56</property>
<property name="height_request">56</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Stop spindle turning</property>
<property name="active">True</property>
<property name="draw_indicator">False</property>
<signal name="clicked" handler="on_rbt_stop_clicked"/>
@@ -1759,52 +1792,57 @@
<property name="pixbuf">images/stop.gif</property>
</object>
</child>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_SHRINK</property>
<property name="y_options">GTK_SHRINK</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
</packing>
</child>
- </object>
- <packing>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox_spindle_bar">
- <property name="visible">True</property>
<child>
- <object class="HAL_HBar" id="spindle_feedback_bar">
+ <object class="GtkHBox" id="hbox_spindle_bar">
+ <property name="visible">True</property>
+ <child>
+ <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="text_template">%i</property>
<property name="z0_color">#0000ffff0000</property>
+ <property name="max">6000</property>
+ <property name="bg_color">#bebebebebebe</property>
+ <property name="z0_border">0.40000000596046448</property>
+ <property name="text_template">%i</property>
+ <property name="z1_border">0.80000001192092896</property>
<property name="target_color">#0000ffff0000</property>
<property name="z1_color">#0000ffff0000</property>
<property name="target_value">-0.039999999105930328</property>
- <property name="bg_color">#bebebebebebe</property>
- <property name="max">6000</property>
<property name="z2_color">#0000ffff0000</property>
- <property name="z0_border">0.40000000596046448</property>
- <property name="z1_border">0.80000001192092896</property>
<signal name="hal_pin_changed" handler="on_spindle_feedback_bar_hal_pin_changed"/>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="HAL_LED" id="spindle_at_speed_led">
+ </packing>
+ </child>
+ <child>
+ <object class="HAL_LED" id="spindle_at_speed_led">
<property name="visible">True</property>
- <property name="tooltip_text" translatable="yes">Indicates if the spindle is at speed</property>
<property name="on_color">green</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">2</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">2</property>
<property name="position">1</property>
@@ -1812,32 +1850,40 @@
</child>
</object>
<packing>
- <property name="fill">False</property>
- <property name="padding">2</property>
<property name="position">1</property>
</packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">&lt;b&gt;Spindle [rpm]&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Spindle [rpm]&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="box_custom_4">
+ <child>
+ <placeholder/>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -1845,7 +1891,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -6649,14 +6695,6 @@ selected</property>
<property name="step_increment">1</property>
<signal name="value_changed" handler="on_adj_max_messages_value_changed"/>
</object>
- <object class="GtkImage" id="img_coolant_off">
- <property name="visible">True</property>
- <property name="pixbuf">images/coolant_off.png</property>
- </object>
- <object class="GtkImage" id="img_mist_off">
- <property name="visible">True</property>
- <property name="pixbuf">images/mist_off.png</property>
- </object>
<object class="GtkAdjustment" id="adj_probe_height">
<property name="value">32.429000000000002</property>
<property name="upper">100</property>
@@ -6676,4 +6714,12 @@ selected</property>
<property name="visible">True</property>
<property name="pixbuf">images/step.png</property>
</object>
+ <object class="GtkImage" id="img_coolant_off">
+ <property name="visible">True</property>
+ <property name="pixbuf">images/coolant_off.png</property>
+ </object>
+ <object class="GtkImage" id="img_mist_off">
+ <property name="visible">True</property>
+ <property name="pixbuf">images/mist_off.png</property>
+ </object>
</interface>
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
index 962ba0aa3..50de8b54a 100755
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.py
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -84,7 +84,7 @@ if debug:
pass
# constants
-_RELEASE = "1.0.5"
+_RELEASE = "1.0.6"
_INCH = 0 # imperial units are active
_MM = 1 # metric units are active
_MANUAL = 1 # Check for the mode Manual
@@ -440,13 +440,40 @@ class gmoccapy(object):
# This is normaly only used for the plasma screen layout
if "box_coolant_and_spindle" in self.get_ini_info.get_embedded_tabs()[1]:
- widgetlist = ["frm_spindle", "frm_cooling", "frm_spindle_settings"]
+ widgetlist = ["box_spindle", "box_cooling"]
for widget in widgetlist:
self.widgets[widget].hide()
self.widgets.tbtn_user_tabs.set_sensitive(False)
+ if "box_cooling" in self.get_ini_info.get_embedded_tabs()[1]:
+ widgetlist = ["frm_cooling"]
+ for widget in widgetlist:
+ self.widgets[widget].hide()
+
+ if "box_spindle" in self.get_ini_info.get_embedded_tabs()[1]:
+ widgetlist = ["frm_spindle"]
+ for widget in widgetlist:
+ self.widgets[widget].hide()
+
+ if "box_vel_info" in self.get_ini_info.get_embedded_tabs()[1]:
+ widgetlist = ["frm_max_vel", "frm_feed_override"]
+ for widget in widgetlist:
+ self.widgets[widget].hide()
+
+ if "box_custom_1" in self.get_ini_info.get_embedded_tabs()[1]:
+ self.widgets.box_custom_1.show()
+
+ if "box_custom_2" in self.get_ini_info.get_embedded_tabs()[1]:
+ self.widgets.box_custom_2.show()
+
+ if "box_custom_3" in self.get_ini_info.get_embedded_tabs()[1]:
+ self.widgets.box_custom_3.show()
+
+ if "box_custom_4" in self.get_ini_info.get_embedded_tabs()[1]:
+ self.widgets.box_custom_4.show()
+
if "box_tool_and_code_info" in self.get_ini_info.get_embedded_tabs()[1]:
- widgetlist = ["frm_tool_info", "active_speed_label", "lbl_speed", "vbox_vel_info"]
+ widgetlist = ["frm_tool_info", "active_speed_label", "lbl_speed", "box_vel_info"]
for widget in widgetlist:
self.widgets[widget].hide()
self.widgets.btn_tool.set_sensitive(False)
diff --git a/src/emc/usr_intf/gmoccapy/release_notes.txt b/src/emc/usr_intf/gmoccapy/release_notes.txt
index 46520eabf..4fe4ac59c 100755
--- a/src/emc/usr_intf/gmoccapy/release_notes.txt
+++ b/src/emc/usr_intf/gmoccapy/release_notes.txt
@@ -1,3 +1,17 @@
+ver. 1.0.6
+- introduced new locations for EMBEDDED_TABS, it is possible to use
+ in addition to the previous ones now also:
+
+ * box_cooling (will hide the cooling frame and introduce your glade file)
+ * box_spindle (will hide the spindle frame and introduce your glade file)
+ * box_vel_info (will hide the velocity frames and introduce your glade file)
+ * box_custom_1 (will introduce your glade file left of vel_frame)
+ * box_custom_2 (will introduce your glade file left of cooling_frame)
+ * box_custom_3 (will introduce your glade file left of spindle_frame)
+ * box_custom_4 (will introduce your glade file right of spindle_frame)
+
+ requested from verser
+
ver. 1.0.5
- because of wrong steps in initializing the increment pins
has not been made, I changed the init order and now they
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-14 07:58:05 +0000