removed dir tests/pyvcp-bar because runtests script doesnt work with …

…graphics
dwrobel · Nov 27, 2023 · 6e84469 · 6e84469
1 parent 5fea690
commit 6e84469
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 254 deletions.
diff --git a/configs/tomp/nuPyvcpBars/bars1.xml b/configs/tomp/nuPyvcpBars/bars1.xml
@@ -8,41 +8,42 @@
         <hbox>
             <vbox>
                 <bar>
-                    <orient>'Vert'</orient>
+                    <orient>'Horz'</orient>
+
                     <halpin>"proc01"</halpin>
                     <min_>100</min_>
                     <max_>110</max_>
-					
-                    <!--origin>105</origin-->
+                    <!--bgcolor>'grey'</bgcolor-->
+                    <!--fillcolor>'red'</fillcolor-->
 
-                    <!--canvas_height>600</canvas_height>
-                    <canvas_width>70</canvas_width>
-                    <bar_height>500</bar_height>
-                    <bar_width>1</bar_width-->
+                    <origin>100</origin>
+
+                    <canvas_height>60</canvas_height>
+                    <canvas_width>609</canvas_width>
+                    <bar_height>50</bar_height>
+                    <bar_width>500</bar_width>
 
                     <!-- nformat>'3.3f'</nformat -->
 
-                    <bgcolor>'grey'</bgcolor>
-                    <fillcolor>'red'</fillcolor>
 
-					<!--range1>(100,103.3,"blue")</range1>
-					<range2>(103.301,106.6,"yellow")</range2>
-					<range3>(106.601,110,"red")</range3-->
-					
+                    <range1>(100,103.3,"blue")</range1>
+                    <range2>(103.301,106.6,"yellow")</range2>
+                    <range3>(106.601,110,"orange")</range3>
+                    
                     <!--font>("Courier", -18, "bold")</font-->
 
                     <!--font>("Bitstream Charter", -24, "bold")</font-->
 
                     <!--font>("Century Schoolbook L", -24, "bold")</font-->
-					
+                    
                     <!--font>("eufm10", -14, "bold")</font-->
-                    <!-- imgf>"/home/tomp/Desktop/pngs/wifi16.png"</imgf -->
-					
+                    <!--imgf>"pix/wifi.png"</imgf-->
+                    
                     <!--dwgf>"vbardiamond01"</dwgf-->
-
-                    <dwgf>"/home/tomp/linuxcnc-barwidgets/grfx/vbardiamond01"</dwgf>
 
-                    <!--imgf>"/home/tomp/Desktop/pngs/wifi16.png"</imgf-->
+                    <dwgf>"/home/tomp/linuxcnc-barwidgets/dwgs/hbardiamond01"</dwgf>
+
+                    <!--imgf>"pix/wifi.png"</imgf-->
 
                     <layout>"0"</layout>
                 </bar>

diff --git a/configs/tomp/nuPyvcpBars/custom4.hal b/configs/tomp/nuPyvcpBars/custom4.hal
@@ -1,4 +1,3 @@
-# #########################################
 # 18nov2023 
 # a demo of new pyvcp bars wodgets  
 # display is on a tab in ACIS 

diff --git a/lib/python/pyvcp_widgets.py b/lib/python/pyvcp_widgets.py
diff --git a/tests/pyvcp-bar/expected b/tests/pyvcp-bar/expected
diff --git a/tests/pyvcp-bar/lbl.xml b/tests/pyvcp-bar/lbl.xml
diff --git a/tests/pyvcp-bar/pbar01.xml b/tests/pyvcp-bar/pbar01.xml
diff --git a/tests/pyvcp-bar/test.hal b/tests/pyvcp-bar/test.hal
diff --git a/tests/pyvcp-bar/xpbar01,py b/tests/pyvcp-bar/xpbar01,py
diff --git a/tests/pyvcp-bar/xpbar01.hal b/tests/pyvcp-bar/xpbar01.hal