Skip to content

Commit 88b5a75

Browse files
hansuhansu
committed
gmoccapy: add progressbar for program progress
1 parent a7e769c commit 88b5a75

2 files changed

Lines changed: 52 additions & 16 deletions

File tree

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

Lines changed: 41 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,25 +1747,52 @@
17471747
</packing>
17481748
</child>
17491749
<child>
1750-
<object class="GtkScrolledWindow" id="scrolledwindow1">
1750+
<object class="GtkBox" id="vbox_gcode">
17511751
<property name="visible">True</property>
1752-
<property name="can-focus">True</property>
1752+
<property name="can-focus">False</property>
1753+
<property name="orientation">vertical</property>
17531754
<child>
1754-
<object class="EMC_SourceView" id="gcode_view">
1755-
<property name="name">gcode_view</property>
1755+
<object class="GtkScrolledWindow" id="scrolledwindow1">
17561756
<property name="visible">True</property>
17571757
<property name="can-focus">True</property>
1758-
<property name="tooltip-text" translatable="yes">Shows the code to execute</property>
1759-
<property name="left-margin">2</property>
1760-
<property name="right-margin">2</property>
1761-
<property name="show-line-numbers">True</property>
1762-
<property name="show-line-marks">True</property>
1763-
<property name="tab-width">4</property>
1764-
<property name="auto-indent">True</property>
1765-
<property name="highlight-current-line">True</property>
1766-
<property name="indent-on-tab">False</property>
1767-
<signal name="changed" handler="on_gcode_view_changed" swapped="no"/>
1758+
<child>
1759+
<object class="EMC_SourceView" id="gcode_view">
1760+
<property name="name">gcode_view</property>
1761+
<property name="visible">True</property>
1762+
<property name="can-focus">True</property>
1763+
<property name="tooltip-text" translatable="yes">Shows the code to execute</property>
1764+
<property name="left-margin">2</property>
1765+
<property name="right-margin">2</property>
1766+
<property name="show-line-numbers">True</property>
1767+
<property name="show-line-marks">True</property>
1768+
<property name="tab-width">4</property>
1769+
<property name="auto-indent">True</property>
1770+
<property name="highlight-current-line">True</property>
1771+
<property name="indent-on-tab">False</property>
1772+
<signal name="changed" handler="on_gcode_view_changed" swapped="no"/>
1773+
</object>
1774+
</child>
17681775
</object>
1776+
<packing>
1777+
<property name="expand">True</property>
1778+
<property name="fill">True</property>
1779+
<property name="position">0</property>
1780+
</packing>
1781+
</child>
1782+
<child>
1783+
<object class="GtkProgressBar" id="progressbar_pgm">
1784+
<property name="visible">True</property>
1785+
<property name="can-focus">False</property>
1786+
<property name="margin-start">10</property>
1787+
<property name="margin-end">10</property>
1788+
<property name="margin-bottom">5</property>
1789+
<property name="show-text">True</property>
1790+
</object>
1791+
<packing>
1792+
<property name="expand">False</property>
1793+
<property name="fill">True</property>
1794+
<property name="position">1</property>
1795+
</packing>
17691796
</child>
17701797
</object>
17711798
<packing>

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,12 @@ def __init__(self, argv):
151151
#eb_program_label, #eb_blockheight_label {
152152
background: rgba(0,0,0,1);
153153
}
154+
progress, trough {
155+
min-height: 5px;
156+
}
157+
progress, text {
158+
font-size: 13.3px;
159+
}
154160
"""
155161
screen = Gdk.Screen.get_default()
156162
provider = Gtk.CssProvider()
@@ -2566,7 +2572,8 @@ def on_hal_status_line_changed(self, widget, line):
25662572
self.halcomp["program.progress"] = 100.00 * line / self.halcomp["program.length"]
25672573
else:
25682574
self.halcomp["program.progress"] = 0.0
2569-
# print("Progress = {0:.2f} %".format(100.00 * line / self.halcomp["program.length"]))
2575+
2576+
self.widgets.progressbar_pgm.set_fraction(self.halcomp["program.progress"] / 100)
25702577

25712578
def on_hal_status_interp_idle(self, widget):
25722579
LOG.debug("IDLE")
@@ -2619,6 +2626,7 @@ def on_hal_status_interp_idle(self, widget):
26192626

26202627
self.halcomp["program.current-line"] = 0
26212628
self.halcomp["program.progress"] = 0.0
2629+
self.widgets.progressbar_pgm.set_fraction(0)
26222630

26232631
def on_hal_status_interp_run(self, widget):
26242632
LOG.debug("RUN")
@@ -5245,11 +5253,11 @@ def on_btn_edit_clicked(self, widget, data=None):
52455253
self.widgets.gcode_view.grab_focus()
52465254
if self.widgets.chk_use_kb_on_edit.get_active():
52475255
self.widgets.ntb_info.set_current_page(1)
5248-
52495256
else:
52505257
self.widgets.ntb_info.hide()
52515258

52525259
self.widgets.grid_search.show()
5260+
self.widgets.progressbar_pgm.hide()
52535261
self.gcodeerror = ""
52545262
self.file_changed = False
52555263
# deactivate the mode buttons, so changing modes is not possible while we are editing
@@ -5325,6 +5333,7 @@ def on_ntb_button_switch_page(self, *args):
53255333
self.widgets.ntb_info.show()
53265334
self.widgets.ntb_info.set_size_request(-1, -1)
53275335
self.widgets.grid_search.hide()
5336+
self.widgets.progressbar_pgm.show()
53285337

53295338
# make a new file
53305339
def on_btn_new_clicked(self, widget, data=None):

0 commit comments

Comments
 (0)