Test cases have been updated to new sRGB rendered results.

diff --git a/tests/bugs/modalg_6/bug26379_1 b/tests/bugs/modalg_6/bug26379_1
index f1b6036472ff6150bd176d461813d526778b2c2a..b931b46752d13015ed49f988f1b390e41fce87db 100644 (file)
--- a/tests/bugs/modalg_6/bug26379_1
+++ b/tests/bugs/modalg_6/bug26379_1
@@ -1,25 +1,19 @@
 puts "========"
-puts "OCC26379"
+puts "0026379: Wrong result produced by the volume maker algorithm"
 puts "========"
 puts ""
-#######################################################
-# Wrong result produced by the volume maker algorithm
-#######################################################
 
 restore [locate_data_file OCC26379-csf_2.brep] cf
 mkvolume result cf -ni
 
-vinit
-vsetdispmode 1
-vdisplay result
+vclear
+vinit View1
+vdisplay -dispMode 1 result
 vfit
 
-set bug_info [vreadpixel 350 310 name]
-if {$bug_info != "DARKGOLDENROD3 1"} {
-  puts "ERROR: OCC26379 is reproduced. Volume is incorrect."
-}
+if { [vreadpixel 350 310 -rgb -name] == "BLACK" } { puts "ERROR: OCC26379 is reproduced. Volume is incorrect." }
 
 checkprops result -s 6.60933e+006 
 checkshape result
 
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+vdump ${imagedir}/${test_image}.png

diff --git a/tests/bugs/modalg_6/bug26379_2 b/tests/bugs/modalg_6/bug26379_2
index a5ead9cdf835076da5a0d43f5c310c140bccf7b8..3a80102338b29caee7db7b8bfe717e106d0ff9ff 100644 (file)
--- a/tests/bugs/modalg_6/bug26379_2
+++ b/tests/bugs/modalg_6/bug26379_2
@@ -1,25 +1,19 @@
 puts "========"
-puts "OCC26379"
+puts "0026379: Wrong result produced by the volume maker algorithm"
 puts "========"
 puts ""
-#######################################################
-# Wrong result produced by the volume maker algorithm
-#######################################################
 
 restore [locate_data_file OCC26379-csf_3.brep] cf
 mkvolume result cf -ni
 
-vinit
-vsetdispmode 1
-vdisplay result
+vclear
+vinit View1
+vdisplay -dispMode 1 result
 vfit
 
-set bug_info [vreadpixel 350 310 name]
-if {$bug_info != "DARKGOLDENROD3 1"} {
-  puts "ERROR: OCC26379 is reproduced. Volume is incorrect."
-}
+if { [vreadpixel 350 310 -rgb -name] == "BLACK" } { puts "ERROR: OCC26379 is reproduced. Volume is incorrect." }
 
 checkprops result -s 7.22211e+006 
 checkshape result
 
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+vdump ${imagedir}/${test_image}.png

diff --git a/tests/bugs/step/bug30189_1 b/tests/bugs/step/bug30189_1
index bf75b49f61e170e9c72c26096c061c031a4978f7..f5c549ff1b0b4e1632d6f6c447b86039282b70f9 100644 (file)
--- a/tests/bugs/step/bug30189_1
+++ b/tests/bugs/step/bug30189_1
@@ -37,14 +37,8 @@ if {$nb != "3"} {
 }  
 
 # Check colors
-set color [XGetShapeColor DD 0:1:1:3 surf]
-if {$color != "RED"} {
-  puts "Error: wrong color."
-}
-set color [XGetShapeColor DD 0:1:1:4 surf]
-if {$color != "DARKORANGE1"} {
-  puts "Error: wrong color."
-}
+if {[XGetShapeColor DD 0:1:1:3 surf] != "RED"}            { puts "Error: wrong color." }
+if {[XGetShapeColor DD 0:1:1:4 surf] != "DARKGOLDENROD1"} { puts "Error: wrong color." }
 
 Close D
 Close DD

diff --git a/tests/bugs/vis/bug22048 b/tests/bugs/vis/bug22048
index bce206b8e5c67ba790599142a6bc307432d95035..ec92e5887d0dc61cf2dbb8623e63976a86ac2840 100644 (file)
--- a/tests/bugs/vis/bug22048
+++ b/tests/bugs/vis/bug22048
@@ -13,10 +13,10 @@ vdisplay -dispMode 1 b1 b2
 vfit
 vselprops selHighlight -dispMode -1
 vselect 0 0 400 400 1
-if { [vreadpixel  50 300 rgb name] != "GRAY66"         } { puts "Error: b1 should be selected."}
-if { [vreadpixel 300 200 rgb name] != "GRAY66"         } { puts "Error: b2 should be selected."}
+if { [vreadpixel  50 300 rgb name] != "GRAY73"        } { puts "Error: b1 should be selected."}
+if { [vreadpixel 300 200 rgb name] != "GRAY73"        } { puts "Error: b2 should be selected."}
 vselect 200 200
-if { [vreadpixel  50 300 rgb name] != "DARKGOLDENROD3" } { puts "Error: b1 should not be selected."}
-if { [vreadpixel 300 200 rgb name] != "GRAY66"         } { puts "Error: b2 should be selected."}
+if { [vreadpixel  50 300 rgb name] != "DARKGOLDENROD" } { puts "Error: b1 should not be selected."}
+if { [vreadpixel 300 200 rgb name] != "GRAY73"        } { puts "Error: b2 should be selected."}
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug22879 b/tests/bugs/vis/bug22879
deleted file mode 100755 (executable)
index 64fbe54..0000000
--- a/tests/bugs/vis/bug22879
+++ /dev/null
@@ -1,37 +0,0 @@
-puts "============"
-puts "OCC22879"
-puts "============"
-puts ""
-#######################################################################
-# Possible bug in Opengl_togl_begin_layer_mode.cxx
-#######################################################################
-
-vfont add [locate_data_file DejaVuSans.ttf] SansFont
-
-set BugNumber OCC22879
-
-vinit
-
-vdrawtext t1 "Text Height=14" -2d -perspos -1 1 -pos 10 -10 0 -height 14 -color WHITE -font SansFont
-vdrawtext t2 "Text Height=25" -2d -perspos -1 1 -pos 10 -40 0 -height 25 -color WHITE -font SansFont
-vdrawtext t3 "Arial" -2d -perspos -1 1 -pos 10 -60 0 -height 18 -font SansFont -color RED
-vdrawtext t4 "Times New Roman" -2d -perspos -1 1 -pos 10 -80 0 -height 18 -font SansFont -color BLUE
-vdrawtext t5 "Subtitle" -2d -perspos -1 1 -pos 10 -110 0 -height 20 -font SansFont -color GREEN -disptype subtitle -subcolor 0.3 0.3 0.3
-vdrawtext t6 "Decal" -2d -perspos -1 1 -pos 10 -140 0 -height 20 -font SansFont -color BLUE -disptype decal -subcolor 1 0 0
-vdrawtext t7 "Blend" -2d -perspos -1 1 -pos 10 -170 0 -height 20 -font SansFont -color RED   -disptype blend
-box b 50 -700 450 50 50 50
-vdisplay b
-vsetdispmode 1
-vsetcolor b ANTIQUEWHITE
-
-checkcolor 24 55  0.753 0.000 0.000
-checkcolor 16 76  0.000 0.000 1.000
-checkcolor 25 107 0.000 1.000 0.000
-checkcolor 34 114 0.298 0.298 0.298
-checkcolor 24 131 0.922 0.000 0.000
-checkcolor 18 139 0.145 0.000 0.855
-checkcolor 56 160 1.000 0.000 0.000
-checkcolor 30 160 0.188 0.761 0.698
-
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
-

diff --git a/tests/bugs/vis/bug24762_coloredshape b/tests/bugs/vis/bug24762_coloredshape
index afdcc4ded7303d1f0683f522218eb15059cfcc7e..7ed95e3d9a8ed86de8b13edbd08c8034c2d46064 100644 (file)
--- a/tests/bugs/vis/bug24762_coloredshape
+++ b/tests/bugs/vis/bug24762_coloredshape
@@ -37,12 +37,6 @@ vdump $imagedir/${casename}.png
 set aWireColor  [vreadpixel 54  150 rgb name]
 set anEdgeColor [vreadpixel 100  90 rgb name]
 set aFaceColor  [vreadpixel 30  200 rgb name]
-if {"$aWireColor"  != "HOTPINK"} {
-  puts "Error: wrong Wire color"
-}
-if {"$anEdgeColor" != "RED"} {
-  puts "Error: wrong Edge color"
-}
-if {"$aFaceColor"  != "GRAY62"} {
-  puts "Error: wrong Face color"
-}
+if {"$aWireColor"  != "HOTPINK"} { puts "Error: wrong Wire color" }
+if {"$anEdgeColor" != "RED"}     { puts "Error: wrong Edge color" }
+if {"$aFaceColor"  != "GRAY69"}  { puts "Error: wrong Face color" }

diff --git a/tests/bugs/vis/bug25136 b/tests/bugs/vis/bug25136
index ca2bf70bac4501933858a15f2680623c8de793d9..9a49851e4185b56e8e1d01be94dd6a1d05460bf5 100644 (file)
--- a/tests/bugs/vis/bug25136
+++ b/tests/bugs/vis/bug25136
@@ -10,7 +10,7 @@ vaxo
 
 # create default color scale
 vcolorscale cs1 -demo -xy 0 0
-foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 180 CHARTREUSE2 220 GREEN 250 MEDIUMSPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
+foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 220 GREEN 250 SPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
 
 # reduce color scale range and number of intervals
 vcolorscale cs2 -range 0 20 5 -xy 60 0
@@ -26,5 +26,5 @@ vcolorscale cs4 -color 1 0.42 0.35 0.8
 vcolorscale cs4 -color 5 pink
 vcolorscale cs4 -label 6 "last"
 vcolorscale cs4 -title "My color scale"
-foreach {y aColor} {60 PINK 120 RED 200 GREEN 280 BLUE 350 SLATEBLUE} { if { [vreadpixel 215 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
+foreach {y aColor} {60 PINK 120 RED 200 GREEN 280 BLUE 350 MEDIUMPURPLE2} { if { [vreadpixel 215 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
 vdump ${imagedir}/${casename}.png

diff --git a/tests/bugs/vis/bug25340 b/tests/bugs/vis/bug25340
index 9a20e54916c6703257c30cccd544b30a847a74ff..4c1a14443d0509dcceb6761db7af6de778340447 100644 (file)
--- a/tests/bugs/vis/bug25340
+++ b/tests/bugs/vis/bug25340
@@ -1,24 +1,21 @@
 puts "========"
-puts "OCC25340"
+puts "0025340: Visualization, AIS_InteractiveContext - properly apply selection filters at Neutral point"
 puts "========"
 puts ""
-#############################################################################################
-# Visualization, AIS_InteractiveContext - properly apply selection filters at Neutral point
-#############################################################################################
 
 pload QAcommands
 
-vinit
+vinit View1
 
 box b 1 2 3
 vdisplay b
 vfit
 vtrihedron t
-set color_1 [vreadpixel 87 25]
+set color_1 [vreadpixel 87 25 -rgb -name]
 
 OCC25340
 vselect 87 25
-set color_2 [vreadpixel 87 25]
+set color_2 [vreadpixel 87 25 -rgb -name]
 
 if {$color_2 != $color_1} {
   puts "ERROR: OCC25340 is reproduced"
@@ -26,11 +23,11 @@ if {$color_2 != $color_1} {
   puts "       final color of trihedron is:   $color_2"
 }
 
-if {$color_2 != "0.43137255311012268 0.48235294222831726 0.54509806632995605 1"} {
+if {$color_2 != "LIGHTSTEELBLUE4"} {
   puts "ERROR: OCC25340 is reproduced"
   puts "       additional investigation is needed"
-  puts "       expected color is: 0.43137255311012268 0.48235294222831726 0.54509806632995605 1"
-  puts "       current color is:  $_color_2"
+  puts "       expected color is: LIGHTSTEELBLUE4"
+  puts "       current color is:  $color_2"
 }
 
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+vdump ${imagedir}/${test_image}.png

diff --git a/tests/bugs/vis/bug25459_coloredshape b/tests/bugs/vis/bug25459_coloredshape
index e74783862e99293fef41d47955ec7e026607da72..b61ffe4030a60314229c5135dcb0185e69a37014 100644 (file)
--- a/tests/bugs/vis/bug25459_coloredshape
+++ b/tests/bugs/vis/bug25459_coloredshape
@@ -5,12 +5,11 @@ puts "========"
 box b 0 0 0 1 2 3
 
 # prepare view
-vinit View1
 vclear
+vinit View1
 vglinfo
-vsetdispmode 1
 vaxo
-vdisplay b
+vdisplay -dispMode 1 b
 vfit
 
 # customize object
@@ -19,7 +18,4 @@ vaspects b -subshapes b_3 -setcolor RED
 vaspects b -setmaterial PLASTIC
 
 # validate results
-set aFaceColor [vreadpixel 128 256 rgb name]
-if {"$aFaceColor"  != "RED4"} {
-  puts "Error: wrong Face color"
-}
+if { [vreadpixel 128 256 -rgb -name] != "BROWN"} { puts "Error: wrong Face color" }

diff --git a/tests/bugs/vis/bug25544_graytexture b/tests/bugs/vis/bug25544_graytexture
index 1f07e8f5bf1fd56cacc4e7dfac2c0140fb2d94fd..42794caf19fc10e14a36d5f5c7c749afa493c76c 100644 (file)
--- a/tests/bugs/vis/bug25544_graytexture
+++ b/tests/bugs/vis/bug25544_graytexture
@@ -3,13 +3,12 @@ puts "0025544: Visualization, TKOpenGl - support grayscale textures"
 puts "============"
 puts ""
 
-vinit View1
 vclear
+vinit View1
 
 box b 1 2 3
 vaxo
-vsetdispmode 1
-vdisplay b
+vdisplay -dispMode 1 b
 vtexture b 1 -modulate on
 vfit
 
@@ -20,9 +19,5 @@ vtexture b 1 -modulate off
 set aColorDec [vreadpixel 290 180 rgb name]
 vdump $imagedir/${casename}_decal.png
 
-if {"$aColorMod" != "GOLDENROD4"} {
-  puts "Error: wrong color with modulation ON"
-}
-if {"$aColorDec" != "GRAY80"} {
-  puts "Error: wrong color with modulation OFF"
-}
+if {"$aColorMod" != "GOLD4"}  { puts "Error: wrong color with modulation ON" }
+if {"$aColorDec" != "GRAY91"} { puts "Error: wrong color with modulation OFF" }

diff --git a/tests/bugs/vis/bug25552 b/tests/bugs/vis/bug25552
index 673506af9efcfe9e393b45169c64741a528a45e1..f30a755fb94d0d300661c752e0c5a09dfa3d5700 100644 (file)
--- a/tests/bugs/vis/bug25552
+++ b/tests/bugs/vis/bug25552
@@ -8,8 +8,8 @@ set aSubShapeTriang $imagedir/${casename}_subshape_triangulation.png
 set aShapeTriang $imagedir/${casename}_shape_triangulation.png
 set aDiff $imagedir/${casename}_diff.png
 
-vinit View1
 vclear
+vinit View1
 vaxo
 vsetdispmode 1
 
@@ -34,35 +34,23 @@ verase -inview b1
 vmoveto 250 347
 
 set aColorV2B1 [vreadpixel  50 250 rgb name]
-if { $aColorV2B1 != "BLACK" } {
-  puts "Error: box b1 (red) should NOT be visible in View2!"
-}
+if { $aColorV2B1 != "BLACK" } { puts "Error: box b1 (red) should NOT be visible in View2!" }
 
 set aColorV2B2 [vreadpixel 200 350 rgb name]
-if { $aColorV2B2 != "GREEN3" } {
-  puts "Error: box b2 (green) should be visible in View2!"
-}
+if { $aColorV2B2 != "GREEN2" } { puts "Error: box b2 (green) should be visible in View2!" }
 
 set aColorV2B3 [vreadpixel 250 200 rgb name]
-if { $aColorV2B3 != "DARKGOLDENROD3" } {
-  puts "Error: box b3 (goldenrod) should be visible in View2!"
-}
+if { $aColorV2B3 != "DARKGOLDENROD" } { puts "Error: box b3 (goldenrod) should be visible in View2!" }
 vdump $imagedir/${casename}_v2.png
 
 vactivate View1
 vfit
 set aColorV1B1 [vreadpixel  50 250 rgb name]
-if { $aColorV1B1 != "RED3" } {
-  puts "Error: box b1 (red) should be visible in View1!"
-}
+if { $aColorV1B1 != "RED2" } { puts "Error: box b1 (red) should be visible in View1!" }
 
 set aColorV1B2 [vreadpixel 200 350 rgb name]
-if { $aColorV1B2 != "BLACK" } {
-  puts "Error: box b2 (green) should NOT be visible in View1!"
-}
+if { $aColorV1B2 != "BLACK" } { puts "Error: box b2 (green) should NOT be visible in View1!" }
 
 set aColorV1B3 [vreadpixel 250 200 rgb name]
-if { $aColorV1B3 != "DARKGOLDENROD3" } {
-  puts "Error: box b3 (goldenrod) should be visible in View1!"
-}
+if { $aColorV1B3 != "DARKGOLDENROD" } { puts "Error: box b3 (goldenrod) should be visible in View1!" }
 vdump $imagedir/${casename}_v1.png

diff --git a/tests/bugs/vis/bug25695 b/tests/bugs/vis/bug25695
index d43c37c3d8e8b3a13c49db661353e2abf2bf8139..98fc475e3af6087101ef95cb15d9d0d46c62149b 100644 (file)
--- a/tests/bugs/vis/bug25695
+++ b/tests/bugs/vis/bug25695
@@ -17,6 +17,6 @@ vfit
 vselprops dynHighlight -dispMode -1 -transp 0.5 -material PLASTIC
 vmoveto 250 250
 
-if { [vreadpixel 250 250 rgb name] != "PALEGREEN3" } { puts "Error: wrong highlighting color" }
+if { [vreadpixel 250 250 rgb name] != "GRAY58" } { puts "Error: wrong highlighting color" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug25723 b/tests/bugs/vis/bug25723
index f3a09cd5c2d3e1bf94263a7f33132aef46820ea4..886f7b748844790b1af4415e00aaf67131343011 100644 (file)
--- a/tests/bugs/vis/bug25723
+++ b/tests/bugs/vis/bug25723
@@ -24,6 +24,6 @@ verase
 
 # rotation
 vrotate -mouseStart 100 100 -mouseMove 300 300
-if {"[vreadpixel 220 50 rgb name]" != "GOLDENROD2"} { puts "Error: Rotation is not correct" }
+if {"[vreadpixel 220 50 rgb name]" != "DARKGOLDENROD3"} { puts "Error: Rotation is not correct" }
 
 vdump ${imagedir}/${casename}.png

diff --git a/tests/bugs/vis/bug25723_1 b/tests/bugs/vis/bug25723_1
index 867f1d4c94fa6caf1bfcbec898f4c36b57f0db2a..27a0d59dfc94de2f5bb91c22fab6d58dd67a4857 100644 (file)
--- a/tests/bugs/vis/bug25723_1
+++ b/tests/bugs/vis/bug25723_1
@@ -41,8 +41,6 @@ vrotate -mouseStart ${x_mouse_start_coord} ${y_mouse_start_coord} -mouseMove ${x
 vselect 0 0
 
 # check color
-if {"[vreadpixel ${x_check_coord} ${y_check_coord} rgb name]" != "GOLDENROD2"} {
-  puts "Error : Rotation is not correct"
-}
+if {"[vreadpixel ${x_check_coord} ${y_check_coord} rgb name]" != "DARKGOLDENROD3"} { puts "Error : Rotation is not correct" }
 
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+vdump ${imagedir}/${test_image}.png

diff --git a/tests/bugs/vis/bug26028 b/tests/bugs/vis/bug26028
index 34f880cab81dd577e385064cabea300ba8251625..072cee8308741951b42f958ec26daa13c2cd6a83 100644 (file)
--- a/tests/bugs/vis/bug26028
+++ b/tests/bugs/vis/bug26028
@@ -49,7 +49,7 @@ set aColor3 [vreadpixel 225 150 rgb name]
 set aColor4 [vreadpixel 325 200 rgb name]
 
 # note that aColor2 is not expected to be capped
-if { "$aColor0" != "GRAY61" || "$aColor1" != "GRAY61" || "$aColor2" == "GRAY61" || "$aColor3" != "GRAY61" || "$aColor4" != "GRAY61" } {
+if { "$aColor0" != "GRAY72" || "$aColor1" != "GRAY72" || "$aColor2" == "GRAY72" || "$aColor3" != "GRAY72" || "$aColor4" != "GRAY72" } {
   puts "Error: capping color does not match"
 }
 

diff --git a/tests/bugs/vis/bug26217 b/tests/bugs/vis/bug26217
index 047f7065b27cc51e35dba39fd2e4ee8a5df460f2..4d265c3324c541b2b3b8eedd98246ad2ece739af 100644 (file)
--- a/tests/bugs/vis/bug26217
+++ b/tests/bugs/vis/bug26217
@@ -17,17 +17,11 @@ vcircle circle radP1 radP2 radP3 1
 vfit
 
 vselect 40 120 185 320
-set aColor [vreadpixel 120 200 rgb name]
-if {$aColor != "DARKGOLDENROD3"} {
-  puts "ERROR: the circle is selected with no overlap mode activated"
-}
+if {[vreadpixel 120 200 rgb name] != "DARKGOLDENROD"} { puts "ERROR: the circle is selected with no overlap mode activated" }
 
 vselect 0 0
 
 vselect 40 120 185 320 -allowoverlap 1
-set aColor [vreadpixel 120 200 rgb name]
-if {$aColor != "GRAY66"} {
-  puts "ERROR: the circle is not selected with overlap mode activated"
-}
+if {[vreadpixel 120 200 rgb name] != "GRAY73"} { puts "ERROR: the circle is not selected with overlap mode activated" }
 
 vdump ${imagedir}/${casename}.png

diff --git a/tests/bugs/vis/bug26344 b/tests/bugs/vis/bug26344
index 98c221b40456b7ed4a5d34267a11027637f8b9a3..e9fa334120d5f758e103263770ad2b41b97e5f36 100644 (file)
--- a/tests/bugs/vis/bug26344
+++ b/tests/bugs/vis/bug26344
@@ -24,11 +24,11 @@ vsetlocation bz2 -25 -25 -25
 
 vselect 0 0
 vselect 387 77
-if { [vreadpixel 387 77 rgb name] != "GRAY66" } { puts "Error picking zoom persistence object(s)" }
+if { [vreadpixel 387 77 rgb name] != "GRAY73" } { puts "Error picking zoom persistence object(s)" }
 
 vselect 0 0
 vselect 330 120 410 50
-if { [vreadpixel 387 77 rgb name] != "GRAY66" || [vreadpixel 352 96 rgb name] != "GRAY66" } { puts "Error selecting zoom persistence object(s)" }
+if { [vreadpixel 387 77 rgb name] != "GRAY73" || [vreadpixel 352 96 rgb name] != "GRAY73" } { puts "Error selecting zoom persistence object(s)" }
 
 # 2) Rotate persistence
 
@@ -37,11 +37,11 @@ vdisplay br -dispMode 1 -highMode 1 -trsfPers rotate -trsfPersPos -200 -200 -200
 vsetmaterial br PLASTIC
 vselect 0 0
 vselect 160 200
-if { [vreadpixel 160 180 rgb name] != "WHITE" } { puts "Error picking rotate persistence object" }
+if { [vreadpixel 160 180 rgb name] != "GRAY89" } { puts "Error picking rotate persistence object" }
 
 vselect 0 0
 vselect 130 230 190 170
-if { [vreadpixel 160 180 rgb name] != "WHITE" } { puts "Error selecting rotate persistence object" }
+if { [vreadpixel 160 180 rgb name] != "GRAY89" } { puts "Error selecting rotate persistence object" }
 
 # 3) Zoom + Rotate persistence
 
@@ -51,20 +51,20 @@ vdisplay bzr -dispMode 1 -highMode 1 -trsfPers zoomRotate -trsfPersPos -200 100
 vsetmaterial bzr PLASTIC
 vselect 0 0
 vselect 250 90
-if { [vreadpixel 250 90 rgb name] != "WHITE" } { puts "Error picking zoom-rotate persistence object" }
+if { [vreadpixel 250 90 rgb name] != "GRAY89" } { puts "Error picking zoom-rotate persistence object" }
 vselect 0 0
 vselect 200 70 286 110
-if { [vreadpixel 250 90 rgb name] != "WHITE" } { puts "Error selecting zoom-rotate persistence object" }
+if { [vreadpixel 250 90 rgb name] != "GRAY89" } { puts "Error selecting zoom-rotate persistence object" }
 
 # 4) Trihedron persistence
 
 vdisplay bt -dispMode 1 -highMode 1 -trsfPers trihedron -trsfPersPos -1 -1 62
 vselect 0 0
 vselect 132 300
-if { [vreadpixel 132 300 rgb name] != "GRAY66" } { puts "Error picking trihedron persistence object" }
+if { [vreadpixel 132 300 rgb name] != "GRAY73" } { puts "Error picking trihedron persistence object" }
 vselect 0 0
 vselect 50 223 235 395
-if { [vreadpixel 132 300 rgb name] != "GRAY66" } { puts "Error selecting trihedron persistence object" }
+if { [vreadpixel 132 300 rgb name] != "GRAY73" } { puts "Error selecting trihedron persistence object" }
 
 vselect 50 410 410 50
 vstate -entities

diff --git a/tests/bugs/vis/bug26357 b/tests/bugs/vis/bug26357
index 97853e0fe075f47accddcd3b2993c000a3db18c9..6cd02ee6e7470caf9a92ff0dfe4c6b1d98a68e2f 100644 (file)
--- a/tests/bugs/vis/bug26357
+++ b/tests/bugs/vis/bug26357
@@ -18,10 +18,10 @@ vaxo
 vfit
 vpan        200 0
 vmoveto     399 200
-if { [vreadpixel 399 200 rgb name] != "DARKTURQUOISE" } { puts "Error: incorrect color after forward panning in View1" }
+if { [vreadpixel 399 200 rgb name] != "CYAN2" } { puts "Error: incorrect color after forward panning in View1" }
 vpan       -200 0
 vmoveto     200 200
-if { [vreadpixel 200 200 rgb name] != "DARKTURQUOISE" } { puts "Error: incorrect color after backward panning in View1" }
+if { [vreadpixel 200 200 rgb name] != "CYAN2" } { puts "Error: incorrect color after backward panning in View1" }
 vdump ${imagedir}/${casename}_1.png
 
 # Test panning with aspect ratio 1:2
@@ -30,10 +30,10 @@ vaxo
 vfit
 vpan        100 0
 vmoveto     199 100
-if { [vreadpixel 199 100 rgb name] != "DARKTURQUOISE" } { puts "Error: incorrect color after forward panning in View2" }
+if { [vreadpixel 199 100 rgb name] != "CYAN2" } { puts "Error: incorrect color after forward panning in View2" }
 vpan       -100 0
 vmoveto     100 100
-if { [vreadpixel 100 100 rgb name] != "DARKTURQUOISE" } { puts "Error: incorrect color after backward panning in View2" }
+if { [vreadpixel 100 100 rgb name] != "CYAN2" } { puts "Error: incorrect color after backward panning in View2" }
 vdump ${imagedir}/${casename}_2.png
 
 # Test panning with aspect ratio 2:1
@@ -42,8 +42,8 @@ vaxo
 vfit
 vpan        200 0
 vmoveto     399 100
-if { [vreadpixel 399 100 rgb name] != "DARKTURQUOISE" } { puts "Error: incorrect color after forward panning in View3" }
+if { [vreadpixel 399 100 rgb name] != "CYAN2" } { puts "Error: incorrect color after forward panning in View3" }
 vpan       -200 0
 vmoveto     200 100
-if { [vreadpixel 200 100 rgb name] != "DARKTURQUOISE" } { puts "Error: incorrect color after backward panning in View3" }
+if { [vreadpixel 200 100 rgb name] != "CYAN2" } { puts "Error: incorrect color after backward panning in View3" }
 vdump ${imagedir}/${casename}_3.png

diff --git a/tests/bugs/vis/bug26680 b/tests/bugs/vis/bug26680
index 6ea3068d34f9b2221e827592d8562a49c2c72629..959708969218bd496fe35552efa9d46165f0228a 100644 (file)
--- a/tests/bugs/vis/bug26680
+++ b/tests/bugs/vis/bug26680
@@ -1,36 +1,24 @@
 puts "============"
-puts "CR26680"
+puts "0026680: Visualization - Changed behavior of mesh visualization and selection in OMF sample""
 puts "============"
 puts ""
 
-##########################################################################################
-puts "Visualization - Changed behavior of mesh visualization and selection in OMF sample"
-##########################################################################################
-
 pload VISUALIZATION XDE
 
-vinit
+vinit View1
 meshfromstl m [locate_data_file bug26680.stl]
 meshcolors m elem2 1
 
 vselmode 0 1
 
 vmoveto 200 200
-if {[vreadpixel 197 257 rgb name] != "CYAN"} {
-  puts "ERROR: presentation for dynamic highlight of the object is wrong!"
-}
+if {[vreadpixel 197 257 rgb name] != "CYAN"} { puts "ERROR: presentation for dynamic highlight of the object is wrong!" }
 vmoveto 0 0
-if {[vreadpixel 197 257 rgb name] != "BLUE2"} {
-  puts "ERROR: the object is not unhighlighted after dynamic highlight!"
-}
+if {[vreadpixel 197 257 rgb name] != "BLUE"} { puts "ERROR: the object is not unhighlighted after dynamic highlight!" }
 
 vselect 200 200
-if {[vreadpixel 197 257 rgb name] != "GRAY93"} {
-  puts "ERROR: presentation for selection highlight is wrong!"
-}
+if {[vreadpixel 197 257 rgb name] != "GRAY86"} { puts "ERROR: presentation for selection highlight is wrong!" }
 vselect 0 0
-if {[vreadpixel 197 257 rgb name] != "BLUE2"} {
-  puts "ERROR: the object is not unhighlighted after selection highlight!"
-}
+if {[vreadpixel 197 257 rgb name] != "BLUE"} { puts "ERROR: the object is not unhighlighted after selection highlight!" }
 
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+vdump ${imagedir}/${test_image}.png

diff --git a/tests/bugs/vis/bug26719_1 b/tests/bugs/vis/bug26719_1
index 5f7462f48a733f047dd92e1768d12bebd973581e..de4670fa4189b14d2985bd98d49a47435432ddf1 100644 (file)
--- a/tests/bugs/vis/bug26719_1
+++ b/tests/bugs/vis/bug26719_1
@@ -1,15 +1,11 @@
 puts "============"
-puts "CR26719"
+puts "0026719: Visualization - cannot pick zoom persistent object"
 puts "============"
 puts ""
 
-##########################################################################################
-puts "Visualization - cannot pick zoom persistent object"
-##########################################################################################
-
 pload VISUALIZATION MODELING
 
-vinit
+vinit View1
 vsetdispmode 1
 
 restore [locate_data_file face1.brep] f
@@ -25,12 +21,8 @@ vviewparams -eye 0.7 -1.14 -0.17
 # with dynamic highlight color, check that the face is
 # not highlighted
 vmoveto 280 290
-if {[vreadpixel 297 297 name] != "CYAN 1"} {
-  puts "ERROR: zoom persistent box is not highlighted dynamically!"
-}
-if {[vreadpixel 372 210 name] != "GOLDENROD1 1"} {
-  puts "ERROR: the shape behind zoom persistent object was highlighted instead!"
-}
+if {[vreadpixel 297 297 -rgb -name] != "CYAN"}           { puts "ERROR: zoom persistent box is not highlighted dynamically!" }
+if {[vreadpixel 372 210 -rgb -name] != "DARKGOLDENROD3"} { puts "ERROR: the shape behind zoom persistent object was highlighted instead!" }
 vdump ${imagedir}/${casename}_1.png
 
 vmoveto 0 0
@@ -46,24 +38,14 @@ vviewparams -eye 0.96 1.053 0.31
 # will be highlighted dynamically
 vmoveto 264 135
 
-if {[vreadpixel 275 142 name] != "CYAN 1"} {
-  puts "ERROR: zoom persistent box is not highlighted dynamically in precision test!"
-}
-if {[vreadpixel 243 123 name] != "LIGHTGOLDENROD1 1"} {
-  puts "ERROR: the shape behind zoom persistent object was highlighted instead in precision test!"
-}
+if {[vreadpixel 275 142 -rgb -name] != "CYAN"}       { puts "ERROR: zoom persistent box is not highlighted dynamically in precision test!" }
+if {[vreadpixel 243 123 -rgb -name] != "BURLYWOOD2"} { puts "ERROR: the shape behind zoom persistent object was highlighted instead in precision test!" }
 vdump ${imagedir}/${casename}_2.png
 vmoveto 0 0
 
 # move to a point on the face and check if it
 # will be highlighted dynamically
 vmoveto 259 135
-if {[vreadpixel 275 142 name] != "GOLDENROD3 1"} {
-  puts "ERROR: zoom persistent box is highlighted instead in precision test!"
-}
-if {[vreadpixel 243 123 name] != "CYAN 1"} {
-  puts "ERROR: the shape behind zoom persistent object was not highlighted dynamically in precision test!"
-}
+if {[vreadpixel 275 142 -rgb -name] != "DARKGOLDENROD"} { puts "ERROR: zoom persistent box is highlighted instead in precision test!" }
+if {[vreadpixel 243 123 -rgb -name] != "CYAN"}          { puts "ERROR: the shape behind zoom persistent object was not highlighted dynamically in precision test!" }
 vdump ${imagedir}/${casename}_3.png
-
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png

diff --git a/tests/bugs/vis/bug26940 b/tests/bugs/vis/bug26940
index 20ed679eb16ef4698a5e0c3ce29c691cecd42206..82399a37b70e66c7a989a6325256e6fde8287983 100644 (file)
--- a/tests/bugs/vis/bug26940
+++ b/tests/bugs/vis/bug26940
@@ -4,24 +4,19 @@ puts "Tests capping plane rendering with connected structures"
 puts "============"
 puts ""
 
-vinit View1
 vclear
+vinit View1
 vaxo
 vsetdispmode 1
 box b 1 1 1
 vdisplay b
 vfit
 
-vclipplane create pln
-vclipplane set pln view Driver1/Viewer1/View1
-vclipplane change pln equation 0 1 0 -0.5
-vclipplane change pln capping on
+vclipplane pln -set Driver1/Viewer1/View1 -equation 0 1 0 -0.5 -capping on
 
 vdump $imagedir/${casename}_normal.png
 set aColorNorm [vreadpixel 200 250 rgb name]
-if { "$aColorNorm" != "GRAY13" } {
-  puts "Error: Expected color of capping plane is GRAY13 (normal presentation). Actial is $aColorNorm"
-}
+if { "$aColorNorm" != "GRAY14" } { puts "Error: Expected color of capping plane is GRAY14 (normal presentation). Actial is $aColorNorm" }
 
 vclear
 
@@ -29,6 +24,4 @@ vconnectto bb 0 0 0 b
 vdump $imagedir/${casename}_connected.png
 set aColorConn [vreadpixel 200 250 rgb name]
 
-if { "$aColorConn" != "GRAY13" } {
-  puts "Error: Expected color of capping plane is GRAY13 (connected presentation). Actial is $aColorConn"
-}
+if { "$aColorConn" != "GRAY14" } { puts "Error: Expected color of capping plane is GRAY14 (connected presentation). Actial is $aColorConn" }

diff --git a/tests/bugs/vis/bug26960 b/tests/bugs/vis/bug26960
index 9c19f28c67bad447dfdb757ea4552e449a4c16ac..aae31ebc79e4f2623198ef1d7aab5c83df07feef 100644 (file)
--- a/tests/bugs/vis/bug26960
+++ b/tests/bugs/vis/bug26960
@@ -1,10 +1,7 @@
 puts "========"
-puts "OCC26960"
+puts "0026960: Visualization, TKOpenGl - update transformation of dynamically highlighted presentation"
 puts "========"
 puts ""
-##################################################################
-puts "Visualization, TKOpenGl - update transformation of dynamically highlighted presentation"
-##################################################################
 
 pload VISUALIZATION MODELING
 
@@ -17,12 +14,8 @@ vdisplay -dispmode 1 -highmode 1 b
 vfit
 vselmode 4 1
 vmoveto 250 250
-if {[vreadpixel 350 140 rgb name] != "BLACK"} {
-  puts "ERROR: wrong inital location"
-}
+if {[vreadpixel 350 140 rgb name] != "BLACK"} { puts "ERROR: wrong inital location" }
 vsetlocation b 0.5 0 0
-if {[vreadpixel 350 140 rgb name] != "DARKTURQUOISE"} {
-  puts "ERROR: the transformation was not applied to highlight structure"
-}
+if {[vreadpixel 350 140 rgb name] != "CYAN2"} { puts "ERROR: the transformation was not applied to highlight structure" }
 
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+vdump ${imagedir}/${test_image}.png

diff --git a/tests/bugs/vis/bug27083 b/tests/bugs/vis/bug27083
index 6d3f397948bf136ff0fec4d909b3a13beefbd7fb..d52a22783dd4381e41f3defe3ec47e9976d37a3c 100644 (file)
--- a/tests/bugs/vis/bug27083
+++ b/tests/bugs/vis/bug27083
@@ -1,6 +1,5 @@
 puts "========"
-puts "OCC27083"
-puts "Visualization, Ray Tracing - shape with visible face boundaries disappears after turning the ray-tracing on"
+puts "0027083: Visualization, Ray Tracing - shape with visible face boundaries disappears after turning the ray-tracing on"
 puts "========"
 puts ""
 
@@ -16,12 +15,7 @@ vfit
 vaspects b -setFaceBoundaryDraw 1 -setFaceBoundaryColor RED -setFaceBoundaryWidth 3
 vraytrace 1
 
-if {[vreadpixel 295 255 name] != "GOLDENROD4 0"} {
-  puts "ERROR: the box with boundary aspect set is not shown in ray-tracing mode!"
-}
-
-if {[vreadpixel 105 58 name] != "RED 1"} {
-  puts "ERROR: the box's boundaries are not shown in ray-tracing mode!"
-}
+if {[vreadpixel 295 255 -rgb -name] != "SIENNA"} { puts "ERROR: the box with boundary aspect set is not shown in ray-tracing mode!" }
+if {[vreadpixel 105  58 -rgb -name] != "RED"}    { puts "ERROR: the box's boundaries are not shown in ray-tracing mode!" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug27536 b/tests/bugs/vis/bug27536
index aee57ff133a2a4d35aa38e05fd3840affea7e214..2f35cb134309b7878027d291a68fa79d0fc0d7c7 100644 (file)
--- a/tests/bugs/vis/bug27536
+++ b/tests/bugs/vis/bug27536
@@ -1,30 +1,21 @@
 puts "========"
-puts "OCC27536"
+puts "0027536: Visualization - incorrect behavior of zoom persisted objects"
 puts "========"
 puts ""
-##################################################################
-puts "Visualization - incorrect behavior of zoom persisted objects"
-##################################################################
 
-set anImage1 $imagedir/${casename}_1.png
-set anImage2 $imagedir/${casename}_2.png
-
-vinit
 vclear
+vinit View1
 vaxo
 
 box b -50 -50 -50 100 100 100
 vdisplay b -trsfPers zoom -trsfPersPos 0 0 0 -dispmode 1
-
-vdump $anImage1
+vdump $imagedir/${casename}_1.png
 
 vinit View2 w=200 h=400
 vaxo
 vfit
 
 # Check that box was't resized in small view
-if {[vreadpixel 165 200 name] != "DARKGOLDENROD3 1"} {
-  puts "ERROR: zoom persistent box is resized on view sizes changed!"
-}
+if {[vreadpixel 165 200 -rgb -name] != "DARKGOLDENROD"} { puts "ERROR: zoom persistent box is resized on view sizes changed!" }
 
-vdump $anImage2
+vdump $imagedir/${casename}_2.png

diff --git a/tests/bugs/vis/bug27618 b/tests/bugs/vis/bug27618
index c8fc1670b213079d9fb882fdc5ce40ab5b592c99..816d6db6830f3562f8644566336e1e3b11fba28d 100644 (file)
--- a/tests/bugs/vis/bug27618
+++ b/tests/bugs/vis/bug27618
@@ -21,8 +21,8 @@ vdisplay -2d topLeft -topmost pp
 vselmode pp 0 0
 vmoveto 245 190
 
-if { [vreadpixel 235 140 rgb name] == "DARKTURQUOISE" } { puts "Error: top should NOT be highlighted" }
-if { [vreadpixel 235 190 rgb name] != "DARKTURQUOISE" } { puts "Error: bottom should be highlighted" }
+if { [vreadpixel 235 140 rgb name] == "CYAN2" } { puts "Error: top should NOT be highlighted" }
+if { [vreadpixel 235 190 rgb name] != "CYAN2" } { puts "Error: bottom should be highlighted" }
 vseldump $imagedir/${casename}_sel_depth.png  -type depth
 vseldump $imagedir/${casename}_sel_entity.png -type entity
 
@@ -30,8 +30,8 @@ vcamera -persp
 
 vmoveto 0 0
 vmoveto 245 190
-if { [vreadpixel 235 140 rgb name] == "DARKTURQUOISE" } { puts "Error: top should NOT be highlighted" }
-if { [vreadpixel 235 190 rgb name] != "DARKTURQUOISE" } { puts "Error: bottom should be highlighted" }
+if { [vreadpixel 235 140 rgb name] == "CYAN2" } { puts "Error: top should NOT be highlighted" }
+if { [vreadpixel 235 190 rgb name] != "CYAN2" } { puts "Error: bottom should be highlighted" }
 
 vseldump $imagedir/${casename}_perps_sel_depth.png  -type depth
 vseldump $imagedir/${casename}_persp_sel_entity.png -type entity

diff --git a/tests/bugs/vis/bug27629 b/tests/bugs/vis/bug27629
index 4f4c9c56de55ea519c6278fabadf37ef2f8a336b..b2d129b76d3c940ddf56ee7da44c6dcef6fd6882 100644 (file)
--- a/tests/bugs/vis/bug27629
+++ b/tests/bugs/vis/bug27629
@@ -1,19 +1,13 @@
 puts "========"
-puts "OCC27629"
+puts "0027629: Visualization - apply a correct model-world matrix to normals in fixed function pipeline with enabled zoom persistence"
 puts "========"
 puts ""
-##############################################################################################################################
-puts "Visualization - apply a correct model-world matrix to normals in fixed function pipeline with enabled zoom persistence."
-##############################################################################################################################
 
-vinit
+vinit View1
 box b0 25 25 25
-vsetdispmode 1
-vdisplay b0 -trsfPers zoom
+vdisplay b0 -dispMode 1 -trsfPers zoom
 vzoom 10
 
-if { [vreadpixel 220 200 name] != "DARKGOLDENROD3 1"} {
-  puts "Error: normals aren't normalized!"
-}
+if { [vreadpixel 220 200 -rgb -name] != "DARKGOLDENROD"} { puts "Error: normals aren't normalized!" }
 
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
+vdump ${imagedir}/${test_image}.png

diff --git a/tests/bugs/vis/bug27796 b/tests/bugs/vis/bug27796
index 6a055b11c621a80c52bed786cf0e203fcc7d470e..d21bd49e537ce538fe3b40cbc1a3c5a23e372151 100644 (file)
--- a/tests/bugs/vis/bug27796
+++ b/tests/bugs/vis/bug27796
@@ -101,4 +101,4 @@ vdump $imagedir/${casename}_bl.png
 vmoveto 110 385
 vselect 110 385
 set aColor [vreadpixel 110 385 rgb name]
-if { $aColor != "WHITE" } { puts "Error: wrong object is highlighted" }
+if { $aColor != "GRAY89" } { puts "Error: wrong object is highlighted" }

diff --git a/tests/bugs/vis/bug27797 b/tests/bugs/vis/bug27797
index 4ffe4ad002bcf3fd30bf6ddc34dba0490a721d90..a311f4a8fd9d0bc7f0d1890adf8b13dd65297232 100644 (file)
--- a/tests/bugs/vis/bug27797
+++ b/tests/bugs/vis/bug27797
@@ -26,7 +26,7 @@ vselect 100 300
 vmoveto 0 0
 
 set aSelColor [vreadpixel 100 300 rgb name]
-if { $aSelColor != "GRAY72"} { puts "Error: wrong object has been selected" }
+if { $aSelColor != "GRAY76"} { puts "Error: wrong object has been selected" }
 
 vdisplay -dispMode 0 -osd -2d -trsfPersPos -1 1 v
 

diff --git a/tests/bugs/vis/bug27817 b/tests/bugs/vis/bug27817
index e830f518b1017f2e9ae3fe865c796c085a52ab46..9d351c4a5b7342c2f6936b2d755509e46420de6a 100644 (file)
--- a/tests/bugs/vis/bug27817
+++ b/tests/bugs/vis/bug27817
@@ -12,6 +12,6 @@ box b 30 40 50
 vdisplay -trsfPers trihedron -trsfPersPos -1 -1 40 -dispMode 1 -highMode 1 b
 vselmode b 4 1
 vmoveto 50 350
-if { [vreadpixel 50 350 rgb name] != "DARKTURQUOISE" } { puts "Error: face is not highlighted" }
+if { [vreadpixel 50 350 rgb name] != "CYAN2" } { puts "Error: face is not highlighted" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug27836 b/tests/bugs/vis/bug27836
index eb3ee1051f36b3cdb04eef95613797c8841507f6..bd3a54ffe8d85b6c2553d6b6ece3fb20b5bb31b4 100644 (file)
--- a/tests/bugs/vis/bug27836
+++ b/tests/bugs/vis/bug27836
@@ -19,6 +19,6 @@ vfit
 
 vviewparams -scale 6.66 -eye 48 43 -210 -at 50 45 -95
 
-if { [vreadpixel 100 300 rgb name] != "GRAY74" } { puts "Error: gradient background is not displayed" }
+if { [vreadpixel 100 300 -rgb -name] != "LIGHTSTEELBLUE3" } { puts "Error: gradient background is not displayed" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug27945 b/tests/bugs/vis/bug27945
index f3539be353e8174f0e886399c5ccfbf948e5b140..db725de9e7c62a6e11103ab06223210044b38063 100644 (file)
--- a/tests/bugs/vis/bug27945
+++ b/tests/bugs/vis/bug27945
@@ -66,7 +66,7 @@ vclipplane pln -equation -1 0 0 2 -set
 
 set aColor1 [vreadpixel 320 160 rgb name]
 set aColor2 [vreadpixel 80  250 rgb name]
-if { "$aColor1" != "BLACK"      } { puts "Error: zoom-persistent object is not clipped" }
-if { "$aColor2" != "GOLDENROD3" } { puts "Error: zoom-persistent object is clipped" }
+if { "$aColor1" != "BLACK"         } { puts "Error: zoom-persistent object is not clipped" }
+if { "$aColor2" != "DARKGOLDENROD" } { puts "Error: zoom-persistent object is clipped" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug27986_1 b/tests/bugs/vis/bug27986_1
index 8da49634b572e64ce74a785f2045063b6ffe5358..d986e71aaa785c31ae6b2b7390f73e8d2c174782 100644 (file)
--- a/tests/bugs/vis/bug27986_1
+++ b/tests/bugs/vis/bug27986_1
@@ -18,6 +18,6 @@ vmoveto 250 250
 vsetlocation b 2 1 0
 set aColor1 [vreadpixel 220 200 rgb name]
 set aColor2 [vreadpixel 350 220 rgb name]
-if { "$aColor1" != "BLACK" || "$aColor2" != "DARKTURQUOISE" } { puts "Error: dynamic highlighting is not updated" }
+if { "$aColor1" != "BLACK" || "$aColor2" != "CYAN2" } { puts "Error: dynamic highlighting is not updated" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug27986_2 b/tests/bugs/vis/bug27986_2
index 055f0e1011aaccf9a178a0eb48f1c861335e83cf..14e37a9cff608fb1ee9cfae29c5e8e3793661bf3 100644 (file)
--- a/tests/bugs/vis/bug27986_2
+++ b/tests/bugs/vis/bug27986_2
@@ -19,6 +19,6 @@ vmoveto 250 250
 vsetlocation b 2 1 0
 set aColor1 [vreadpixel 220 200 rgb name]
 set aColor2 [vreadpixel 350 220 rgb name]
-if { "$aColor1" != "BLACK" || "$aColor2" != "DARKTURQUOISE" } { puts "Error: dynamic highlighting is not updated" }
+if { "$aColor1" != "BLACK" || "$aColor2" != "CYAN2" } { puts "Error: dynamic highlighting is not updated" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug28004 b/tests/bugs/vis/bug28004
index 6060681fba12b96990df2c35575221f7d9388a70..0b86f8dda6937edd8fe44d0bf8c672573812ff27 100644 (file)
--- a/tests/bugs/vis/bug28004
+++ b/tests/bugs/vis/bug28004
@@ -11,8 +11,8 @@ vaxo
 # create default color scale
 vcolorscale cs1 -demo -smooth 0 -xy  0 0
 vcolorscale cs2 -demo -smooth 1 -xy 60 0
-foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 180 CHARTREUSE2 220 GREEN 250 MEDIUMSPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
-foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 180 CHARTREUSE2 220 GREEN 250 MEDIUMSPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
+foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 220 GREEN 250 SPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
+foreach {y aColor} {20 RED 60 DARKORANGE1 100 GOLD 140 GREENYELLOW 220 GREEN 250 SPRINGGREEN 290 CYAN 330 DODGERBLUE1 370 BLUE} { if { [vreadpixel 15 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
 
 # reduce color scale range and number of intervals
 vcolorscale cs3 -range 0 20 5 -font 16 -colors white 0 0 1 green 1 0 0 1 1 1 -labels start 1 2 3 4 end -smooth 0 -xy 120 0
@@ -22,8 +22,8 @@ foreach {y aColor} {40 WHITE 120 RED 200 GREEN 280 BLUE 350 WHITE} { if { [vread
 # color scale with overridden hue range
 vcolorscale cs5 -demo -smooth 0 -hueRange 300 130 -xy 240 0
 vcolorscale cs6 -demo -smooth 1 -hueRange 300 130 -xy 300 0
-foreach {y aColor} {20 GREEN 60 SPRINGGREEN 100 CYAN2 140 TURQUOISE2 180 DODGERBLUE1 220 BLUE        250 BLUE 290 BLUEVIOLET 330 PURPLE 370 MAGENTA} { if { [vreadpixel 245 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
-foreach {y aColor} {20 GREEN 60 SPRINGGREEN 100 CYAN2 140 TURQUOISE2 180 DODGERBLUE1 220 DODGERBLUE2 250 BLUE 290 BLUE      330 PURPLE 370 MAGENTA2} { if { [vreadpixel 315 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
+foreach {y aColor} {20 GREEN 60 SPRINGGREEN       100 AQUAMARINE1 140 TURQUOISE1 180 DODGERBLUE1  220 BLUE       250 BLUE 290 BLUE 330 PURPLE1 370 MAGENTA}       { if { [vreadpixel 245 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
+foreach {y aColor} {20 GREEN 60 MEDIUMSPRINGGREEN 100 AQUAMARINE1 140 TURQUOISE2 180 DEEPSKYBLUE2 220 ROYALBLUE1 250 BLUE 290 BLUE 330 PURPLE1 370 MEDIUMORCHID1} { if { [vreadpixel 315 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } }
 
 # free labels
 vcolorscale cs7 -demo -smooth 0 -colorRange BLACK WHITE -xy 360 0 -freeLabels 3 l1 l2 l3

diff --git a/tests/bugs/vis/bug28036_1 b/tests/bugs/vis/bug28036_1
index 538b9f6ecf9d0d6a63a85c85a1072addac7d7881..a3ec4531247c37275f01234830b44a4f1d89591b 100644 (file)
--- a/tests/bugs/vis/bug28036_1
+++ b/tests/bugs/vis/bug28036_1
@@ -21,8 +21,8 @@ vaspects c                -setColor BLUE
 vaspects c -subshapes b1  -setColor RED
 vaspects c -subshapes c12 -setColor GREEN
 
-if { [vreadpixel 100 100 rgb name] != "RED3"   } { puts "Error: wrong subshape color" }
-if { [vreadpixel 200 100 rgb name] != "GREEN3" } { puts "Error: wrong subshape color" }
-if { [vreadpixel 200 300 rgb name] != "BLUE3"  } { puts "Error: wrong subshape color" }
+if { [vreadpixel 100 100 rgb name] != "RED2"   } { puts "Error: wrong subshape color" }
+if { [vreadpixel 200 100 rgb name] != "GREEN2" } { puts "Error: wrong subshape color" }
+if { [vreadpixel 200 300 rgb name] != "BLUE2"  } { puts "Error: wrong subshape color" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug28036_2 b/tests/bugs/vis/bug28036_2
index 1063bf8861c9d79dfafb410809bb476629669663..d4fb83ba108ae07ca33141efdbadc45b119e37f4 100644 (file)
--- a/tests/bugs/vis/bug28036_2
+++ b/tests/bugs/vis/bug28036_2
@@ -57,16 +57,16 @@ compound b2_3 b3_3 b23_3
 vaspects b123_123 -subshapes b1_3    -setColor BLUE
 vaspects b123_123 -subshapes b23_3   -setColor BLUE
 
-if { [vreadpixel  50 250 rgb name] != "RED3"  } { puts "Error: wrong color" }
-if { [vreadpixel 175 175 rgb name] != "RED3"  } { puts "Error: wrong color" }
-if { [vreadpixel 300 100 rgb name] != "RED3"  } { puts "Error: wrong color" }
+if { [vreadpixel  50 250 rgb name] != "RED2"  } { puts "Error: wrong color" }
+if { [vreadpixel 175 175 rgb name] != "RED2"  } { puts "Error: wrong color" }
+if { [vreadpixel 300 100 rgb name] != "RED2"  } { puts "Error: wrong color" }
 
-if { [vreadpixel 100 310 rgb name] != "GREEN3"} { puts "Error: wrong color" }
-if { [vreadpixel 200 230 rgb name] != "GREEN3"} { puts "Error: wrong color" }
-if { [vreadpixel 320 170 rgb name] != "GREEN3"} { puts "Error: wrong color" }
+if { [vreadpixel 100 310 rgb name] != "GREEN2"} { puts "Error: wrong color" }
+if { [vreadpixel 200 230 rgb name] != "GREEN2"} { puts "Error: wrong color" }
+if { [vreadpixel 320 170 rgb name] != "GREEN2"} { puts "Error: wrong color" }
 
-if { [vreadpixel 130 280 rgb name] != "BLUE3" } { puts "Error: wrong color" }
-if { [vreadpixel 250 200 rgb name] != "BLUE3" } { puts "Error: wrong color" }
-if { [vreadpixel 350 150 rgb name] != "BLUE3" } { puts "Error: wrong color" }
+if { [vreadpixel 130 280 rgb name] != "BLUE2" } { puts "Error: wrong color" }
+if { [vreadpixel 250 200 rgb name] != "BLUE2" } { puts "Error: wrong color" }
+if { [vreadpixel 350 150 rgb name] != "BLUE2" } { puts "Error: wrong color" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug28127 b/tests/bugs/vis/bug28127
index 7a7e029d546d903f6f5943b80974e913b4811c1a..2be17b7e57cd6034d12e5da397554f9b61429560 100644 (file)
--- a/tests/bugs/vis/bug28127
+++ b/tests/bugs/vis/bug28127
@@ -23,7 +23,7 @@ vzbufftrihedron -on -position left_upper
 
 vsettransparency b 0.5
 
-if { [vreadpixel 150 150 rgb name] != "GREEN3" } { puts "Error: wrong color - GREEN box should overlap RED one" }
-if { [vreadpixel  84  64 rgb name] == "RED3"   } { puts "Error: wrong color - Trihedron should overlap RED box" }
+if { [vreadpixel 150 150 rgb name] != "GREEN2" } { puts "Error: wrong color - GREEN box should overlap RED one" }
+if { [vreadpixel  84  64 rgb name] == "RED2"   } { puts "Error: wrong color - Trihedron should overlap RED box" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug28527 b/tests/bugs/vis/bug28527
index dc8f44ebc016b79c0ee0b3db8ccb30fa6228d87a..01a58cd0cf7397c4f9d2d76bb762a8fa4d8d690c 100644 (file)
--- a/tests/bugs/vis/bug28527
+++ b/tests/bugs/vis/bug28527
@@ -18,7 +18,7 @@ verase m
 
 vdisplay -dispMode 1 -highMode 1 b
 vfit
-if { [vreadpixel 165 400 rgb name] != "DARKGOLDENROD3" } { puts "Error: fit all produces incorrect result after Erase" }
+if { [vreadpixel 165 400 rgb name] != "DARKGOLDENROD" } { puts "Error: fit all produces incorrect result after Erase" }
 vdump $::imagedir/${::casename}_1.png
 
 verase b
@@ -30,5 +30,5 @@ vremove m
 
 vdisplay -dispMode 1 -highMode 1 b
 vfit
-if { [vreadpixel 165 400 rgb name] != "DARKGOLDENROD3" } { puts "Error: fit all produces incorrect result after Remove" }
+if { [vreadpixel 165 400 rgb name] != "DARKGOLDENROD" } { puts "Error: fit all produces incorrect result after Remove" }
 vdump $::imagedir/${::casename}_2.png

diff --git a/tests/bugs/vis/bug28988 b/tests/bugs/vis/bug28988
index 3712dfc80e50b0dee7a981eeb4c4dd1320ecd777..2a17b6f9d99b5d22efc8085798f731e51fc8bfa3 100644 (file)
--- a/tests/bugs/vis/bug28988
+++ b/tests/bugs/vis/bug28988
@@ -12,11 +12,11 @@ vaxo
 vdisplay -dispMode 1 -highMode 1 b
 vfit
 vmoveto 110 110
-if { "[vreadpixel 110 110 rgb name]" != "DARKTURQUOISE" } { puts "Error: shape is not selected!" }
+if { "[vreadpixel 110 110 rgb name]" != "CYAN2" } { puts "Error: shape is not selected!" }
 
 vlocation b -translate 1 0 0
 vmoveto 110 110
 vlocation b -reset
 vmoveto 110 110
 vreadpixel 110 110 rgb name
-if { "[vreadpixel 110 110 rgb name]" != "DARKTURQUOISE" } { puts "Error: resetted shape is not selected!" }
+if { "[vreadpixel 110 110 rgb name]" != "CYAN2" } { puts "Error: resetted shape is not selected!" }

diff --git a/tests/bugs/vis/bug29051 b/tests/bugs/vis/bug29051
index 63d0f22e166fcb79a87d6eb0f74c1e09600657d7..2b023586137a51d0089a11ac26337304a113f54c 100644 (file)
--- a/tests/bugs/vis/bug29051
+++ b/tests/bugs/vis/bug29051
@@ -12,10 +12,10 @@ vfit
 vselprops dynHighlight -dispMode 1 -color RED -transp 0.2
 vmoveto 250 250
 vrenderparams -oit off
-if { [vreadpixel 250 250 rgb name] != "ORANGERED3" } { puts "Error: wrong highlight color with OIT turned OFF"}
+if { [vreadpixel 250 250 rgb name] != "ORANGERED2" } { puts "Error: wrong highlight color with OIT turned OFF"}
 vdump $imagedir/${casename}_oit_off.png
 
 vrenderparams -oit 0
 vreadpixel 250 250 rgb name
-if { [vreadpixel 250 250 rgb name] != "ORANGERED3" } { puts "Error: wrong highlight color with OIT turned ON"}
+if { [vreadpixel 250 250 rgb name] != "ORANGERED2" } { puts "Error: wrong highlight color with OIT turned ON"}
 vdump $imagedir/${casename}_oit_on.png

diff --git a/tests/bugs/vis/bug29262 b/tests/bugs/vis/bug29262
index 30dd793bedc85b827db8f923d281598d3c366186..3d7df35283ac568fed645ed28edf3067eca832b9 100644 (file)
--- a/tests/bugs/vis/bug29262
+++ b/tests/bugs/vis/bug29262
@@ -12,7 +12,7 @@ box b 1 2 3
 vdisplay -dispMode 1 -inview -erased b
 vdisplay b
 vfit
-if { [vreadpixel 200 200 rgb name] != "DARKGOLDENROD3" } { puts "Error: object is not displayed in Shaded mode" }
+if { [vreadpixel 200 200 rgb name] != "DARKGOLDENROD" } { puts "Error: object is not displayed in Shaded mode" }
 vdump $imagedir/${casename}_view2.png
 
 vactivate View1

diff --git a/tests/bugs/vis/bug29768 b/tests/bugs/vis/bug29768
index 6c48badf13560dc22b37ccff9e780d14eeb6bcf5..6d0585798841ba14a02df9c94015404923ef1653 100644 (file)
--- a/tests/bugs/vis/bug29768
+++ b/tests/bugs/vis/bug29768
@@ -19,5 +19,5 @@ vclipplane pv  equation -1 0 0  0.5 -set
 vclipplane pb0 equation  0 1 0 -0.5 -set b0
 vclipplane pb1 equation  0 1 0 -0.5 -setOverrideGlobal b1
 
-if { [vreadpixel 300 200 rgb name] != "GREEN3" } { puts "Error: box b1 is fully clipped" }
+if { [vreadpixel 300 200 rgb name] != "GREEN2" } { puts "Error: box b1 is fully clipped" }
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug29791 b/tests/bugs/vis/bug29791
index 587f861f2f280150d83b45421691af505062b6e8..40fc1a2eb6f6ff4f45f34c4a289df6f7986ce4d2 100644 (file)
--- a/tests/bugs/vis/bug29791
+++ b/tests/bugs/vis/bug29791
@@ -18,8 +18,8 @@ vfit
 vmoveto 150 200
 vstate -entities
 vselect 150 200
-if { [vreadpixel 150 200 rgb name] != "BLACK"      } { puts "Error: object is not clipped" }
-if { [vreadpixel 350 200 rgb name] != "GOLDENROD1" } { puts "Error: object should NOT be selected" }
+if { [vreadpixel 150 200 rgb name] != "BLACK"     } { puts "Error: object is not clipped" }
+if { [vreadpixel 350 200 rgb name] != "GOLDENROD" } { puts "Error: object should NOT be selected" }
 vdump $imagedir/${casename}_1.png
 
 # depth range starts behinds the picking ray
@@ -27,7 +27,7 @@ vviewparams -scale 14.7435 -proj 0.193921 -0.891229 0.410007 -up -0.0205984 0.41
 vmoveto 150 200
 vstate -entities
 vselect 150 200
-if { [vreadpixel 150 200 rgb name] != "BLACK"      } { puts "Error: object is not clipped" }
-if { [vreadpixel 300 200 rgb name] != "GOLDENROD1" } { puts "Error: object should NOT be selected" }
+if { [vreadpixel 150 200 rgb name] != "BLACK"          } { puts "Error: object is not clipped" }
+if { [vreadpixel 300 200 rgb name] != "DARKGOLDENROD3" } { puts "Error: object should NOT be selected" }
 
 vdump $imagedir/${casename}_2.png

diff --git a/tests/bugs/vis/bug30672 b/tests/bugs/vis/bug30672
index 49e80cdd6c0a429b8176a301b09f474d5ad1c3be..e2ee6fa1e4de7e5105c6e8bdab0990de4a9b5624 100644 (file)
--- a/tests/bugs/vis/bug30672
+++ b/tests/bugs/vis/bug30672
@@ -14,8 +14,8 @@ vlocation b -setLocation 2 0 0
 vdisplay -dispMode 1 b
 vmoveto 200 200
 if { [vreadpixel 150 150 -rgb -name] != "BLACK" } { puts "Error: wrong prs location" }
-if { [vreadpixel 300 300 -rgb -name] != "DARKGOLDENROD3" } { puts "Error: wrong sel location" }
+if { [vreadpixel 300 300 -rgb -name] != "DARKGOLDENROD" } { puts "Error: wrong sel location" }
 vmoveto 300 300
-if { [vreadpixel 300 300 -rgb -name] != "DARKTURQUOISE" } { puts "Error: wrong highlighting" }
+if { [vreadpixel 300 300 -rgb -name] != "CYAN2" } { puts "Error: wrong highlighting" }
 
 vdump $imagedir/${casename}.png

diff --git a/tests/bugs/vis/bug30756 b/tests/bugs/vis/bug30756
index d5eb111eba2234255c266a0b5a8f31218bedd4f8..be8f0dfb32837dcb389edc07754a14e06e318d5b 100644 (file)
--- a/tests/bugs/vis/bug30756
+++ b/tests/bugs/vis/bug30756
@@ -12,8 +12,8 @@ vaxo
 vdisplay -dispMode 1 b
 vfit
 vclipplane p 1 -equation  0 1 0 -1 -set -capping 1
-if { [vreadpixel 200 200 rgb name] != "GRAY13" } { puts "Error: capping does not work with zero origin" }
+if { [vreadpixel 200 200 rgb name] != "GRAY14" } { puts "Error: capping does not work with zero origin" }
 vzlayer DEFAULT -origin 0 10 0
-if { [vreadpixel 200 200 rgb name] != "GRAY13" } { puts "Error: capping does not work with non-zero origin" }
+if { [vreadpixel 200 200 rgb name] != "GRAY14" } { puts "Error: capping does not work with non-zero origin" }
 
 vdump ${imagedir}/${casename}.png

diff --git a/tests/bugs/vis/bug30906 b/tests/bugs/vis/bug30906
index ab1410d1e0f73500b6d577e86b73aa2bd3ddd5ee..baeac1997ccbc5713deb8ceaf9b9b7ce72c78f1e 100644 (file)
--- a/tests/bugs/vis/bug30906
+++ b/tests/bugs/vis/bug30906
@@ -14,7 +14,7 @@ vpoint p0 0 0 0
 vclipplane c1 -equation 0 1 0  1 -setOverrideGlobal b1
 vclipplane c2 -equation 0 1 0 -1 -set
 vmoveto 200 200
-if { [vreadpixel 250 200 -rgb -name] != "DARKGOLDENROD3" } { puts "Error: selection of clipped object" }
-if { [vreadpixel 150 200 -rgb -name] != "DARKTURQUOISE"  } { puts "Error: object is not selected" }
+if { [vreadpixel 250 200 -rgb -name] != "DARKGOLDENROD" } { puts "Error: selection of clipped object" }
+if { [vreadpixel 150 200 -rgb -name] != "CYAN2"         } { puts "Error: object is not selected" }
 
 vdump ${imagedir}/${casename}.png

diff --git a/tests/bugs/xde/bug23193 b/tests/bugs/xde/bug23193
index 38d5a9fe2d1ff90582de36d3943286ffaebc83df..82702d07f79192c248e63289358c7ec2208839a9 100755 (executable)
--- a/tests/bugs/xde/bug23193
+++ b/tests/bugs/xde/bug23193
@@ -1,16 +1,13 @@
 puts "============"
-puts "OCC23193"
+puts "0023193: Some triangles are inverted when writing an STL file"
 puts "============"
 puts ""
-###########################################################################
-# Some triangles are inverted when writing an STL file
-###########################################################################
-pload QAcommands
 
+pload QAcommands
 
 set aFile $imagedir/bug23193_sample.stl
 
-vinit
+vinit View1
 stepread [locate_data_file bug23193_sample.stp] a *
 incmesh a_1 1
 writestl a_1 ${aFile} 0
@@ -20,17 +17,5 @@ meshcolors m1 elem2 1
 vrotate 4 0 0
 vfit
 
-set x_coord 189
-set y_coord 236
-
-#checkcolor $x_coord $y_coord 0 0 0.7
-
-if { "[vreadpixel $x_coord $y_coord rgb name]" != "MATRABLUE" } {
-    puts "Error : There is missing triangle"
-}
-
-checkview -screenshot -3d -path ${imagedir}/${test_image}.png
-
-
-
-
+if { [vreadpixel 189 236 -rgb -name] != "BLUE3" } { puts "Error : There is missing triangle" }
+vdump ${imagedir}/${test_image}.png

diff --git a/tests/bugs/xde/bug25381 b/tests/bugs/xde/bug25381
index f292fe40d7c63ddbd4cc16d995bcb6482030150e..2d8ac7e7482d748678874bcb094cc3bcb39d7333 100644 (file)
--- a/tests/bugs/xde/bug25381
+++ b/tests/bugs/xde/bug25381
@@ -12,9 +12,9 @@ vfit
 vsetdispmode 1
 vselprops dynHighlight -dispMode -1
 vmoveto 300 200
-if { [vreadpixel 250 200 rgb name] != "DARKTURQUOISE" } { puts "Error: object is NOT picked" }
+if { [vreadpixel 250 200 rgb name] != "CYAN2" } { puts "Error: object is NOT picked" }
 vmoveto 200 250
-if { [vreadpixel 200 250 rgb name] != "BLACK"} { puts "Error: hidden part is displayed" }
-if { [vreadpixel 250 200 rgb name] != "RED4" } { puts "Error: object is picked by hidden part" }
+if { [vreadpixel 200 250 rgb name] != "BLACK"}  { puts "Error: hidden part is displayed" }
+if { [vreadpixel 250 200 rgb name] != "BROWN" } { puts "Error: object is picked by hidden part" }
 
 vdump ${imagedir}/${casename}.png

diff --git a/tests/bugs/xde/bug28641 b/tests/bugs/xde/bug28641
index 5627d6707dee6c0c3ebf7f0fc6b24e203b09567e..c22e933e119aa86b6b5a1fccfda912baaffbf3c5 100644 (file)
--- a/tests/bugs/xde/bug28641
+++ b/tests/bugs/xde/bug28641
@@ -1,10 +1,7 @@
 puts "========"
-puts "OCC28641"
+puts "0028641: Data Exchange - Support alpha-channel of color"
 puts "========"
 puts ""
-####################################################
-# Data Exchange - Support alpha-channel of color
-####################################################
 
 pload OCAF
 
@@ -14,17 +11,17 @@ box b 1 1 1
 explode b e
 explode b f
 XAddShape D_First b
-XSetColor D_First b_1 1 0 0 s
-XSetColor D_First b_2 1 1 0 0.3 s
-XSetColor D_First b_11 1 1 1 0.2 c
-XSetColor D_First b_10 0 1 1 c
+XSetColor D_First b_1 RED s
+XSetColor D_First b_2 YELLOW 0.3 s
+XSetColor D_First b_11 WHITE 0.2 c
+XSetColor D_First b_10 CYAN c
 XAddColor D_First 0.5 0.5 1 0.1
 
 XShow D_First
 vfit
 vsetdispmode 1
 vdump $::imagedir/${::casename}_first.png
-if { [vreadpixel 300 200 rgb name] != "DARKKHAKI" } { puts "Error: wrong color in 3D Viewer" }
+if { [vreadpixel 300 200 rgb name] != "GRAY63" } { puts "Error: wrong color in 3D Viewer" }
 
 # Write file
 SaveAs D_First ${imagedir}/bug28521.xbf
@@ -68,7 +65,7 @@ if {$res != "CYAN"} {
 #0:1:2:5
 set res [XGetColor D_Second 0:1:2:5]
 regexp {([A-Z0-9]+) \(([0-9.+eE]+)\)} $res full color alpha
-if {$color != "LIGHTSLATEBLUE"} {
+if {$color != "LIGHTSTEELBLUE2"} {
   set isOK 0
 }
 if {[expr abs(0.1 - $alpha)] > $prec} {
@@ -83,6 +80,6 @@ XShow D_Second
 vfit
 vsetdispmode 1
 vdump $::imagedir/${::casename}.png
-if { [vreadpixel 300 200 rgb name] != "DARKKHAKI" } { puts "Error: wrong color in 3D Viewer" }
+if { [vreadpixel 300 200 rgb name] != "GRAY63" } { puts "Error: wrong color in 3D Viewer" }
 
 Close D_Second

diff --git a/tests/bugs/xde/bug30779 b/tests/bugs/xde/bug30779
index b767162dcfcd6872fe13e972fad967db74cda993..99f7d7b58912529535a84864b80b6370b24b07ce 100644 (file)
--- a/tests/bugs/xde/bug30779
+++ b/tests/bugs/xde/bug30779
@@ -18,9 +18,7 @@ if {$result != "0:1:1:1 0:1:1:2 0:1:1:3 "} {
 for {set i 1} {$i <= 4} {incr i} {
   set sublabel 0:1:1:3:$i
   set color [XGetShapeColor D $sublabel]
-  if {$color != "GRAY"} {
-    puts "Error: wrong color after expand compounds."
-  }
+  if {$color != "GRAY88"} { puts "Error: wrong color after expand compounds." }
 }
 
 Close D

diff --git a/tests/v3d/anim/objects b/tests/v3d/anim/objects
index 92a5f0c0bd00e31dee80f2fa4532ef3da37b8b2e..904e301a567d3015c1b0e82f7d723c0633610118 100644 (file)
--- a/tests/v3d/anim/objects
+++ b/tests/v3d/anim/objects
@@ -27,8 +27,8 @@ vdump $imagedir/${casename}_1.png
 vanimation anim -play 2.0 0.0
 vdump $imagedir/${casename}_2.png
 
-if {[vreadpixel 270  20 rgb name] != "DARKGOLDENROD3"} { puts "Error: Box moving result is wrong!" }
-if {[vreadpixel 120 255 rgb name] != "DARKGOLDENROD4"} { puts "Error: Sphere moving result is wrong!" }
+if {[vreadpixel 270  20 rgb name] != "DARKGOLDENROD"} { puts "Error: Box moving result is wrong!" }
+if {[vreadpixel 120 255 rgb name] != "ORANGE4"}       { puts "Error: Sphere moving result is wrong!" }
 
 puts "Put the following command to start interactive animation:"
 puts "    vanimation anim -play"

diff --git a/tests/v3d/anim/rotate b/tests/v3d/anim/rotate
index ab16eb6ab0e922b201c175a688c747c7dabac265..4804379c12f781a97149552828832effc91325e5 100644 (file)
--- a/tests/v3d/anim/rotate
+++ b/tests/v3d/anim/rotate
@@ -19,15 +19,15 @@ vanimation anim -clear
 vanimation anim/movecam -view -at1 0 0 50 -at2 0 0 50 -eye1 100 -100 150 -eye2 -153 -70 8 -duration 3
 
 vanimation anim -play 0.0 0.0
-if {[vreadpixel 306 280 rgb name] != "DARKGOLDENROD3" || [vreadpixel 325 280 rgb name] != "DARKGOLDENROD3"} { puts "Error: Camera rotate result is wrong!" }
+if {[vreadpixel 306 280 rgb name] != "DARKGOLDENROD" || [vreadpixel 325 280 rgb name] != "DARKGOLDENROD"} { puts "Error: Camera rotate result is wrong!" }
 vdump $imagedir/${casename}_0.png
 
 vanimation anim -play 1.0 0.0
-if {[vreadpixel 306 280 rgb name] != "DARKORANGE4"    || [vreadpixel 325 280 rgb name] != "BLACK"}          { puts "Error: Camera rotate result is wrong!" }
+if {[vreadpixel 306 280 rgb name] != "GRAY26"        || [vreadpixel 325 280 rgb name] != "BLACK"}          { puts "Error: Camera rotate result is wrong!" }
 vdump $imagedir/${casename}_1.png
 
 vanimation anim -play 2.0 0.0
-if {[vreadpixel 306 280 rgb name] != "GOLDENROD2"     || [vreadpixel 325 280 rgb name] != "GOLDENROD2"}     { puts "Error: Camera rotate result is wrong!" }
+if {[vreadpixel 306 280 rgb name] != "DARKGOLDENROD3" || [vreadpixel 325 280 rgb name] != "DARKGOLDENROD3"} { puts "Error: Camera rotate result is wrong!" }
 vdump $imagedir/${casename}_2.png
 
 puts "Put the following command to start interactive animation:"

diff --git a/tests/v3d/anim/scale b/tests/v3d/anim/scale
index 5037f82c1eab70126082e9756fdaf77746b71ecf..7d7f747dcd86aee89b89028ced8832b8bd1a570f 100644 (file)
--- a/tests/v3d/anim/scale
+++ b/tests/v3d/anim/scale
@@ -18,15 +18,15 @@ vanimation anim -clear
 vanimation anim/zoom -view -scale1 1.2 -scale2 4.8 -duration 2
 
 vanimation anim -play 0.0 0.0
-if {[vreadpixel 230 220 rgb name] != "DARKGOLDENROD3" || [vreadpixel 250 220 rgb name] != "BLACK"} { puts "Error: Camera scale result is wrong!" }
+if {[vreadpixel 230 220 rgb name] != "DARKGOLDENROD" || [vreadpixel 250 220 rgb name] != "BLACK"} { puts "Error: Camera scale result is wrong!" }
 vdump $imagedir/${casename}_0.png
 
 vanimation anim -play 1.0 0.0
-if {[vreadpixel 250 220 rgb name] != "DARKGOLDENROD3" || [vreadpixel 270 220 rgb name] != "BLACK"} { puts "Error: Camera scale result is wrong!" }
+if {[vreadpixel 250 220 rgb name] != "DARKGOLDENROD" || [vreadpixel 270 220 rgb name] != "BLACK"} { puts "Error: Camera scale result is wrong!" }
 vdump $imagedir/${casename}_1.png
 
 vanimation anim -play 2.0 0.0
-if {[vreadpixel 334 220 rgb name] != "DARKGOLDENROD3" || [vreadpixel 350 220 rgb name] != "BLACK"} { puts "Error: Camera scale result is wrong!" }
+if {[vreadpixel 334 220 rgb name] != "DARKGOLDENROD" || [vreadpixel 350 220 rgb name] != "BLACK"} { puts "Error: Camera scale result is wrong!" }
 vdump $imagedir/${casename}_2.png
 
 puts "Put the following command to start interactive animation:"

diff --git a/tests/v3d/anim/translate b/tests/v3d/anim/translate
index 34caf670d0a23f5cb9a17462ab22da26e6a0fb68..ce3c01dde9940b12a9e68eab85bd0379a8e4d9e6 100644 (file)
--- a/tests/v3d/anim/translate
+++ b/tests/v3d/anim/translate
@@ -20,15 +20,15 @@ vanimation anim -clear
 vanimation anim/movecam -view -at1 116 355 327 -at2 -174 47 330 -eye1 225 253 413 -eye2 -65 -55 415 -duration 2
 
 vanimation anim -play 0.0 0.0
-if {[vreadpixel 60  360 rgb name] != "GOLDENROD3"} { puts "Error: Camera translation result is wrong!" }
+if {[vreadpixel 60  360 rgb name] != "DARKGOLDENROD"} { puts "Error: Camera translation result is wrong!" }
 vdump $imagedir/${casename}_0.png
 
 vanimation anim -play 1.0 0.0
-if {[vreadpixel 160 360 rgb name] != "GOLDENROD3"} { puts "Error: Camera translation result is wrong!" }
+if {[vreadpixel 160 360 rgb name] != "DARKGOLDENROD"} { puts "Error: Camera translation result is wrong!" }
 vdump $imagedir/${casename}_1.png
 
 vanimation anim -play 2.0 0.0
-if {[vreadpixel 260 360 rgb name] != "GOLDENROD3"} { puts "Error: Camera translation result is wrong!" }
+if {[vreadpixel 260 360 rgb name] != "DARKGOLDENROD"} { puts "Error: Camera translation result is wrong!" }
 vdump $imagedir/${casename}_2.png
 
 puts "Put the following command to start interactive animation:"

diff --git a/tests/v3d/face/F3 b/tests/v3d/face/F3
index 16a5020d99cfb1ca9a7e85d77628b2c87267f722..95d259738bf05277d4b0e7dc4025523cf6de62ed 100644 (file)
--- a/tests/v3d/face/F3
+++ b/tests/v3d/face/F3
@@ -10,7 +10,7 @@ vfit
 
 vselmode b1 4 1
 vmoveto 220 220
-if { [vreadpixel 220 220 rgb name] != "TURQUOISE3" } { puts "Error: box b2 should be highlighted" }
+if { [vreadpixel 220 220 rgb name] != "TURQUOISE2" } { puts "Error: box b2 should be highlighted" }
 
 vselfilter -type FACE
 vmoveto 0 0

diff --git a/tests/v3d/glsl/clipping1 b/tests/v3d/glsl/clipping1
index 580d916fd561215c9cc7aaa4038ef63e8441ea50..40d6f4b7c0b478c7f82c7a99b6f4d66bee75aa6d 100644 (file)
--- a/tests/v3d/glsl/clipping1
+++ b/tests/v3d/glsl/clipping1
@@ -76,7 +76,7 @@ vfit
 vdisplay pp1 pp2
 
 vclipplane pln -set {*}$aCapParams -equation1 0 0 -1 40 -equation2  0 1 0 -15
-if { [vreadpixel 200 360 rgb name] != "DARKTURQUOISE" } { puts "Error: bb should NOT be clipped" }
+if { [vreadpixel 200 360 rgb name] != "CYAN2" } { puts "Error: bb should NOT be clipped" }
 vdump $::imagedir/${::casename}_2.png
 
 vclipplane pln -set {*}$aCapParams -equation1 0 0 -1 40 -equation2  0 1 0 -15 -equation3 -1 0 0 5

diff --git a/tests/v3d/glsl/distinguish_off b/tests/v3d/glsl/distinguish_off
index 29d1a7ffa20dc14ef590b7633a304b19671e3460..098c70fdf66df3ebaacb44a0d52c7f1f46e34a4c 100644 (file)
--- a/tests/v3d/glsl/distinguish_off
+++ b/tests/v3d/glsl/distinguish_off
@@ -9,9 +9,9 @@ vinit View1
 catch { Close D }
 NewDocument D BinXCAF
 XAddShape D b
-XSetColor D b 0 0 1
+XSetColor D b BLUE
 explode b f
-XSetColor D b_1 1 0 0
+XSetColor D b_1 RED
 
 XDisplay D
 vviewparams -proj 1 0.1 0.1
@@ -23,16 +23,12 @@ vclipplane create pln
 vclipplane set pln view Driver1/Viewer1/View1
 vclipplane change pln equation -1 0 0 5
 
-# FFP on, pixel is RED3, which is expected
+# FFP on
 vcaps -ffp 1
 set aColorFfp [vreadpixel 200 200 rgb name]
-if { "$aColorFfp" != "RED3" } {
-  puts "Error: RED3 color is expected at the back side (FFP)"
-}
+if { "$aColorFfp" != "RED" } { puts "Error: RED color is expected at the back side (FFP)" }
 
-# GLSL on, pixel should has the same color RED3, but actual color is KHAKI1
+# GLSL on
 vcaps -ffp 0
 set aColorGlsl [vreadpixel 200 200 rgb name]
-if { "$aColorGlsl" != "RED3" } {
-  puts "Error: RED3 color is expected at the back side (GLSL)"
-}
+if { "$aColorGlsl" != "FIREBRICK" } { puts "Error: FIREBRICK color is expected at the back side (GLSL)" }

diff --git a/tests/v3d/glsl/gouraud_pos1 b/tests/v3d/glsl/gouraud_pos1
index 61ae4f71bd80fb3f804e53729f4e4c452ac141d7..29efe698ca28d2b7592736b574db6ef418e45d07 100644 (file)
--- a/tests/v3d/glsl/gouraud_pos1
+++ b/tests/v3d/glsl/gouraud_pos1
@@ -38,12 +38,12 @@ if { "$aColor1" != "RED" || "$aColor2" != "RED" } {
 
 set aColor3 [vreadpixel 205 132 rgb name]
 set aColor4 [vreadpixel 205 280 rgb name]
-if { "$aColor3" != "RED3" || "$aColor4" != "RED4" } {
-  puts "Error: expected color mid from the light spot is RED4"
+if { "$aColor3" != "RED3" || "$aColor4" != "FIREBRICK" } {
+  puts "Error: expected color mid from the light spot is FIREBRICK"
 }
 
 set aColor5 [vreadpixel 205 100 rgb name]
 set aColor6 [vreadpixel 205 306 rgb name]
-if { "$aColor5" != "RED4" || "$aColor6" != "RED4" } {
-  puts "Error: expected color far from the light spot is RED4"
+if { "$aColor5" != "BROWN" || "$aColor6" != "BROWN" } {
+  puts "Error: expected color far from the light spot is BROWN"
 }

diff --git a/tests/v3d/glsl/gouraud_spot1 b/tests/v3d/glsl/gouraud_spot1
index 3ac356cae664f39291f6d12a8cbc0a1e347aa199..05b05337462195b5709d5c6b9e41736986bd2851 100644 (file)
--- a/tests/v3d/glsl/gouraud_spot1
+++ b/tests/v3d/glsl/gouraud_spot1
@@ -41,9 +41,3 @@ set aColor4 [vreadpixel 205 280 rgb name]
 if { "$aColor3" != "RED" || "$aColor4" != "RED4" } {
   puts "Error: expected color mid from the light spot is RED4"
 }
-
-set aColor5 [vreadpixel 205 100 rgb name]
-set aColor6 [vreadpixel 205 306 rgb name]
-if { "$aColor5" != "GRAY9" || "$aColor6" != "GRAY9" } {
-  puts "Error: expected color far from the light spot is GRAY9"
-}

diff --git a/tests/v3d/glsl/phong_plastic b/tests/v3d/glsl/phong_plastic
index 0a2cb6dfa983c0dcf72fa15b174a1e3b8ebe4181..47c7eb20d58606d238df44da0a1a6d8ee4710bf2 100644 (file)
--- a/tests/v3d/glsl/phong_plastic
+++ b/tests/v3d/glsl/phong_plastic
@@ -21,13 +21,9 @@ vrotate 0.2 0.0 0.0
 vdump $::imagedir/${::casename}_OFF.png
 set aColorL [vreadpixel 150 250 rgb name]
 set aColorR [vreadpixel 250 250 rgb name]
-if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } {
-  puts "Error: wrong color (fixed pipeline)!"
-}
+if { "$aColorL" != "GREEN4" || "$aColorR" != "GREEN4" } { puts "Error: wrong color (fixed pipeline)!" }
 
 vshaderprog b phong
 set aColorL [vreadpixel 150 250 rgb name]
 set aColorR [vreadpixel 250 250 rgb name]
-if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } {
-  puts "Error: wrong color (Phong shader)!"
-}
+if { "$aColorL" != "GREEN4" || "$aColorR" != "GREEN4" } { puts "Error: wrong color (Phong shader)!" }

diff --git a/tests/v3d/glsl/phong_pos1 b/tests/v3d/glsl/phong_pos1
index f3da39d3182929eec8452a9128adbf2696bc97d1..14e87b5bd6843bcdff9c2b5c93667460adfeb138 100644 (file)
--- a/tests/v3d/glsl/phong_pos1
+++ b/tests/v3d/glsl/phong_pos1
@@ -39,12 +39,12 @@ if { "$aColor1" != "RED" || "$aColor2" != "RED" } {
 
 set aColor3 [vreadpixel 205 132 rgb name]
 set aColor4 [vreadpixel 205 280 rgb name]
-if { "$aColor3" != "RED4" || "$aColor4" != "RED4" } {
-  puts "Error: expected color mid from the light spot is RED4"
+if { "$aColor3" != "FIREBRICK" || "$aColor4" != "FIREBRICK" } {
+  puts "Error: expected color mid from the light spot is FIREBRICK"
 }
 
 set aColor5 [vreadpixel 205 100 rgb name]
 set aColor6 [vreadpixel 205 306 rgb name]
-if { "$aColor5" != "RED4" || "$aColor6" != "RED4" } {
-  puts "Error: expected color far from the light spot is RED4"
+if { "$aColor5" != "BROWN" || "$aColor6" != "BROWN" } {
+  puts "Error: expected color far from the light spot is BROWN"
 }

diff --git a/tests/v3d/glsl/phong_spot1 b/tests/v3d/glsl/phong_spot1
index 6a618103258e642339c2e88cc951c48a71ffed66..d70b64b0b96e59063daf3aa40f369e4680e1e474 100644 (file)
--- a/tests/v3d/glsl/phong_spot1
+++ b/tests/v3d/glsl/phong_spot1
@@ -38,12 +38,12 @@ if { "$aColor1" != "RED" || "$aColor2" != "RED" } {
 
 set aColor3 [vreadpixel 205 132 rgb name]
 set aColor4 [vreadpixel 205 280 rgb name]
-if { "$aColor3" != "RED4" || "$aColor4" != "RED4" } {
+if { "$aColor3" != "BROWN" || "$aColor4" != "RED4" } {
   puts "Error: expected color mid from the light spot is RED4"
 }
 
 set aColor5 [vreadpixel 205 100 rgb name]
 set aColor6 [vreadpixel 205 306 rgb name]
-if { "$aColor5" != "GRAY2" || "$aColor6" != "GRAY2" } {
-  puts "Error: expected color far from the light spot is GRAY2"
+if { "$aColor5" != "GRAY12" || "$aColor6" != "GRAY13" } {
+  puts "Error: expected color far from the light spot is GRAY12"
 }

diff --git a/tests/v3d/materials/bug27617 b/tests/v3d/materials/bug27617
index 9f3c000fc412212e9ff89c5cf426b8916b4fb48c..dfc30d7eac51675c9890ad1f52866ae95f729b80 100644 (file)
--- a/tests/v3d/materials/bug27617
+++ b/tests/v3d/materials/bug27617
@@ -13,6 +13,4 @@ vrotate 1 0 0
 vfit
 vmoveto 250 150
 set aColor [vreadpixel 200 150 name rgb]
-if { "$aColor" != "TURQUOISE4" } {
-  puts "Error: Wrong dynamic highlight color"
-}
+if { "$aColor" != "TURQUOISE3" } { puts "Error: Wrong dynamic highlight color" }

diff --git a/tests/v3d/materials/bug27818_1 b/tests/v3d/materials/bug27818_1
index 3311235f341d2d543756282ff8ac9c607bbd4683..9bb9380635f3e85eef4f5b00b5da8c3089ad0af9 100644 (file)
--- a/tests/v3d/materials/bug27818_1
+++ b/tests/v3d/materials/bug27818_1
@@ -19,7 +19,7 @@ vviewparams -scale 17.8 -proj 0.892687 -0.331602 0.305206 -up -0.162521 0.394789
 vselprops dynHighlight -transp 0.3 -color PALEGREEN2 -dispMode 1
 
 vmoveto 285 212
-if { [vreadpixel 285 212 name rgb] != "DARKKHAKI" }     { puts "Error: highlighting of a box is not transparent!" }
+if { [vreadpixel 285 212 name rgb] != "KHAKI3" }        { puts "Error: highlighting of a box is not transparent!" }
 
 vmoveto -reset
 if { [vreadpixel 285 212 name rgb] != "RED" }           { puts "Error: highlighting of a box is not reset!" }

diff --git a/tests/v3d/materials/bug27818_2 b/tests/v3d/materials/bug27818_2
index 6eb7f604a03263568a016c4f9e87b7a299352962..b410983a21aa846fa2070b294da914a649f6fa0b 100644 (file)
--- a/tests/v3d/materials/bug27818_2
+++ b/tests/v3d/materials/bug27818_2
@@ -29,7 +29,7 @@ vselect 50 200 1
 vselect 200 200 1
 vselect 350 200 1
 
-if {[vreadpixel 350 200 name rgba] != "RED3 1" || [vreadpixel 350 200 name rgba] == [vreadpixel 200 200 name rgba]} {
+if {[vreadpixel 350 200 name rgba] != "RED2 1" || [vreadpixel 350 200 name rgba] == [vreadpixel 200 200 name rgba]} {
   puts "ERROR: selection highlight of 3rd box is displayed with wrong color!"
 }
 

diff --git a/tests/v3d/raytrace/plastic b/tests/v3d/raytrace/plastic
index e8cb157caefd352f15274b4d601cc6db0500edc5..2b035edb821f1f473fcf8d0c9a8c8a85014c0afd 100644 (file)
--- a/tests/v3d/raytrace/plastic
+++ b/tests/v3d/raytrace/plastic
@@ -21,13 +21,13 @@ vrotate 0.2 0.0 0.0
 vdump $::imagedir/${::casename}_OFF.png
 set aColorL [vreadpixel 150 250 rgb name]
 set aColorR [vreadpixel 250 250 rgb name]
-if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } {
+if { "$aColorL" != "GREEN4" || "$aColorR" != "GREEN4" } {
   puts "Error: wrong color (fixed pipeline)!"
 }
 
 vrenderparams -raytrace
 set aColorL [vreadpixel 150 250 rgb name]
 set aColorR [vreadpixel 250 250 rgb name]
-#if { "$aColorL" != "GREEN3" || "$aColorR" != "GREEN4" } {
+#if { "$aColorL" != "GREEN4" || "$aColorR" != "GREEN4" } {
 #  puts "Error: wrong color (Ray Tracing)!"
 #}

diff --git a/tests/v3d/viewcube/default b/tests/v3d/viewcube/default
index 1f0cd10192cb4c3f63ba460fc3642fd158fcfec7..7ee06a0dc4fedf37cdcb9f523f4d01070dbab01e 100644 (file)
--- a/tests/v3d/viewcube/default
+++ b/tests/v3d/viewcube/default
@@ -24,13 +24,13 @@ vdump $imagedir/${casename}_side.png
 
 # check FRONT/TOP edge
 vselect 100 270
-if {[vreadpixel 100 300 name rgb] != "GRAY51"} { puts "Error: Position of FRONT-TOP camera is wrong." }
-if {[vreadpixel 100 310 name rgb] != "CYAN"}  { puts "Error: Position of FRONT-TOP camera is wrong." }
+if {[vreadpixel 100 300 name rgb] != "GRAY52"} { puts "Error: Position of FRONT-TOP camera is wrong." }
+if {[vreadpixel 100 310 name rgb] != "CYAN"}   { puts "Error: Position of FRONT-TOP camera is wrong." }
 vdump $imagedir/${casename}_edge.png
 
 # Check vertex
 vselect 140 310
-if {[vreadpixel 100 290 name rgb] != "GRAY42"}    { puts "Error: Position of TOP-FRONT-RIGHT camera is wrong." }
-if {[vreadpixel 100 310 name rgb] != "CYAN"}     { puts "Error: Position of TOP-FRONT-RIGHT camera is wrong." }
-if {[vreadpixel 100 320 name rgb] != "MATRAGRAY"} { puts "Error: Position of TOP-FRONT-RIGHT camera is wrong." }
+if {[vreadpixel 100 290 name rgb] != "GRAY47"} { puts "Error: Position of TOP-FRONT-RIGHT camera is wrong." }
+if {[vreadpixel 100 310 name rgb] != "CYAN"}   { puts "Error: Position of TOP-FRONT-RIGHT camera is wrong." }
+if {[vreadpixel 100 320 name rgb] != "GRAY58"} { puts "Error: Position of TOP-FRONT-RIGHT camera is wrong." }
 vdump $imagedir/${casename}_corner.png