Skip to content

Commit 6e84469

Browse files
tomptomp
authored andcommitted
removed dir tests/pyvcp-bar because runtests script doesnt work with graphics
1 parent 5fea690 commit 6e84469

File tree

9 files changed

+88
-254
lines changed

9 files changed

+88
-254
lines changed

configs/tomp/nuPyvcpBars/bars1.xml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,42 @@
88
<hbox>
99
<vbox>
1010
<bar>
11-
<orient>'Vert'</orient>
11+
<orient>'Horz'</orient>
12+
1213
<halpin>"proc01"</halpin>
1314
<min_>100</min_>
1415
<max_>110</max_>
15-
16-
<!--origin>105</origin-->
16+
<!--bgcolor>'grey'</bgcolor-->
17+
<!--fillcolor>'red'</fillcolor-->
1718

18-
<!--canvas_height>600</canvas_height>
19-
<canvas_width>70</canvas_width>
20-
<bar_height>500</bar_height>
21-
<bar_width>1</bar_width-->
19+
<origin>100</origin>
20+
21+
<canvas_height>60</canvas_height>
22+
<canvas_width>609</canvas_width>
23+
<bar_height>50</bar_height>
24+
<bar_width>500</bar_width>
2225

2326
<!-- nformat>'3.3f'</nformat -->
2427

25-
<bgcolor>'grey'</bgcolor>
26-
<fillcolor>'red'</fillcolor>
2728

28-
<!--range1>(100,103.3,"blue")</range1>
29-
<range2>(103.301,106.6,"yellow")</range2>
30-
<range3>(106.601,110,"red")</range3-->
31-
29+
<range1>(100,103.3,"blue")</range1>
30+
<range2>(103.301,106.6,"yellow")</range2>
31+
<range3>(106.601,110,"orange")</range3>
32+
3233
<!--font>("Courier", -18, "bold")</font-->
3334

3435
<!--font>("Bitstream Charter", -24, "bold")</font-->
3536

3637
<!--font>("Century Schoolbook L", -24, "bold")</font-->
37-
38+
3839
<!--font>("eufm10", -14, "bold")</font-->
39-
<!-- imgf>"/home/tomp/Desktop/pngs/wifi16.png"</imgf -->
40-
40+
<!--imgf>"pix/wifi.png"</imgf-->
41+
4142
<!--dwgf>"vbardiamond01"</dwgf-->
42-
43-
<dwgf>"/home/tomp/linuxcnc-barwidgets/grfx/vbardiamond01"</dwgf>
4443

45-
<!--imgf>"/home/tomp/Desktop/pngs/wifi16.png"</imgf-->
44+
<dwgf>"/home/tomp/linuxcnc-barwidgets/dwgs/hbardiamond01"</dwgf>
45+
46+
<!--imgf>"pix/wifi.png"</imgf-->
4647

4748
<layout>"0"</layout>
4849
</bar>

configs/tomp/nuPyvcpBars/custom4.hal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# #########################################
21
# 18nov2023
32
# a demo of new pyvcp bars wodgets
43
# display is on a tab in ACIS

lib/python/pyvcp_widgets.py

Lines changed: 68 additions & 168 deletions
Large diffs are not rendered by default.

tests/pyvcp-bar/expected

Lines changed: 0 additions & 2 deletions
This file was deleted.

tests/pyvcp-bar/lbl.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

tests/pyvcp-bar/pbar01.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

tests/pyvcp-bar/test.hal

Lines changed: 0 additions & 5 deletions
This file was deleted.

tests/pyvcp-bar/xpbar01,py

Lines changed: 0 additions & 8 deletions
This file was deleted.

tests/pyvcp-bar/xpbar01.hal

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)