diff --git a/samples/tcl/ANC101.tcl b/samples/tcl/ANC101.tcl index 42852ebb92..570b84b9ff 100644 --- a/samples/tcl/ANC101.tcl +++ b/samples/tcl/ANC101.tcl @@ -276,7 +276,7 @@ blend result _model 2 _model_161 # Show result pload VISUALIZATION vinit Driver1/Viewer1/View1 -vbackground -color 0.784314 0.784314 1 +vbackground -color C8C8FF vdisplay -dispMode 1 result vfit vaspects result -setFaceBoundaryDraw 1 -mostContinuity c2 diff --git a/samples/tcl/MBBGehauseRohteil.tcl b/samples/tcl/MBBGehauseRohteil.tcl index 7d61a04588..d150cfa6ba 100644 --- a/samples/tcl/MBBGehauseRohteil.tcl +++ b/samples/tcl/MBBGehauseRohteil.tcl @@ -262,7 +262,7 @@ unifysamedom result p_1 # Show result pload VISUALIZATION vinit Driver1/Viewer1/View1 -vbackground -color 0.784314 0.784314 1 +vbackground -color C8C8FF vdisplay -dispMode 1 result vfit vaspects result -setFaceBoundaryDraw 1 diff --git a/samples/tcl/Penrose.tcl b/samples/tcl/Penrose.tcl index 4b284a59ba..21a94aa8b4 100644 --- a/samples/tcl/Penrose.tcl +++ b/samples/tcl/Penrose.tcl @@ -68,18 +68,18 @@ vlight add directional direction 0 -10 0 head 1 color white vdisplay b1 b2 b3 b4 b5 b6 b7 b8 b9 b10 # set colors like in boxes of on OCC logo -vsetcolor b1 0.8671875 0 0.16015625 -vsetcolor b2 0.96484375 0.8671875 0 -vsetcolor b3 0.609375 0.97734375 0.09375 -vsetcolor b4 0.90234375 0 0.48046875 -vsetcolor b5 0 0.48046875 0.73828125 -vsetcolor b6 0.578125 0 0.48046875 -vsetcolor b7 0.93359375 0.609375 0 -vsetcolor b8 0 0.70703125 0.9296875 -vsetcolor b9 0 0.64453125 0.48046875 -vsetcolor b10 0 0.48046875 0.73828125 +vsetcolor b1 DD0029 +vsetcolor b2 F6DD00 +vsetcolor b3 98F918 +vsetcolor b4 E9007A +vsetcolor b5 007ABC +vsetcolor b6 93007A +vsetcolor b7 EE9800 +vsetcolor b8 00B489 +vsetcolor b9 00A47A +vsetcolor b10 007ABC # set material to plastic for better look for {set i 1} {$i <= 10} {incr i} {vsetmaterial b$i plastic} -vdrawtext label "Which\nbox\nis\ncloser\nto\nyou?" -pos 0 -6 -2 -color 0 0 0 -halign left -valign bottom -angle 0 -zoom 0 -height 40 +vdrawtext label "Which\nbox\nis\ncloser\nto\nyou?" -pos 0 -6 -2 -color BLACK -halign left -valign bottom -angle 0 -zoom 0 -height 40 diff --git a/samples/tcl/cpu.tcl b/samples/tcl/cpu.tcl index c756de8478..4b46725341 100644 --- a/samples/tcl/cpu.tcl +++ b/samples/tcl/cpu.tcl @@ -255,27 +255,27 @@ if [info exists i7_show_3dview] { vlight add directional direction 1 -1 -2 head 1 vdisplay case - vsetcolor case 0.7 0.7 0.7 + vsetcolor case GRAY70 vdisplay title - vsetcolor title 0.1 0.1 0.1 + vsetcolor title GRAY10 # board is mostly yellow (edges, triangle markers) - foreach f [explode board f] { vdisplay $f; vsetcolor $f 0.7 0.5 0.3 } + foreach f [explode board f] { vdisplay $f; vsetcolor $f B3803D } # top and bottom faces are light-green (outside) and dark-green (inside) - vsetcolor board_4 0 0.6 0.55 - vsetcolor board_5 0 0.6 0.55 - vsetcolor board_12 0 0.3 0.33 - vsetcolor board_14 0 0.3 0.33 + vsetcolor board_4 00998C + vsetcolor board_5 00998C + vsetcolor board_12 004D54 + vsetcolor board_14 004D54 vdisplay rpads - vsetcolor rpads 0.7 0.6 0.4 + vsetcolor rpads B39966 vdisplay bpads - vsetcolor bpads 0.7 0.6 0.4 + vsetcolor bpads B39966 vdisplay brpk - vsetcolor brpk 0.5 0.4 0.3 + vsetcolor brpk 80664D donly board case rpads brpk; fit } @@ -287,17 +287,17 @@ pload OCAF XDE NewDocument D MDTV-XCAF SetName D [XAddShape D board 0] "Board" -foreach f [explode board f] { XSetColor D $f 0.7 0.5 0.3 } -XSetColor D board_4 0 0.6 0.55 -XSetColor D board_5 0 0.6 0.55 -XSetColor D board_12 0 0.3 0.33 -XSetColor D board_14 0 0.3 0.33 +foreach f [explode board f] { XSetColor D $f B3803D } +XSetColor D board_4 00998C +XSetColor D board_5 00998C +XSetColor D board_12 004D54 +XSetColor D board_14 004D54 SetName D [XAddShape D case 0] "Case" -XSetColor D case 0.7 0.7 0.7 +XSetColor D case GRAY70 SetName D [XAddShape D title 0] "Case title" -XSetColor D title 0.1 0.1 0.1 +XSetColor D title GRAY10 SetName D [XAddShape D rpads 1] "Top side contact pads" SetName D [XAddShape D bpads 1] "Bottom contact pads" @@ -306,17 +306,17 @@ SetName D [XFindShape D rpad] "Round pad" SetName D [XFindShape D Rpad] "Big round pad" SetName D [XFindShape D spad_1] "Square pad 1" SetName D [XFindShape D spad_2] "Square pad 2" -XSetColor D rpad 0.7 0.6 0.4 -XSetColor D Rpad 0.7 0.6 0.4 -XSetColor D bpad 0.7 0.6 0.4 -XSetColor D spad_1 0.7 0.6 0.4 -XSetColor D spad_2 0.7 0.6 0.4 +XSetColor D rpad B39966 +XSetColor D Rpad B39966 +XSetColor D bpad B39966 +XSetColor D spad_1 B39966 +XSetColor D spad_2 B39966 SetName D [XAddShape D brpk 1] "Bottom packages" SetName D [XFindShape D rpk] "Bottom package" -XSetColor D rpk1 0.7 0.7 0.7 -XSetColor D rpk2 0.5 0.4 0.3 -XSetColor D rpk3 0.7 0.7 0.7 +XSetColor D rpk1 GRAY70 +XSetColor D rpk2 80664D +XSetColor D rpk3 GRAY70 XShow D vlight clear diff --git a/samples/tcl/dimensions.tcl b/samples/tcl/dimensions.tcl index e13b49b740..2c651b1a9f 100644 --- a/samples/tcl/dimensions.tcl +++ b/samples/tcl/dimensions.tcl @@ -36,9 +36,7 @@ set anArrAngle [expr 3.14 * 12.0 / 180.0] # Form dimension names list to set parameters with vdimparam command set aList {rd_1 rd_2 ad_1 ad_2 ad_3} -for {set i 1} {$i <= 10} {incr i} { -lappend aList ld_$i -} +for {set i 1} {$i <= 10} {incr i} { lappend aList ld_$i } puts "Creating dimensions..." vdimension ld_1 -length -shapes bs_27 -plane xoy -color black -flyout -15 @@ -67,29 +65,14 @@ foreach i $aList { vfit puts "Displaying exported shapes..." -vdisplay a b -vsetdispmode a 1 -vsetdispmode b 1 +vdisplay -dispMode 1 a b vaspects a -setmaterial steel vaspects b -setmaterial bronze puts "Clipping shapes for better view..." -vclipplane create pa -vclipplane change pa equation 0 0 1 0 -vclipplane change pa capping on -vclipplane change pa capping color 0.9 0.9 0.9 -vclipplane set pa object a -vclipplane create pb -vclipplane change pb equation 0 0 1 0 -vclipplane change pb capping on -vclipplane change pb capping color 1.0 0.8 0.0 -vclipplane set pb object b - -vclipplane change pa capping texname $aHatch -vclipplane change pa capping texscale 0.05 -0.05 -vclipplane change pb capping texname $aHatch -vclipplane change pb capping texscale 0.05 0.05 +vclipplane pa -set a -equation 0 0 1 0 -capping on -color GRAY90 -texName $aHatch -texScale 0.05 -0.05 +vclipplane pb -set b -equation 0 0 1 0 -capping on -color GOLD -texName $aHatch -texScale 0.05 -0.05 vbottom vrotate -0.3 -0.3 0 diff --git a/samples/tcl/logo2019.tcl b/samples/tcl/logo2019.tcl index 2d279e6b9c..a620a053e2 100644 --- a/samples/tcl/logo2019.tcl +++ b/samples/tcl/logo2019.tcl @@ -77,14 +77,13 @@ SetName D $main "OCC Logo 2019" SetName D [XFindShape D sb] "Core" SetName D [XFindShape D tp] "Loop" SetName D [XFindShape D rs] "Connector" -XSetColor D sb 1 0.21 0.32 -XSetColor D tp 0 0.667 0.855 -XSetColor D rs 0 0.45 0.69 +XSetColor D sb FF3652 +XSetColor D tp 00AADA +XSetColor D rs 0073B0 # display -vinit -vsetcolorbg 1 1 1 -vsetdispmode 1 -XDisplay D +vinit View1 +vbackground -color WHITE +XDisplay -dispMode 1 D vtop vfit diff --git a/samples/tcl/markers.tcl b/samples/tcl/markers.tcl index af18729426..2313a1a6f8 100644 --- a/samples/tcl/markers.tcl +++ b/samples/tcl/markers.tcl @@ -56,7 +56,7 @@ for { set aMarkerType 0 } { $aMarkerType <= 13 } { incr aMarkerType } { set aRow [expr $aMarkerType - 7] set aCol 5 set aName [lindex $aMarkerTypeNames $aMarkerType] - vdrawtext "$aName" "$aName" -pos 0 [expr $aRow + 0.5] 0 -color 0.5 1.0 1.0 -halign center -valign center -angle 000 -zoom 0 -height 12 -aspect bold -font $aLabelFont -noupdate + vdrawtext "$aName" "$aName" -pos 0 [expr $aRow + 0.5] 0 -color 7FFFFF -halign center -valign center -angle 000 -zoom 0 -height 12 -aspect bold -font $aLabelFont -noupdate vdisplay -top -noupdate "$aName" if { $aMarkerType == 13 } { vmarkerstest m${aMarkerType}_${aCol} $aCol $aRow 0 PointsOnSide=1 FileName=$aCustom1 diff --git a/samples/tcl/materials.tcl b/samples/tcl/materials.tcl index e377752465..7919192dac 100644 --- a/samples/tcl/materials.tcl +++ b/samples/tcl/materials.tcl @@ -4,36 +4,22 @@ #Title: Material properties in viewer set THE_MATERIALS {brass bronze copper gold jade neon_phc pewter obsidian plaster plastic satin silver steel stone chrome aluminium water glass diamond charcoal} -set THE_COLORS {default red green blue1} +set THE_COLORS {default red green blue} set THE_ROW_DIST 35 proc drawLabels {} { set x 20 set y 15 - set r 0.098 - set g 0.098 - set b 0.098 foreach aMatIter $::THE_MATERIALS { - vdrawtext "$aMatIter" "$aMatIter" -pos $x $y 0 -color $r $g $b -halign right -valign center -angle 000 -zoom 0 -height 14 -aspect regular -font Arial + vdrawtext "$aMatIter" "$aMatIter" -pos $x $y 0 -color GRAY10 -halign right -valign center -angle 000 -zoom 0 -height 14 -aspect regular -font Arial incr y 10 } set x 40 set y 5 foreach aColIter $::THE_COLORS { - if { $aColIter == "red" } { - set r 1.0 - set g 0.0 - set b 0 - } elseif { $aColIter == "green" } { - set r 0.0 - set g 1.0 - set b 0.0 - } elseif { $aColIter == "blue1" } { - set r 0.0 - set g 0.0 - set b 1.0 - } - vdrawtext "$aColIter" "$aColIter" -pos $x $y 0 -color $r $g $b -halign center -valign center -angle 000 -zoom 0 -height 14 -aspect regular -font Arial + set aLabColor "$aColIter" + if { "$aColIter" == "default" } { set aLabColor BLACK } + vdrawtext "$aColIter" "$aColIter" -pos $x $y 0 -color "$aLabColor" -halign center -valign center -angle 000 -zoom 0 -height 14 -aspect regular -font Arial incr x $::THE_ROW_DIST } } @@ -69,7 +55,7 @@ vclose ALL vinit View1 w=768 h=768 vtop vglinfo -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL vlight -change 0 -dir 0.577 -0.577 -0.577 vrenderparams -msaa 8 diff --git a/samples/tcl/pencil.tcl b/samples/tcl/pencil.tcl index 904cadd33d..92ad26cbea 100644 --- a/samples/tcl/pencil.tcl +++ b/samples/tcl/pencil.tcl @@ -46,18 +46,17 @@ NewDocument D XAddShape D body_1 XAddShape D core_1 -#XSetColor D body_1 0. 0. 1. -for {set i 1} {$i <= 26} {incr i} {XSetColor D body_1_$i 0. 0. 1.} -XSetColor D body_1_1 0.9 0.5 0.4 -XSetColor D body_1_9 0.9 0.5 0.4 -for {set i 10} {$i <= 22} {incr i} {XSetColor D body_1_$i 0.6 0.7 0.0} -XSetColor D core_1 0.1 0.1 1. -foreach ff [explode core_1 f] { XSetColor D $ff 0.1 0.1 1. ; puts "set color $ff" } - -XShow D +for {set i 1} {$i <= 26} {incr i} {XSetColor D body_1_$i BLUE} +XSetColor D body_1_1 E68066 +XSetColor D body_1_9 E68066 +for {set i 10} {$i <= 22} {incr i} {XSetColor D body_1_$i 99B300} +XSetColor D core_1 1A1AFF +foreach ff [explode core_1 f] { XSetColor D $ff 1A1AFF ; puts "set color $ff" } +vclear +vinit View1 +XDisplay -dispMode 1 D -explore vfit -vsetdispmode 1 vrenderparams -msaa 8 vbackground -color WHITE diff --git a/samples/tcl/xde.tcl b/samples/tcl/xde.tcl index 63f120af31..452f643f29 100644 --- a/samples/tcl/xde.tcl +++ b/samples/tcl/xde.tcl @@ -28,19 +28,20 @@ SetName D [XFindShape D link]:2 "Nut instance 1" SetName D [XFindShape D link]:3 "Nut instance 2" puts "- Pin will be white" -XSetColor D [XFindShape D pin] 1 1 1 +XSetColor D [XFindShape D pin] WHITE puts "- Nut itself will be dark gray" -XSetColor D [XFindShape D nut] 0.1 0.1 0.1 +XSetColor D [XFindShape D nut] GRAY10 puts "- Nut instance #1 will be red" -XSetColor D [XFindShape D link]:2 1 0 0 +XSetColor D [XFindShape D link]:2 RED puts "- Nut instance #2 will be green" -XSetColor D [XFindShape D link]:3 0 1 0 +XSetColor D [XFindShape D link]:3 GREEN puts "Starting DF browser..." DFBrowse D puts "Expand the document tree to see its structure and assigned names" puts "Showing assembly in 3d view..." -XShow D +vclear +vinit View1 +XDisplay -dispMode 1 D -explore vfit -vsetdispmode 1 diff --git a/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx b/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx index c1ea69bb80..0ae5914550 100644 --- a/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx +++ b/src/DPrsStd/DPrsStd_AISPresentationCommands.cxx @@ -367,35 +367,57 @@ static Standard_Integer DPrsStd_AISColor (Draw_Interpretor& di, Standard_Integer nb, const char** arg) { - if (nb >= 3) { - Handle(TDocStd_Document) D; - if (!DDocStd::GetDocument(arg[1],D)) return 1; - TDF_Label L; - if (!DDF::FindLabel(D->GetData(),arg[2],L)) return 1; - - Handle(TPrsStd_AISViewer) viewer; - if( !TPrsStd_AISViewer::Find(L, viewer) ) return 1; - - Handle(TPrsStd_AISPresentation) prs; - if(L.FindAttribute( TPrsStd_AISPresentation::GetID(), prs) ) { - if( nb == 4 ) { - prs->SetColor((Quantity_NameOfColor)Draw::Atoi(arg[3])); - TPrsStd_AISViewer::Update(L); - } - else - if (prs->HasOwnColor()){ - di << "Color = " << prs->Color() << "\n"; - di<Color(); - } - else{ - di << "DPrsStd_AISColor: Warning : Color wasn't set\n"; - di<<(-1); - } - return 0; - } + if (nb != 3 && nb != 4) + { + std::cout << "Syntax error: wrong number of arguments\n"; + return 1; } - di << "DPrsStd_AISColor : Error" << "\n"; - return 1; + + Handle(TDocStd_Document) D; + if (!DDocStd::GetDocument (arg[1], D)) + { + std::cout << "Syntax error: '" << arg[1] << "' is not a document\n"; + return 1; + } + + TDF_Label L; + if (!DDF::FindLabel (D->GetData(), arg[2], L)) + { + std::cout << "Syntax error: '" << arg[2] << "' label cannot be found in the document\n"; + return 1; + } + + Handle(TPrsStd_AISViewer) viewer; + Handle(TPrsStd_AISPresentation) prs; + if (!TPrsStd_AISViewer::Find (L, viewer) + ||!L.FindAttribute (TPrsStd_AISPresentation::GetID(), prs)) + { + std::cout << "Syntax error: '" << arg[2] << "' label has no presentation\n"; + return 1; + } + + if (nb == 4) + { + Quantity_NameOfColor aColor = Quantity_NOC_BLACK; + if (!Quantity_Color::ColorFromName (arg[3], aColor)) + { + std::cout << "Syntax error: unknown color '" << arg[3] << "'\n"; + return 1; + } + prs->SetColor (aColor); + TPrsStd_AISViewer::Update (L); + } + else if (prs->HasOwnColor()) + { + di << "Color = " << Quantity_Color::StringName (prs->Color()) << "\n"; + di << Quantity_Color::StringName (prs->Color()); + } + else + { + di << "DPrsStd_AISColor: Warning : Color wasn't set\n"; + di << (-1); + } + return 0; } //======================================================================= diff --git a/src/Image/Image_PixMap.cxx b/src/Image/Image_PixMap.cxx index 638324d424..ffbac02a70 100644 --- a/src/Image/Image_PixMap.cxx +++ b/src/Image/Image_PixMap.cxx @@ -192,7 +192,8 @@ void Image_PixMap::Clear() // purpose : // ======================================================================= Quantity_ColorRGBA Image_PixMap::PixelColor (const Standard_Integer theX, - const Standard_Integer theY) const + const Standard_Integer theY, + const Standard_Boolean theToLinearize) const { if (IsEmpty() || theX < 0 || (Standard_Size )theX >= SizeX() @@ -236,32 +237,58 @@ Quantity_ColorRGBA Image_PixMap::PixelColor (const Standard_Integer theX, case Image_Format_RGBA: { const Image_ColorRGBA& aPixel = Value (theY, theX); - return Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, float(aPixel.a()) / 255.0f); + return theToLinearize + ? Quantity_ColorRGBA (Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.r()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.g()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.b()) / 255.0f), + float(aPixel.a()) / 255.0f) + : Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, float(aPixel.a()) / 255.0f); } case Image_Format_BGRA: { const Image_ColorBGRA& aPixel = Value (theY, theX); - return Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, float(aPixel.a()) / 255.0f); + return theToLinearize + ? Quantity_ColorRGBA (Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.r()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.g()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.b()) / 255.0f), + float(aPixel.a()) / 255.0f) + : Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, float(aPixel.a()) / 255.0f); } case Image_Format_RGB32: { const Image_ColorRGB32& aPixel = Value (theY, theX); - return Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, 1.0f); // opaque + return theToLinearize + ? Quantity_ColorRGBA (Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.r()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.g()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.b()) / 255.0f), 1.0f) + : Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, 1.0f); } case Image_Format_BGR32: { const Image_ColorBGR32& aPixel = Value (theY, theX); - return Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, 1.0f); // opaque + return theToLinearize + ? Quantity_ColorRGBA (Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.r()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.g()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.b()) / 255.0f), 1.0f) + : Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, 1.0f); } case Image_Format_RGB: { const Image_ColorRGB& aPixel = Value (theY, theX); - return Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, 1.0f); // opaque + return theToLinearize + ? Quantity_ColorRGBA (Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.r()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.g()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.b()) / 255.0f), 1.0f) + : Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, 1.0f); } case Image_Format_BGR: { const Image_ColorBGR& aPixel = Value (theY, theX); - return Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, 1.0f); // opaque + return theToLinearize + ? Quantity_ColorRGBA (Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.r()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.g()) / 255.0f), + Quantity_Color::Convert_sRGB_To_LinearRGB (float(aPixel.b()) / 255.0f), 1.0f) + : Quantity_ColorRGBA (float(aPixel.r()) / 255.0f, float(aPixel.g()) / 255.0f, float(aPixel.b()) / 255.0f, 1.0f); } case Image_Format_Gray: { @@ -289,7 +316,8 @@ Quantity_ColorRGBA Image_PixMap::PixelColor (const Standard_Integer theX, // ======================================================================= void Image_PixMap::SetPixelColor (const Standard_Integer theX, const Standard_Integer theY, - const Quantity_ColorRGBA& theColor) + const Quantity_ColorRGBA& theColor, + const Standard_Boolean theToDeLinearize) { if (IsEmpty() || theX < 0 || Standard_Size(theX) >= SizeX() @@ -348,53 +376,107 @@ void Image_PixMap::SetPixelColor (const Standard_Integer theX, case Image_Format_RGBA: { Image_ColorRGBA& aPixel = ChangeValue (theY, theX); - aPixel.r() = Standard_Byte(aColor.r() * 255.0f); - aPixel.g() = Standard_Byte(aColor.g() * 255.0f); - aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + if (theToDeLinearize) + { + aPixel.r() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.r()) * 255.0f); + aPixel.g() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.g()) * 255.0f); + aPixel.b() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.b()) * 255.0f); + } + else + { + aPixel.r() = Standard_Byte(aColor.r() * 255.0f); + aPixel.g() = Standard_Byte(aColor.g() * 255.0f); + aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + } aPixel.a() = Standard_Byte(aColor.a() * 255.0f); return; } case Image_Format_BGRA: { Image_ColorBGRA& aPixel = ChangeValue (theY, theX); - aPixel.r() = Standard_Byte(aColor.r() * 255.0f); - aPixel.g() = Standard_Byte(aColor.g() * 255.0f); - aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + if (theToDeLinearize) + { + aPixel.r() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.r()) * 255.0f); + aPixel.g() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.g()) * 255.0f); + aPixel.b() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.b()) * 255.0f); + } + else + { + aPixel.r() = Standard_Byte(aColor.r() * 255.0f); + aPixel.g() = Standard_Byte(aColor.g() * 255.0f); + aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + } aPixel.a() = Standard_Byte(aColor.a() * 255.0f); return; } case Image_Format_RGB32: { Image_ColorRGB32& aPixel = ChangeValue (theY, theX); - aPixel.r() = Standard_Byte(aColor.r() * 255.0f); - aPixel.g() = Standard_Byte(aColor.g() * 255.0f); - aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + if (theToDeLinearize) + { + aPixel.r() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.r()) * 255.0f); + aPixel.g() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.g()) * 255.0f); + aPixel.b() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.b()) * 255.0f); + } + else + { + aPixel.r() = Standard_Byte(aColor.r() * 255.0f); + aPixel.g() = Standard_Byte(aColor.g() * 255.0f); + aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + } aPixel.a_() = 255; return; } case Image_Format_BGR32: { Image_ColorBGR32& aPixel = ChangeValue (theY, theX); - aPixel.r() = Standard_Byte(aColor.r() * 255.0f); - aPixel.g() = Standard_Byte(aColor.g() * 255.0f); - aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + if (theToDeLinearize) + { + aPixel.r() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.r()) * 255.0f); + aPixel.g() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.g()) * 255.0f); + aPixel.b() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.b()) * 255.0f); + } + else + { + aPixel.r() = Standard_Byte(aColor.r() * 255.0f); + aPixel.g() = Standard_Byte(aColor.g() * 255.0f); + aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + } aPixel.a_() = 255; return; } case Image_Format_RGB: { Image_ColorRGB& aPixel = ChangeValue (theY, theX); - aPixel.r() = Standard_Byte(aColor.r() * 255.0f); - aPixel.g() = Standard_Byte(aColor.g() * 255.0f); - aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + if (theToDeLinearize) + { + aPixel.r() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.r()) * 255.0f); + aPixel.g() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.g()) * 255.0f); + aPixel.b() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.b()) * 255.0f); + } + else + { + aPixel.r() = Standard_Byte(aColor.r() * 255.0f); + aPixel.g() = Standard_Byte(aColor.g() * 255.0f); + aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + } return; } case Image_Format_BGR: { Image_ColorBGR& aPixel = ChangeValue (theY, theX); - aPixel.r() = Standard_Byte(aColor.r() * 255.0f); - aPixel.g() = Standard_Byte(aColor.g() * 255.0f); - aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + if (theToDeLinearize) + { + aPixel.r() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.r()) * 255.0f); + aPixel.g() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.g()) * 255.0f); + aPixel.b() = Standard_Byte(Quantity_Color::Convert_LinearRGB_To_sRGB (aColor.b()) * 255.0f); + } + else + { + aPixel.r() = Standard_Byte(aColor.r() * 255.0f); + aPixel.g() = Standard_Byte(aColor.g() * 255.0f); + aPixel.b() = Standard_Byte(aColor.b() * 255.0f); + } return; } case Image_Format_Gray: diff --git a/src/Image/Image_PixMap.hxx b/src/Image/Image_PixMap.hxx index a87ac62be2..6323445156 100644 --- a/src/Image/Image_PixMap.hxx +++ b/src/Image/Image_PixMap.hxx @@ -102,26 +102,38 @@ public: // high-level API //! Returns the pixel color. This function is relatively slow. //! Beware that this method takes coordinates in opposite order in contrast to ::Value() and ::ChangeValue(). - //! @param theX column index from left - //! @param theY row index from top + //! @param theX [in] column index from left + //! @param theY [in] row index from top + //! @param theToLinearize [in] when TRUE, the color stored in non-linear color space (e.g. Image_Format_RGB) will be linearized //! @return the pixel color Standard_EXPORT Quantity_ColorRGBA PixelColor (const Standard_Integer theX, - const Standard_Integer theY) const; + const Standard_Integer theY, + const Standard_Boolean theToLinearize = Standard_False) const; //! Sets the pixel color. This function is relatively slow. //! Beware that this method takes coordinates in opposite order in contrast to ::Value() and ::ChangeValue(). + //! @param theX [in] column index from left + //! @param theY [in] row index from top + //! @param theColor [in] color to store + //! @param theToDeLinearize [in] when TRUE, the gamma correction will be applied for storing in non-linear color space (e.g. Image_Format_RGB) void SetPixelColor (const Standard_Integer theX, const Standard_Integer theY, - const Quantity_Color& theColor) + const Quantity_Color& theColor, + const Standard_Boolean theToDeLinearize = Standard_False) { - SetPixelColor (theX, theY, Quantity_ColorRGBA (theColor, 1.0f)); + SetPixelColor (theX, theY, Quantity_ColorRGBA (theColor, 1.0f), theToDeLinearize); } //! Sets the pixel color. This function is relatively slow. //! Beware that this method takes coordinates in opposite order in contrast to ::Value() and ::ChangeValue(). + //! @param theX [in] column index from left + //! @param theY [in] row index from top + //! @param theColor [in] color to store + //! @param theToDeLinearize [in] when TRUE, the gamma correction will be applied for storing in non-linear color space (e.g. Image_Format_RGB) Standard_EXPORT void SetPixelColor (const Standard_Integer theX, const Standard_Integer theY, - const Quantity_ColorRGBA& theColor); + const Quantity_ColorRGBA& theColor, + const Standard_Boolean theToDeLinearize = Standard_False); //! Initialize image plane as wrapper over alien data. //! Data will not be copied! Notice that caller should ensure diff --git a/src/QABugs/QABugs_11.cxx b/src/QABugs/QABugs_11.cxx index 983cc5a45f..2d403e220c 100644 --- a/src/QABugs/QABugs_11.cxx +++ b/src/QABugs/QABugs_11.cxx @@ -1741,39 +1741,6 @@ static Standard_Integer OCC1029_AISTransparency (Draw_Interpretor& di, return 1; } -//======================================================================= -//function : OCC1030_AISColor -//purpose : OCC1030_AISColor (DOC,entry,[color]) -//======================================================================= - -static Standard_Integer OCC1030_AISColor (Draw_Interpretor& di, - Standard_Integer nb, - const char ** arg) -{ - if (nb >= 3) { - Handle(TDocStd_Document) D; - if (!DDocStd::GetDocument(arg[1],D)) return 1; - TDF_Label L; - if (!DDF::FindLabel(D->GetData(),arg[2],L)) return 1; - - Handle(TPrsStd_AISViewer) viewer; - if( !TPrsStd_AISViewer::Find(L, viewer) ) return 1; - - Handle(TPrsStd_AISPresentation) prs; - if(L.FindAttribute( TPrsStd_AISPresentation::GetID(), prs) ) { - if( nb == 4 ) { - prs->SetColor((Quantity_NameOfColor)Draw::Atoi(arg[3])); - TPrsStd_AISViewer::Update(L); - } - else - di << "Color = " << prs->Color() << "\n"; - return 0; - } - } - di << arg[0] << " : Error\n"; - return 1; -} - //======================================================================= //function : OCC1031_AISMaterial //purpose : OCC1031_AISMaterial (DOC,entry,[material]) @@ -4866,7 +4833,6 @@ void QABugs::Commands_11(Draw_Interpretor& theCommands) { theCommands.Add("OCC902", "OCC902 expression", __FILE__, OCC902, group); theCommands.Add ("OCC1029_AISTransparency","OCC1029_AISTransparency (DOC, entry, [real])",__FILE__, OCC1029_AISTransparency, group); - theCommands.Add ("OCC1030_AISColor", "OCC1030_AISColor (DOC, entry, [color])", __FILE__, OCC1030_AISColor, group); theCommands.Add ("OCC1031_AISMaterial", "OCC1031_AISMaterial (DOC, entry, [material])", __FILE__, OCC1031_AISMaterial, group); theCommands.Add ("OCC1032_AISWidth", "OCC1032_AISWidth (DOC, entry, [width])", __FILE__, OCC1032_AISWidth, group); theCommands.Add ("OCC1033_AISMode", "OCC1033_AISMode (DOC, entry, [mode])", __FILE__, OCC1033_AISMode, group); diff --git a/src/Quantity/FILES b/src/Quantity/FILES index fa0ce019e5..1be1ffd0ec 100755 --- a/src/Quantity/FILES +++ b/src/Quantity/FILES @@ -13,11 +13,11 @@ Quantity_Coefficient.hxx Quantity_CoefficientOfExpansion.hxx Quantity_Color.cxx Quantity_Color.hxx +Quantity_ColorTable.pxx Quantity_ColorHasher.hxx Quantity_ColorRGBA.cxx Quantity_ColorRGBA.hxx Quantity_ColorRGBAHasher.hxx -Quantity_ColorDefinitionError.hxx Quantity_Concentration.hxx Quantity_Conductivity.hxx Quantity_Constant.hxx diff --git a/src/Quantity/Quantity_Color.cxx b/src/Quantity/Quantity_Color.cxx index 69e94fdf28..d29b651c92 100644 --- a/src/Quantity/Quantity_Color.cxx +++ b/src/Quantity/Quantity_Color.cxx @@ -15,7 +15,6 @@ #include -#include #include #include #include @@ -23,29 +22,103 @@ #include #include -// for Test method (suite et fin) -void call_hlsrgb(float h, float l, float s, float& r, float& g, float& b); -void call_rgbhls(float r, float g, float b, float& h, float& l, float& s); - -//-Aliases - -//-Global data definitions #define RGBHLS_H_UNDEFINED -1.0 static Standard_Real TheEpsilon = 0.0001; -// -- les composantes RGB -// MyRed : Standard_ShortReal; -// MyGreen : Standard_ShortReal; -// MyBlue : Standard_ShortReal; +// Throw exception if RGB values are out of range. +#define Quantity_ColorValidateRgbRange(theR, theG, theB) \ + if (theR < 0.0 || theR > 1.0 \ + || theG < 0.0 || theG > 1.0 \ + || theB < 0.0 || theB > 1.0) { throw Standard_OutOfRange("Color out"); } -//-Constructors +// Throw exception if HLS values are out of range. +#define Quantity_ColorValidateHlsRange(theH, theL, theS) \ + if ((theH < 0.0 && theH != RGBHLS_H_UNDEFINED && theS != 0.0) \ + || (theH > 360.0) \ + || theL < 0.0 || theL > 1.0 \ + || theS < 0.0 || theS > 1.0) { throw Standard_OutOfRange("Color out"); } -//-Destructors +namespace +{ + //! Raw color for defining list of standard color + struct Quantity_StandardColor + { + const char* StringName; + NCollection_Vec3 RgbValues; + Quantity_NameOfColor EnumName; -//-Methods, in order + Quantity_StandardColor (Quantity_NameOfColor theName, const char* theStringName, const NCollection_Vec3& theVec3) + : StringName (theStringName), RgbValues (theVec3), EnumName (theName) {} + }; +} +// Note that HTML/hex sRGB representation is ignored +#define RawColor(theName, theHex, theR, theG, theB) Quantity_StandardColor(Quantity_NOC_##theName, #theName, NCollection_Vec3(theR##f, theG##f, theB##f)) + +//! Name list of standard materials (defined within enumeration). +static const Quantity_StandardColor THE_COLORS[] = +{ +#include "Quantity_ColorTable.pxx" +}; + +// ======================================================================= +// function : Epsilon +// purpose : +// ======================================================================= +Standard_Real Quantity_Color::Epsilon() +{ + return TheEpsilon; +} + +// ======================================================================= +// function : SetEpsilon +// purpose : +// ======================================================================= +void Quantity_Color::SetEpsilon (const Standard_Real theEpsilon) +{ + TheEpsilon = theEpsilon; +} + +// ======================================================================= +// function : valuesOf +// purpose : +// ======================================================================= +NCollection_Vec3 Quantity_Color::valuesOf (const Quantity_NameOfColor theName, + const Quantity_TypeOfColor theType) +{ + if ((Standard_Integer )theName < 0 || (Standard_Integer )theName > Quantity_NOC_WHITE) + { + throw Standard_OutOfRange("Bad name"); + } + + const NCollection_Vec3& anRgb = THE_COLORS[theName].RgbValues; + switch (theType) + { + case Quantity_TOC_RGB: return anRgb; + case Quantity_TOC_HLS: return Convert_sRGB_To_HLS (anRgb); + } + throw Standard_ProgramError("Internal error"); +} + +// ======================================================================= +// function : StringName +// purpose : +// ======================================================================= +Standard_CString Quantity_Color::StringName (const Quantity_NameOfColor theName) +{ + if ((Standard_Integer )theName < 0 || (Standard_Integer )theName > Quantity_NOC_WHITE) + { + throw Standard_OutOfRange("Bad name"); + } + return THE_COLORS[theName].StringName; +} + +// ======================================================================= +// function : ColorFromName +// purpose : +// ======================================================================= Standard_Boolean Quantity_Color::ColorFromName (const Standard_CString theName, Quantity_NameOfColor& theColor) { @@ -58,21 +131,41 @@ Standard_Boolean Quantity_Color::ColorFromName (const Standard_CString theName, for (Standard_Integer anIter = Quantity_NOC_BLACK; anIter <= Quantity_NOC_WHITE; ++anIter) { - Standard_CString aColorName = Quantity_Color::StringName (Quantity_NameOfColor (anIter)); + Standard_CString aColorName = THE_COLORS[anIter].StringName; if (aName == aColorName) { theColor = (Quantity_NameOfColor )anIter; return Standard_True; } } - return Standard_False; + + // aliases + if (aName == "BLUE1") { theColor = Quantity_NOC_BLUE1; } + else if (aName == "CHARTREUSE1") { theColor = Quantity_NOC_CHARTREUSE1; } + else if (aName == "CYAN1") { theColor = Quantity_NOC_CYAN1; } + else if (aName == "GOLD1") { theColor = Quantity_NOC_GOLD1; } + else if (aName == "GREEN1") { theColor = Quantity_NOC_GREEN1; } + else if (aName == "LIGHTCYAN1") { theColor = Quantity_NOC_LIGHTCYAN1; } + else if (aName == "MAGENTA1") { theColor = Quantity_NOC_MAGENTA1; } + else if (aName == "ORANGE1") { theColor = Quantity_NOC_ORANGE1; } + else if (aName == "ORANGERED1") { theColor = Quantity_NOC_ORANGERED1; } + else if (aName == "RED1") { theColor = Quantity_NOC_RED1; } + else if (aName == "TOMATO1") { theColor = Quantity_NOC_TOMATO1; } + else if (aName == "YELLOW1") { theColor = Quantity_NOC_YELLOW1; } + else + { + return Standard_False; + } + + return Standard_True; } //======================================================================= // function : ColorFromHex // purpose : //======================================================================= -bool Quantity_Color::ColorFromHex (const Standard_CString theHexColorString, Quantity_Color& theColor) +bool Quantity_Color::ColorFromHex (const Standard_CString theHexColorString, + Quantity_Color& theColor) { Quantity_ColorRGBA aColorRGBA; if (!Quantity_ColorRGBA::ColorFromHex (theHexColorString, aColorRGBA, true)) @@ -83,3847 +176,394 @@ bool Quantity_Color::ColorFromHex (const Standard_CString theHexColorString, Qua return true; } -Quantity_Color::Quantity_Color () { - - Quantity_Color::ValuesOf - (Quantity_NOC_YELLOW, Quantity_TOC_RGB, MyRed, MyGreen, MyBlue); -} - -Quantity_Color::Quantity_Color (const Quantity_NameOfColor AName) { - - Quantity_Color::ValuesOf - (AName, Quantity_TOC_RGB, MyRed, MyGreen, MyBlue); -} - -Quantity_Color::Quantity_Color (const Standard_Real R1, const Standard_Real R2, const Standard_Real R3, const Quantity_TypeOfColor AType) { - - switch (AType) { - - case Quantity_TOC_RGB : - if ( R1 < 0. || R1 > 1. || - R2 < 0. || R2 > 1. || - R3 < 0. || R3 > 1. ) - throw Standard_OutOfRange("Color out"); - MyRed = Standard_ShortReal (R1); - MyGreen = Standard_ShortReal (R2); - MyBlue = Standard_ShortReal (R3); - break; - - case Quantity_TOC_HLS : - if ( (R1 < 0. && R1 != RGBHLS_H_UNDEFINED && R3 != 0.0) - || (R1 > 360.) || - R2 < 0. || R2 > 1. || - R3 < 0. || R3 > 1. ) - throw Standard_OutOfRange("Color out"); - Quantity_Color::hlsrgb - (Standard_ShortReal (R1), - Standard_ShortReal (R2), - Standard_ShortReal (R3), - MyRed, MyGreen, MyBlue); - break; - } - -} - -Quantity_Color::Quantity_Color (const NCollection_Vec3& theRgb) -: MyRed (theRgb.r()), - MyGreen(theRgb.g()), - MyBlue (theRgb.b()) +// ======================================================================= +// function : Quantity_Color +// purpose : +// ======================================================================= +Quantity_Color::Quantity_Color (const Standard_Real theR1, const Standard_Real theR2, const Standard_Real theR3, + const Quantity_TypeOfColor theType) { - if (theRgb.r() < 0.0f || theRgb.r() > 1.0f - || theRgb.g() < 0.0f || theRgb.g() > 1.0f - || theRgb.b() < 0.0f || theRgb.b() > 1.0f) + switch (theType) { - throw Standard_OutOfRange("Color out"); + case Quantity_TOC_RGB: + { + Quantity_ColorValidateRgbRange(theR1, theR2, theR3); + myRgb.SetValues (float(theR1), float(theR2), float(theR3)); + break; + } + case Quantity_TOC_HLS: + { + Quantity_ColorValidateHlsRange(theR1, theR2, theR3); + myRgb = Convert_HLS_To_sRGB (NCollection_Vec3 (float(theR1), float(theR2), float(theR3))); + break; + } } } -void Quantity_Color::ChangeContrast (const Standard_Real ADelta) { - -Standard_ShortReal MyHue, MyLight, MySaturation; - - Quantity_Color::rgbhls - (MyRed, MyGreen, MyBlue, MyHue, MyLight, MySaturation); - - MySaturation += MySaturation * Standard_ShortReal (ADelta) / (float ) 100.0; - - if ( !((MySaturation > 1.0) || (MySaturation < 0.0) )) { - Quantity_Color::hlsrgb - (MyHue, MyLight, MySaturation, MyRed, MyGreen, MyBlue); - } -} - -void Quantity_Color::ChangeIntensity (const Standard_Real ADelta) { - -Standard_ShortReal MyHue, MyLight, MySaturation; - - Quantity_Color::rgbhls - (MyRed, MyGreen, MyBlue, MyHue, MyLight, MySaturation); - - - MyLight += MyLight * Standard_ShortReal (ADelta) / (float ) 100.0; - if ( !((MyLight > 1.0) || (MyLight < 0.0) )) { - Quantity_Color::hlsrgb - (MyHue, MyLight, MySaturation, MyRed, MyGreen, MyBlue); - } - -} - -void Quantity_Color::SetValues (const Quantity_NameOfColor AName) { - - Quantity_Color::ValuesOf - (AName, Quantity_TOC_RGB, MyRed, MyGreen, MyBlue); - -} - -void Quantity_Color::SetValues (const Standard_Real R1, const Standard_Real R2, const Standard_Real R3, const Quantity_TypeOfColor AType) { - - switch (AType) { - - case Quantity_TOC_RGB : - if ( R1 < 0. || R1 > 1. || - R2 < 0. || R2 > 1. || - R3 < 0. || R3 > 1. ) - throw Standard_OutOfRange("Color out"); - else { - MyRed = Standard_ShortReal (R1); - MyGreen = Standard_ShortReal (R2); - MyBlue = Standard_ShortReal (R3); - } - break; - - case Quantity_TOC_HLS : - if ( R1 < 0. || R1 > 360. || - R2 < 0. || R2 > 1. || - R3 < 0. || R3 > 1. ) - throw Standard_OutOfRange("Color out"); - else { - Quantity_Color::hlsrgb - (Standard_ShortReal (R1), - Standard_ShortReal (R2), - Standard_ShortReal (R3), - MyRed, MyGreen, MyBlue); - } - break; - } - -} - -Standard_Real Quantity_Color::Distance (const Quantity_Color& AColor) const { - -Standard_Real R1, G1, B1; -Standard_Real R2, G2, B2; - - R1 = Standard_Real (MyRed); - G1 = Standard_Real (MyGreen); - B1 = Standard_Real (MyBlue); - - R2 = Standard_Real (AColor.MyRed); - G2 = Standard_Real (AColor.MyGreen); - B2 = Standard_Real (AColor.MyBlue); - - return Sqrt ( - ((R1 - R2) * (R1 - R2)) + - ((G1 - G2) * (G1 - G2)) + - ((B1 - B2) * (B1 - B2)) - ); - -} - -Standard_Real Quantity_Color::SquareDistance (const Quantity_Color& AColor) const { - -Standard_Real R1, G1, B1; -Standard_Real R2, G2, B2; - - R1 = Standard_Real (MyRed); - G1 = Standard_Real (MyGreen); - B1 = Standard_Real (MyBlue); - - R2 = Standard_Real (AColor.MyRed); - G2 = Standard_Real (AColor.MyGreen); - B2 = Standard_Real (AColor.MyBlue); - - return ( - ((R1 - R2) * (R1 - R2)) + - ((G1 - G2) * (G1 - G2)) + - ((B1 - B2) * (B1 - B2)) - ); - -} - -void Quantity_Color::Delta (const Quantity_Color& AColor, Standard_Real& DC, Standard_Real& DI) const { - -Standard_ShortReal MyHue, MyLight, MySaturation; - - Quantity_Color::rgbhls - (MyRed, MyGreen, MyBlue, MyHue, MyLight, MySaturation); - - DC = Standard_Real (MySaturation - AColor.Saturation ()); - DI = Standard_Real (MyLight - AColor.Light ()); - -} - -Standard_Boolean Quantity_Color::IsDifferent (const Quantity_Color& Other) const { - - return (Distance (Other) > Epsilon ()); - -} - -Standard_Boolean Quantity_Color::IsEqual (const Quantity_Color& Other) const { - - return (Distance (Other) <= Epsilon ()); - -} - -Quantity_NameOfColor Quantity_Color::Name () const { - -Quantity_NameOfColor MyNewName = Quantity_NOC_BLACK; // Nom courant. -Quantity_Color Col; // Couleur courante. -Standard_Real NewDist = 4.0; // Distance courante. -Standard_Real Dist = 4.0; // Distance la plus courte. - -Standard_Integer Begin, End, Current; - - // - // Parcours de l'enumeration - // - Begin = Standard_Integer (Quantity_NOC_BLACK); - End = Standard_Integer (Quantity_NOC_WHITE); - - for (Current = Begin; - ((Current <= End) && (NewDist != 0.0)); Current++) { - - Col.SetValues (Quantity_NameOfColor (Current)); - NewDist = - ((MyRed - Col.MyRed) * (MyRed - Col.MyRed)) + - ((MyGreen - Col.MyGreen) * (MyGreen - Col.MyGreen)) + - ((MyBlue - Col.MyBlue) * (MyBlue - Col.MyBlue)); - - if (NewDist < Dist) { - MyNewName = Quantity_NameOfColor (Current); - Dist = NewDist; - } - } // Fin de boucle for - - return (MyNewName); - -} - -Standard_Real Quantity_Color::Epsilon() +// ======================================================================= +// function : Quantity_Color +// purpose : +// ======================================================================= +Quantity_Color::Quantity_Color (const NCollection_Vec3& theRgb) +: myRgb (theRgb) { - return TheEpsilon; + Quantity_ColorValidateRgbRange(theRgb.r(), theRgb.g(), theRgb.b()); } -void Quantity_Color::SetEpsilon (const Standard_Real AnEpsilon) { - - TheEpsilon = AnEpsilon; - -} - -Quantity_NameOfColor Quantity_Color::Name (const Standard_Real R, const Standard_Real G, const Standard_Real B) { - - if ( R < 0. || R > 1. || - G < 0. || G > 1. || - B < 0. || B > 1. ) - throw Standard_OutOfRange("Color out"); - -Quantity_Color AColor (R, G, B, Quantity_TOC_RGB); // Couleur definie en RGB. - - return (AColor.Name ()); - -} - -Standard_Real Quantity_Color::Red () const { - - return (Standard_Real (MyRed)); - -} - -Standard_Real Quantity_Color::Green () const { - - return (Standard_Real (MyGreen)); - -} - -Standard_Real Quantity_Color::Blue () const { - - return (Standard_Real (MyBlue)); - -} - -Standard_Real Quantity_Color::Hue () const { - -Standard_ShortReal MyHue, MyLight, MySaturation; - - Quantity_Color::rgbhls - (MyRed, MyGreen, MyBlue, MyHue, MyLight, MySaturation); - - return (Standard_Real (MyHue)); - -} - -Standard_Real Quantity_Color::Light () const { - -Standard_ShortReal MyHue, MyLight, MySaturation; - - Quantity_Color::rgbhls - (MyRed, MyGreen, MyBlue, MyHue, MyLight, MySaturation); - - return (Standard_Real (MyLight)); - -} - -Standard_Real Quantity_Color::Saturation () const { - -Standard_ShortReal MyHue, MyLight, MySaturation; - - Quantity_Color::rgbhls - (MyRed, MyGreen, MyBlue, MyHue, MyLight, MySaturation); - - return (Standard_Real (MySaturation)); - -} - -void Quantity_Color::Values (Standard_Real& R1, Standard_Real& R2, Standard_Real& R3, const Quantity_TypeOfColor AType) const { - - - switch (AType) { - - case Quantity_TOC_RGB : - R1 = Standard_Real (MyRed); - R2 = Standard_Real (MyGreen); - R3 = Standard_Real (MyBlue); - break; - - case Quantity_TOC_HLS : - { Standard_ShortReal MyHue, MyLight, MySaturation; - - Quantity_Color::rgbhls - (MyRed, MyGreen, MyBlue, MyHue, MyLight, MySaturation); - - R1 = Standard_Real (MyHue); - R2 = Standard_Real (MyLight); - R3 = Standard_Real (MySaturation); - } - break; - } - -} - -void Quantity_Color::RgbHls (const Standard_Real R, const Standard_Real G, const Standard_Real B, Standard_Real& H, Standard_Real& L, Standard_Real& S) { - -Standard_ShortReal HH, LL, SS; - - call_rgbhls (Standard_ShortReal (R), - Standard_ShortReal (G), - Standard_ShortReal (B), - HH, LL, SS); - - H = Standard_Real (HH); - L = Standard_Real (LL); - S = Standard_Real (SS); - -} - -void Quantity_Color::HlsRgb (const Standard_Real H, const Standard_Real L, const Standard_Real S, Standard_Real& R, Standard_Real& G, Standard_Real& B) { - -Standard_ShortReal RR, GG, BB; - - call_hlsrgb (Standard_ShortReal (H), - Standard_ShortReal (L), - Standard_ShortReal (S), - RR, GG, BB); - - R = Standard_Real (RR); - G = Standard_Real (GG); - B = Standard_Real (BB); - -} - -void Quantity_Color::rgbhls (const Standard_ShortReal R, const Standard_ShortReal G, const Standard_ShortReal B, Standard_ShortReal& H, Standard_ShortReal& L, Standard_ShortReal& S) { - - call_rgbhls (R, G, B, H, L, S); - -} - -void Quantity_Color::hlsrgb (const Standard_ShortReal H, const Standard_ShortReal L, const Standard_ShortReal S, Standard_ShortReal& R, Standard_ShortReal& G, Standard_ShortReal& B) { - - call_hlsrgb (H, L, S, R, G, B); - -} - -//======================================================================= -//function : Color2argb -//purpose : -//======================================================================= - -void Quantity_Color::Color2argb (const Quantity_Color& theColor, - Standard_Integer& theARGB) +// ======================================================================= +// function : ChangeContrast +// purpose : +// ======================================================================= +void Quantity_Color::ChangeContrast (const Standard_Real theDelta) { - const Standard_Integer aColor[3] = { - static_cast (255 * theColor.MyRed), - static_cast (255 * theColor.MyGreen), - static_cast (255 * theColor.MyBlue) - }; - theARGB = (((aColor[0] & 0xff) << 16) | - ((aColor[1] & 0xff) << 8) | - (aColor[2] & 0xff)); + NCollection_Vec3 aHls = Convert_sRGB_To_HLS (myRgb); + aHls[2] += aHls[2] * Standard_ShortReal (theDelta) / 100.0f; // saturation + if (!((aHls[2] > 1.0f) || (aHls[2] < 0.0f))) + { + myRgb = Convert_HLS_To_sRGB (aHls); + } } -//======================================================================= -//function : Argb2color -//purpose : -//======================================================================= - -void Quantity_Color::Argb2color (const Standard_Integer theARGB, - Quantity_Color& theColor) +// ======================================================================= +// function : ChangeIntensity +// purpose : +// ======================================================================= +void Quantity_Color::ChangeIntensity (const Standard_Real theDelta) { - const Standard_Real aColor[3] = { - static_cast ((theARGB & 0xff0000) >> 16), - static_cast ((theARGB & 0x00ff00) >> 8), - static_cast ((theARGB & 0x0000ff)) - }; - theColor.SetValues(aColor[0] / 255.0, aColor[1] / 255.0, aColor[2] / 255.0, - Quantity_TOC_RGB); + NCollection_Vec3 aHls = Convert_sRGB_To_HLS (myRgb); + aHls[1] += aHls[1] * Standard_ShortReal (theDelta) / 100.0f; // light + if (!((aHls[1] > 1.0f) || (aHls[1] < 0.0f))) + { + myRgb = Convert_HLS_To_sRGB (aHls); + } } -void Quantity_Color::ValuesOf (const Quantity_NameOfColor AName, const Quantity_TypeOfColor AType, Standard_ShortReal& R1, Standard_ShortReal& R2, Standard_ShortReal& R3) { - -Standard_ShortReal RR = 0 ; -Standard_ShortReal RG = 0 ; -Standard_ShortReal RB = 0 ; - -switch (AName) { - - case Quantity_NOC_BLACK : - RR = R1 = 0.000000; RG = R2 = 0.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_MATRAGRAY : - RR = R1 = (float ) 0.600000; RG = R2 = (float ) 0.600000; RB = R3 = (float ) 0.600000; - break; - case Quantity_NOC_MATRABLUE : - RR = R1 = 0.000000; RG = R2 = 0.000000; RB = R3 = 0.750000; - break; - case Quantity_NOC_ALICEBLUE : - RR = R1 = (float ) 0.941176; RG = R2 = (float ) 0.972549; RB = R3 = 1.000000; - break; - case Quantity_NOC_ANTIQUEWHITE : - RR = R1 = (float ) 0.980392; RG = R2 = (float ) 0.921569; RB = R3 = (float ) 0.843137; - break; - case Quantity_NOC_ANTIQUEWHITE1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.937255; RB = R3 = (float ) 0.858824; - break; - case Quantity_NOC_ANTIQUEWHITE2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.874510; RB = R3 = (float ) 0.800000; - break; - case Quantity_NOC_ANTIQUEWHITE3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.752941; RB = R3 = (float ) 0.690196; - break; - case Quantity_NOC_ANTIQUEWHITE4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.513725; RB = R3 = (float ) 0.470588; - break; - case Quantity_NOC_AQUAMARINE1 : - RR = R1 = (float ) 0.498039; RG = R2 = 1.000000; RB = R3 = (float ) 0.831373; - break; - case Quantity_NOC_AQUAMARINE2 : - RR = R1 = (float ) 0.462745; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.776471; - break; - case Quantity_NOC_AQUAMARINE4 : - RR = R1 = (float ) 0.270588; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.454902; - break; - case Quantity_NOC_AZURE : - RR = R1 = (float ) 0.941176; RG = R2 = 1.000000; RB = R3 = 1.000000; - break; - case Quantity_NOC_AZURE2 : - RR = R1 = (float ) 0.878431; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_AZURE3 : - RR = R1 = (float ) 0.756863; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_AZURE4 : - RR = R1 = (float ) 0.513725; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_BEIGE : - RR = R1 = (float ) 0.960784; RG = R2 = (float ) 0.960784; RB = R3 = (float ) 0.862745; - break; - case Quantity_NOC_BISQUE : - RR = R1 = 1.000000; RG = R2 = (float ) 0.894118; RB = R3 = (float ) 0.768627; - break; - case Quantity_NOC_BISQUE2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.835294; RB = R3 = (float ) 0.717647; - break; - case Quantity_NOC_BISQUE3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.717647; RB = R3 = (float ) 0.619608; - break; - case Quantity_NOC_BISQUE4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.490196; RB = R3 = (float ) 0.419608; - break; - case Quantity_NOC_BLANCHEDALMOND : - RR = R1 = 1.000000; RG = R2 = (float ) 0.921569; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_BLUE1 : - RR = R1 = 0.000000; RG = R2 = 0.000000; RB = R3 = 1.000000; - break; - case Quantity_NOC_BLUE2 : - RR = R1 = 0.000000; RG = R2 = 0.000000; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_BLUE3 : - RR = R1 = 0.000000; RG = R2 = 0.000000; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_BLUE4 : - RR = R1 = 0.000000; RG = R2 = 0.000000; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_BLUEVIOLET : - RR = R1 = (float ) 0.541176; RG = R2 = (float ) 0.168627; RB = R3 = (float ) 0.886275; - break; - case Quantity_NOC_BROWN : - RR = R1 = (float ) 0.647059; RG = R2 = (float ) 0.164706; RB = R3 = (float ) 0.164706; - break; - case Quantity_NOC_BROWN1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.250980; RB = R3 = (float ) 0.250980; - break; - case Quantity_NOC_BROWN2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.231373; RB = R3 = (float ) 0.231373; - break; - case Quantity_NOC_BROWN3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.200000; RB = R3 = (float ) 0.200000; - break; - case Quantity_NOC_BROWN4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.137255; RB = R3 = (float ) 0.137255; - break; - case Quantity_NOC_BURLYWOOD : - RR = R1 = (float ) 0.870588; RG = R2 = (float ) 0.721569; RB = R3 = (float ) 0.529412; - break; - case Quantity_NOC_BURLYWOOD1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.827451; RB = R3 = (float ) 0.607843; - break; - case Quantity_NOC_BURLYWOOD2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.772549; RB = R3 = (float ) 0.568627; - break; - case Quantity_NOC_BURLYWOOD3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.666667; RB = R3 = (float ) 0.490196; - break; - case Quantity_NOC_BURLYWOOD4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.450980; RB = R3 = (float ) 0.333333; - break; - case Quantity_NOC_CADETBLUE : - RR = R1 = (float ) 0.372549; RG = R2 = (float ) 0.619608; RB = R3 = (float ) 0.627451; - break; - case Quantity_NOC_CADETBLUE1 : - RR = R1 = (float ) 0.596078; RG = R2 = (float ) 0.960784; RB = R3 = 1.000000; - break; - case Quantity_NOC_CADETBLUE2 : - RR = R1 = (float ) 0.556863; RG = R2 = (float ) 0.898039; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_CADETBLUE3 : - RR = R1 = (float ) 0.478431; RG = R2 = (float ) 0.772549; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_CADETBLUE4 : - RR = R1 = (float ) 0.325490; RG = R2 = (float ) 0.525490; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_CHARTREUSE : - RR = R1 = (float ) 0.498039; RG = R2 = 1.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_CHARTREUSE1 : - RR = R1 = (float ) 0.498039; RG = R2 = 1.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_CHARTREUSE2 : - RR = R1 = (float ) 0.462745; RG = R2 = (float ) 0.933333; RB = R3 = 0.000000; - break; - case Quantity_NOC_CHARTREUSE3 : - RR = R1 = (float ) 0.400000; RG = R2 = (float ) 0.803922; RB = R3 = 0.000000; - break; - case Quantity_NOC_CHARTREUSE4 : - RR = R1 = (float ) 0.270588; RG = R2 = (float ) 0.545098; RB = R3 = 0.000000; - break; - case Quantity_NOC_CHOCOLATE : - RR = R1 = (float ) 0.823529; RG = R2 = (float ) 0.411765; RB = R3 = (float ) 0.117647; - break; - case Quantity_NOC_CHOCOLATE1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.498039; RB = R3 = (float ) 0.141176; - break; - case Quantity_NOC_CHOCOLATE2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.462745; RB = R3 = (float ) 0.129412; - break; - case Quantity_NOC_CHOCOLATE3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.400000; RB = R3 = (float ) 0.113725; - break; - case Quantity_NOC_CHOCOLATE4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.270588; RB = R3 = (float ) 0.074510; - break; - case Quantity_NOC_CORAL : - RR = R1 = 1.000000; RG = R2 = (float ) 0.498039; RB = R3 = (float ) 0.313725; - break; - case Quantity_NOC_CORAL1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.447059; RB = R3 = (float ) 0.337255; - break; - case Quantity_NOC_CORAL2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.415686; RB = R3 = (float ) 0.313725; - break; - case Quantity_NOC_CORAL3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.356863; RB = R3 = (float ) 0.270588; - break; - case Quantity_NOC_CORAL4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.243137; RB = R3 = (float ) 0.184314; - break; - case Quantity_NOC_CORNFLOWERBLUE : - RR = R1 = (float ) 0.392157; RG = R2 = (float ) 0.584314; RB = R3 = (float ) 0.929412; - break; - case Quantity_NOC_CORNSILK1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.972549; RB = R3 = (float ) 0.862745; - break; - case Quantity_NOC_CORNSILK2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.909804; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_CORNSILK3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.784314; RB = R3 = (float ) 0.694118; - break; - case Quantity_NOC_CORNSILK4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.533333; RB = R3 = (float ) 0.470588; - break; - case Quantity_NOC_CYAN1 : - RR = R1 = 0.000000; RG = R2 = 1.000000; RB = R3 = 1.000000; - break; - case Quantity_NOC_CYAN2 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_CYAN3 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_CYAN4 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_DARKGOLDENROD : - RR = R1 = (float ) 0.721569; RG = R2 = (float ) 0.525490; RB = R3 = (float ) 0.043137; - break; - case Quantity_NOC_DARKGOLDENROD1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.725490; RB = R3 = (float ) 0.058824; - break; - case Quantity_NOC_DARKGOLDENROD2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.678431; RB = R3 = (float ) 0.054902; - break; - case Quantity_NOC_DARKGOLDENROD3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.584314; RB = R3 = (float ) 0.047059; - break; - case Quantity_NOC_DARKGOLDENROD4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.396078; RB = R3 = (float ) 0.031373; - break; - case Quantity_NOC_DARKGREEN : - RR = R1 = 0.000000; RG = R2 = (float ) 0.392157; RB = R3 = 0.000000; - break; - case Quantity_NOC_DARKKHAKI : - RR = R1 = (float ) 0.741176; RG = R2 = (float ) 0.717647; RB = R3 = (float ) 0.419608; - break; - case Quantity_NOC_DARKOLIVEGREEN : - RR = R1 = (float ) 0.333333; RG = R2 = (float ) 0.419608; RB = R3 = (float ) 0.184314; - break; - case Quantity_NOC_DARKOLIVEGREEN1 : - RR = R1 = (float ) 0.792157; RG = R2 = 1.000000; RB = R3 = (float ) 0.439216; - break; - case Quantity_NOC_DARKOLIVEGREEN2 : - RR = R1 = (float ) 0.737255; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.407843; - break; - case Quantity_NOC_DARKOLIVEGREEN3 : - RR = R1 = (float ) 0.635294; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.352941; - break; - case Quantity_NOC_DARKOLIVEGREEN4 : - RR = R1 = (float ) 0.431373; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.239216; - break; - case Quantity_NOC_DARKORANGE : - RR = R1 = 1.000000; RG = R2 = (float ) 0.549020; RB = R3 = 0.000000; - break; - case Quantity_NOC_DARKORANGE1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.498039; RB = R3 = 0.000000; - break; - case Quantity_NOC_DARKORANGE2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.462745; RB = R3 = 0.000000; - break; - case Quantity_NOC_DARKORANGE3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.400000; RB = R3 = 0.000000; - break; - case Quantity_NOC_DARKORANGE4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.270588; RB = R3 = 0.000000; - break; - case Quantity_NOC_DARKORCHID : - RR = R1 = (float ) 0.600000; RG = R2 = (float ) 0.196078; RB = R3 = (float ) 0.800000; - break; - case Quantity_NOC_DARKORCHID1 : - RR = R1 = (float ) 0.749020; RG = R2 = (float ) 0.243137; RB = R3 = 1.000000; - break; - case Quantity_NOC_DARKORCHID2 : - RR = R1 = (float ) 0.698039; RG = R2 = (float ) 0.227451; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_DARKORCHID3 : - RR = R1 = (float ) 0.603922; RG = R2 = (float ) 0.196078; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_DARKORCHID4 : - RR = R1 = (float ) 0.407843; RG = R2 = (float ) 0.133333; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_DARKSALMON : - RR = R1 = (float ) 0.913725; RG = R2 = (float ) 0.588235; RB = R3 = (float ) 0.478431; - break; - case Quantity_NOC_DARKSEAGREEN : - RR = R1 = (float ) 0.560784; RG = R2 = (float ) 0.737255; RB = R3 = (float ) 0.560784; - break; - case Quantity_NOC_DARKSEAGREEN1 : - RR = R1 = (float ) 0.756863; RG = R2 = 1.000000; RB = R3 = (float ) 0.756863; - break; - case Quantity_NOC_DARKSEAGREEN2 : - RR = R1 = (float ) 0.705882; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.705882; - break; - case Quantity_NOC_DARKSEAGREEN3 : - RR = R1 = (float ) 0.607843; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.607843; - break; - case Quantity_NOC_DARKSEAGREEN4 : - RR = R1 = (float ) 0.411765; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.411765; - break; - case Quantity_NOC_DARKSLATEBLUE : - RR = R1 = (float ) 0.282353; RG = R2 = (float ) 0.239216; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_DARKSLATEGRAY1 : - RR = R1 = (float ) 0.592157; RG = R2 = 1.000000; RB = R3 = 1.000000; - break; - case Quantity_NOC_DARKSLATEGRAY2 : - RR = R1 = (float ) 0.552941; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_DARKSLATEGRAY3 : - RR = R1 = (float ) 0.474510; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_DARKSLATEGRAY4 : - RR = R1 = (float ) 0.321569; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_DARKSLATEGRAY : - RR = R1 = (float ) 0.184314; RG = R2 = (float ) 0.309804; RB = R3 = (float ) 0.309804; - break; - case Quantity_NOC_DARKTURQUOISE : - RR = R1 = 0.000000; RG = R2 = (float ) 0.807843; RB = R3 = (float ) 0.819608; - break; - case Quantity_NOC_DARKVIOLET : - RR = R1 = (float ) 0.580392; RG = R2 = 0.000000; RB = R3 = (float ) 0.827451; - break; - case Quantity_NOC_DEEPPINK : - RR = R1 = 1.000000; RG = R2 = (float ) 0.078431; RB = R3 = (float ) 0.576471; - break; - case Quantity_NOC_DEEPPINK2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.070588; RB = R3 = (float ) 0.537255; - break; - case Quantity_NOC_DEEPPINK3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.062745; RB = R3 = (float ) 0.462745; - break; - case Quantity_NOC_DEEPPINK4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.039216; RB = R3 = (float ) 0.313725; - break; - case Quantity_NOC_DEEPSKYBLUE1 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.749020; RB = R3 = 1.000000; - break; - case Quantity_NOC_DEEPSKYBLUE2 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.698039; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_DEEPSKYBLUE3 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.603922; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_DEEPSKYBLUE4 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.407843; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_DODGERBLUE1 : - RR = R1 = (float ) 0.117647; RG = R2 = (float ) 0.564706; RB = R3 = 1.000000; - break; - case Quantity_NOC_DODGERBLUE2 : - RR = R1 = (float ) 0.109804; RG = R2 = (float ) 0.525490; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_DODGERBLUE3 : - RR = R1 = (float ) 0.094118; RG = R2 = (float ) 0.454902; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_DODGERBLUE4 : - RR = R1 = (float ) 0.062745; RG = R2 = (float ) 0.305882; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_FIREBRICK : - RR = R1 = (float ) 0.698039; RG = R2 = (float ) 0.133333; RB = R3 = (float ) 0.133333; - break; - case Quantity_NOC_FIREBRICK1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.188235; RB = R3 = (float ) 0.188235; - break; - case Quantity_NOC_FIREBRICK2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.172549; RB = R3 = (float ) 0.172549; - break; - case Quantity_NOC_FIREBRICK3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.149020; RB = R3 = (float ) 0.149020; - break; - case Quantity_NOC_FIREBRICK4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.101961; RB = R3 = (float ) 0.101961; - break; - case Quantity_NOC_FLORALWHITE : - RR = R1 = 1.000000; RG = R2 = (float ) 0.980392; RB = R3 = (float ) 0.941176; - break; - case Quantity_NOC_FORESTGREEN : - RR = R1 = (float ) 0.133333; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.133333; - break; - case Quantity_NOC_GAINSBORO : - RR = R1 = (float ) 0.862745; RG = R2 = (float ) 0.862745; RB = R3 = (float ) 0.862745; - break; - case Quantity_NOC_GHOSTWHITE : - RR = R1 = (float ) 0.972549; RG = R2 = (float ) 0.972549; RB = R3 = 1.000000; - break; - case Quantity_NOC_GOLD : - RR = R1 = 1.000000; RG = R2 = (float ) 0.843137; RB = R3 = 0.000000; - break; - case Quantity_NOC_GOLD1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.843137; RB = R3 = 0.000000; - break; - case Quantity_NOC_GOLD2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.788235; RB = R3 = 0.000000; - break; - case Quantity_NOC_GOLD3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.678431; RB = R3 = 0.000000; - break; - case Quantity_NOC_GOLD4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.458824; RB = R3 = 0.000000; - break; - case Quantity_NOC_GOLDENROD : - RR = R1 = (float ) 0.854902; RG = R2 = (float ) 0.647059; RB = R3 = (float ) 0.125490; - break; - case Quantity_NOC_GOLDENROD1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.756863; RB = R3 = (float ) 0.145098; - break; - case Quantity_NOC_GOLDENROD2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.705882; RB = R3 = (float ) 0.133333; - break; - case Quantity_NOC_GOLDENROD3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.607843; RB = R3 = (float ) 0.113725; - break; - case Quantity_NOC_GOLDENROD4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.411765; RB = R3 = (float ) 0.078431; - break; - case Quantity_NOC_GRAY : - RR = R1 = (float ) 0.752941; RG = R2 = (float ) 0.752941; RB = R3 = (float ) 0.752941; - break; - case Quantity_NOC_GRAY0 : - RR = R1 = 0.000000; RG = R2 = 0.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_GRAY1 : - RR = R1 = (float ) 0.011765; RG = R2 = (float ) 0.011765; RB = R3 = (float ) 0.011765; - break; - case Quantity_NOC_GRAY10 : - RR = R1 = (float ) 0.101961; RG = R2 = (float ) 0.101961; RB = R3 = (float ) 0.101961; - break; - case Quantity_NOC_GRAY11 : - RR = R1 = (float ) 0.109804; RG = R2 = (float ) 0.109804; RB = R3 = (float ) 0.109804; - break; - case Quantity_NOC_GRAY12 : - RR = R1 = (float ) 0.121569; RG = R2 = (float ) 0.121569; RB = R3 = (float ) 0.121569; - break; - case Quantity_NOC_GRAY13 : - RR = R1 = (float ) 0.129412; RG = R2 = (float ) 0.129412; RB = R3 = (float ) 0.129412; - break; - case Quantity_NOC_GRAY14 : - RR = R1 = (float ) 0.141176; RG = R2 = (float ) 0.141176; RB = R3 = (float ) 0.141176; - break; - case Quantity_NOC_GRAY15 : - RR = R1 = (float ) 0.149020; RG = R2 = (float ) 0.149020; RB = R3 = (float ) 0.149020; - break; - case Quantity_NOC_GRAY16 : - RR = R1 = (float ) 0.160784; RG = R2 = (float ) 0.160784; RB = R3 = (float ) 0.160784; - break; - case Quantity_NOC_GRAY17 : - RR = R1 = (float ) 0.168627; RG = R2 = (float ) 0.168627; RB = R3 = (float ) 0.168627; - break; - case Quantity_NOC_GRAY18 : - RR = R1 = (float ) 0.180392; RG = R2 = (float ) 0.180392; RB = R3 = (float ) 0.180392; - break; - case Quantity_NOC_GRAY19 : - RR = R1 = (float ) 0.188235; RG = R2 = (float ) 0.188235; RB = R3 = (float ) 0.188235; - break; - case Quantity_NOC_GRAY2 : - RR = R1 = (float ) 0.019608; RG = R2 = (float ) 0.019608; RB = R3 = (float ) 0.019608; - break; - case Quantity_NOC_GRAY20 : - RR = R1 = (float ) 0.200000; RG = R2 = (float ) 0.200000; RB = R3 = (float ) 0.200000; - break; - case Quantity_NOC_GRAY21 : - RR = R1 = (float ) 0.211765; RG = R2 = (float ) 0.211765; RB = R3 = (float ) 0.211765; - break; - case Quantity_NOC_GRAY22 : - RR = R1 = (float ) 0.219608; RG = R2 = (float ) 0.219608; RB = R3 = (float ) 0.219608; - break; - case Quantity_NOC_GRAY23 : - RR = R1 = (float ) 0.231373; RG = R2 = (float ) 0.231373; RB = R3 = (float ) 0.231373; - break; - case Quantity_NOC_GRAY24 : - RR = R1 = (float ) 0.239216; RG = R2 = (float ) 0.239216; RB = R3 = (float ) 0.239216; - break; - case Quantity_NOC_GRAY25 : - RR = R1 = (float ) 0.250980; RG = R2 = (float ) 0.250980; RB = R3 = (float ) 0.250980; - break; - case Quantity_NOC_GRAY26 : - RR = R1 = (float ) 0.258824; RG = R2 = (float ) 0.258824; RB = R3 = (float ) 0.258824; - break; - case Quantity_NOC_GRAY27 : - RR = R1 = (float ) 0.270588; RG = R2 = (float ) 0.270588; RB = R3 = (float ) 0.270588; - break; - case Quantity_NOC_GRAY28 : - RR = R1 = (float ) 0.278431; RG = R2 = (float ) 0.278431; RB = R3 = (float ) 0.278431; - break; - case Quantity_NOC_GRAY29 : - RR = R1 = (float ) 0.290196; RG = R2 = (float ) 0.290196; RB = R3 = (float ) 0.290196; - break; - case Quantity_NOC_GRAY3 : - RR = R1 = (float ) 0.031373; RG = R2 = (float ) 0.031373; RB = R3 = (float ) 0.031373; - break; - case Quantity_NOC_GRAY30 : - RR = R1 = (float ) 0.301961; RG = R2 = (float ) 0.301961; RB = R3 = (float ) 0.301961; - break; - case Quantity_NOC_GRAY31 : - RR = R1 = (float ) 0.309804; RG = R2 = (float ) 0.309804; RB = R3 = (float ) 0.309804; - break; - case Quantity_NOC_GRAY32 : - RR = R1 = (float ) 0.321569; RG = R2 = (float ) 0.321569; RB = R3 = (float ) 0.321569; - break; - case Quantity_NOC_GRAY33 : - RR = R1 = (float ) 0.329412; RG = R2 = (float ) 0.329412; RB = R3 = (float ) 0.329412; - break; - case Quantity_NOC_GRAY34 : - RR = R1 = (float ) 0.341176; RG = R2 = (float ) 0.341176; RB = R3 = (float ) 0.341176; - break; - case Quantity_NOC_GRAY35 : - RR = R1 = (float ) 0.349020; RG = R2 = (float ) 0.349020; RB = R3 = (float ) 0.349020; - break; - case Quantity_NOC_GRAY36 : - RR = R1 = (float ) 0.360784; RG = R2 = (float ) 0.360784; RB = R3 = (float ) 0.360784; - break; - case Quantity_NOC_GRAY37 : - RR = R1 = (float ) 0.368627; RG = R2 = (float ) 0.368627; RB = R3 = (float ) 0.368627; - break; - case Quantity_NOC_GRAY38 : - RR = R1 = (float ) 0.380392; RG = R2 = (float ) 0.380392; RB = R3 = (float ) 0.380392; - break; - case Quantity_NOC_GRAY39 : - RR = R1 = (float ) 0.388235; RG = R2 = (float ) 0.388235; RB = R3 = (float ) 0.388235; - break; - case Quantity_NOC_GRAY4 : - RR = R1 = (float ) 0.039216; RG = R2 = (float ) 0.039216; RB = R3 = (float ) 0.039216; - break; - case Quantity_NOC_GRAY40 : - RR = R1 = (float ) 0.400000; RG = R2 = (float ) 0.400000; RB = R3 = (float ) 0.400000; - break; - case Quantity_NOC_GRAY41 : - RR = R1 = (float ) 0.411765; RG = R2 = (float ) 0.411765; RB = R3 = (float ) 0.411765; - break; - case Quantity_NOC_GRAY42 : - RR = R1 = (float ) 0.419608; RG = R2 = (float ) 0.419608; RB = R3 = (float ) 0.419608; - break; - case Quantity_NOC_GRAY43 : - RR = R1 = (float ) 0.431373; RG = R2 = (float ) 0.431373; RB = R3 = (float ) 0.431373; - break; - case Quantity_NOC_GRAY44 : - RR = R1 = (float ) 0.439216; RG = R2 = (float ) 0.439216; RB = R3 = (float ) 0.439216; - break; - case Quantity_NOC_GRAY45 : - RR = R1 = (float ) 0.450980; RG = R2 = (float ) 0.450980; RB = R3 = (float ) 0.450980; - break; - case Quantity_NOC_GRAY46 : - RR = R1 = (float ) 0.458824; RG = R2 = (float ) 0.458824; RB = R3 = (float ) 0.458824; - break; - case Quantity_NOC_GRAY47 : - RR = R1 = (float ) 0.470588; RG = R2 = (float ) 0.470588; RB = R3 = (float ) 0.470588; - break; - case Quantity_NOC_GRAY48 : - RR = R1 = (float ) 0.478431; RG = R2 = (float ) 0.478431; RB = R3 = (float ) 0.478431; - break; - case Quantity_NOC_GRAY49 : - RR = R1 = (float ) 0.490196; RG = R2 = (float ) 0.490196; RB = R3 = (float ) 0.490196; - break; - case Quantity_NOC_GRAY5 : - RR = R1 = (float ) 0.050980; RG = R2 = (float ) 0.050980; RB = R3 = (float ) 0.050980; - break; - case Quantity_NOC_GRAY50 : - RR = R1 = (float ) 0.498039; RG = R2 = (float ) 0.498039; RB = R3 = (float ) 0.498039; - break; - case Quantity_NOC_GRAY51 : - RR = R1 = (float ) 0.509804; RG = R2 = (float ) 0.509804; RB = R3 = (float ) 0.509804; - break; - case Quantity_NOC_GRAY52 : - RR = R1 = (float ) 0.521569; RG = R2 = (float ) 0.521569; RB = R3 = (float ) 0.521569; - break; - case Quantity_NOC_GRAY53 : - RR = R1 = (float ) 0.529412; RG = R2 = (float ) 0.529412; RB = R3 = (float ) 0.529412; - break; - case Quantity_NOC_GRAY54 : - RR = R1 = (float ) 0.541176; RG = R2 = (float ) 0.541176; RB = R3 = (float ) 0.541176; - break; - case Quantity_NOC_GRAY55 : - RR = R1 = (float ) 0.549020; RG = R2 = (float ) 0.549020; RB = R3 = (float ) 0.549020; - break; - case Quantity_NOC_GRAY56 : - RR = R1 = (float ) 0.560784; RG = R2 = (float ) 0.560784; RB = R3 = (float ) 0.560784; - break; - case Quantity_NOC_GRAY57 : - RR = R1 = (float ) 0.568627; RG = R2 = (float ) 0.568627; RB = R3 = (float ) 0.568627; - break; - case Quantity_NOC_GRAY58 : - RR = R1 = (float ) 0.580392; RG = R2 = (float ) 0.580392; RB = R3 = (float ) 0.580392; - break; - case Quantity_NOC_GRAY59 : - RR = R1 = (float ) 0.588235; RG = R2 = (float ) 0.588235; RB = R3 = (float ) 0.588235; - break; - case Quantity_NOC_GRAY6 : - RR = R1 = (float ) 0.058824; RG = R2 = (float ) 0.058824; RB = R3 = (float ) 0.058824; - break; - case Quantity_NOC_GRAY60 : - RR = R1 = (float ) 0.600000; RG = R2 = (float ) 0.600000; RB = R3 = (float ) 0.600000; - break; - case Quantity_NOC_GRAY61 : - RR = R1 = (float ) 0.611765; RG = R2 = (float ) 0.611765; RB = R3 = (float ) 0.611765; - break; - case Quantity_NOC_GRAY62 : - RR = R1 = (float ) 0.619608; RG = R2 = (float ) 0.619608; RB = R3 = (float ) 0.619608; - break; - case Quantity_NOC_GRAY63 : - RR = R1 = (float ) 0.631373; RG = R2 = (float ) 0.631373; RB = R3 = (float ) 0.631373; - break; - case Quantity_NOC_GRAY64 : - RR = R1 = (float ) 0.639216; RG = R2 = (float ) 0.639216; RB = R3 = (float ) 0.639216; - break; - case Quantity_NOC_GRAY65 : - RR = R1 = (float ) 0.650980; RG = R2 = (float ) 0.650980; RB = R3 = (float ) 0.650980; - break; - case Quantity_NOC_GRAY66 : - RR = R1 = (float ) 0.658824; RG = R2 = (float ) 0.658824; RB = R3 = (float ) 0.658824; - break; - case Quantity_NOC_GRAY67 : - RR = R1 = (float ) 0.670588; RG = R2 = (float ) 0.670588; RB = R3 = (float ) 0.670588; - break; - case Quantity_NOC_GRAY68 : - RR = R1 = (float ) 0.678431; RG = R2 = (float ) 0.678431; RB = R3 = (float ) 0.678431; - break; - case Quantity_NOC_GRAY69 : - RR = R1 = (float ) 0.690196; RG = R2 = (float ) 0.690196; RB = R3 = (float ) 0.690196; - break; - case Quantity_NOC_GRAY7 : - RR = R1 = (float ) 0.070588; RG = R2 = (float ) 0.070588; RB = R3 = (float ) 0.070588; - break; - case Quantity_NOC_GRAY70 : - RR = R1 = (float ) 0.701961; RG = R2 = (float ) 0.701961; RB = R3 = (float ) 0.701961; - break; - case Quantity_NOC_GRAY71 : - RR = R1 = (float ) 0.709804; RG = R2 = (float ) 0.709804; RB = R3 = (float ) 0.709804; - break; - case Quantity_NOC_GRAY72 : - RR = R1 = (float ) 0.721569; RG = R2 = (float ) 0.721569; RB = R3 = (float ) 0.721569; - break; - case Quantity_NOC_GRAY73 : - RR = R1 = (float ) 0.729412; RG = R2 = (float ) 0.729412; RB = R3 = (float ) 0.729412; - break; - case Quantity_NOC_GRAY74 : - RR = R1 = (float ) 0.741176; RG = R2 = (float ) 0.741176; RB = R3 = (float ) 0.741176; - break; - case Quantity_NOC_GRAY75 : - RR = R1 = (float ) 0.749020; RG = R2 = (float ) 0.749020; RB = R3 = (float ) 0.749020; - break; - case Quantity_NOC_GRAY76 : - RR = R1 = (float ) 0.760784; RG = R2 = (float ) 0.760784; RB = R3 = (float ) 0.760784; - break; - case Quantity_NOC_GRAY77 : - RR = R1 = (float ) 0.768627; RG = R2 = (float ) 0.768627; RB = R3 = (float ) 0.768627; - break; - case Quantity_NOC_GRAY78 : - RR = R1 = (float ) 0.780392; RG = R2 = (float ) 0.780392; RB = R3 = (float ) 0.780392; - break; - case Quantity_NOC_GRAY79 : - RR = R1 = (float ) 0.788235; RG = R2 = (float ) 0.788235; RB = R3 = (float ) 0.788235; - break; - case Quantity_NOC_GRAY8 : - RR = R1 = (float ) 0.078431; RG = R2 = (float ) 0.078431; RB = R3 = (float ) 0.078431; - break; - case Quantity_NOC_GRAY80 : - RR = R1 = (float ) 0.800000; RG = R2 = (float ) 0.800000; RB = R3 = (float ) 0.800000; - break; - case Quantity_NOC_GRAY81 : - RR = R1 = (float ) 0.811765; RG = R2 = (float ) 0.811765; RB = R3 = (float ) 0.811765; - break; - case Quantity_NOC_GRAY82 : - RR = R1 = (float ) 0.819608; RG = R2 = (float ) 0.819608; RB = R3 = (float ) 0.819608; - break; - case Quantity_NOC_GRAY83 : - RR = R1 = (float ) 0.831373; RG = R2 = (float ) 0.831373; RB = R3 = (float ) 0.831373; - break; - case Quantity_NOC_GRAY85 : - RR = R1 = (float ) 0.850980; RG = R2 = (float ) 0.850980; RB = R3 = (float ) 0.850980; - break; - case Quantity_NOC_GRAY86 : - RR = R1 = (float ) 0.858824; RG = R2 = (float ) 0.858824; RB = R3 = (float ) 0.858824; - break; - case Quantity_NOC_GRAY87 : - RR = R1 = (float ) 0.870588; RG = R2 = (float ) 0.870588; RB = R3 = (float ) 0.870588; - break; - case Quantity_NOC_GRAY88 : - RR = R1 = (float ) 0.878431; RG = R2 = (float ) 0.878431; RB = R3 = (float ) 0.878431; - break; - case Quantity_NOC_GRAY89 : - RR = R1 = (float ) 0.890196; RG = R2 = (float ) 0.890196; RB = R3 = (float ) 0.890196; - break; - case Quantity_NOC_GRAY9 : - RR = R1 = (float ) 0.090196; RG = R2 = (float ) 0.090196; RB = R3 = (float ) 0.090196; - break; - case Quantity_NOC_GRAY90 : - RR = R1 = (float ) 0.898039; RG = R2 = (float ) 0.898039; RB = R3 = (float ) 0.898039; - break; - case Quantity_NOC_GRAY91 : - RR = R1 = (float ) 0.909804; RG = R2 = (float ) 0.909804; RB = R3 = (float ) 0.909804; - break; - case Quantity_NOC_GRAY92 : - RR = R1 = (float ) 0.921569; RG = R2 = (float ) 0.921569; RB = R3 = (float ) 0.921569; - break; - case Quantity_NOC_GRAY93 : - RR = R1 = (float ) 0.929412; RG = R2 = (float ) 0.929412; RB = R3 = (float ) 0.929412; - break; - case Quantity_NOC_GRAY94 : - RR = R1 = (float ) 0.941176; RG = R2 = (float ) 0.941176; RB = R3 = (float ) 0.941176; - break; - case Quantity_NOC_GRAY95 : - RR = R1 = (float ) 0.949020; RG = R2 = (float ) 0.949020; RB = R3 = (float ) 0.949020; - break; - case Quantity_NOC_GREEN : - RR = R1 = 0.000000; RG = R2 = 1.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_GREEN1 : - RR = R1 = 0.000000; RG = R2 = 1.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_GREEN2 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.933333; RB = R3 = 0.000000; - break; - case Quantity_NOC_GREEN3 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.803922; RB = R3 = 0.000000; - break; - case Quantity_NOC_GREEN4 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.545098; RB = R3 = 0.000000; - break; - case Quantity_NOC_GREENYELLOW : - RR = R1 = (float ) 0.678431; RG = R2 = 1.000000; RB = R3 = (float ) 0.184314; - break; - case Quantity_NOC_GRAY97 : - RR = R1 = (float ) 0.968627; RG = R2 = (float ) 0.968627; RB = R3 = (float ) 0.968627; - break; - case Quantity_NOC_GRAY98 : - RR = R1 = (float ) 0.980392; RG = R2 = (float ) 0.980392; RB = R3 = (float ) 0.980392; - break; - case Quantity_NOC_GRAY99 : - RR = R1 = (float ) 0.988235; RG = R2 = (float ) 0.988235; RB = R3 = (float ) 0.988235; - break; - case Quantity_NOC_HONEYDEW : - RR = R1 = (float ) 0.941176; RG = R2 = 1.000000; RB = R3 = (float ) 0.941176; - break; - case Quantity_NOC_HONEYDEW2 : - RR = R1 = (float ) 0.878431; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.878431; - break; - case Quantity_NOC_HONEYDEW3 : - RR = R1 = (float ) 0.756863; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.756863; - break; - case Quantity_NOC_HONEYDEW4 : - RR = R1 = (float ) 0.513725; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.513725; - break; - case Quantity_NOC_HOTPINK : - RR = R1 = 1.000000; RG = R2 = (float ) 0.411765; RB = R3 = (float ) 0.705882; - break; - case Quantity_NOC_HOTPINK1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.431373; RB = R3 = (float ) 0.705882; - break; - case Quantity_NOC_HOTPINK2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.415686; RB = R3 = (float ) 0.654902; - break; - case Quantity_NOC_HOTPINK3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.376471; RB = R3 = (float ) 0.564706; - break; - case Quantity_NOC_HOTPINK4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.227451; RB = R3 = (float ) 0.384314; - break; - case Quantity_NOC_INDIANRED : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.360784; RB = R3 = (float ) 0.360784; - break; - case Quantity_NOC_INDIANRED1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.415686; RB = R3 = (float ) 0.415686; - break; - case Quantity_NOC_INDIANRED2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.388235; RB = R3 = (float ) 0.388235; - break; - case Quantity_NOC_INDIANRED3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.333333; RB = R3 = (float ) 0.333333; - break; - case Quantity_NOC_INDIANRED4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.227451; RB = R3 = (float ) 0.227451; - break; - case Quantity_NOC_IVORY : - RR = R1 = 1.000000; RG = R2 = 1.000000; RB = R3 = (float ) 0.941176; - break; - case Quantity_NOC_IVORY2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.878431; - break; - case Quantity_NOC_IVORY3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.756863; - break; - case Quantity_NOC_IVORY4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.513725; - break; - case Quantity_NOC_KHAKI : - RR = R1 = (float ) 0.941176; RG = R2 = (float ) 0.901961; RB = R3 = (float ) 0.549020; - break; - case Quantity_NOC_KHAKI1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.964706; RB = R3 = (float ) 0.560784; - break; - case Quantity_NOC_KHAKI2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.901961; RB = R3 = (float ) 0.521569; - break; - case Quantity_NOC_KHAKI3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.776471; RB = R3 = (float ) 0.450980; - break; - case Quantity_NOC_KHAKI4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.525490; RB = R3 = (float ) 0.305882; - break; - case Quantity_NOC_LAVENDER : - RR = R1 = (float ) 0.901961; RG = R2 = (float ) 0.901961; RB = R3 = (float ) 0.980392; - break; - case Quantity_NOC_LAVENDERBLUSH1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.941176; RB = R3 = (float ) 0.960784; - break; - case Quantity_NOC_LAVENDERBLUSH2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.878431; RB = R3 = (float ) 0.898039; - break; - case Quantity_NOC_LAVENDERBLUSH3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.756863; RB = R3 = (float ) 0.772549; - break; - case Quantity_NOC_LAVENDERBLUSH4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.513725; RB = R3 = (float ) 0.525490; - break; - case Quantity_NOC_LAWNGREEN : - RR = R1 = (float ) 0.486275; RG = R2 = (float ) 0.988235; RB = R3 = 0.000000; - break; - case Quantity_NOC_LEMONCHIFFON1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.980392; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_LEMONCHIFFON2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.913725; RB = R3 = (float ) 0.749020; - break; - case Quantity_NOC_LEMONCHIFFON3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.788235; RB = R3 = (float ) 0.647059; - break; - case Quantity_NOC_LEMONCHIFFON4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.537255; RB = R3 = (float ) 0.439216; - break; - case Quantity_NOC_LIGHTBLUE : - RR = R1 = (float ) 0.678431; RG = R2 = (float ) 0.847059; RB = R3 = (float ) 0.901961; - break; - case Quantity_NOC_LIGHTBLUE1 : - RR = R1 = (float ) 0.749020; RG = R2 = (float ) 0.937255; RB = R3 = 1.000000; - break; - case Quantity_NOC_LIGHTBLUE2 : - RR = R1 = (float ) 0.698039; RG = R2 = (float ) 0.874510; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_LIGHTBLUE3 : - RR = R1 = (float ) 0.603922; RG = R2 = (float ) 0.752941; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_LIGHTBLUE4 : - RR = R1 = (float ) 0.407843; RG = R2 = (float ) 0.513725; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_LIGHTCORAL : - RR = R1 = (float ) 0.941176; RG = R2 = (float ) 0.501961; RB = R3 = (float ) 0.501961; - break; - case Quantity_NOC_LIGHTCYAN1 : - RR = R1 = (float ) 0.878431; RG = R2 = 1.000000; RB = R3 = 1.000000; - break; - case Quantity_NOC_LIGHTCYAN2 : - RR = R1 = (float ) 0.819608; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_LIGHTCYAN3 : - RR = R1 = (float ) 0.705882; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_LIGHTCYAN4 : - RR = R1 = (float ) 0.478431; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_LIGHTGOLDENROD : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.866667; RB = R3 = (float ) 0.509804; - break; - case Quantity_NOC_LIGHTGOLDENROD1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.925490; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_LIGHTGOLDENROD2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.862745; RB = R3 = (float ) 0.509804; - break; - case Quantity_NOC_LIGHTGOLDENROD3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.745098; RB = R3 = (float ) 0.439216; - break; - case Quantity_NOC_LIGHTGOLDENROD4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.505882; RB = R3 = (float ) 0.298039; - break; - case Quantity_NOC_LIGHTGOLDENRODYELLOW : - RR = R1 = (float ) 0.980392; RG = R2 = (float ) 0.980392; RB = R3 = (float ) 0.823529; - break; - case Quantity_NOC_LIGHTGRAY : - RR = R1 = (float ) 0.827451; RG = R2 = (float ) 0.827451; RB = R3 = (float ) 0.827451; - break; - case Quantity_NOC_LIGHTPINK : - RR = R1 = 1.000000; RG = R2 = (float ) 0.713725; RB = R3 = (float ) 0.756863; - break; - case Quantity_NOC_LIGHTPINK1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.682353; RB = R3 = (float ) 0.725490; - break; - case Quantity_NOC_LIGHTPINK2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.635294; RB = R3 = (float ) 0.678431; - break; - case Quantity_NOC_LIGHTPINK3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.549020; RB = R3 = (float ) 0.584314; - break; - case Quantity_NOC_LIGHTPINK4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.372549; RB = R3 = (float ) 0.396078; - break; - case Quantity_NOC_LIGHTSALMON1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.627451; RB = R3 = (float ) 0.478431; - break; - case Quantity_NOC_LIGHTSALMON2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.584314; RB = R3 = (float ) 0.447059; - break; - case Quantity_NOC_LIGHTSALMON3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.505882; RB = R3 = (float ) 0.384314; - break; - case Quantity_NOC_LIGHTSALMON4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.341176; RB = R3 = (float ) 0.258824; - break; - case Quantity_NOC_LIGHTSEAGREEN : - RR = R1 = (float ) 0.125490; RG = R2 = (float ) 0.698039; RB = R3 = (float ) 0.666667; - break; - case Quantity_NOC_LIGHTSKYBLUE : - RR = R1 = (float ) 0.529412; RG = R2 = (float ) 0.807843; RB = R3 = (float ) 0.980392; - break; - case Quantity_NOC_LIGHTSKYBLUE1 : - RR = R1 = (float ) 0.690196; RG = R2 = (float ) 0.886275; RB = R3 = 1.000000; - break; - case Quantity_NOC_LIGHTSKYBLUE2 : - RR = R1 = (float ) 0.643137; RG = R2 = (float ) 0.827451; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_LIGHTSKYBLUE3 : - RR = R1 = (float ) 0.552941; RG = R2 = (float ) 0.713725; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_LIGHTSKYBLUE4 : - RR = R1 = (float ) 0.376471; RG = R2 = (float ) 0.482353; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_LIGHTSLATEBLUE : - RR = R1 = (float ) 0.517647; RG = R2 = (float ) 0.439216; RB = R3 = 1.000000; - break; - case Quantity_NOC_LIGHTSLATEGRAY : - RR = R1 = (float ) 0.466667; RG = R2 = (float ) 0.533333; RB = R3 = (float ) 0.600000; - break; - case Quantity_NOC_LIGHTSTEELBLUE : - RR = R1 = (float ) 0.690196; RG = R2 = (float ) 0.768627; RB = R3 = (float ) 0.870588; - break; - case Quantity_NOC_LIGHTSTEELBLUE1 : - RR = R1 = (float ) 0.792157; RG = R2 = (float ) 0.882353; RB = R3 = 1.000000; - break; - case Quantity_NOC_LIGHTSTEELBLUE2 : - RR = R1 = (float ) 0.737255; RG = R2 = (float ) 0.823529; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_LIGHTSTEELBLUE3 : - RR = R1 = (float ) 0.635294; RG = R2 = (float ) 0.709804; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_LIGHTSTEELBLUE4 : - RR = R1 = (float ) 0.431373; RG = R2 = (float ) 0.482353; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_LIGHTYELLOW : - RR = R1 = 1.000000; RG = R2 = 1.000000; RB = R3 = (float ) 0.878431; - break; - case Quantity_NOC_LIGHTYELLOW2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.819608; - break; - case Quantity_NOC_LIGHTYELLOW3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.705882; - break; - case Quantity_NOC_LIGHTYELLOW4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.478431; - break; - case Quantity_NOC_LIMEGREEN : - RR = R1 = (float ) 0.196078; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.196078; - break; - case Quantity_NOC_LINEN : - RR = R1 = (float ) 0.980392; RG = R2 = (float ) 0.941176; RB = R3 = (float ) 0.901961; - break; - case Quantity_NOC_MAGENTA1 : - RR = R1 = 1.000000; RG = R2 = 0.000000; RB = R3 = 1.000000; - break; - case Quantity_NOC_MAGENTA2 : - RR = R1 = (float ) 0.933333; RG = R2 = 0.000000; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_MAGENTA3 : - RR = R1 = (float ) 0.803922; RG = R2 = 0.000000; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_MAGENTA4 : - RR = R1 = (float ) 0.545098; RG = R2 = 0.000000; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_MAROON : - RR = R1 = (float ) 0.690196; RG = R2 = (float ) 0.188235; RB = R3 = (float ) 0.376471; - break; - case Quantity_NOC_MAROON1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.203922; RB = R3 = (float ) 0.701961; - break; - case Quantity_NOC_MAROON2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.188235; RB = R3 = (float ) 0.654902; - break; - case Quantity_NOC_MAROON3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.160784; RB = R3 = (float ) 0.564706; - break; - case Quantity_NOC_MAROON4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.109804; RB = R3 = (float ) 0.384314; - break; - case Quantity_NOC_MEDIUMAQUAMARINE : - RR = R1 = (float ) 0.400000; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.666667; - break; - case Quantity_NOC_MEDIUMORCHID : - RR = R1 = (float ) 0.729412; RG = R2 = (float ) 0.333333; RB = R3 = (float ) 0.827451; - break; - case Quantity_NOC_MEDIUMORCHID1 : - RR = R1 = (float ) 0.878431; RG = R2 = (float ) 0.400000; RB = R3 = 1.000000; - break; - case Quantity_NOC_MEDIUMORCHID2 : - RR = R1 = (float ) 0.819608; RG = R2 = (float ) 0.372549; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_MEDIUMORCHID3 : - RR = R1 = (float ) 0.705882; RG = R2 = (float ) 0.321569; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_MEDIUMORCHID4 : - RR = R1 = (float ) 0.478431; RG = R2 = (float ) 0.215686; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_MEDIUMPURPLE : - RR = R1 = (float ) 0.576471; RG = R2 = (float ) 0.439216; RB = R3 = (float ) 0.858824; - break; - case Quantity_NOC_MEDIUMPURPLE1 : - RR = R1 = (float ) 0.670588; RG = R2 = (float ) 0.509804; RB = R3 = 1.000000; - break; - case Quantity_NOC_MEDIUMPURPLE2 : - RR = R1 = (float ) 0.623529; RG = R2 = (float ) 0.474510; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_MEDIUMPURPLE3 : - RR = R1 = (float ) 0.537255; RG = R2 = (float ) 0.407843; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_MEDIUMPURPLE4 : - RR = R1 = (float ) 0.364706; RG = R2 = (float ) 0.278431; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_MEDIUMSEAGREEN : - RR = R1 = (float ) 0.235294; RG = R2 = (float ) 0.701961; RB = R3 = (float ) 0.443137; - break; - case Quantity_NOC_MEDIUMSLATEBLUE : - RR = R1 = (float ) 0.482353; RG = R2 = (float ) 0.407843; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_MEDIUMSPRINGGREEN : - RR = R1 = 0.000000; RG = R2 = (float ) 0.980392; RB = R3 = (float ) 0.603922; - break; - case Quantity_NOC_MEDIUMTURQUOISE : - RR = R1 = (float ) 0.282353; RG = R2 = (float ) 0.819608; RB = R3 = (float ) 0.800000; - break; - case Quantity_NOC_MEDIUMVIOLETRED : - RR = R1 = (float ) 0.780392; RG = R2 = (float ) 0.082353; RB = R3 = (float ) 0.521569; - break; - case Quantity_NOC_MIDNIGHTBLUE : - RR = R1 = (float ) 0.098039; RG = R2 = (float ) 0.098039; RB = R3 = (float ) 0.439216; - break; - case Quantity_NOC_MINTCREAM : - RR = R1 = (float ) 0.960784; RG = R2 = 1.000000; RB = R3 = (float ) 0.980392; - break; - case Quantity_NOC_MISTYROSE : - RR = R1 = 1.000000; RG = R2 = (float ) 0.894118; RB = R3 = (float ) 0.882353; - break; - case Quantity_NOC_MISTYROSE2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.835294; RB = R3 = (float ) 0.823529; - break; - case Quantity_NOC_MISTYROSE3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.717647; RB = R3 = (float ) 0.709804; - break; - case Quantity_NOC_MISTYROSE4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.490196; RB = R3 = (float ) 0.482353; - break; - case Quantity_NOC_MOCCASIN : - RR = R1 = 1.000000; RG = R2 = (float ) 0.894118; RB = R3 = (float ) 0.709804; - break; - case Quantity_NOC_NAVAJOWHITE1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.870588; RB = R3 = (float ) 0.678431; - break; - case Quantity_NOC_NAVAJOWHITE2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.811765; RB = R3 = (float ) 0.631373; - break; - case Quantity_NOC_NAVAJOWHITE3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.701961; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_NAVAJOWHITE4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.474510; RB = R3 = (float ) 0.368627; - break; - case Quantity_NOC_NAVYBLUE : - RR = R1 = 0.000000; RG = R2 = 0.000000; RB = R3 = (float ) 0.501961; - break; - case Quantity_NOC_OLDLACE : - RR = R1 = (float ) 0.992157; RG = R2 = (float ) 0.960784; RB = R3 = (float ) 0.901961; - break; - case Quantity_NOC_OLIVEDRAB : - RR = R1 = (float ) 0.419608; RG = R2 = (float ) 0.556863; RB = R3 = (float ) 0.137255; - break; - case Quantity_NOC_OLIVEDRAB1 : - RR = R1 = (float ) 0.752941; RG = R2 = 1.000000; RB = R3 = (float ) 0.243137; - break; - case Quantity_NOC_OLIVEDRAB2 : - RR = R1 = (float ) 0.701961; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.227451; - break; - case Quantity_NOC_OLIVEDRAB3 : - RR = R1 = (float ) 0.603922; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.196078; - break; - case Quantity_NOC_OLIVEDRAB4 : - RR = R1 = (float ) 0.411765; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.133333; - break; - case Quantity_NOC_ORANGE : - RR = R1 = 1.000000; RG = R2 = (float ) 0.647059; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORANGE1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.647059; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORANGE2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.603922; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORANGE3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.521569; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORANGE4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.352941; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORANGERED : - RR = R1 = 1.000000; RG = R2 = (float ) 0.270588; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORANGERED1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.270588; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORANGERED2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.250980; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORANGERED3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.215686; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORANGERED4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.145098; RB = R3 = 0.000000; - break; - case Quantity_NOC_ORCHID : - RR = R1 = (float ) 0.854902; RG = R2 = (float ) 0.439216; RB = R3 = (float ) 0.839216; - break; - case Quantity_NOC_ORCHID1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.513725; RB = R3 = (float ) 0.980392; - break; - case Quantity_NOC_ORCHID2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.478431; RB = R3 = (float ) 0.913725; - break; - case Quantity_NOC_ORCHID3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.411765; RB = R3 = (float ) 0.788235; - break; - case Quantity_NOC_ORCHID4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.278431; RB = R3 = (float ) 0.537255; - break; - case Quantity_NOC_PALEGOLDENROD : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.909804; RB = R3 = (float ) 0.666667; - break; - case Quantity_NOC_PALEGREEN : - RR = R1 = (float ) 0.596078; RG = R2 = (float ) 0.984314; RB = R3 = (float ) 0.596078; - break; - case Quantity_NOC_PALEGREEN1 : - RR = R1 = (float ) 0.603922; RG = R2 = 1.000000; RB = R3 = (float ) 0.603922; - break; - case Quantity_NOC_PALEGREEN2 : - RR = R1 = (float ) 0.564706; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.564706; - break; - case Quantity_NOC_PALEGREEN3 : - RR = R1 = (float ) 0.486275; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.486275; - break; - case Quantity_NOC_PALEGREEN4 : - RR = R1 = (float ) 0.329412; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.329412; - break; - case Quantity_NOC_PALETURQUOISE : - RR = R1 = (float ) 0.686275; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_PALETURQUOISE1 : - RR = R1 = (float ) 0.733333; RG = R2 = 1.000000; RB = R3 = 1.000000; - break; - case Quantity_NOC_PALETURQUOISE2 : - RR = R1 = (float ) 0.682353; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_PALETURQUOISE3 : - RR = R1 = (float ) 0.588235; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_PALETURQUOISE4 : - RR = R1 = (float ) 0.400000; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_PALEVIOLETRED : - RR = R1 = (float ) 0.858824; RG = R2 = (float ) 0.439216; RB = R3 = (float ) 0.576471; - break; - case Quantity_NOC_PALEVIOLETRED1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.509804; RB = R3 = (float ) 0.670588; - break; - case Quantity_NOC_PALEVIOLETRED2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.474510; RB = R3 = (float ) 0.623529; - break; - case Quantity_NOC_PALEVIOLETRED3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.407843; RB = R3 = (float ) 0.537255; - break; - case Quantity_NOC_PALEVIOLETRED4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.278431; RB = R3 = (float ) 0.364706; - break; - case Quantity_NOC_PAPAYAWHIP : - RR = R1 = 1.000000; RG = R2 = (float ) 0.937255; RB = R3 = (float ) 0.835294; - break; - case Quantity_NOC_PEACHPUFF : - RR = R1 = 1.000000; RG = R2 = (float ) 0.854902; RB = R3 = (float ) 0.725490; - break; - case Quantity_NOC_PEACHPUFF2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.796078; RB = R3 = (float ) 0.678431; - break; - case Quantity_NOC_PEACHPUFF3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.686275; RB = R3 = (float ) 0.584314; - break; - case Quantity_NOC_PEACHPUFF4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.466667; RB = R3 = (float ) 0.396078; - break; - case Quantity_NOC_PERU : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.521569; RB = R3 = (float ) 0.247059; - break; - case Quantity_NOC_PINK : - RR = R1 = 1.000000; RG = R2 = (float ) 0.752941; RB = R3 = (float ) 0.796078; - break; - case Quantity_NOC_PINK1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.709804; RB = R3 = (float ) 0.772549; - break; - case Quantity_NOC_PINK2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.662745; RB = R3 = (float ) 0.721569; - break; - case Quantity_NOC_PINK3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.568627; RB = R3 = (float ) 0.619608; - break; - case Quantity_NOC_PINK4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.388235; RB = R3 = (float ) 0.423529; - break; - case Quantity_NOC_PLUM : - RR = R1 = (float ) 0.866667; RG = R2 = (float ) 0.627451; RB = R3 = (float ) 0.866667; - break; - case Quantity_NOC_PLUM1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.733333; RB = R3 = 1.000000; - break; - case Quantity_NOC_PLUM2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.682353; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_PLUM3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.588235; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_PLUM4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.400000; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_POWDERBLUE : - RR = R1 = (float ) 0.690196; RG = R2 = (float ) 0.878431; RB = R3 = (float ) 0.901961; - break; - case Quantity_NOC_PURPLE : - RR = R1 = (float ) 0.627451; RG = R2 = (float ) 0.125490; RB = R3 = (float ) 0.941176; - break; - case Quantity_NOC_PURPLE1 : - RR = R1 = (float ) 0.607843; RG = R2 = (float ) 0.188235; RB = R3 = 1.000000; - break; - case Quantity_NOC_PURPLE2 : - RR = R1 = (float ) 0.568627; RG = R2 = (float ) 0.172549; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_PURPLE3 : - RR = R1 = (float ) 0.490196; RG = R2 = (float ) 0.149020; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_PURPLE4 : - RR = R1 = (float ) 0.333333; RG = R2 = (float ) 0.101961; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_RED : - RR = R1 = 1.000000; RG = R2 = 0.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_RED1 : - RR = R1 = 1.000000; RG = R2 = 0.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_RED2 : - RR = R1 = (float ) 0.933333; RG = R2 = 0.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_RED3 : - RR = R1 = (float ) 0.803922; RG = R2 = 0.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_RED4 : - RR = R1 = (float ) 0.545098; RG = R2 = 0.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_ROSYBROWN : - RR = R1 = (float ) 0.737255; RG = R2 = (float ) 0.560784; RB = R3 = (float ) 0.560784; - break; - case Quantity_NOC_ROSYBROWN1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.756863; RB = R3 = (float ) 0.756863; - break; - case Quantity_NOC_ROSYBROWN2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.705882; RB = R3 = (float ) 0.705882; - break; - case Quantity_NOC_ROSYBROWN3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.607843; RB = R3 = (float ) 0.607843; - break; - case Quantity_NOC_ROSYBROWN4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.411765; RB = R3 = (float ) 0.411765; - break; - case Quantity_NOC_ROYALBLUE : - RR = R1 = (float ) 0.254902; RG = R2 = (float ) 0.411765; RB = R3 = (float ) 0.882353; - break; - case Quantity_NOC_ROYALBLUE1 : - RR = R1 = (float ) 0.282353; RG = R2 = (float ) 0.462745; RB = R3 = 1.000000; - break; - case Quantity_NOC_ROYALBLUE2 : - RR = R1 = (float ) 0.262745; RG = R2 = (float ) 0.431373; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_ROYALBLUE3 : - RR = R1 = (float ) 0.227451; RG = R2 = (float ) 0.372549; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_ROYALBLUE4 : - RR = R1 = (float ) 0.152941; RG = R2 = (float ) 0.250980; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_SADDLEBROWN : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.270588; RB = R3 = (float ) 0.074510; - break; - case Quantity_NOC_SALMON : - RR = R1 = (float ) 0.980392; RG = R2 = (float ) 0.501961; RB = R3 = (float ) 0.447059; - break; - case Quantity_NOC_SALMON1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.549020; RB = R3 = (float ) 0.411765; - break; - case Quantity_NOC_SALMON2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.509804; RB = R3 = (float ) 0.384314; - break; - case Quantity_NOC_SALMON3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.439216; RB = R3 = (float ) 0.329412; - break; - case Quantity_NOC_SALMON4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.298039; RB = R3 = (float ) 0.223529; - break; - case Quantity_NOC_SANDYBROWN : - RR = R1 = (float ) 0.956863; RG = R2 = (float ) 0.643137; RB = R3 = (float ) 0.376471; - break; - case Quantity_NOC_SEAGREEN : - RR = R1 = (float ) 0.180392; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.341176; - break; - case Quantity_NOC_SEAGREEN1 : - RR = R1 = (float ) 0.329412; RG = R2 = 1.000000; RB = R3 = (float ) 0.623529; - break; - case Quantity_NOC_SEAGREEN2 : - RR = R1 = (float ) 0.305882; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.580392; - break; - case Quantity_NOC_SEAGREEN3 : - RR = R1 = (float ) 0.262745; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.501961; - break; - case Quantity_NOC_SEAGREEN4 : - RR = R1 = (float ) 0.180392; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.341176; - break; - case Quantity_NOC_SEASHELL : - RR = R1 = 1.000000; RG = R2 = (float ) 0.960784; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_SEASHELL2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.898039; RB = R3 = (float ) 0.870588; - break; - case Quantity_NOC_SEASHELL3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.772549; RB = R3 = (float ) 0.749020; - break; - case Quantity_NOC_SEASHELL4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.525490; RB = R3 = (float ) 0.509804; - break; - case Quantity_NOC_BEET : - RR = R1 = (float ) 0.556863; RG = R2 = (float ) 0.219608; RB = R3 = (float ) 0.556863; - break; - case Quantity_NOC_TEAL : - RR = R1 = (float ) 0.219608; RG = R2 = (float ) 0.556863; RB = R3 = (float ) 0.556863; - break; - case Quantity_NOC_SIENNA : - RR = R1 = (float ) 0.627451; RG = R2 = (float ) 0.321569; RB = R3 = (float ) 0.176471; - break; - case Quantity_NOC_SIENNA1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.509804; RB = R3 = (float ) 0.278431; - break; - case Quantity_NOC_SIENNA2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.474510; RB = R3 = (float ) 0.258824; - break; - case Quantity_NOC_SIENNA3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.407843; RB = R3 = (float ) 0.223529; - break; - case Quantity_NOC_SIENNA4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.278431; RB = R3 = (float ) 0.149020; - break; - case Quantity_NOC_SKYBLUE : - RR = R1 = (float ) 0.529412; RG = R2 = (float ) 0.807843; RB = R3 = (float ) 0.921569; - break; - case Quantity_NOC_SKYBLUE1 : - RR = R1 = (float ) 0.529412; RG = R2 = (float ) 0.807843; RB = R3 = 1.000000; - break; - case Quantity_NOC_SKYBLUE2 : - RR = R1 = (float ) 0.494118; RG = R2 = (float ) 0.752941; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_SKYBLUE3 : - RR = R1 = (float ) 0.423529; RG = R2 = (float ) 0.650980; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_SKYBLUE4 : - RR = R1 = (float ) 0.290196; RG = R2 = (float ) 0.439216; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_SLATEBLUE : - RR = R1 = (float ) 0.415686; RG = R2 = (float ) 0.352941; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_SLATEBLUE1 : - RR = R1 = (float ) 0.513725; RG = R2 = (float ) 0.435294; RB = R3 = 1.000000; - break; - case Quantity_NOC_SLATEBLUE2 : - RR = R1 = (float ) 0.478431; RG = R2 = (float ) 0.403922; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_SLATEBLUE3 : - RR = R1 = (float ) 0.411765; RG = R2 = (float ) 0.349020; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_SLATEBLUE4 : - RR = R1 = (float ) 0.278431; RG = R2 = (float ) 0.235294; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_SLATEGRAY1 : - RR = R1 = (float ) 0.776471; RG = R2 = (float ) 0.886275; RB = R3 = 1.000000; - break; - case Quantity_NOC_SLATEGRAY2 : - RR = R1 = (float ) 0.725490; RG = R2 = (float ) 0.827451; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_SLATEGRAY3 : - RR = R1 = (float ) 0.623529; RG = R2 = (float ) 0.713725; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_SLATEGRAY4 : - RR = R1 = (float ) 0.423529; RG = R2 = (float ) 0.482353; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_SLATEGRAY : - RR = R1 = (float ) 0.439216; RG = R2 = (float ) 0.501961; RB = R3 = (float ) 0.564706; - break; - case Quantity_NOC_SNOW : - RR = R1 = 1.000000; RG = R2 = (float ) 0.980392; RB = R3 = (float ) 0.980392; - break; - case Quantity_NOC_SNOW2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.913725; RB = R3 = (float ) 0.913725; - break; - case Quantity_NOC_SNOW3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.788235; RB = R3 = (float ) 0.788235; - break; - case Quantity_NOC_SNOW4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.537255; RB = R3 = (float ) 0.537255; - break; - case Quantity_NOC_SPRINGGREEN : - RR = R1 = 0.000000; RG = R2 = 1.000000; RB = R3 = (float ) 0.498039; - break; - case Quantity_NOC_SPRINGGREEN2 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.933333; RB = R3 = (float ) 0.462745; - break; - case Quantity_NOC_SPRINGGREEN3 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.400000; - break; - case Quantity_NOC_SPRINGGREEN4 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.545098; RB = R3 = (float ) 0.270588; - break; - case Quantity_NOC_STEELBLUE : - RR = R1 = (float ) 0.274510; RG = R2 = (float ) 0.509804; RB = R3 = (float ) 0.705882; - break; - case Quantity_NOC_STEELBLUE1 : - RR = R1 = (float ) 0.388235; RG = R2 = (float ) 0.721569; RB = R3 = 1.000000; - break; - case Quantity_NOC_STEELBLUE2 : - RR = R1 = (float ) 0.360784; RG = R2 = (float ) 0.674510; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_STEELBLUE3 : - RR = R1 = (float ) 0.309804; RG = R2 = (float ) 0.580392; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_STEELBLUE4 : - RR = R1 = (float ) 0.211765; RG = R2 = (float ) 0.392157; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_TAN : - RR = R1 = (float ) 0.823529; RG = R2 = (float ) 0.705882; RB = R3 = (float ) 0.549020; - break; - case Quantity_NOC_TAN1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.647059; RB = R3 = (float ) 0.309804; - break; - case Quantity_NOC_TAN2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.603922; RB = R3 = (float ) 0.286275; - break; - case Quantity_NOC_TAN3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.521569; RB = R3 = (float ) 0.247059; - break; - case Quantity_NOC_TAN4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.352941; RB = R3 = (float ) 0.168627; - break; - case Quantity_NOC_THISTLE : - RR = R1 = (float ) 0.847059; RG = R2 = (float ) 0.749020; RB = R3 = (float ) 0.847059; - break; - case Quantity_NOC_THISTLE1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.882353; RB = R3 = 1.000000; - break; - case Quantity_NOC_THISTLE2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.823529; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_THISTLE3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.709804; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_THISTLE4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.482353; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_TOMATO : - RR = R1 = 1.000000; RG = R2 = (float ) 0.388235; RB = R3 = (float ) 0.278431; - break; - case Quantity_NOC_TOMATO1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.388235; RB = R3 = (float ) 0.278431; - break; - case Quantity_NOC_TOMATO2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.360784; RB = R3 = (float ) 0.258824; - break; - case Quantity_NOC_TOMATO3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.309804; RB = R3 = (float ) 0.223529; - break; - case Quantity_NOC_TOMATO4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.211765; RB = R3 = (float ) 0.149020; - break; - case Quantity_NOC_TURQUOISE : - RR = R1 = (float ) 0.250980; RG = R2 = (float ) 0.878431; RB = R3 = (float ) 0.815686; - break; - case Quantity_NOC_TURQUOISE1 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.960784; RB = R3 = 1.000000; - break; - case Quantity_NOC_TURQUOISE2 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.898039; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_TURQUOISE3 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.772549; RB = R3 = (float ) 0.803922; - break; - case Quantity_NOC_TURQUOISE4 : - RR = R1 = 0.000000; RG = R2 = (float ) 0.525490; RB = R3 = (float ) 0.545098; - break; - case Quantity_NOC_VIOLET : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.509804; RB = R3 = (float ) 0.933333; - break; - case Quantity_NOC_VIOLETRED : - RR = R1 = (float ) 0.815686; RG = R2 = (float ) 0.125490; RB = R3 = (float ) 0.564706; - break; - case Quantity_NOC_VIOLETRED1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.243137; RB = R3 = (float ) 0.588235; - break; - case Quantity_NOC_VIOLETRED2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.227451; RB = R3 = (float ) 0.549020; - break; - case Quantity_NOC_VIOLETRED3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.196078; RB = R3 = (float ) 0.470588; - break; - case Quantity_NOC_VIOLETRED4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.133333; RB = R3 = (float ) 0.321569; - break; - case Quantity_NOC_WHEAT : - RR = R1 = (float ) 0.960784; RG = R2 = (float ) 0.870588; RB = R3 = (float ) 0.701961; - break; - case Quantity_NOC_WHEAT1 : - RR = R1 = 1.000000; RG = R2 = (float ) 0.905882; RB = R3 = (float ) 0.729412; - break; - case Quantity_NOC_WHEAT2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.847059; RB = R3 = (float ) 0.682353; - break; - case Quantity_NOC_WHEAT3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.729412; RB = R3 = (float ) 0.588235; - break; - case Quantity_NOC_WHEAT4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.494118; RB = R3 = (float ) 0.400000; - break; - case Quantity_NOC_WHITE : - RR = R1 = 1.000000; RG = R2 = 1.000000; RB = R3 = 1.000000; - break; - case Quantity_NOC_WHITESMOKE : - RR = R1 = (float ) 0.960784; RG = R2 = (float ) 0.960784; RB = R3 = (float ) 0.960784; - break; - case Quantity_NOC_YELLOW : - RR = R1 = 1.000000; RG = R2 = 1.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_YELLOW1 : - RR = R1 = 1.000000; RG = R2 = 1.000000; RB = R3 = 0.000000; - break; - case Quantity_NOC_YELLOW2 : - RR = R1 = (float ) 0.933333; RG = R2 = (float ) 0.933333; RB = R3 = 0.000000; - break; - case Quantity_NOC_YELLOW3 : - RR = R1 = (float ) 0.803922; RG = R2 = (float ) 0.803922; RB = R3 = 0.000000; - break; - case Quantity_NOC_YELLOW4 : - RR = R1 = (float ) 0.545098; RG = R2 = (float ) 0.545098; RB = R3 = 0.000000; - break; - case Quantity_NOC_YELLOWGREEN : - RR = R1 = (float ) 0.603922; RG = R2 = (float ) 0.803922; RB = R3 = (float ) 0.196078; - break; - default : - throw Standard_OutOfRange("Bad name"); - break; -} - if (AType == Quantity_TOC_HLS) - Quantity_Color::rgbhls (RR, RG, RB, R1, R2, R3); +// ======================================================================= +// function : SetValues +// purpose : +// ======================================================================= +void Quantity_Color::SetValues (const Standard_Real theR1, const Standard_Real theR2, const Standard_Real theR3, + const Quantity_TypeOfColor theType) +{ + switch (theType) + { + case Quantity_TOC_RGB: + { + Quantity_ColorValidateRgbRange(theR1, theR2, theR3); + myRgb.SetValues (float(theR1), float(theR2), float(theR3)); + break; + } + case Quantity_TOC_HLS: + { + Quantity_ColorValidateHlsRange(theR1, theR2, theR3); + myRgb = Convert_HLS_To_sRGB (NCollection_Vec3 (float(theR1), float(theR2), float(theR3))); + break; + } + } } -Standard_CString Quantity_Color::StringName ( - const Quantity_NameOfColor AName) { - -Standard_CString TheName; - -switch (AName) { - - case Quantity_NOC_BLACK : - TheName = "BLACK"; - break; - case Quantity_NOC_MATRAGRAY : - TheName = "MATRAGRAY"; - break; - case Quantity_NOC_MATRABLUE : - TheName = "MATRABLUE"; - break; - case Quantity_NOC_ALICEBLUE : - TheName = "ALICEBLUE"; - break; - case Quantity_NOC_ANTIQUEWHITE : - TheName = "ANTIQUEWHITE"; - break; - case Quantity_NOC_ANTIQUEWHITE1 : - TheName = "ANTIQUEWHITE1"; - break; - case Quantity_NOC_ANTIQUEWHITE2 : - TheName = "ANTIQUEWHITE2"; - break; - case Quantity_NOC_ANTIQUEWHITE3 : - TheName = "ANTIQUEWHITE3"; - break; - case Quantity_NOC_ANTIQUEWHITE4 : - TheName = "ANTIQUEWHITE4"; - break; - case Quantity_NOC_AQUAMARINE1 : - TheName = "AQUAMARINE1"; - break; - case Quantity_NOC_AQUAMARINE2 : - TheName = "AQUAMARINE2"; - break; - case Quantity_NOC_AQUAMARINE4 : - TheName = "AQUAMARINE4"; - break; - case Quantity_NOC_AZURE : - TheName = "AZURE"; - break; - case Quantity_NOC_AZURE2 : - TheName = "AZURE2"; - break; - case Quantity_NOC_AZURE3 : - TheName = "AZURE3"; - break; - case Quantity_NOC_AZURE4 : - TheName = "AZURE4"; - break; - case Quantity_NOC_BEIGE : - TheName = "BEIGE"; - break; - case Quantity_NOC_BISQUE : - TheName = "BISQUE"; - break; - case Quantity_NOC_BISQUE2 : - TheName = "BISQUE2"; - break; - case Quantity_NOC_BISQUE3 : - TheName = "BISQUE3"; - break; - case Quantity_NOC_BISQUE4 : - TheName = "BISQUE4"; - break; - case Quantity_NOC_BLANCHEDALMOND : - TheName = "BLANCHEDALMOND"; - break; - case Quantity_NOC_BLUE1 : - TheName = "BLUE1"; - break; - case Quantity_NOC_BLUE2 : - TheName = "BLUE2"; - break; - case Quantity_NOC_BLUE3 : - TheName = "BLUE3"; - break; - case Quantity_NOC_BLUE4 : - TheName = "BLUE4"; - break; - case Quantity_NOC_BLUEVIOLET : - TheName = "BLUEVIOLET"; - break; - case Quantity_NOC_BROWN : - TheName = "BROWN"; - break; - case Quantity_NOC_BROWN1 : - TheName = "BROWN1"; - break; - case Quantity_NOC_BROWN2 : - TheName = "BROWN2"; - break; - case Quantity_NOC_BROWN3 : - TheName = "BROWN3"; - break; - case Quantity_NOC_BROWN4 : - TheName = "BROWN4"; - break; - case Quantity_NOC_BURLYWOOD : - TheName = "BURLYWOOD"; - break; - case Quantity_NOC_BURLYWOOD1 : - TheName = "BURLYWOOD1"; - break; - case Quantity_NOC_BURLYWOOD2 : - TheName = "BURLYWOOD2"; - break; - case Quantity_NOC_BURLYWOOD3 : - TheName = "BURLYWOOD3"; - break; - case Quantity_NOC_BURLYWOOD4 : - TheName = "BURLYWOOD4"; - break; - case Quantity_NOC_CADETBLUE : - TheName = "CADETBLUE"; - break; - case Quantity_NOC_CADETBLUE1 : - TheName = "CADETBLUE1"; - break; - case Quantity_NOC_CADETBLUE2 : - TheName = "CADETBLUE2"; - break; - case Quantity_NOC_CADETBLUE3 : - TheName = "CADETBLUE3"; - break; - case Quantity_NOC_CADETBLUE4 : - TheName = "CADETBLUE4"; - break; - case Quantity_NOC_CHARTREUSE : - TheName = "CHARTREUSE"; - break; - case Quantity_NOC_CHARTREUSE1 : - TheName = "CHARTREUSE1"; - break; - case Quantity_NOC_CHARTREUSE2 : - TheName = "CHARTREUSE2"; - break; - case Quantity_NOC_CHARTREUSE3 : - TheName = "CHARTREUSE3"; - break; - case Quantity_NOC_CHARTREUSE4 : - TheName = "CHARTREUSE4"; - break; - case Quantity_NOC_CHOCOLATE : - TheName = "CHOCOLATE"; - break; - case Quantity_NOC_CHOCOLATE1 : - TheName = "CHOCOLATE1"; - break; - case Quantity_NOC_CHOCOLATE2 : - TheName = "CHOCOLATE2"; - break; - case Quantity_NOC_CHOCOLATE3 : - TheName = "CHOCOLATE3"; - break; - case Quantity_NOC_CHOCOLATE4 : - TheName = "CHOCOLATE4"; - break; - case Quantity_NOC_CORAL : - TheName = "CORAL"; - break; - case Quantity_NOC_CORAL1 : - TheName = "CORAL1"; - break; - case Quantity_NOC_CORAL2 : - TheName = "CORAL2"; - break; - case Quantity_NOC_CORAL3 : - TheName = "CORAL3"; - break; - case Quantity_NOC_CORAL4 : - TheName = "CORAL4"; - break; - case Quantity_NOC_CORNFLOWERBLUE : - TheName = "CORNFLOWERBLUE"; - break; - case Quantity_NOC_CORNSILK1 : - TheName = "CORNSILK1"; - break; - case Quantity_NOC_CORNSILK2 : - TheName = "CORNSILK2"; - break; - case Quantity_NOC_CORNSILK3 : - TheName = "CORNSILK3"; - break; - case Quantity_NOC_CORNSILK4 : - TheName = "CORNSILK4"; - break; - case Quantity_NOC_CYAN1 : - TheName = "CYAN1"; - break; - case Quantity_NOC_CYAN2 : - TheName = "CYAN2"; - break; - case Quantity_NOC_CYAN3 : - TheName = "CYAN3"; - break; - case Quantity_NOC_CYAN4 : - TheName = "CYAN4"; - break; - case Quantity_NOC_DARKGOLDENROD : - TheName = "DARKGOLDENROD"; - break; - case Quantity_NOC_DARKGOLDENROD1 : - TheName = "DARKGOLDENROD1"; - break; - case Quantity_NOC_DARKGOLDENROD2 : - TheName = "DARKGOLDENROD2"; - break; - case Quantity_NOC_DARKGOLDENROD3 : - TheName = "DARKGOLDENROD3"; - break; - case Quantity_NOC_DARKGOLDENROD4 : - TheName = "DARKGOLDENROD4"; - break; - case Quantity_NOC_DARKGREEN : - TheName = "DARKGREEN"; - break; - case Quantity_NOC_DARKKHAKI : - TheName = "DARKKHAKI"; - break; - case Quantity_NOC_DARKOLIVEGREEN : - TheName = "DARKOLIVEGREEN"; - break; - case Quantity_NOC_DARKOLIVEGREEN1 : - TheName = "DARKOLIVEGREEN1"; - break; - case Quantity_NOC_DARKOLIVEGREEN2 : - TheName = "DARKOLIVEGREEN2"; - break; - case Quantity_NOC_DARKOLIVEGREEN3 : - TheName = "DARKOLIVEGREEN3"; - break; - case Quantity_NOC_DARKOLIVEGREEN4 : - TheName = "DARKOLIVEGREEN4"; - break; - case Quantity_NOC_DARKORANGE : - TheName = "DARKORANGE"; - break; - case Quantity_NOC_DARKORANGE1 : - TheName = "DARKORANGE1"; - break; - case Quantity_NOC_DARKORANGE2 : - TheName = "DARKORANGE2"; - break; - case Quantity_NOC_DARKORANGE3 : - TheName = "DARKORANGE3"; - break; - case Quantity_NOC_DARKORANGE4 : - TheName = "DARKORANGE4"; - break; - case Quantity_NOC_DARKORCHID : - TheName = "DARKORCHID"; - break; - case Quantity_NOC_DARKORCHID1 : - TheName = "DARKORCHID1"; - break; - case Quantity_NOC_DARKORCHID2 : - TheName = "DARKORCHID2"; - break; - case Quantity_NOC_DARKORCHID3 : - TheName = "DARKORCHID3"; - break; - case Quantity_NOC_DARKORCHID4 : - TheName = "DARKORCHID4"; - break; - case Quantity_NOC_DARKSALMON : - TheName = "DARKSALMON"; - break; - case Quantity_NOC_DARKSEAGREEN : - TheName = "DARKSEAGREEN"; - break; - case Quantity_NOC_DARKSEAGREEN1 : - TheName = "DARKSEAGREEN1"; - break; - case Quantity_NOC_DARKSEAGREEN2 : - TheName = "DARKSEAGREEN2"; - break; - case Quantity_NOC_DARKSEAGREEN3 : - TheName = "DARKSEAGREEN3"; - break; - case Quantity_NOC_DARKSEAGREEN4 : - TheName = "DARKSEAGREEN4"; - break; - case Quantity_NOC_DARKSLATEBLUE : - TheName = "DARKSLATEBLUE"; - break; - case Quantity_NOC_DARKSLATEGRAY1 : - TheName = "DARKSLATEGRAY1"; - break; - case Quantity_NOC_DARKSLATEGRAY2 : - TheName = "DARKSLATEGRAY2"; - break; - case Quantity_NOC_DARKSLATEGRAY3 : - TheName = "DARKSLATEGRAY3"; - break; - case Quantity_NOC_DARKSLATEGRAY4 : - TheName = "DARKSLATEGRAY4"; - break; - case Quantity_NOC_DARKSLATEGRAY : - TheName = "DARKSLATEGRAY"; - break; - case Quantity_NOC_DARKTURQUOISE : - TheName = "DARKTURQUOISE"; - break; - case Quantity_NOC_DARKVIOLET : - TheName = "DARKVIOLET"; - break; - case Quantity_NOC_DEEPPINK : - TheName = "DEEPPINK"; - break; - case Quantity_NOC_DEEPPINK2 : - TheName = "DEEPPINK2"; - break; - case Quantity_NOC_DEEPPINK3 : - TheName = "DEEPPINK3"; - break; - case Quantity_NOC_DEEPPINK4 : - TheName = "DEEPPINK4"; - break; - case Quantity_NOC_DEEPSKYBLUE1 : - TheName = "DEEPSKYBLUE1"; - break; - case Quantity_NOC_DEEPSKYBLUE2 : - TheName = "DEEPSKYBLUE2"; - break; - case Quantity_NOC_DEEPSKYBLUE3 : - TheName = "DEEPSKYBLUE3"; - break; - case Quantity_NOC_DEEPSKYBLUE4 : - TheName = "DEEPSKYBLUE4"; - break; - case Quantity_NOC_DODGERBLUE1 : - TheName = "DODGERBLUE1"; - break; - case Quantity_NOC_DODGERBLUE2 : - TheName = "DODGERBLUE2"; - break; - case Quantity_NOC_DODGERBLUE3 : - TheName = "DODGERBLUE3"; - break; - case Quantity_NOC_DODGERBLUE4 : - TheName = "DODGERBLUE4"; - break; - case Quantity_NOC_FIREBRICK : - TheName = "FIREBRICK"; - break; - case Quantity_NOC_FIREBRICK1 : - TheName = "FIREBRICK1"; - break; - case Quantity_NOC_FIREBRICK2 : - TheName = "FIREBRICK2"; - break; - case Quantity_NOC_FIREBRICK3 : - TheName = "FIREBRICK3"; - break; - case Quantity_NOC_FIREBRICK4 : - TheName = "FIREBRICK4"; - break; - case Quantity_NOC_FLORALWHITE : - TheName = "FLORALWHITE"; - break; - case Quantity_NOC_FORESTGREEN : - TheName = "FORESTGREEN"; - break; - case Quantity_NOC_GAINSBORO : - TheName = "GAINSBORO"; - break; - case Quantity_NOC_GHOSTWHITE : - TheName = "GHOSTWHITE"; - break; - case Quantity_NOC_GOLD : - TheName = "GOLD"; - break; - case Quantity_NOC_GOLD1 : - TheName = "GOLD1"; - break; - case Quantity_NOC_GOLD2 : - TheName = "GOLD2"; - break; - case Quantity_NOC_GOLD3 : - TheName = "GOLD3"; - break; - case Quantity_NOC_GOLD4 : - TheName = "GOLD4"; - break; - case Quantity_NOC_GOLDENROD : - TheName = "GOLDENROD"; - break; - case Quantity_NOC_GOLDENROD1 : - TheName = "GOLDENROD1"; - break; - case Quantity_NOC_GOLDENROD2 : - TheName = "GOLDENROD2"; - break; - case Quantity_NOC_GOLDENROD3 : - TheName = "GOLDENROD3"; - break; - case Quantity_NOC_GOLDENROD4 : - TheName = "GOLDENROD4"; - break; - case Quantity_NOC_GRAY : - TheName = "GRAY"; - break; - case Quantity_NOC_GRAY0 : - TheName = "GRAY0"; - break; - case Quantity_NOC_GRAY1 : - TheName = "GRAY1"; - break; - case Quantity_NOC_GRAY10 : - TheName = "GRAY10"; - break; - case Quantity_NOC_GRAY11 : - TheName = "GRAY11"; - break; - case Quantity_NOC_GRAY12 : - TheName = "GRAY12"; - break; - case Quantity_NOC_GRAY13 : - TheName = "GRAY13"; - break; - case Quantity_NOC_GRAY14 : - TheName = "GRAY14"; - break; - case Quantity_NOC_GRAY15 : - TheName = "GRAY15"; - break; - case Quantity_NOC_GRAY16 : - TheName = "GRAY16"; - break; - case Quantity_NOC_GRAY17 : - TheName = "GRAY17"; - break; - case Quantity_NOC_GRAY18 : - TheName = "GRAY18"; - break; - case Quantity_NOC_GRAY19 : - TheName = "GRAY19"; - break; - case Quantity_NOC_GRAY2 : - TheName = "GRAY2"; - break; - case Quantity_NOC_GRAY20 : - TheName = "GRAY20"; - break; - case Quantity_NOC_GRAY21 : - TheName = "GRAY21"; - break; - case Quantity_NOC_GRAY22 : - TheName = "GRAY22"; - break; - case Quantity_NOC_GRAY23 : - TheName = "GRAY23"; - break; - case Quantity_NOC_GRAY24 : - TheName = "GRAY24"; - break; - case Quantity_NOC_GRAY25 : - TheName = "GRAY25"; - break; - case Quantity_NOC_GRAY26 : - TheName = "GRAY26"; - break; - case Quantity_NOC_GRAY27 : - TheName = "GRAY27"; - break; - case Quantity_NOC_GRAY28 : - TheName = "GRAY28"; - break; - case Quantity_NOC_GRAY29 : - TheName = "GRAY29"; - break; - case Quantity_NOC_GRAY3 : - TheName = "GRAY3"; - break; - case Quantity_NOC_GRAY30 : - TheName = "GRAY30"; - break; - case Quantity_NOC_GRAY31 : - TheName = "GRAY31"; - break; - case Quantity_NOC_GRAY32 : - TheName = "GRAY32"; - break; - case Quantity_NOC_GRAY33 : - TheName = "GRAY33"; - break; - case Quantity_NOC_GRAY34 : - TheName = "GRAY34"; - break; - case Quantity_NOC_GRAY35 : - TheName = "GRAY35"; - break; - case Quantity_NOC_GRAY36 : - TheName = "GRAY36"; - break; - case Quantity_NOC_GRAY37 : - TheName = "GRAY37"; - break; - case Quantity_NOC_GRAY38 : - TheName = "GRAY38"; - break; - case Quantity_NOC_GRAY39 : - TheName = "GRAY39"; - break; - case Quantity_NOC_GRAY4 : - TheName = "GRAY4"; - break; - case Quantity_NOC_GRAY40 : - TheName = "GRAY40"; - break; - case Quantity_NOC_GRAY41 : - TheName = "GRAY41"; - break; - case Quantity_NOC_GRAY42 : - TheName = "GRAY42"; - break; - case Quantity_NOC_GRAY43 : - TheName = "GRAY43"; - break; - case Quantity_NOC_GRAY44 : - TheName = "GRAY44"; - break; - case Quantity_NOC_GRAY45 : - TheName = "GRAY45"; - break; - case Quantity_NOC_GRAY46 : - TheName = "GRAY46"; - break; - case Quantity_NOC_GRAY47 : - TheName = "GRAY47"; - break; - case Quantity_NOC_GRAY48 : - TheName = "GRAY48"; - break; - case Quantity_NOC_GRAY49 : - TheName = "GRAY49"; - break; - case Quantity_NOC_GRAY5 : - TheName = "GRAY5"; - break; - case Quantity_NOC_GRAY50 : - TheName = "GRAY50"; - break; - case Quantity_NOC_GRAY51 : - TheName = "GRAY51"; - break; - case Quantity_NOC_GRAY52 : - TheName = "GRAY52"; - break; - case Quantity_NOC_GRAY53 : - TheName = "GRAY53"; - break; - case Quantity_NOC_GRAY54 : - TheName = "GRAY54"; - break; - case Quantity_NOC_GRAY55 : - TheName = "GRAY55"; - break; - case Quantity_NOC_GRAY56 : - TheName = "GRAY56"; - break; - case Quantity_NOC_GRAY57 : - TheName = "GRAY57"; - break; - case Quantity_NOC_GRAY58 : - TheName = "GRAY58"; - break; - case Quantity_NOC_GRAY59 : - TheName = "GRAY59"; - break; - case Quantity_NOC_GRAY6 : - TheName = "GRAY6"; - break; - case Quantity_NOC_GRAY60 : - TheName = "GRAY60"; - break; - case Quantity_NOC_GRAY61 : - TheName = "GRAY61"; - break; - case Quantity_NOC_GRAY62 : - TheName = "GRAY62"; - break; - case Quantity_NOC_GRAY63 : - TheName = "GRAY63"; - break; - case Quantity_NOC_GRAY64 : - TheName = "GRAY64"; - break; - case Quantity_NOC_GRAY65 : - TheName = "GRAY65"; - break; - case Quantity_NOC_GRAY66 : - TheName = "GRAY66"; - break; - case Quantity_NOC_GRAY67 : - TheName = "GRAY67"; - break; - case Quantity_NOC_GRAY68 : - TheName = "GRAY68"; - break; - case Quantity_NOC_GRAY69 : - TheName = "GRAY69"; - break; - case Quantity_NOC_GRAY7 : - TheName = "GRAY7"; - break; - case Quantity_NOC_GRAY70 : - TheName = "GRAY70"; - break; - case Quantity_NOC_GRAY71 : - TheName = "GRAY71"; - break; - case Quantity_NOC_GRAY72 : - TheName = "GRAY72"; - break; - case Quantity_NOC_GRAY73 : - TheName = "GRAY73"; - break; - case Quantity_NOC_GRAY74 : - TheName = "GRAY74"; - break; - case Quantity_NOC_GRAY75 : - TheName = "GRAY75"; - break; - case Quantity_NOC_GRAY76 : - TheName = "GRAY76"; - break; - case Quantity_NOC_GRAY77 : - TheName = "GRAY77"; - break; - case Quantity_NOC_GRAY78 : - TheName = "GRAY78"; - break; - case Quantity_NOC_GRAY79 : - TheName = "GRAY79"; - break; - case Quantity_NOC_GRAY8 : - TheName = "GRAY8"; - break; - case Quantity_NOC_GRAY80 : - TheName = "GRAY80"; - break; - case Quantity_NOC_GRAY81 : - TheName = "GRAY81"; - break; - case Quantity_NOC_GRAY82 : - TheName = "GRAY82"; - break; - case Quantity_NOC_GRAY83 : - TheName = "GRAY83"; - break; - case Quantity_NOC_GRAY85 : - TheName = "GRAY85"; - break; - case Quantity_NOC_GRAY86 : - TheName = "GRAY86"; - break; - case Quantity_NOC_GRAY87 : - TheName = "GRAY87"; - break; - case Quantity_NOC_GRAY88 : - TheName = "GRAY88"; - break; - case Quantity_NOC_GRAY89 : - TheName = "GRAY89"; - break; - case Quantity_NOC_GRAY9 : - TheName = "GRAY9"; - break; - case Quantity_NOC_GRAY90 : - TheName = "GRAY90"; - break; - case Quantity_NOC_GRAY91 : - TheName = "GRAY91"; - break; - case Quantity_NOC_GRAY92 : - TheName = "GRAY92"; - break; - case Quantity_NOC_GRAY93 : - TheName = "GRAY93"; - break; - case Quantity_NOC_GRAY94 : - TheName = "GRAY94"; - break; - case Quantity_NOC_GRAY95 : - TheName = "GRAY95"; - break; - case Quantity_NOC_GREEN : - TheName = "GREEN"; - break; - case Quantity_NOC_GREEN1 : - TheName = "GREEN1"; - break; - case Quantity_NOC_GREEN2 : - TheName = "GREEN2"; - break; - case Quantity_NOC_GREEN3 : - TheName = "GREEN3"; - break; - case Quantity_NOC_GREEN4 : - TheName = "GREEN4"; - break; - case Quantity_NOC_GREENYELLOW : - TheName = "GREENYELLOW"; - break; - case Quantity_NOC_GRAY97 : - TheName = "GRAY97"; - break; - case Quantity_NOC_GRAY98 : - TheName = "GRAY98"; - break; - case Quantity_NOC_GRAY99 : - TheName = "GRAY99"; - break; - case Quantity_NOC_HONEYDEW : - TheName = "HONEYDEW"; - break; - case Quantity_NOC_HONEYDEW2 : - TheName = "HONEYDEW2"; - break; - case Quantity_NOC_HONEYDEW3 : - TheName = "HONEYDEW3"; - break; - case Quantity_NOC_HONEYDEW4 : - TheName = "HONEYDEW4"; - break; - case Quantity_NOC_HOTPINK : - TheName = "HOTPINK"; - break; - case Quantity_NOC_HOTPINK1 : - TheName = "HOTPINK1"; - break; - case Quantity_NOC_HOTPINK2 : - TheName = "HOTPINK2"; - break; - case Quantity_NOC_HOTPINK3 : - TheName = "HOTPINK3"; - break; - case Quantity_NOC_HOTPINK4 : - TheName = "HOTPINK4"; - break; - case Quantity_NOC_INDIANRED : - TheName = "INDIANRED"; - break; - case Quantity_NOC_INDIANRED1 : - TheName = "INDIANRED1"; - break; - case Quantity_NOC_INDIANRED2 : - TheName = "INDIANRED2"; - break; - case Quantity_NOC_INDIANRED3 : - TheName = "INDIANRED3"; - break; - case Quantity_NOC_INDIANRED4 : - TheName = "INDIANRED4"; - break; - case Quantity_NOC_IVORY : - TheName = "IVORY"; - break; - case Quantity_NOC_IVORY2 : - TheName = "IVORY2"; - break; - case Quantity_NOC_IVORY3 : - TheName = "IVORY3"; - break; - case Quantity_NOC_IVORY4 : - TheName = "IVORY4"; - break; - case Quantity_NOC_KHAKI : - TheName = "KHAKI"; - break; - case Quantity_NOC_KHAKI1 : - TheName = "KHAKI1"; - break; - case Quantity_NOC_KHAKI2 : - TheName = "KHAKI2"; - break; - case Quantity_NOC_KHAKI3 : - TheName = "KHAKI3"; - break; - case Quantity_NOC_KHAKI4 : - TheName = "KHAKI4"; - break; - case Quantity_NOC_LAVENDER : - TheName = "LAVENDER"; - break; - case Quantity_NOC_LAVENDERBLUSH1 : - TheName = "LAVENDERBLUSH1"; - break; - case Quantity_NOC_LAVENDERBLUSH2 : - TheName = "LAVENDERBLUSH2"; - break; - case Quantity_NOC_LAVENDERBLUSH3 : - TheName = "LAVENDERBLUSH3"; - break; - case Quantity_NOC_LAVENDERBLUSH4 : - TheName = "LAVENDERBLUSH4"; - break; - case Quantity_NOC_LAWNGREEN : - TheName = "LAWNGREEN"; - break; - case Quantity_NOC_LEMONCHIFFON1 : - TheName = "LEMONCHIFFON1"; - break; - case Quantity_NOC_LEMONCHIFFON2 : - TheName = "LEMONCHIFFON2"; - break; - case Quantity_NOC_LEMONCHIFFON3 : - TheName = "LEMONCHIFFON3"; - break; - case Quantity_NOC_LEMONCHIFFON4 : - TheName = "LEMONCHIFFON4"; - break; - case Quantity_NOC_LIGHTBLUE : - TheName = "LIGHTBLUE"; - break; - case Quantity_NOC_LIGHTBLUE1 : - TheName = "LIGHTBLUE1"; - break; - case Quantity_NOC_LIGHTBLUE2 : - TheName = "LIGHTBLUE2"; - break; - case Quantity_NOC_LIGHTBLUE3 : - TheName = "LIGHTBLUE3"; - break; - case Quantity_NOC_LIGHTBLUE4 : - TheName = "LIGHTBLUE4"; - break; - case Quantity_NOC_LIGHTCORAL : - TheName = "LIGHTCORAL"; - break; - case Quantity_NOC_LIGHTCYAN1 : - TheName = "LIGHTCYAN1"; - break; - case Quantity_NOC_LIGHTCYAN2 : - TheName = "LIGHTCYAN2"; - break; - case Quantity_NOC_LIGHTCYAN3 : - TheName = "LIGHTCYAN3"; - break; - case Quantity_NOC_LIGHTCYAN4 : - TheName = "LIGHTCYAN4"; - break; - case Quantity_NOC_LIGHTGOLDENROD : - TheName = "LIGHTGOLDENROD"; - break; - case Quantity_NOC_LIGHTGOLDENROD1 : - TheName = "LIGHTGOLDENROD1"; - break; - case Quantity_NOC_LIGHTGOLDENROD2 : - TheName = "LIGHTGOLDENROD2"; - break; - case Quantity_NOC_LIGHTGOLDENROD3 : - TheName = "LIGHTGOLDENROD3"; - break; - case Quantity_NOC_LIGHTGOLDENROD4 : - TheName = "LIGHTGOLDENROD4"; - break; - case Quantity_NOC_LIGHTGOLDENRODYELLOW : - TheName = "LIGHTGOLDENRODYELLOW"; - break; - case Quantity_NOC_LIGHTGRAY : - TheName = "LIGHTGRAY"; - break; - case Quantity_NOC_LIGHTPINK : - TheName = "LIGHTPINK"; - break; - case Quantity_NOC_LIGHTPINK1 : - TheName = "LIGHTPINK1"; - break; - case Quantity_NOC_LIGHTPINK2 : - TheName = "LIGHTPINK2"; - break; - case Quantity_NOC_LIGHTPINK3 : - TheName = "LIGHTPINK3"; - break; - case Quantity_NOC_LIGHTPINK4 : - TheName = "LIGHTPINK4"; - break; - case Quantity_NOC_LIGHTSALMON1 : - TheName = "LIGHTSALMON1"; - break; - case Quantity_NOC_LIGHTSALMON2 : - TheName = "LIGHTSALMON2"; - break; - case Quantity_NOC_LIGHTSALMON3 : - TheName = "LIGHTSALMON3"; - break; - case Quantity_NOC_LIGHTSALMON4 : - TheName = "LIGHTSALMON4"; - break; - case Quantity_NOC_LIGHTSEAGREEN : - TheName = "LIGHTSEAGREEN"; - break; - case Quantity_NOC_LIGHTSKYBLUE : - TheName = "LIGHTSKYBLUE"; - break; - case Quantity_NOC_LIGHTSKYBLUE1 : - TheName = "LIGHTSKYBLUE1"; - break; - case Quantity_NOC_LIGHTSKYBLUE2 : - TheName = "LIGHTSKYBLUE2"; - break; - case Quantity_NOC_LIGHTSKYBLUE3 : - TheName = "LIGHTSKYBLUE3"; - break; - case Quantity_NOC_LIGHTSKYBLUE4 : - TheName = "LIGHTSKYBLUE4"; - break; - case Quantity_NOC_LIGHTSLATEBLUE : - TheName = "LIGHTSLATEBLUE"; - break; - case Quantity_NOC_LIGHTSLATEGRAY : - TheName = "LIGHTSLATEGRAY"; - break; - case Quantity_NOC_LIGHTSTEELBLUE : - TheName = "LIGHTSTEELBLUE"; - break; - case Quantity_NOC_LIGHTSTEELBLUE1 : - TheName = "LIGHTSTEELBLUE1"; - break; - case Quantity_NOC_LIGHTSTEELBLUE2 : - TheName = "LIGHTSTEELBLUE2"; - break; - case Quantity_NOC_LIGHTSTEELBLUE3 : - TheName = "LIGHTSTEELBLUE3"; - break; - case Quantity_NOC_LIGHTSTEELBLUE4 : - TheName = "LIGHTSTEELBLUE4"; - break; - case Quantity_NOC_LIGHTYELLOW : - TheName = "LIGHTYELLOW"; - break; - case Quantity_NOC_LIGHTYELLOW2 : - TheName = "LIGHTYELLOW2"; - break; - case Quantity_NOC_LIGHTYELLOW3 : - TheName = "LIGHTYELLOW3"; - break; - case Quantity_NOC_LIGHTYELLOW4 : - TheName = "LIGHTYELLOW4"; - break; - case Quantity_NOC_LIMEGREEN : - TheName = "LIMEGREEN"; - break; - case Quantity_NOC_LINEN : - TheName = "LINEN"; - break; - case Quantity_NOC_MAGENTA1 : - TheName = "MAGENTA1"; - break; - case Quantity_NOC_MAGENTA2 : - TheName = "MAGENTA2"; - break; - case Quantity_NOC_MAGENTA3 : - TheName = "MAGENTA3"; - break; - case Quantity_NOC_MAGENTA4 : - TheName = "MAGENTA4"; - break; - case Quantity_NOC_MAROON : - TheName = "MAROON"; - break; - case Quantity_NOC_MAROON1 : - TheName = "MAROON1"; - break; - case Quantity_NOC_MAROON2 : - TheName = "MAROON2"; - break; - case Quantity_NOC_MAROON3 : - TheName = "MAROON3"; - break; - case Quantity_NOC_MAROON4 : - TheName = "MAROON4"; - break; - case Quantity_NOC_MEDIUMAQUAMARINE : - TheName = "MEDIUMAQUAMARINE"; - break; - case Quantity_NOC_MEDIUMORCHID : - TheName = "MEDIUMORCHID"; - break; - case Quantity_NOC_MEDIUMORCHID1 : - TheName = "MEDIUMORCHID1"; - break; - case Quantity_NOC_MEDIUMORCHID2 : - TheName = "MEDIUMORCHID2"; - break; - case Quantity_NOC_MEDIUMORCHID3 : - TheName = "MEDIUMORCHID3"; - break; - case Quantity_NOC_MEDIUMORCHID4 : - TheName = "MEDIUMORCHID4"; - break; - case Quantity_NOC_MEDIUMPURPLE : - TheName = "MEDIUMPURPLE"; - break; - case Quantity_NOC_MEDIUMPURPLE1 : - TheName = "MEDIUMPURPLE1"; - break; - case Quantity_NOC_MEDIUMPURPLE2 : - TheName = "MEDIUMPURPLE2"; - break; - case Quantity_NOC_MEDIUMPURPLE3 : - TheName = "MEDIUMPURPLE3"; - break; - case Quantity_NOC_MEDIUMPURPLE4 : - TheName = "MEDIUMPURPLE4"; - break; - case Quantity_NOC_MEDIUMSEAGREEN : - TheName = "MEDIUMSEAGREEN"; - break; - case Quantity_NOC_MEDIUMSLATEBLUE : - TheName = "MEDIUMSLATEBLUE"; - break; - case Quantity_NOC_MEDIUMSPRINGGREEN : - TheName = "MEDIUMSPRINGGREEN"; - break; - case Quantity_NOC_MEDIUMTURQUOISE : - TheName = "MEDIUMTURQUOISE"; - break; - case Quantity_NOC_MEDIUMVIOLETRED : - TheName = "MEDIUMVIOLETRED"; - break; - case Quantity_NOC_MIDNIGHTBLUE : - TheName = "MIDNIGHTBLUE"; - break; - case Quantity_NOC_MINTCREAM : - TheName = "MINTCREAM"; - break; - case Quantity_NOC_MISTYROSE : - TheName = "MISTYROSE"; - break; - case Quantity_NOC_MISTYROSE2 : - TheName = "MISTYROSE2"; - break; - case Quantity_NOC_MISTYROSE3 : - TheName = "MISTYROSE3"; - break; - case Quantity_NOC_MISTYROSE4 : - TheName = "MISTYROSE4"; - break; - case Quantity_NOC_MOCCASIN : - TheName = "MOCCASIN"; - break; - case Quantity_NOC_NAVAJOWHITE1 : - TheName = "NAVAJOWHITE1"; - break; - case Quantity_NOC_NAVAJOWHITE2 : - TheName = "NAVAJOWHITE2"; - break; - case Quantity_NOC_NAVAJOWHITE3 : - TheName = "NAVAJOWHITE3"; - break; - case Quantity_NOC_NAVAJOWHITE4 : - TheName = "NAVAJOWHITE4"; - break; - case Quantity_NOC_NAVYBLUE : - TheName = "NAVYBLUE"; - break; - case Quantity_NOC_OLDLACE : - TheName = "OLDLACE"; - break; - case Quantity_NOC_OLIVEDRAB : - TheName = "OLIVEDRAB"; - break; - case Quantity_NOC_OLIVEDRAB1 : - TheName = "OLIVEDRAB1"; - break; - case Quantity_NOC_OLIVEDRAB2 : - TheName = "OLIVEDRAB2"; - break; - case Quantity_NOC_OLIVEDRAB3 : - TheName = "OLIVEDRAB3"; - break; - case Quantity_NOC_OLIVEDRAB4 : - TheName = "OLIVEDRAB4"; - break; - case Quantity_NOC_ORANGE : - TheName = "ORANGE"; - break; - case Quantity_NOC_ORANGE1 : - TheName = "ORANGE1"; - break; - case Quantity_NOC_ORANGE2 : - TheName = "ORANGE2"; - break; - case Quantity_NOC_ORANGE3 : - TheName = "ORANGE3"; - break; - case Quantity_NOC_ORANGE4 : - TheName = "ORANGE4"; - break; - case Quantity_NOC_ORANGERED : - TheName = "ORANGERED"; - break; - case Quantity_NOC_ORANGERED1 : - TheName = "ORANGERED1"; - break; - case Quantity_NOC_ORANGERED2 : - TheName = "ORANGERED2"; - break; - case Quantity_NOC_ORANGERED3 : - TheName = "ORANGERED3"; - break; - case Quantity_NOC_ORANGERED4 : - TheName = "ORANGERED4"; - break; - case Quantity_NOC_ORCHID : - TheName = "ORCHID"; - break; - case Quantity_NOC_ORCHID1 : - TheName = "ORCHID1"; - break; - case Quantity_NOC_ORCHID2 : - TheName = "ORCHID2"; - break; - case Quantity_NOC_ORCHID3 : - TheName = "ORCHID3"; - break; - case Quantity_NOC_ORCHID4 : - TheName = "ORCHID4"; - break; - case Quantity_NOC_PALEGOLDENROD : - TheName = "PALEGOLDENROD"; - break; - case Quantity_NOC_PALEGREEN : - TheName = "PALEGREEN"; - break; - case Quantity_NOC_PALEGREEN1 : - TheName = "PALEGREEN1"; - break; - case Quantity_NOC_PALEGREEN2 : - TheName = "PALEGREEN2"; - break; - case Quantity_NOC_PALEGREEN3 : - TheName = "PALEGREEN3"; - break; - case Quantity_NOC_PALEGREEN4 : - TheName = "PALEGREEN4"; - break; - case Quantity_NOC_PALETURQUOISE : - TheName = "PALETURQUOISE"; - break; - case Quantity_NOC_PALETURQUOISE1 : - TheName = "PALETURQUOISE1"; - break; - case Quantity_NOC_PALETURQUOISE2 : - TheName = "PALETURQUOISE2"; - break; - case Quantity_NOC_PALETURQUOISE3 : - TheName = "PALETURQUOISE3"; - break; - case Quantity_NOC_PALETURQUOISE4 : - TheName = "PALETURQUOISE4"; - break; - case Quantity_NOC_PALEVIOLETRED : - TheName = "PALEVIOLETRED"; - break; - case Quantity_NOC_PALEVIOLETRED1 : - TheName = "PALEVIOLETRED1"; - break; - case Quantity_NOC_PALEVIOLETRED2 : - TheName = "PALEVIOLETRED2"; - break; - case Quantity_NOC_PALEVIOLETRED3 : - TheName = "PALEVIOLETRED3"; - break; - case Quantity_NOC_PALEVIOLETRED4 : - TheName = "PALEVIOLETRED4"; - break; - case Quantity_NOC_PAPAYAWHIP : - TheName = "PAPAYAWHIP"; - break; - case Quantity_NOC_PEACHPUFF : - TheName = "PEACHPUFF"; - break; - case Quantity_NOC_PEACHPUFF2 : - TheName = "PEACHPUFF2"; - break; - case Quantity_NOC_PEACHPUFF3 : - TheName = "PEACHPUFF3"; - break; - case Quantity_NOC_PEACHPUFF4 : - TheName = "PEACHPUFF4"; - break; - case Quantity_NOC_PERU : - TheName = "PERU"; - break; - case Quantity_NOC_PINK : - TheName = "PINK"; - break; - case Quantity_NOC_PINK1 : - TheName = "PINK1"; - break; - case Quantity_NOC_PINK2 : - TheName = "PINK2"; - break; - case Quantity_NOC_PINK3 : - TheName = "PINK3"; - break; - case Quantity_NOC_PINK4 : - TheName = "PINK4"; - break; - case Quantity_NOC_PLUM : - TheName = "PLUM"; - break; - case Quantity_NOC_PLUM1 : - TheName = "PLUM1"; - break; - case Quantity_NOC_PLUM2 : - TheName = "PLUM2"; - break; - case Quantity_NOC_PLUM3 : - TheName = "PLUM3"; - break; - case Quantity_NOC_PLUM4 : - TheName = "PLUM4"; - break; - case Quantity_NOC_POWDERBLUE : - TheName = "POWDERBLUE"; - break; - case Quantity_NOC_PURPLE : - TheName = "PURPLE"; - break; - case Quantity_NOC_PURPLE1 : - TheName = "PURPLE1"; - break; - case Quantity_NOC_PURPLE2 : - TheName = "PURPLE2"; - break; - case Quantity_NOC_PURPLE3 : - TheName = "PURPLE3"; - break; - case Quantity_NOC_PURPLE4 : - TheName = "PURPLE4"; - break; - case Quantity_NOC_RED : - TheName = "RED"; - break; - case Quantity_NOC_RED1 : - TheName = "RED1"; - break; - case Quantity_NOC_RED2 : - TheName = "RED2"; - break; - case Quantity_NOC_RED3 : - TheName = "RED3"; - break; - case Quantity_NOC_RED4 : - TheName = "RED4"; - break; - case Quantity_NOC_ROSYBROWN : - TheName = "ROSYBROWN"; - break; - case Quantity_NOC_ROSYBROWN1 : - TheName = "ROSYBROWN1"; - break; - case Quantity_NOC_ROSYBROWN2 : - TheName = "ROSYBROWN2"; - break; - case Quantity_NOC_ROSYBROWN3 : - TheName = "ROSYBROWN3"; - break; - case Quantity_NOC_ROSYBROWN4 : - TheName = "ROSYBROWN4"; - break; - case Quantity_NOC_ROYALBLUE : - TheName = "ROYALBLUE"; - break; - case Quantity_NOC_ROYALBLUE1 : - TheName = "ROYALBLUE1"; - break; - case Quantity_NOC_ROYALBLUE2 : - TheName = "ROYALBLUE2"; - break; - case Quantity_NOC_ROYALBLUE3 : - TheName = "ROYALBLUE3"; - break; - case Quantity_NOC_ROYALBLUE4 : - TheName = "ROYALBLUE4"; - break; - case Quantity_NOC_SADDLEBROWN : - TheName = "SADDLEBROWN"; - break; - case Quantity_NOC_SALMON : - TheName = "SALMON"; - break; - case Quantity_NOC_SALMON1 : - TheName = "SALMON1"; - break; - case Quantity_NOC_SALMON2 : - TheName = "SALMON2"; - break; - case Quantity_NOC_SALMON3 : - TheName = "SALMON3"; - break; - case Quantity_NOC_SALMON4 : - TheName = "SALMON4"; - break; - case Quantity_NOC_SANDYBROWN : - TheName = "SANDYBROWN"; - break; - case Quantity_NOC_SEAGREEN : - TheName = "SEAGREEN"; - break; - case Quantity_NOC_SEAGREEN1 : - TheName = "SEAGREEN1"; - break; - case Quantity_NOC_SEAGREEN2 : - TheName = "SEAGREEN2"; - break; - case Quantity_NOC_SEAGREEN3 : - TheName = "SEAGREEN3"; - break; - case Quantity_NOC_SEAGREEN4 : - TheName = "SEAGREEN4"; - break; - case Quantity_NOC_SEASHELL : - TheName = "SEASHELL"; - break; - case Quantity_NOC_SEASHELL2 : - TheName = "SEASHELL2"; - break; - case Quantity_NOC_SEASHELL3 : - TheName = "SEASHELL3"; - break; - case Quantity_NOC_SEASHELL4 : - TheName = "SEASHELL4"; - break; - case Quantity_NOC_BEET : - TheName = "BEET"; - break; - case Quantity_NOC_TEAL : - TheName = "TEAL"; - break; - case Quantity_NOC_SIENNA : - TheName = "SIENNA"; - break; - case Quantity_NOC_SIENNA1 : - TheName = "SIENNA1"; - break; - case Quantity_NOC_SIENNA2 : - TheName = "SIENNA2"; - break; - case Quantity_NOC_SIENNA3 : - TheName = "SIENNA3"; - break; - case Quantity_NOC_SIENNA4 : - TheName = "SIENNA4"; - break; - case Quantity_NOC_SKYBLUE : - TheName = "SKYBLUE"; - break; - case Quantity_NOC_SKYBLUE1 : - TheName = "SKYBLUE1"; - break; - case Quantity_NOC_SKYBLUE2 : - TheName = "SKYBLUE2"; - break; - case Quantity_NOC_SKYBLUE3 : - TheName = "SKYBLUE3"; - break; - case Quantity_NOC_SKYBLUE4 : - TheName = "SKYBLUE4"; - break; - case Quantity_NOC_SLATEBLUE : - TheName = "SLATEBLUE"; - break; - case Quantity_NOC_SLATEBLUE1 : - TheName = "SLATEBLUE1"; - break; - case Quantity_NOC_SLATEBLUE2 : - TheName = "SLATEBLUE2"; - break; - case Quantity_NOC_SLATEBLUE3 : - TheName = "SLATEBLUE3"; - break; - case Quantity_NOC_SLATEBLUE4 : - TheName = "SLATEBLUE4"; - break; - case Quantity_NOC_SLATEGRAY1 : - TheName = "SLATEGRAY1"; - break; - case Quantity_NOC_SLATEGRAY2 : - TheName = "SLATEGRAY2"; - break; - case Quantity_NOC_SLATEGRAY3 : - TheName = "SLATEGRAY3"; - break; - case Quantity_NOC_SLATEGRAY4 : - TheName = "SLATEGRAY4"; - break; - case Quantity_NOC_SLATEGRAY : - TheName = "SLATEGRAY"; - break; - case Quantity_NOC_SNOW : - TheName = "SNOW"; - break; - case Quantity_NOC_SNOW2 : - TheName = "SNOW2"; - break; - case Quantity_NOC_SNOW3 : - TheName = "SNOW3"; - break; - case Quantity_NOC_SNOW4 : - TheName = "SNOW4"; - break; - case Quantity_NOC_SPRINGGREEN : - TheName = "SPRINGGREEN"; - break; - case Quantity_NOC_SPRINGGREEN2 : - TheName = "SPRINGGREEN2"; - break; - case Quantity_NOC_SPRINGGREEN3 : - TheName = "SPRINGGREEN3"; - break; - case Quantity_NOC_SPRINGGREEN4 : - TheName = "SPRINGGREEN4"; - break; - case Quantity_NOC_STEELBLUE : - TheName = "STEELBLUE"; - break; - case Quantity_NOC_STEELBLUE1 : - TheName = "STEELBLUE1"; - break; - case Quantity_NOC_STEELBLUE2 : - TheName = "STEELBLUE2"; - break; - case Quantity_NOC_STEELBLUE3 : - TheName = "STEELBLUE3"; - break; - case Quantity_NOC_STEELBLUE4 : - TheName = "STEELBLUE4"; - break; - case Quantity_NOC_TAN : - TheName = "TAN"; - break; - case Quantity_NOC_TAN1 : - TheName = "TAN1"; - break; - case Quantity_NOC_TAN2 : - TheName = "TAN2"; - break; - case Quantity_NOC_TAN3 : - TheName = "TAN3"; - break; - case Quantity_NOC_TAN4 : - TheName = "TAN4"; - break; - case Quantity_NOC_THISTLE : - TheName = "THISTLE"; - break; - case Quantity_NOC_THISTLE1 : - TheName = "THISTLE1"; - break; - case Quantity_NOC_THISTLE2 : - TheName = "THISTLE2"; - break; - case Quantity_NOC_THISTLE3 : - TheName = "THISTLE3"; - break; - case Quantity_NOC_THISTLE4 : - TheName = "THISTLE4"; - break; - case Quantity_NOC_TOMATO : - TheName = "TOMATO"; - break; - case Quantity_NOC_TOMATO1 : - TheName = "TOMATO1"; - break; - case Quantity_NOC_TOMATO2 : - TheName = "TOMATO2"; - break; - case Quantity_NOC_TOMATO3 : - TheName = "TOMATO3"; - break; - case Quantity_NOC_TOMATO4 : - TheName = "TOMATO4"; - break; - case Quantity_NOC_TURQUOISE : - TheName = "TURQUOISE"; - break; - case Quantity_NOC_TURQUOISE1 : - TheName = "TURQUOISE1"; - break; - case Quantity_NOC_TURQUOISE2 : - TheName = "TURQUOISE2"; - break; - case Quantity_NOC_TURQUOISE3 : - TheName = "TURQUOISE3"; - break; - case Quantity_NOC_TURQUOISE4 : - TheName = "TURQUOISE4"; - break; - case Quantity_NOC_VIOLET : - TheName = "VIOLET"; - break; - case Quantity_NOC_VIOLETRED : - TheName = "VIOLETRED"; - break; - case Quantity_NOC_VIOLETRED1 : - TheName = "VIOLETRED1"; - break; - case Quantity_NOC_VIOLETRED2 : - TheName = "VIOLETRED2"; - break; - case Quantity_NOC_VIOLETRED3 : - TheName = "VIOLETRED3"; - break; - case Quantity_NOC_VIOLETRED4 : - TheName = "VIOLETRED4"; - break; - case Quantity_NOC_WHEAT : - TheName = "WHEAT"; - break; - case Quantity_NOC_WHEAT1 : - TheName = "WHEAT1"; - break; - case Quantity_NOC_WHEAT2 : - TheName = "WHEAT2"; - break; - case Quantity_NOC_WHEAT3 : - TheName = "WHEAT3"; - break; - case Quantity_NOC_WHEAT4 : - TheName = "WHEAT4"; - break; - case Quantity_NOC_WHITE : - TheName = "WHITE"; - break; - case Quantity_NOC_WHITESMOKE : - TheName = "WHITESMOKE"; - break; - case Quantity_NOC_YELLOW : - TheName = "YELLOW"; - break; - case Quantity_NOC_YELLOW1 : - TheName = "YELLOW1"; - break; - case Quantity_NOC_YELLOW2 : - TheName = "YELLOW2"; - break; - case Quantity_NOC_YELLOW3 : - TheName = "YELLOW3"; - break; - case Quantity_NOC_YELLOW4 : - TheName = "YELLOW4"; - break; - case Quantity_NOC_YELLOWGREEN : - TheName = "YELLOWGREEN"; - break; - default : - TheName = "UNDEFINED"; - throw Standard_OutOfRange("Bad name"); - break; -} -return (TheName); +// ======================================================================= +// function : Delta +// purpose : +// ======================================================================= +void Quantity_Color::Delta (const Quantity_Color& theColor, + Standard_Real& theDC, + Standard_Real& theDI) const +{ + const NCollection_Vec3 aHls1 = Convert_sRGB_To_HLS (myRgb); + const NCollection_Vec3 aHls2 = Convert_sRGB_To_HLS (theColor.myRgb); + theDC = Standard_Real (aHls1[2] - aHls2[2]); // saturation + theDI = Standard_Real (aHls1[1] - aHls2[1]); // light +} + +// ======================================================================= +// function : Name +// purpose : +// ======================================================================= +Quantity_NameOfColor Quantity_Color::Name() const +{ + Standard_ShortReal aDist2 = 4.0f; + Quantity_NameOfColor aResName = Quantity_NOC_BLACK; + for (Standard_Integer aColIter = Quantity_NOC_BLACK; aColIter <= Quantity_NOC_WHITE; ++aColIter) + { + const Standard_ShortReal aNewDist2 = (myRgb - THE_COLORS[aColIter].RgbValues).SquareModulus(); + if (aNewDist2 < aDist2) + { + aResName = Quantity_NameOfColor (aColIter); + aDist2 = aNewDist2; + if (aNewDist2 == 0.0f) + { + break; + } + } + } + return aResName; +} + +// ======================================================================= +// function : Values +// purpose : +// ======================================================================= +void Quantity_Color::Values (Standard_Real& theR1, Standard_Real& theR2, Standard_Real& theR3, + const Quantity_TypeOfColor theType) const +{ + switch (theType) + { + case Quantity_TOC_RGB: + { + theR1 = myRgb.r(); + theR2 = myRgb.g(); + theR3 = myRgb.b(); + break; + } + case Quantity_TOC_HLS: + { + const NCollection_Vec3 aHls = Convert_sRGB_To_HLS (myRgb); + theR1 = aHls[0]; + theR2 = aHls[1]; + theR3 = aHls[2]; + break; + } + } +} + +// ======================================================================= +// function : Convert_HLS_To_sRGB +// purpose : Reference: La synthese d'images, Collection Hermes +// ======================================================================= +NCollection_Vec3 Quantity_Color::Convert_HLS_To_sRGB (const NCollection_Vec3& theHls) +{ + float aHue = theHls[0]; + const float aLight = theHls[1]; + const float aSaturation = theHls[2]; + if (aSaturation == 0.0f + && aHue == RGBHLS_H_UNDEFINED) + { + return NCollection_Vec3 (aLight, aLight, aLight); + } + + int aHueIndex = 0; + float lmuls = aLight * aSaturation; + if (aHue == 360.0f) + { + aHue = 0.0; + aHueIndex = 0; + } + else + { + aHue /= 60.0f; + aHueIndex = (int )aHue; + } + + switch (aHueIndex) + { + case 0: return NCollection_Vec3 (aLight, + aLight - lmuls + lmuls * aHue, + aLight - lmuls); + case 1: return NCollection_Vec3 (aLight + lmuls - lmuls * aHue, + aLight, + aLight - lmuls); + case 2: return NCollection_Vec3 (aLight - lmuls, + aLight, + aLight - 3 * lmuls + lmuls * aHue); + case 3: return NCollection_Vec3 (aLight - lmuls, + aLight + 3 * lmuls - lmuls * aHue, + aLight); + case 4: return NCollection_Vec3 (aLight - 5 * lmuls + lmuls * aHue, + aLight - lmuls, + aLight); + case 5 : return NCollection_Vec3 (aLight, + aLight - lmuls, + aLight + 5 * lmuls - lmuls * aHue); + } + throw Standard_OutOfRange("Color out"); +} + +// ======================================================================= +// function : Convert_sRGB_To_HLS +// purpose : Reference: La synthese d'images, Collection Hermes +// ======================================================================= +NCollection_Vec3 Quantity_Color::Convert_sRGB_To_HLS (const NCollection_Vec3& theRgb) +{ + float aPlus = 0.0f; + float aDiff = theRgb.g() - theRgb.b(); + + // compute maximum from RGB components, which will be a luminance + float aMax = theRgb.r(); + if (theRgb.g() > aMax) { aPlus = 2.0; aDiff = theRgb.b() - theRgb.r(); aMax = theRgb.g(); } + if (theRgb.b() > aMax) { aPlus = 4.0; aDiff = theRgb.r() - theRgb.g(); aMax = theRgb.b(); } + + // compute minimum from RGB components + float min = theRgb.r(); + if (theRgb.g() < min) min = theRgb.g(); + if (theRgb.b() < min) min = theRgb.b(); + + const float aDelta = aMax - min; + + // compute saturation + float aSaturation = 0.0f; + if (aMax != 0.0f) aSaturation = aDelta / aMax; + + // compute hue + float aHue = RGBHLS_H_UNDEFINED; + if (aSaturation != 0.0f) + { + aHue = 60.0f * (aPlus + aDiff / aDelta); + if (aHue < 0.0f) aHue += 360.0f; + } + return NCollection_Vec3 (aHue, aMax, aSaturation); } -// /////////////////////////////////////////////////////////////////////////////// //////////////////////////////////// TESTS //////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// - -void Quantity_Color::Test () { - -void TestOfColor (); - - try { - OCC_CATCH_SIGNALS - TestOfColor (); - } - - catch (Standard_Failure const& anException) { - std::cout << anException << std::endl; - } - -} - -void TestOfColor () { - -Standard_Real H, L, S; -Standard_Real R, G, B; -Standard_Real DC, DI; -Standard_Integer i; - -std::cout << "definition color tests\n----------------------\n"; - -Quantity_Color C1; -Quantity_Color C2 (Quantity_NOC_ROYALBLUE2); -Quantity_Color C3 (Quantity_NOC_SANDYBROWN); - -// An Introduction to Standard_Object-Oriented Programming and C++ p43 -// a comment for the "const char *const" declaration -const char *const cyan = "YELLOW"; -const char *const blue = "ROYALBLUE2"; -const char *const brown = "SANDYBROWN"; - -Standard_Real RR, GG, BB; - -const Standard_Real DELTA = 1.0e-4; - -std::cout << "Get values and names of color tests\n-----------------------------------\n"; - - C1.Values (R, G, B, Quantity_TOC_RGB); - if ( (R!=1.0) || (G!=1.0) || (B!=0.0) ) { - std::cout << "TEST_ERROR : Values () bad default color\n"; - std::cout << "R, G, B values: " << R << " " << G << " " << B << "\n"; - } - if ( (C1.Red ()!=1.0) || (C1.Green ()!=1.0) || (C1.Blue ()!=0.0) ) { - std::cout << "TEST_ERROR : Values () bad default color\n"; - std::cout << "R, G, B values: " << C1.Red () << " " << C1.Green () - << " " << C1.Blue () << "\n"; - } - if (strcmp (Quantity_Color::StringName (C1.Name()), cyan) != 0) - std::cout << "TEST_ERROR : StringName () " << - Quantity_Color::StringName (C1.Name()) << - " != YELLOW\n"; - - RR=0.262745; GG=0.431373; BB=0.933333; - C1.SetValues (RR, GG, BB, Quantity_TOC_RGB); - C2.Values (R, G, B, Quantity_TOC_RGB); - if ( (Abs (RR-R) > DELTA) || - (Abs (GG-G) > DELTA) || - (Abs (BB-B) > DELTA) ) { - std::cout << "TEST_ERROR : Values () bad default color\n"; - std::cout << "R, G, B values: " << R << " " << G << " " << B << "\n"; - } - - if (C2 != C1) { - std::cout << "TEST_ERROR : IsDifferent ()\n"; - } - if (C3 == C1) { - std::cout << "TEST_ERROR : IsEqual ()\n"; - } - - std::cout << "Distance C1,C2 " << C1.Distance (C2) << "\n"; - std::cout << "Distance C1,C3 " << C1.Distance (C3) << "\n"; - std::cout << "Distance C2,C3 " << C2.Distance (C3) << "\n"; - std::cout << "SquareDistance C1,C2 " << C1.SquareDistance (C2) << "\n"; - std::cout << "SquareDistance C1,C3 " << C1.SquareDistance (C3) << "\n"; - std::cout << "SquareDistance C2,C3 " << C2.SquareDistance (C3) << "\n"; - - if (strcmp (Quantity_Color::StringName (C2.Name()), blue) != 0) - std::cout << "TEST_ERROR : StringName () " << - Quantity_Color::StringName (C2.Name()) << - " != ROYALBLUE2\n"; - -std::cout << "conversion rgbhls tests\n-----------------------\n"; - Quantity_Color::RgbHls (R, G, B, H, L, S); - Quantity_Color::HlsRgb (H, L, S, R, G, B); - RR=0.262745; GG=0.431373; BB=0.933333; - if ( (Abs (RR-R) > DELTA) || - (Abs (GG-G) > DELTA) || - (Abs (BB-B) > DELTA) ) { - std::cout << "TEST_ERROR : RgbHls or HlsRgb bad conversion\n"; - std::cout << "RGB init : " << RR << " " << GG << " " << BB << "\n"; - std::cout << "RGB values : " << R << " " << G << " " << B << "\n"; - std::cout << "Difference RGB : " - << RR-R << " " << GG-G << " " << BB-B << "\n"; - } - -std::cout << "distance tests\n--------------\n"; - R = (float ) 0.9568631; G = (float ) 0.6431371; B = (float ) 0.3764711; - C2.SetValues (R, G, B, Quantity_TOC_RGB); - if (C2.Distance (C3) > DELTA) { - std::cout << "TEST_ERROR : Distance () bad result\n"; - std::cout << "Distance C2 and C3 : " << C2.Distance (C3) << "\n"; - } - - C2.Delta (C3, DC, DI); - if (Abs (DC) > DELTA) - std::cout << "TEST_ERROR : Delta () bad result for DC\n"; - if (Abs (DI) > DELTA) - std::cout << "TEST_ERROR : Delta () bad result for DI\n"; - -std::cout << "name tests\n----------\n"; - R = (float ) 0.9568631; G = (float ) 0.6431371; B = (float ) 0.3764711; - C2.SetValues (R, G, B, Quantity_TOC_RGB); - if (strcmp (Quantity_Color::StringName (C2.Name()), brown) != 0) - std::cout << "TEST_ERROR : StringName () " << - Quantity_Color::StringName (C2.Name()) << - " != SANDYBROWN\n"; - -std::cout << "contrast change tests\n---------------------\n"; - for (i=1; i<=10; i++) { - C2.ChangeContrast (10.); - C2.ChangeContrast (-9.09090909); - } - C2.Values (R, G, B, Quantity_TOC_RGB); - RR=0.956863; GG=0.6431371; BB=0.3764711; - if ( (Abs (RR-R) > DELTA) || - (Abs (GG-G) > DELTA) || - (Abs (BB-B) > DELTA) ) { - std::cout << "TEST_ERROR : ChangeContrast () bad values\n"; - std::cout << "RGB init : " << RR << " " << GG << " " << BB << "\n"; - std::cout << "RGB values : " << R << " " << G << " " << B << "\n"; - } - -} - -/* - * - * Objet : Algorithme de conversion HLS vers RGB - * - * Rappels : RGB et HLS sont 2 modeles de representation - * des couleurs - * - * Parametres : h, l, s connus avec h dans [0,360] et l et s dans [0,1] - * r, g, b dans [0,1] - * - * Reference : La synthese d'images, Collection Hermes - * - * Adaptation : Cal 07 fevrier 1992 - * - * Modification : ? - */ - -void call_hlsrgb (float h, float l, float s, float& r, float& g, float& b) -/* parametres d'entree : h, l, s connus avec h dans [0,360] - * et l et s dans [0,1] */ -/* parametres de sortie : r, g, b dans [0,1] */ +static void TestOfColor() { + Standard_Real H, L, S; + Standard_Real R, G, B; + Standard_Real DC, DI; + Standard_Integer i; - float hcopy; - float lmuls; - int hi; + std::cout << "definition color tests\n----------------------\n"; - hcopy = h; - lmuls = l * s; + Quantity_Color C1; + Quantity_Color C2 (Quantity_NOC_ROYALBLUE2); + Quantity_Color C3 (Quantity_NOC_SANDYBROWN); - if (s == 0.0 && h == RGBHLS_H_UNDEFINED) { - /* cas achromatique */ - r = g = b = l; - } - else { - /* cas chromatique */ - if (hcopy == 360.0) { - hcopy = 0.0; - hi = 0; - } - else { - hcopy /= 60.0; - hi = (int)hcopy; - } + // An Introduction to Standard_Object-Oriented Programming and C++ p43 + // a comment for the "const char *const" declaration + const char *const cyan = "YELLOW"; + const char *const blue = "ROYALBLUE2"; + const char *const brown = "SANDYBROWN"; - switch (hi) { - case 0 : - /* - r = l; - g = l * (1 - (s * (1 - (hcopy - hi)))); - b = l * (1 - s); - */ - r = l; - b = l - lmuls; - g = b + lmuls * hcopy; - break; - case 1 : - /* - r = l * (1 - (s * (hcopy - hi))); - g = l; - b = l * (1 - s); - */ - r = l + lmuls - lmuls * hcopy; - g = l; - b = l - lmuls; - break; - case 2 : - /* - r = l * (1 - s); - g = l; - b = l * (1 - (s * (1 - (hcopy - hi)))); - */ - r = l - lmuls; - g = l; - b = l - 3 * lmuls + lmuls * hcopy; - break; - case 3 : - /* - r = l * (1 - s); - g = l * (1 - (s * (hcopy - hi))); - b = l; - */ - r = l - lmuls; - g = l + 3 * lmuls - lmuls * hcopy; - b = l; - break; - case 4 : - /* - r = l * (1 - (s * (1 - (hcopy - hi)))); - g = l * (1 - s); - b = l; - */ - r = l - 5 * lmuls + lmuls * hcopy; - g = l - lmuls; - b = l; - break; - case 5 : - /* - r = l; - g = l * (1 - s); - b = l * (1 - (s * (hcopy - hi))); - */ - r = l; - g = l - lmuls; - b = l + 5 * lmuls - lmuls * hcopy; - break; - } - } + Standard_Real RR, GG, BB; + + const Standard_Real DELTA = 1.0e-4; + + std::cout << "Get values and names of color tests\n-----------------------------------\n"; + + C1.Values (R, G, B, Quantity_TOC_RGB); + if ((R!=1.0) || (G!=1.0) || (B!=0.0)) + { + std::cout << "TEST_ERROR : Values () bad default color\n"; + std::cout << "R, G, B values: " << R << " " << G << " " << B << "\n"; + } + if ( (C1.Red ()!=1.0) || (C1.Green ()!=1.0) || (C1.Blue ()!=0.0) ) + { + std::cout << "TEST_ERROR : Values () bad default color\n"; + std::cout << "R, G, B values: " << C1.Red () << " " << C1.Green () << " " << C1.Blue () << "\n"; + } + if (strcmp (Quantity_Color::StringName (C1.Name()), cyan) != 0) + { + std::cout << "TEST_ERROR : StringName () " << Quantity_Color::StringName (C1.Name()) << " != YELLOW\n"; + } + + RR=0.262745; GG=0.431373; BB=0.933333; + C1.SetValues (RR, GG, BB, Quantity_TOC_RGB); + C2.Values (R, G, B, Quantity_TOC_RGB); + if ((Abs (RR-R) > DELTA) + || (Abs (GG-G) > DELTA) + || (Abs (BB-B) > DELTA)) + { + std::cout << "TEST_ERROR : Values () bad default color\n"; + std::cout << "R, G, B values: " << R << " " << G << " " << B << "\n"; + } + + if (C2 != C1) + { + std::cout << "TEST_ERROR : IsDifferent ()\n"; + } + if (C3 == C1) + { + std::cout << "TEST_ERROR : IsEqual ()\n"; + } + + std::cout << "Distance C1,C2 " << C1.Distance (C2) << "\n"; + std::cout << "Distance C1,C3 " << C1.Distance (C3) << "\n"; + std::cout << "Distance C2,C3 " << C2.Distance (C3) << "\n"; + std::cout << "SquareDistance C1,C2 " << C1.SquareDistance (C2) << "\n"; + std::cout << "SquareDistance C1,C3 " << C1.SquareDistance (C3) << "\n"; + std::cout << "SquareDistance C2,C3 " << C2.SquareDistance (C3) << "\n"; + + if (strcmp (Quantity_Color::StringName (C2.Name()), blue) != 0) + { + std::cout << "TEST_ERROR : StringName () " << Quantity_Color::StringName (C2.Name()) << " != ROYALBLUE2\n"; + } + + std::cout << "conversion rgbhls tests\n-----------------------\n"; + Quantity_Color::RgbHls (R, G, B, H, L, S); + Quantity_Color::HlsRgb (H, L, S, R, G, B); + RR=0.262745; GG=0.431373; BB=0.933333; + if ((Abs (RR-R) > DELTA) + || (Abs (GG-G) > DELTA) + || (Abs (BB-B) > DELTA)) + { + std::cout << "TEST_ERROR : RgbHls or HlsRgb bad conversion\n"; + std::cout << "RGB init : " << RR << " " << GG << " " << BB << "\n"; + std::cout << "RGB values : " << R << " " << G << " " << B << "\n"; + std::cout << "Difference RGB : " << RR-R << " " << GG-G << " " << BB-B << "\n"; + } + + std::cout << "distance tests\n--------------\n"; + R = (float ) 0.9568631; G = (float ) 0.6431371; B = (float ) 0.3764711; + C2.SetValues (R, G, B, Quantity_TOC_RGB); + if (C2.Distance (C3) > DELTA) + { + std::cout << "TEST_ERROR : Distance () bad result\n"; + std::cout << "Distance C2 and C3 : " << C2.Distance (C3) << "\n"; + } + + C2.Delta (C3, DC, DI); + if (Abs (DC) > DELTA) + { + std::cout << "TEST_ERROR : Delta () bad result for DC\n"; + } + if (Abs (DI) > DELTA) + { + std::cout << "TEST_ERROR : Delta () bad result for DI\n"; + } + + std::cout << "name tests\n----------\n"; + R = (float ) 0.9568631; G = (float ) 0.6431371; B = (float ) 0.3764711; + C2.SetValues (R, G, B, Quantity_TOC_RGB); + if (strcmp (Quantity_Color::StringName (C2.Name()), brown) != 0) + { + std::cout << "TEST_ERROR : StringName () " << Quantity_Color::StringName (C2.Name()) << " != SANDYBROWN\n"; + } + + std::cout << "contrast change tests\n---------------------\n"; + for (i=1; i<=10; i++) + { + C2.ChangeContrast (10.); + C2.ChangeContrast (-9.09090909); + } + C2.Values (R, G, B, Quantity_TOC_RGB); + RR=0.956863; GG=0.6431371; BB=0.3764711; + if ((Abs (RR-R) > DELTA) + || (Abs (GG-G) > DELTA) + || (Abs (BB-B) > DELTA)) + { + std::cout << "TEST_ERROR : ChangeContrast () bad values\n"; + std::cout << "RGB init : " << RR << " " << GG << " " << BB << "\n"; + std::cout << "RGB values : " << R << " " << G << " " << B << "\n"; + } } -/* - * Objet : Algorithme de conversion RGB vers HLS - * - * Rappels : RGB et HLS sont 2 modeles de representation - * des couleurs - * - * Parametres : r, g, b connus dans [0,1] - * h, l, s avec h dans [0,360] et l et s dans [0,1] - * - * Reference : La synthese d'images, Collection Hermes - * - * Creation : Cal 04 fevrier 1992 - * - * Modification : ? - */ - -void call_rgbhls (float r, float g, float b, float& h, float& l, float& s) -/* parametres d'entree : r, g, b connus dans [0,1] */ -/* parametres de sortie : h, l, s avec h dans [0,360] et l et s dans [0,1] */ +// ======================================================================= +// function : Test +// purpose : +// ======================================================================= +void Quantity_Color::Test() { - - float max, min; - float plus, diff; - float delta; - - /* calcul du max entre r, g et b */ - { plus = 0.0; diff = g - b; max = r; } - if (g > max) { plus = 2.0; diff = b - r; max = g; } - if (b > max) { plus = 4.0; diff = r - g; max = b; } - - /* calcul du min entre r, g et b */ - min = r; - if (g < min) min = g; - if (b < min) min = b; - - delta = max - min; - - /* calcul de la luminance */ - l = max; - - /* calcul de la saturation */ - s = 0.0; - if (max != 0.0) s = delta / max; - - /* calcul de la teinte */ - if (s == 0.0) - /* cas des gris */ - h = RGBHLS_H_UNDEFINED; - else { - h = (float ) 60.0 * ( plus + diff / delta ); - if (h < 0.0) h += 360.0; - } + try + { + OCC_CATCH_SIGNALS + TestOfColor(); + } + catch (Standard_Failure const& anException) + { + std::cout << anException << std::endl; + } } //======================================================================= @@ -3933,5 +573,5 @@ void call_rgbhls (float r, float g, float b, float& h, float& l, float& s) void Quantity_Color::DumpJson (Standard_OStream& theOStream, const Standard_Integer) const { OCCT_DUMP_CLASS_BEGIN (theOStream, Quantity_Color); - OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "RGB", 3, MyRed, MyGreen, MyBlue) + OCCT_DUMP_FIELD_VALUES_NUMERICAL (theOStream, "RGB", 3, myRgb.r(), myRgb.g(), myRgb.b()) } diff --git a/src/Quantity/Quantity_Color.hxx b/src/Quantity/Quantity_Color.hxx index a5b3ef34d0..33992d52cb 100644 --- a/src/Quantity/Quantity_Color.hxx +++ b/src/Quantity/Quantity_Color.hxx @@ -25,46 +25,22 @@ #include #include #include -class Quantity_ColorDefinitionError; - -//! This class allows the definition of a colour. -//! The names of the colours are from the X11 specification. -//! color object may be used for numerous applicative purposes. -//! A color is defined by: -//! - its respective quantities of red, green and blue (R-G-B values), or -//! - its hue angle and its values of lightness and saturation (H-L-S values). -//! These two color definition systems are equivalent. -//! Use this class in conjunction with: -//! - the Quantity_TypeOfColor enumeration -//! which identifies the color definition system you are using, -//! - the Quantity_NameOfColor enumeration -//! which lists numerous predefined colors and -//! identifies them by their name. -class Quantity_Color +//! This class allows the definition of an RGB color as triplet of 3 normalized floating point values (red, green, blue). +class Quantity_Color { public: DEFINE_STANDARD_ALLOC - - //! Creates Quantity_NOC_YELLOW color. - Standard_EXPORT Quantity_Color(); - + //! Creates Quantity_NOC_YELLOW color (for historical reasons). + Quantity_Color() : myRgb (valuesOf (Quantity_NOC_YELLOW, Quantity_TOC_RGB)) {} + //! Creates the color from enumeration value. - Standard_EXPORT Quantity_Color(const Quantity_NameOfColor AName); - + Quantity_Color (const Quantity_NameOfColor theName) : myRgb (valuesOf (theName, Quantity_TOC_RGB)) {} + //! Creates a color according to the definition system theType. - //! Quantity_TOC_RGB: - //! - theR1 the value of Red within range [0.0; 1.0] - //! - theR2 the value of Green within range [0.0; 1.0] - //! - theR3 the value of Blue within range [0.0; 1.0] - //! - //! Quantity_TOC_HLS: - //! - theR1 is the Hue (H) angle in degrees within range [0.0; 360.0], 0.0 being Red. - //! Value -1.0 is a special value reserved for grayscale color (S should be 0.0). - //! - theR2 is the Lightness (L) within range [0.0; 1.0] - //! - theR3 is the Saturation (S) within range [0.0; 1.0] + //! Throws exception if values are out of range. Standard_EXPORT Quantity_Color (const Standard_Real theR1, const Standard_Real theR2, const Standard_Real theR3, @@ -73,156 +49,108 @@ public: //! Define color from RGB values. Standard_EXPORT explicit Quantity_Color (const NCollection_Vec3& theRgb); - //! Increases or decreases the contrast by . - //! is a percentage. Any value greater than zero - //! will increase the contrast. - //! The variation is expressed as a percentage of the - //! current value. - //! It is a variation of the saturation. - Standard_EXPORT void ChangeContrast (const Standard_Real ADelta); - - //! Increases or decreases the intensity by . - //! is a percentage. Any value greater than zero - //! will increase the intensity. - //! The variation is expressed as a percentage of the - //! current value. - //! It is a variation of the lightness. - Standard_EXPORT void ChangeIntensity (const Standard_Real ADelta); - - //! Updates the colour from the definition of the - //! colour . - Standard_EXPORT void SetValues (const Quantity_NameOfColor AName); - - //! Updates a color according to the mode specified by theType. - //! Quantity_TOC_RGB: - //! - theR1 the value of Red within range [0.0; 1.0] - //! - theR2 the value of Green within range [0.0; 1.0] - //! - theR3 the value of Blue within range [0.0; 1.0] - //! - //! Quantity_TOC_HLS: - //! - theR1 is the Hue (H) angle in degrees within range [0.0; 360.0], 0.0 being Red. - //! -1.0 is a special value reserved for grayscale color (S should be 0.0). - //! - theR2 is the Lightness (L) within range [0.0; 1.0] - //! - theR3 is the Saturation (S) within range [0.0; 1.0] - Standard_EXPORT void SetValues (const Standard_Real theR1, - const Standard_Real theR2, - const Standard_Real theR3, - const Quantity_TypeOfColor theType); - - //! Returns the percentage change of contrast and intensity - //! between and . - //! and are percentages, either positive or negative. - //! The calculation is with respect to the current value of - //! If is positive then is more contrasty. - //! If is positive then is more intense. - Standard_EXPORT void Delta (const Quantity_Color& AColor, Standard_Real& DC, Standard_Real& DI) const; - - //! Returns the distance between two colours. It's a - //! value between 0 and the square root of 3 - //! (the black/white distance) - Standard_EXPORT Standard_Real Distance (const Quantity_Color& AColor) const; - - //! Returns the square of distance between two colours. - Standard_EXPORT Standard_Real SquareDistance (const Quantity_Color& AColor) const; - - //! Returns the Blue component (quantity of blue) of the color within range [0.0; 1.0]. - Standard_EXPORT Standard_Real Blue() const; - - //! Returns the Green component (quantity of green) of the color within range [0.0; 1.0]. - Standard_EXPORT Standard_Real Green() const; - - //! Returns the Hue component (hue angle) of the color - //! in degrees within range [0.0; 360.0], 0.0 being Red. - //! -1.0 is a special value reserved for grayscale color (S should be 0.0) - Standard_EXPORT Standard_Real Hue() const; - - //! Returns Standard_True if the distance between and - //! is greater than Epsilon (). - Standard_EXPORT Standard_Boolean IsDifferent (const Quantity_Color& Other) const; -Standard_Boolean operator != (const Quantity_Color& Other) const -{ - return IsDifferent(Other); -} - - //! Returns true if the Other color is - //! - different from, or - //! - equal to this color. - //! Two colors are considered to be equal if their - //! distance is no greater than Epsilon(). - //! These methods are aliases of operator != and operator ==. - Standard_EXPORT Standard_Boolean IsEqual (const Quantity_Color& Other) const; -Standard_Boolean operator == (const Quantity_Color& Other) const -{ - return IsEqual(Other); -} - - //! Returns the Light component (value of the lightness) of the color within range [0.0; 1.0]. - Standard_EXPORT Standard_Real Light() const; - - //! Returns the name of the color defined by its - //! quantities of red R, green G and blue B; more - //! precisely this is the nearest color from the - //! Quantity_NameOfColor enumeration. - //! Exceptions - //! Standard_OutOfRange if R, G or B is less than 0. or greater than 1. + //! Returns the name of the nearest color from the Quantity_NameOfColor enumeration. Standard_EXPORT Quantity_NameOfColor Name() const; - - //! Returns the Red component (quantity of red) of the color within range [0.0; 1.0]. - Standard_EXPORT Standard_Real Red() const; - - //! Returns the Saturation component (value of the saturation) of the color within range [0.0; 1.0]. - Standard_EXPORT Standard_Real Saturation() const; + + //! Updates the color from specified named color. + void SetValues (const Quantity_NameOfColor theName) { myRgb = valuesOf (theName, Quantity_TOC_RGB); } //! Return the color as vector of 3 float elements. - operator const NCollection_Vec3&() const { return *(const NCollection_Vec3* )this; } + operator const NCollection_Vec3&() const { return myRgb; } //! Returns in theR1, theR2 and theR3 the components of this color according to the color system definition theType. - //! If theType is Quantity_TOC_RGB: - //! - theR1 the value of Red between 0.0 and 1.0 - //! - theR2 the value of Green between 0.0 and 1.0 - //! - theR3 the value of Blue between 0.0 and 1.0 - //! If theType is Quantity_TOC_HLS: - //! - theR1 is the Hue (H) angle in degrees within range [0.0; 360.0], 0.0 being Red. - //! -1.0 is a special value reserved for grayscale color (S should be 0.0). - //! - theR2 is the Lightness (L) within range [0.0; 1.0] - //! - theR3 is the Saturation (S) within range [0.0; 1.0] Standard_EXPORT void Values (Standard_Real& theR1, Standard_Real& theR2, Standard_Real& theR3, const Quantity_TypeOfColor theType) const; + + //! Updates a color according to the mode specified by theType. + //! Throws exception if values are out of range. + Standard_EXPORT void SetValues (const Standard_Real theR1, + const Standard_Real theR2, + const Standard_Real theR3, + const Quantity_TypeOfColor theType); + + //! Returns the Red component (quantity of red) of the color within range [0.0; 1.0]. + Standard_Real Red() const { return myRgb.r(); } + + //! Returns the Green component (quantity of green) of the color within range [0.0; 1.0]. + Standard_Real Green() const { return myRgb.g(); } + + //! Returns the Blue component (quantity of blue) of the color within range [0.0; 1.0]. + Standard_Real Blue() const { return myRgb.b(); } + + //! Returns the Hue component (hue angle) of the color + //! in degrees within range [0.0; 360.0], 0.0 being Red. + //! -1.0 is a special value reserved for grayscale color (S should be 0.0) + Standard_Real Hue() const { return Convert_sRGB_To_HLS (myRgb)[0]; } + + //! Returns the Light component (value of the lightness) of the color within range [0.0; 1.0]. + Standard_Real Light() const { return Convert_sRGB_To_HLS (myRgb)[1]; } + + //! Increases or decreases the intensity (variation of the lightness). + //! The delta is a percentage. Any value greater than zero will increase the intensity. + //! The variation is expressed as a percentage of the current value. + Standard_EXPORT void ChangeIntensity (const Standard_Real theDelta); + + //! Returns the Saturation component (value of the saturation) of the color within range [0.0; 1.0]. + Standard_Real Saturation() const { return Convert_sRGB_To_HLS (myRgb)[2]; } + + //! Increases or decreases the contrast (variation of the saturation). + //! The delta is a percentage. Any value greater than zero will increase the contrast. + //! The variation is expressed as a percentage of the current value. + Standard_EXPORT void ChangeContrast (const Standard_Real theDelta); + + //! Returns TRUE if the distance between two colors is greater than Epsilon(). + Standard_Boolean IsDifferent (const Quantity_Color& theOther) const { return (Distance (theOther) > Epsilon()); } + + //! Alias to IsDifferent(). + Standard_Boolean operator!= (const Quantity_Color& theOther) const { return IsDifferent (theOther); } + + //! Returns TRUE if the distance between two colors is no greater than Epsilon(). + Standard_Boolean IsEqual (const Quantity_Color& theOther) const { return (Distance (theOther) <= Epsilon()); } + + //! Alias to IsEqual(). + Standard_Boolean operator== (const Quantity_Color& theOther) const { return IsEqual (theOther); } - //! Sets the specified value used to compare and - //! an other color in IsDifferent and in IsEqual methods. - //! Warning: The default value is 0.0001 - Standard_EXPORT static void SetEpsilon (const Standard_Real AnEpsilon); - - //! Returns the specified value used to compare and - //! an other color in IsDifferent and in IsEqual methods. - Standard_EXPORT static Standard_Real Epsilon(); - - //! Returns the name of the colour for which the RGB components - //! are nearest to , and . - Standard_EXPORT static Quantity_NameOfColor Name (const Standard_Real R, const Standard_Real G, const Standard_Real B); - - //! Returns the name of the color identified by - //! AName in the Quantity_NameOfColor enumeration. - //! For example, the name of the color which - //! corresponds to Quantity_NOC_BLACK is "BLACK". - //! Exceptions - //! Standard_OutOfRange if AName in not known - //! in the Quantity_NameOfColor enumeration. - Standard_EXPORT static Standard_CString StringName (const Quantity_NameOfColor AColor); - + //! Returns the distance between two colors. It's a value between 0 and the square root of 3 (the black/white distance). + Standard_Real Distance (const Quantity_Color& theColor) const + { + return (NCollection_Vec3 (myRgb) - NCollection_Vec3 (theColor.myRgb)).Modulus(); + } + + //! Returns the square of distance between two colors. + Standard_Real SquareDistance (const Quantity_Color& theColor) const + { + return (NCollection_Vec3 (myRgb) - NCollection_Vec3 (theColor.myRgb)).SquareModulus(); + } + + //! Returns the percentage change of contrast and intensity between this and another color. + //! and are percentages, either positive or negative. + //! The calculation is with respect to this color. + //! If is positive then is more contrasty. + //! If is positive then is more intense. + Standard_EXPORT void Delta (const Quantity_Color& theColor, + Standard_Real& DC, Standard_Real& DI) const; + +public: + + //! Returns the color from Quantity_NameOfColor enumeration nearest to specified RGB values. + static Quantity_NameOfColor Name (const Standard_Real theR, const Standard_Real theG, const Standard_Real theB) + { + const Quantity_Color aColor (theR, theG, theB, Quantity_TOC_RGB); + return aColor.Name(); + } + + //! Returns the name of the color identified by the given Quantity_NameOfColor enumeration value. + Standard_EXPORT static Standard_CString StringName (const Quantity_NameOfColor theColor); + //! Finds color from predefined names. - //! For example, the name of the color which - //! corresponds to "BLACK" is Quantity_NOC_BLACK. - //! Returns false if name is unknown. + //! For example, the name of the color which corresponds to "BLACK" is Quantity_NOC_BLACK. + //! Returns FALSE if name is unknown. Standard_EXPORT static Standard_Boolean ColorFromName (const Standard_CString theName, Quantity_NameOfColor& theColor); //! Finds color from predefined names. - //! For example, the name of the color which - //! corresponds to "BLACK" is Quantity_NOC_BLACK. - //! Returns false if name is unknown. //! @param theColorNameString the color name //! @param theColor a found color //! @return false if the color name is unknown, or true if the search by color name was successful @@ -237,7 +165,7 @@ Standard_Boolean operator == (const Quantity_Color& Other) const return true; } - //! Parses the string as a hex color (like "#FF0" for short RGB color, or "#FFFF00" for RGB color) + //! Parses the string as a hex color (like "#FF0" for short sRGB color, or "#FFFF00" for sRGB color) //! @param theHexColorString the string to be parsed //! @param theColor a color that is a result of parsing //! @return true if parsing was successful, or false otherwise @@ -255,20 +183,153 @@ Standard_Boolean operator == (const Quantity_Color& Other) const return aBuff; } + //! Converts sRGB components into HLS ones. + Standard_EXPORT static NCollection_Vec3 Convert_sRGB_To_HLS (const NCollection_Vec3& theRgb); + //! Converts HLS components into RGB ones. - Standard_EXPORT static void HlsRgb (const Standard_Real H, const Standard_Real L, const Standard_Real S, Standard_Real& R, Standard_Real& G, Standard_Real& B); - - //! Converts RGB components into HLS ones. - Standard_EXPORT static void RgbHls (const Standard_Real R, const Standard_Real G, const Standard_Real B, Standard_Real& H, Standard_Real& L, Standard_Real& S); - - //! Convert the Color value to ARGB integer value. - //! theARGB has Alpha equal to zero, so the output is - //! formatted as 0x00RRGGBB - Standard_EXPORT static void Color2argb (const Quantity_Color& theColor, Standard_Integer& theARGB); - + Standard_EXPORT static NCollection_Vec3 Convert_HLS_To_sRGB (const NCollection_Vec3& theHls); + + //! Converts Linear RGB components into HLS ones. + static NCollection_Vec3 Convert_LinearRGB_To_HLS (const NCollection_Vec3& theRgb) + { + return Convert_sRGB_To_HLS (Convert_LinearRGB_To_sRGB (theRgb)); + } + + //! Converts HLS components into linear RGB ones. + static NCollection_Vec3 Convert_HLS_To_LinearRGB (const NCollection_Vec3& theHls) + { + return Convert_sRGB_To_LinearRGB (Convert_HLS_To_sRGB (theHls)); + } + + //! Convert the color value to ARGB integer value, with alpha equals to 0. + //! So the output is formatted as 0x00RRGGBB. + //! @param theColor [in] color to convert + //! @param theARGB [out] result color encoded as integer + static void Color2argb (const Quantity_Color& theColor, + Standard_Integer& theARGB) + { + const NCollection_Vec3 aColor (static_cast (255.0f * theColor.myRgb.r() + 0.5f), + static_cast (255.0f * theColor.myRgb.g() + 0.5f), + static_cast (255.0f * theColor.myRgb.b() + 0.5f)); + theARGB = (((aColor.r() & 0xff) << 16) + | ((aColor.g() & 0xff) << 8) + | (aColor.b() & 0xff)); + } + //! Convert integer ARGB value to Color. Alpha bits are ignored - Standard_EXPORT static void Argb2color (const Standard_Integer theARGB, Quantity_Color& theColor); - + static void Argb2color (const Standard_Integer theARGB, + Quantity_Color& theColor) + { + const NCollection_Vec3 aColor (static_cast ((theARGB & 0xff0000) >> 16), + static_cast ((theARGB & 0x00ff00) >> 8), + static_cast ((theARGB & 0x0000ff))); + theColor.SetValues (aColor.r() / 255.0, aColor.g() / 255.0, aColor.b() / 255.0, Quantity_TOC_RGB); + } + +public: + + //! Convert linear RGB component into sRGB using OpenGL specs formula (double precision), also known as gamma correction. + static Standard_Real Convert_LinearRGB_To_sRGB (Standard_Real theLinearValue) + { + return theLinearValue <= 0.0031308 + ? theLinearValue * 12.92 + : Pow (theLinearValue, 1.0/2.4) * 1.055 - 0.055; + } + + //! Convert linear RGB component into sRGB using OpenGL specs formula (single precision), also known as gamma correction. + static float Convert_LinearRGB_To_sRGB (float theLinearValue) + { + return theLinearValue <= 0.0031308f + ? theLinearValue * 12.92f + : powf (theLinearValue, 1.0f/2.4f) * 1.055f - 0.055f; + } + + //! Convert sRGB component into linear RGB using OpenGL specs formula (double precision), also known as gamma correction. + static Standard_Real Convert_sRGB_To_LinearRGB (Standard_Real thesRGBValue) + { + return thesRGBValue <= 0.04045 + ? thesRGBValue / 12.92 + : Pow ((thesRGBValue + 0.055) / 1.055, 2.4); + } + + //! Convert sRGB component into linear RGB using OpenGL specs formula (single precision), also known as gamma correction. + static float Convert_sRGB_To_LinearRGB (float thesRGBValue) + { + return thesRGBValue <= 0.04045f + ? thesRGBValue / 12.92f + : powf ((thesRGBValue + 0.055f) / 1.055f, 2.4f); + } + + //! Convert linear RGB components into sRGB using OpenGL specs formula. + template + static NCollection_Vec3 Convert_LinearRGB_To_sRGB (const NCollection_Vec3& theRGB) + { + return NCollection_Vec3 (Convert_LinearRGB_To_sRGB (theRGB.r()), + Convert_LinearRGB_To_sRGB (theRGB.g()), + Convert_LinearRGB_To_sRGB (theRGB.b())); + } + + //! Convert sRGB components into linear RGB using OpenGL specs formula. + template + static NCollection_Vec3 Convert_sRGB_To_LinearRGB (const NCollection_Vec3& theRGB) + { + return NCollection_Vec3 (Convert_sRGB_To_LinearRGB (theRGB.r()), + Convert_sRGB_To_LinearRGB (theRGB.g()), + Convert_sRGB_To_LinearRGB (theRGB.b())); + } + +public: + + //! Convert linear RGB component into sRGB using approximated uniform gamma coefficient 2.2. + static float Convert_LinearRGB_To_sRGB_approx22 (float theLinearValue) { return powf (theLinearValue, 2.2f); } + + //! Convert sRGB component into linear RGB using approximated uniform gamma coefficient 2.2 + static float Convert_sRGB_To_LinearRGB_approx22 (float thesRGBValue) { return powf (thesRGBValue, 1.0f/2.2f); } + + //! Convert linear RGB components into sRGB using approximated uniform gamma coefficient 2.2 + static NCollection_Vec3 Convert_LinearRGB_To_sRGB_approx22 (const NCollection_Vec3& theRGB) + { + return NCollection_Vec3 (Convert_LinearRGB_To_sRGB_approx22 (theRGB.r()), + Convert_LinearRGB_To_sRGB_approx22 (theRGB.g()), + Convert_LinearRGB_To_sRGB_approx22 (theRGB.b())); + } + + //! Convert sRGB components into linear RGB using approximated uniform gamma coefficient 2.2 + static NCollection_Vec3 Convert_sRGB_To_LinearRGB_approx22 (const NCollection_Vec3& theRGB) + { + return NCollection_Vec3 (Convert_sRGB_To_LinearRGB_approx22 (theRGB.r()), + Convert_sRGB_To_LinearRGB_approx22 (theRGB.g()), + Convert_sRGB_To_LinearRGB_approx22 (theRGB.b())); + } + +public: + + //! Returns the value used to compare two colors for equality; 0.0001 by default. + Standard_EXPORT static Standard_Real Epsilon(); + + //! Set the value used to compare two colors for equality. + Standard_EXPORT static void SetEpsilon (const Standard_Real theEpsilon); + + //! Converts HLS components into RGB ones. + static void HlsRgb (const Standard_Real theH, const Standard_Real theL, const Standard_Real theS, + Standard_Real& theR, Standard_Real& theG, Standard_Real& theB) + { + const NCollection_Vec3 anRgb = Convert_HLS_To_sRGB (NCollection_Vec3 ((float )theH, (float )theL, (float )theS)); + theR = anRgb[0]; + theG = anRgb[1]; + theB = anRgb[2]; + } + + //! Converts RGB components into HLS ones. + static void RgbHls (const Standard_Real theR, const Standard_Real theG, const Standard_Real theB, + Standard_Real& theH, Standard_Real& theL, Standard_Real& theS) + { + const NCollection_Vec3 aHls = Convert_sRGB_To_HLS (NCollection_Vec3 ((float )theR, (float )theG, (float )theB)); + theH = aHls[0]; + theL = aHls[1]; + theS = aHls[2]; + } + //! Internal test Standard_EXPORT static void Test(); @@ -277,27 +338,13 @@ Standard_Boolean operator == (const Quantity_Color& Other) const private: - //! Converts HLS components into RGB ones. - Standard_EXPORT static void hlsrgb (const Standard_ShortReal H, const Standard_ShortReal L, const Standard_ShortReal S, Standard_ShortReal& R, Standard_ShortReal& G, Standard_ShortReal& B); - - //! Converts RGB components into HLS ones. - Standard_EXPORT static void rgbhls (const Standard_ShortReal R, const Standard_ShortReal G, const Standard_ShortReal B, Standard_ShortReal& H, Standard_ShortReal& L, Standard_ShortReal& S); - - //! Returns the values of a predefined colour according to - //! the mode specified by TypeOfColor - //! TOC_RGB : the value of red between 0. and 1. - //! the value of green between 0. and 1. - //! the value of blue between 0. and 1. - //! - //! TOC_HLS : is the hue angle in degrees, 0. being red - //! is the lightness between 0. and 1. - //! is the saturation between 0. and 1. - Standard_EXPORT static void ValuesOf (const Quantity_NameOfColor AName, const Quantity_TypeOfColor AType, Standard_ShortReal& R1, Standard_ShortReal& R2, Standard_ShortReal& R3); + //! Returns the values of a predefined color according to the mode. + Standard_EXPORT static NCollection_Vec3 valuesOf (const Quantity_NameOfColor theName, + const Quantity_TypeOfColor theType); +private: - Standard_ShortReal MyRed; - Standard_ShortReal MyGreen; - Standard_ShortReal MyBlue; + NCollection_Vec3 myRgb; }; diff --git a/src/Quantity/Quantity_ColorDefinitionError.hxx b/src/Quantity/Quantity_ColorDefinitionError.hxx deleted file mode 100644 index fa530d141d..0000000000 --- a/src/Quantity/Quantity_ColorDefinitionError.hxx +++ /dev/null @@ -1,37 +0,0 @@ -// Created on: 1994-02-08 -// Created by: Gilles DEBARBOUILLE -// Copyright (c) 1994-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef _Quantity_ColorDefinitionError_HeaderFile -#define _Quantity_ColorDefinitionError_HeaderFile - -#include -#include -#include -#include - -class Quantity_ColorDefinitionError; -DEFINE_STANDARD_HANDLE(Quantity_ColorDefinitionError, Standard_DomainError) - -#if !defined No_Exception && !defined No_Quantity_ColorDefinitionError - #define Quantity_ColorDefinitionError_Raise_if(CONDITION, MESSAGE) \ - if (CONDITION) throw Quantity_ColorDefinitionError(MESSAGE); -#else - #define Quantity_ColorDefinitionError_Raise_if(CONDITION, MESSAGE) -#endif - -DEFINE_STANDARD_EXCEPTION(Quantity_ColorDefinitionError, Standard_DomainError) - -#endif // _Quantity_ColorDefinitionError_HeaderFile diff --git a/src/Quantity/Quantity_ColorRGBA.hxx b/src/Quantity/Quantity_ColorRGBA.hxx index cffdbaea23..a641b0c1dc 100644 --- a/src/Quantity/Quantity_ColorRGBA.hxx +++ b/src/Quantity/Quantity_ColorRGBA.hxx @@ -91,10 +91,10 @@ public: //! Two colors are considered to be equal if their distance is no greater than Epsilon(). bool operator== (const Quantity_ColorRGBA& theOther) const { return IsEqual (theOther); } +public: + //! Finds color from predefined names. - //! For example, the name of the color which - //! corresponds to "BLACK" is Quantity_NOC_BLACK. - //! Returns false if name is unknown. + //! For example, the name of the color which corresponds to "BLACK" is Quantity_NOC_BLACK. //! An alpha component is set to 1.0. //! @param theColorNameString the color name //! @param theColor a found color @@ -110,7 +110,7 @@ public: return true; } - //! Parses the string as a hex color (like "#FF0" for short RGB color, "#FF0F" for short RGBA color, + //! Parses the string as a hex color (like "#FF0" for short sRGB color, "#FF0F" for short sRGBA color, //! "#FFFF00" for RGB color, or "#FFFF00FF" for RGBA color) //! @param theHexColorString the string to be parsed //! @param theColor a color that is a result of parsing @@ -133,6 +133,28 @@ public: return aBuff; } +public: + + //! Convert linear RGB components into sRGB using OpenGL specs formula. + static NCollection_Vec4 Convert_LinearRGB_To_sRGB (const NCollection_Vec4& theRGB) + { + return NCollection_Vec4 (Quantity_Color::Convert_LinearRGB_To_sRGB (theRGB.r()), + Quantity_Color::Convert_LinearRGB_To_sRGB (theRGB.g()), + Quantity_Color::Convert_LinearRGB_To_sRGB (theRGB.b()), + theRGB.a()); + } + + //! Convert sRGB components into linear RGB using OpenGL specs formula. + static NCollection_Vec4 Convert_sRGB_To_LinearRGB (const NCollection_Vec4& theRGB) + { + return NCollection_Vec4 (Quantity_Color::Convert_sRGB_To_LinearRGB (theRGB.r()), + Quantity_Color::Convert_sRGB_To_LinearRGB (theRGB.g()), + Quantity_Color::Convert_sRGB_To_LinearRGB (theRGB.b()), + theRGB.a()); + } + +public: + //! Dumps the content of me into the stream Standard_EXPORT void DumpJson (Standard_OStream& theOStream, const Standard_Integer theDepth = -1) const; diff --git a/src/Quantity/Quantity_ColorTable.pxx b/src/Quantity/Quantity_ColorTable.pxx new file mode 100644 index 0000000000..95e45f7f34 --- /dev/null +++ b/src/Quantity/Quantity_ColorTable.pxx @@ -0,0 +1,509 @@ +RawColor(BLACK , 0x000000, 0.000000, 0.000000, 0.000000), +RawColor(MATRABLUE , 0x0000BF, 0.000000, 0.000000, 0.750000), +RawColor(MATRAGRAY , 0x999999, 0.600000, 0.600000, 0.600000), +RawColor(ALICEBLUE , 0xF0F8FF, 0.941176, 0.972549, 1.000000), +RawColor(ANTIQUEWHITE , 0xFAEBD7, 0.980392, 0.921569, 0.843137), +RawColor(ANTIQUEWHITE1 , 0xFFEFDB, 1.000000, 0.937255, 0.858824), +RawColor(ANTIQUEWHITE2 , 0xEEDFCC, 0.933333, 0.874510, 0.800000), +RawColor(ANTIQUEWHITE3 , 0xCDC0B0, 0.803922, 0.752941, 0.690196), +RawColor(ANTIQUEWHITE4 , 0x8B8378, 0.545098, 0.513725, 0.470588), +RawColor(AQUAMARINE1 , 0x7FFFD4, 0.498039, 1.000000, 0.831373), +RawColor(AQUAMARINE2 , 0x76EEC6, 0.462745, 0.933333, 0.776471), +RawColor(AQUAMARINE4 , 0x458B74, 0.270588, 0.545098, 0.454902), +RawColor(AZURE , 0xF0FFFF, 0.941176, 1.000000, 1.000000), +RawColor(AZURE2 , 0xE0EEEE, 0.878431, 0.933333, 0.933333), +RawColor(AZURE3 , 0xC1CDCD, 0.756863, 0.803922, 0.803922), +RawColor(AZURE4 , 0x838B8B, 0.513725, 0.545098, 0.545098), +RawColor(BEIGE , 0xF5F5DC, 0.960784, 0.960784, 0.862745), +RawColor(BISQUE , 0xFFE4C4, 1.000000, 0.894118, 0.768627), +RawColor(BISQUE2 , 0xEED5B7, 0.933333, 0.835294, 0.717647), +RawColor(BISQUE3 , 0xCDB79E, 0.803922, 0.717647, 0.619608), +RawColor(BISQUE4 , 0x8B7D6B, 0.545098, 0.490196, 0.419608), +RawColor(BLANCHEDALMOND , 0xFFEBCD, 1.000000, 0.921569, 0.803922), +RawColor(BLUE , 0x0000FF, 0.000000, 0.000000, 1.000000), +RawColor(BLUE2 , 0x0000EE, 0.000000, 0.000000, 0.933333), +RawColor(BLUE3 , 0x0000CD, 0.000000, 0.000000, 0.803922), +RawColor(BLUE4 , 0x00008B, 0.000000, 0.000000, 0.545098), +RawColor(BLUEVIOLET , 0x8A2BE2, 0.541176, 0.168627, 0.886275), +RawColor(BROWN , 0xA52A2A, 0.647059, 0.164706, 0.164706), +RawColor(BROWN1 , 0xFF4040, 1.000000, 0.250980, 0.250980), +RawColor(BROWN2 , 0xEE3B3B, 0.933333, 0.231373, 0.231373), +RawColor(BROWN3 , 0xCD3333, 0.803922, 0.200000, 0.200000), +RawColor(BROWN4 , 0x8B2323, 0.545098, 0.137255, 0.137255), +RawColor(BURLYWOOD , 0xDEB887, 0.870588, 0.721569, 0.529412), +RawColor(BURLYWOOD1 , 0xFFD39B, 1.000000, 0.827451, 0.607843), +RawColor(BURLYWOOD2 , 0xEEC591, 0.933333, 0.772549, 0.568627), +RawColor(BURLYWOOD3 , 0xCDAA7D, 0.803922, 0.666667, 0.490196), +RawColor(BURLYWOOD4 , 0x8B7355, 0.545098, 0.450980, 0.333333), +RawColor(CADETBLUE , 0x5F9EA0, 0.372549, 0.619608, 0.627451), +RawColor(CADETBLUE1 , 0x98F5FF, 0.596078, 0.960784, 1.000000), +RawColor(CADETBLUE2 , 0x8EE5EE, 0.556863, 0.898039, 0.933333), +RawColor(CADETBLUE3 , 0x7AC5CD, 0.478431, 0.772549, 0.803922), +RawColor(CADETBLUE4 , 0x53868B, 0.325490, 0.525490, 0.545098), +RawColor(CHARTREUSE , 0x7FFF00, 0.498039, 1.000000, 0.000000), +RawColor(CHARTREUSE2 , 0x76EE00, 0.462745, 0.933333, 0.000000), +RawColor(CHARTREUSE3 , 0x66CD00, 0.400000, 0.803922, 0.000000), +RawColor(CHARTREUSE4 , 0x458B00, 0.270588, 0.545098, 0.000000), +RawColor(CHOCOLATE , 0xD2691E, 0.823529, 0.411765, 0.117647), +RawColor(CHOCOLATE1 , 0xFF7F24, 1.000000, 0.498039, 0.141176), +RawColor(CHOCOLATE2 , 0xEE7621, 0.933333, 0.462745, 0.129412), +RawColor(CHOCOLATE3 , 0xCD661D, 0.803922, 0.400000, 0.113725), +RawColor(CHOCOLATE4 , 0x8B4513, 0.545098, 0.270588, 0.074510), +RawColor(CORAL , 0xFF7F50, 1.000000, 0.498039, 0.313725), +RawColor(CORAL1 , 0xFF7256, 1.000000, 0.447059, 0.337255), +RawColor(CORAL2 , 0xEE6A50, 0.933333, 0.415686, 0.313725), +RawColor(CORAL3 , 0xCD5B45, 0.803922, 0.356863, 0.270588), +RawColor(CORAL4 , 0x8B3E2F, 0.545098, 0.243137, 0.184314), +RawColor(CORNFLOWERBLUE , 0x6495ED, 0.392157, 0.584314, 0.929412), +RawColor(CORNSILK1 , 0xFFF8DC, 1.000000, 0.972549, 0.862745), +RawColor(CORNSILK2 , 0xEEE8CD, 0.933333, 0.909804, 0.803922), +RawColor(CORNSILK3 , 0xCDC8B1, 0.803922, 0.784314, 0.694118), +RawColor(CORNSILK4 , 0x8B8878, 0.545098, 0.533333, 0.470588), +RawColor(CYAN , 0x00FFFF, 0.000000, 1.000000, 1.000000), +RawColor(CYAN2 , 0x00EEEE, 0.000000, 0.933333, 0.933333), +RawColor(CYAN3 , 0x00CDCD, 0.000000, 0.803922, 0.803922), +RawColor(CYAN4 , 0x008B8B, 0.000000, 0.545098, 0.545098), +RawColor(DARKGOLDENROD , 0xB8860B, 0.721569, 0.525490, 0.043137), +RawColor(DARKGOLDENROD1 , 0xFFB90F, 1.000000, 0.725490, 0.058824), +RawColor(DARKGOLDENROD2 , 0xEEAD0E, 0.933333, 0.678431, 0.054902), +RawColor(DARKGOLDENROD3 , 0xCD950C, 0.803922, 0.584314, 0.047059), +RawColor(DARKGOLDENROD4 , 0x8B6508, 0.545098, 0.396078, 0.031373), +RawColor(DARKGREEN , 0x006400, 0.000000, 0.392157, 0.000000), +RawColor(DARKKHAKI , 0xBDB76B, 0.741176, 0.717647, 0.419608), +RawColor(DARKOLIVEGREEN , 0x556B2F, 0.333333, 0.419608, 0.184314), +RawColor(DARKOLIVEGREEN1 , 0xCAFF70, 0.792157, 1.000000, 0.439216), +RawColor(DARKOLIVEGREEN2 , 0xBCEE68, 0.737255, 0.933333, 0.407843), +RawColor(DARKOLIVEGREEN3 , 0xA2CD5A, 0.635294, 0.803922, 0.352941), +RawColor(DARKOLIVEGREEN4 , 0x6E8B3D, 0.431373, 0.545098, 0.239216), +RawColor(DARKORANGE , 0xFF8C00, 1.000000, 0.549020, 0.000000), +RawColor(DARKORANGE1 , 0xFF7F00, 1.000000, 0.498039, 0.000000), +RawColor(DARKORANGE2 , 0xEE7600, 0.933333, 0.462745, 0.000000), +RawColor(DARKORANGE3 , 0xCD6600, 0.803922, 0.400000, 0.000000), +RawColor(DARKORANGE4 , 0x8B4500, 0.545098, 0.270588, 0.000000), +RawColor(DARKORCHID , 0x9932CC, 0.600000, 0.196078, 0.800000), +RawColor(DARKORCHID1 , 0xBF3EFF, 0.749020, 0.243137, 1.000000), +RawColor(DARKORCHID2 , 0xB23AEE, 0.698039, 0.227451, 0.933333), +RawColor(DARKORCHID3 , 0x9A32CD, 0.603922, 0.196078, 0.803922), +RawColor(DARKORCHID4 , 0x68228B, 0.407843, 0.133333, 0.545098), +RawColor(DARKSALMON , 0xE9967A, 0.913725, 0.588235, 0.478431), +RawColor(DARKSEAGREEN , 0x8FBC8F, 0.560784, 0.737255, 0.560784), +RawColor(DARKSEAGREEN1 , 0xC1FFC1, 0.756863, 1.000000, 0.756863), +RawColor(DARKSEAGREEN2 , 0xB4EEB4, 0.705882, 0.933333, 0.705882), +RawColor(DARKSEAGREEN3 , 0x9BCD9B, 0.607843, 0.803922, 0.607843), +RawColor(DARKSEAGREEN4 , 0x698B69, 0.411765, 0.545098, 0.411765), +RawColor(DARKSLATEBLUE , 0x483D8B, 0.282353, 0.239216, 0.545098), +RawColor(DARKSLATEGRAY1 , 0x97FFFF, 0.592157, 1.000000, 1.000000), +RawColor(DARKSLATEGRAY2 , 0x8DEEEE, 0.552941, 0.933333, 0.933333), +RawColor(DARKSLATEGRAY3 , 0x79CDCD, 0.474510, 0.803922, 0.803922), +RawColor(DARKSLATEGRAY4 , 0x528B8B, 0.321569, 0.545098, 0.545098), +RawColor(DARKSLATEGRAY , 0x2F4F4F, 0.184314, 0.309804, 0.309804), +RawColor(DARKTURQUOISE , 0x00CED1, 0.000000, 0.807843, 0.819608), +RawColor(DARKVIOLET , 0x9400D3, 0.580392, 0.000000, 0.827451), +RawColor(DEEPPINK , 0xFF1493, 1.000000, 0.078431, 0.576471), +RawColor(DEEPPINK2 , 0xEE1289, 0.933333, 0.070588, 0.537255), +RawColor(DEEPPINK3 , 0xCD1076, 0.803922, 0.062745, 0.462745), +RawColor(DEEPPINK4 , 0x8B0A50, 0.545098, 0.039216, 0.313725), +RawColor(DEEPSKYBLUE1 , 0x00BFFF, 0.000000, 0.749020, 1.000000), +RawColor(DEEPSKYBLUE2 , 0x00B2EE, 0.000000, 0.698039, 0.933333), +RawColor(DEEPSKYBLUE3 , 0x009ACD, 0.000000, 0.603922, 0.803922), +RawColor(DEEPSKYBLUE4 , 0x00688B, 0.000000, 0.407843, 0.545098), +RawColor(DODGERBLUE1 , 0x1E90FF, 0.117647, 0.564706, 1.000000), +RawColor(DODGERBLUE2 , 0x1C86EE, 0.109804, 0.525490, 0.933333), +RawColor(DODGERBLUE3 , 0x1874CD, 0.094118, 0.454902, 0.803922), +RawColor(DODGERBLUE4 , 0x104E8B, 0.062745, 0.305882, 0.545098), +RawColor(FIREBRICK , 0xB22222, 0.698039, 0.133333, 0.133333), +RawColor(FIREBRICK1 , 0xFF3030, 1.000000, 0.188235, 0.188235), +RawColor(FIREBRICK2 , 0xEE2C2C, 0.933333, 0.172549, 0.172549), +RawColor(FIREBRICK3 , 0xCD2626, 0.803922, 0.149020, 0.149020), +RawColor(FIREBRICK4 , 0x8B1A1A, 0.545098, 0.101961, 0.101961), +RawColor(FLORALWHITE , 0xFFFAF0, 1.000000, 0.980392, 0.941176), +RawColor(FORESTGREEN , 0x228B22, 0.133333, 0.545098, 0.133333), +RawColor(GAINSBORO , 0xDCDCDC, 0.862745, 0.862745, 0.862745), +RawColor(GHOSTWHITE , 0xF8F8FF, 0.972549, 0.972549, 1.000000), +RawColor(GOLD , 0xFFD700, 1.000000, 0.843137, 0.000000), +RawColor(GOLD2 , 0xEEC900, 0.933333, 0.788235, 0.000000), +RawColor(GOLD3 , 0xCDAD00, 0.803922, 0.678431, 0.000000), +RawColor(GOLD4 , 0x8B7500, 0.545098, 0.458824, 0.000000), +RawColor(GOLDENROD , 0xDAA520, 0.854902, 0.647059, 0.125490), +RawColor(GOLDENROD1 , 0xFFC125, 1.000000, 0.756863, 0.145098), +RawColor(GOLDENROD2 , 0xEEB422, 0.933333, 0.705882, 0.133333), +RawColor(GOLDENROD3 , 0xCD9B1D, 0.803922, 0.607843, 0.113725), +RawColor(GOLDENROD4 , 0x8B6914, 0.545098, 0.411765, 0.078431), +RawColor(GRAY , 0xC0C0C0, 0.752941, 0.752941, 0.752941), +RawColor(GRAY0 , 0x000000, 0.000000, 0.000000, 0.000000), +RawColor(GRAY1 , 0x030303, 0.011765, 0.011765, 0.011765), +RawColor(GRAY2 , 0x050505, 0.019608, 0.019608, 0.019608), +RawColor(GRAY3 , 0x080808, 0.031373, 0.031373, 0.031373), +RawColor(GRAY4 , 0x0A0A0A, 0.039216, 0.039216, 0.039216), +RawColor(GRAY5 , 0x0D0D0D, 0.050980, 0.050980, 0.050980), +RawColor(GRAY6 , 0x0F0F0F, 0.058824, 0.058824, 0.058824), +RawColor(GRAY7 , 0x121212, 0.070588, 0.070588, 0.070588), +RawColor(GRAY8 , 0x141414, 0.078431, 0.078431, 0.078431), +RawColor(GRAY9 , 0x171717, 0.090196, 0.090196, 0.090196), +RawColor(GRAY10 , 0x1A1A1A, 0.101961, 0.101961, 0.101961), +RawColor(GRAY11 , 0x1C1C1C, 0.109804, 0.109804, 0.109804), +RawColor(GRAY12 , 0x1F1F1F, 0.121569, 0.121569, 0.121569), +RawColor(GRAY13 , 0x212121, 0.129412, 0.129412, 0.129412), +RawColor(GRAY14 , 0x242424, 0.141176, 0.141176, 0.141176), +RawColor(GRAY15 , 0x262626, 0.149020, 0.149020, 0.149020), +RawColor(GRAY16 , 0x292929, 0.160784, 0.160784, 0.160784), +RawColor(GRAY17 , 0x2B2B2B, 0.168627, 0.168627, 0.168627), +RawColor(GRAY18 , 0x2E2E2E, 0.180392, 0.180392, 0.180392), +RawColor(GRAY19 , 0x303030, 0.188235, 0.188235, 0.188235), +RawColor(GRAY20 , 0x333333, 0.200000, 0.200000, 0.200000), +RawColor(GRAY21 , 0x363636, 0.211765, 0.211765, 0.211765), +RawColor(GRAY22 , 0x383838, 0.219608, 0.219608, 0.219608), +RawColor(GRAY23 , 0x3B3B3B, 0.231373, 0.231373, 0.231373), +RawColor(GRAY24 , 0x3D3D3D, 0.239216, 0.239216, 0.239216), +RawColor(GRAY25 , 0x404040, 0.250980, 0.250980, 0.250980), +RawColor(GRAY26 , 0x424242, 0.258824, 0.258824, 0.258824), +RawColor(GRAY27 , 0x454545, 0.270588, 0.270588, 0.270588), +RawColor(GRAY28 , 0x474747, 0.278431, 0.278431, 0.278431), +RawColor(GRAY29 , 0x4A4A4A, 0.290196, 0.290196, 0.290196), +RawColor(GRAY30 , 0x4D4D4D, 0.301961, 0.301961, 0.301961), +RawColor(GRAY31 , 0x4F4F4F, 0.309804, 0.309804, 0.309804), +RawColor(GRAY32 , 0x525252, 0.321569, 0.321569, 0.321569), +RawColor(GRAY33 , 0x545454, 0.329412, 0.329412, 0.329412), +RawColor(GRAY34 , 0x575757, 0.341176, 0.341176, 0.341176), +RawColor(GRAY35 , 0x595959, 0.349020, 0.349020, 0.349020), +RawColor(GRAY36 , 0x5C5C5C, 0.360784, 0.360784, 0.360784), +RawColor(GRAY37 , 0x5E5E5E, 0.368627, 0.368627, 0.368627), +RawColor(GRAY38 , 0x616161, 0.380392, 0.380392, 0.380392), +RawColor(GRAY39 , 0x636363, 0.388235, 0.388235, 0.388235), +RawColor(GRAY40 , 0x666666, 0.400000, 0.400000, 0.400000), +RawColor(GRAY41 , 0x696969, 0.411765, 0.411765, 0.411765), +RawColor(GRAY42 , 0x6B6B6B, 0.419608, 0.419608, 0.419608), +RawColor(GRAY43 , 0x6E6E6E, 0.431373, 0.431373, 0.431373), +RawColor(GRAY44 , 0x707070, 0.439216, 0.439216, 0.439216), +RawColor(GRAY45 , 0x737373, 0.450980, 0.450980, 0.450980), +RawColor(GRAY46 , 0x757575, 0.458824, 0.458824, 0.458824), +RawColor(GRAY47 , 0x787878, 0.470588, 0.470588, 0.470588), +RawColor(GRAY48 , 0x7A7A7A, 0.478431, 0.478431, 0.478431), +RawColor(GRAY49 , 0x7D7D7D, 0.490196, 0.490196, 0.490196), +RawColor(GRAY50 , 0x7F7F7F, 0.498039, 0.498039, 0.498039), +RawColor(GRAY51 , 0x828282, 0.509804, 0.509804, 0.509804), +RawColor(GRAY52 , 0x858585, 0.521569, 0.521569, 0.521569), +RawColor(GRAY53 , 0x878787, 0.529412, 0.529412, 0.529412), +RawColor(GRAY54 , 0x8A8A8A, 0.541176, 0.541176, 0.541176), +RawColor(GRAY55 , 0x8C8C8C, 0.549020, 0.549020, 0.549020), +RawColor(GRAY56 , 0x8F8F8F, 0.560784, 0.560784, 0.560784), +RawColor(GRAY57 , 0x919191, 0.568627, 0.568627, 0.568627), +RawColor(GRAY58 , 0x949494, 0.580392, 0.580392, 0.580392), +RawColor(GRAY59 , 0x969696, 0.588235, 0.588235, 0.588235), +RawColor(GRAY60 , 0x999999, 0.600000, 0.600000, 0.600000), +RawColor(GRAY61 , 0x9C9C9C, 0.611765, 0.611765, 0.611765), +RawColor(GRAY62 , 0x9E9E9E, 0.619608, 0.619608, 0.619608), +RawColor(GRAY63 , 0xA1A1A1, 0.631373, 0.631373, 0.631373), +RawColor(GRAY64 , 0xA3A3A3, 0.639216, 0.639216, 0.639216), +RawColor(GRAY65 , 0xA6A6A6, 0.650980, 0.650980, 0.650980), +RawColor(GRAY66 , 0xA8A8A8, 0.658824, 0.658824, 0.658824), +RawColor(GRAY67 , 0xABABAB, 0.670588, 0.670588, 0.670588), +RawColor(GRAY68 , 0xADADAD, 0.678431, 0.678431, 0.678431), +RawColor(GRAY69 , 0xB0B0B0, 0.690196, 0.690196, 0.690196), +RawColor(GRAY70 , 0xB3B3B3, 0.701961, 0.701961, 0.701961), +RawColor(GRAY71 , 0xB5B5B5, 0.709804, 0.709804, 0.709804), +RawColor(GRAY72 , 0xB8B8B8, 0.721569, 0.721569, 0.721569), +RawColor(GRAY73 , 0xBABABA, 0.729412, 0.729412, 0.729412), +RawColor(GRAY74 , 0xBDBDBD, 0.741176, 0.741176, 0.741176), +RawColor(GRAY75 , 0xBFBFBF, 0.749020, 0.749020, 0.749020), +RawColor(GRAY76 , 0xC2C2C2, 0.760784, 0.760784, 0.760784), +RawColor(GRAY77 , 0xC4C4C4, 0.768627, 0.768627, 0.768627), +RawColor(GRAY78 , 0xC7C7C7, 0.780392, 0.780392, 0.780392), +RawColor(GRAY79 , 0xC9C9C9, 0.788235, 0.788235, 0.788235), +RawColor(GRAY80 , 0xCCCCCC, 0.800000, 0.800000, 0.800000), +RawColor(GRAY81 , 0xCFCFCF, 0.811765, 0.811765, 0.811765), +RawColor(GRAY82 , 0xD1D1D1, 0.819608, 0.819608, 0.819608), +RawColor(GRAY83 , 0xD4D4D4, 0.831373, 0.831373, 0.831373), +RawColor(GRAY85 , 0xD9D9D9, 0.850980, 0.850980, 0.850980), +RawColor(GRAY86 , 0xDBDBDB, 0.858824, 0.858824, 0.858824), +RawColor(GRAY87 , 0xDEDEDE, 0.870588, 0.870588, 0.870588), +RawColor(GRAY88 , 0xE0E0E0, 0.878431, 0.878431, 0.878431), +RawColor(GRAY89 , 0xE3E3E3, 0.890196, 0.890196, 0.890196), +RawColor(GRAY90 , 0xE5E5E5, 0.898039, 0.898039, 0.898039), +RawColor(GRAY91 , 0xE8E8E8, 0.909804, 0.909804, 0.909804), +RawColor(GRAY92 , 0xEBEBEB, 0.921569, 0.921569, 0.921569), +RawColor(GRAY93 , 0xEDEDED, 0.929412, 0.929412, 0.929412), +RawColor(GRAY94 , 0xF0F0F0, 0.941176, 0.941176, 0.941176), +RawColor(GRAY95 , 0xF2F2F2, 0.949020, 0.949020, 0.949020), +RawColor(GRAY97 , 0xF7F7F7, 0.968627, 0.968627, 0.968627), +RawColor(GRAY98 , 0xFAFAFA, 0.980392, 0.980392, 0.980392), +RawColor(GRAY99 , 0xFCFCFC, 0.988235, 0.988235, 0.988235), +RawColor(GREEN , 0x00FF00, 0.000000, 1.000000, 0.000000), +RawColor(GREEN2 , 0x00EE00, 0.000000, 0.933333, 0.000000), +RawColor(GREEN3 , 0x00CD00, 0.000000, 0.803922, 0.000000), +RawColor(GREEN4 , 0x008B00, 0.000000, 0.545098, 0.000000), +RawColor(GREENYELLOW , 0xADFF2F, 0.678431, 1.000000, 0.184314), +RawColor(HONEYDEW , 0xF0FFF0, 0.941176, 1.000000, 0.941176), +RawColor(HONEYDEW2 , 0xE0EEE0, 0.878431, 0.933333, 0.878431), +RawColor(HONEYDEW3 , 0xC1CDC1, 0.756863, 0.803922, 0.756863), +RawColor(HONEYDEW4 , 0x838B83, 0.513725, 0.545098, 0.513725), +RawColor(HOTPINK , 0xFF69B4, 1.000000, 0.411765, 0.705882), +RawColor(HOTPINK1 , 0xFF6EB4, 1.000000, 0.431373, 0.705882), +RawColor(HOTPINK2 , 0xEE6AA7, 0.933333, 0.415686, 0.654902), +RawColor(HOTPINK3 , 0xCD6090, 0.803922, 0.376471, 0.564706), +RawColor(HOTPINK4 , 0x8B3A62, 0.545098, 0.227451, 0.384314), +RawColor(INDIANRED , 0xCD5C5C, 0.803922, 0.360784, 0.360784), +RawColor(INDIANRED1 , 0xFF6A6A, 1.000000, 0.415686, 0.415686), +RawColor(INDIANRED2 , 0xEE6363, 0.933333, 0.388235, 0.388235), +RawColor(INDIANRED3 , 0xCD5555, 0.803922, 0.333333, 0.333333), +RawColor(INDIANRED4 , 0x8B3A3A, 0.545098, 0.227451, 0.227451), +RawColor(IVORY , 0xFFFFF0, 1.000000, 1.000000, 0.941176), +RawColor(IVORY2 , 0xEEEEE0, 0.933333, 0.933333, 0.878431), +RawColor(IVORY3 , 0xCDCDC1, 0.803922, 0.803922, 0.756863), +RawColor(IVORY4 , 0x8B8B83, 0.545098, 0.545098, 0.513725), +RawColor(KHAKI , 0xF0E68C, 0.941176, 0.901961, 0.549020), +RawColor(KHAKI1 , 0xFFF68F, 1.000000, 0.964706, 0.560784), +RawColor(KHAKI2 , 0xEEE685, 0.933333, 0.901961, 0.521569), +RawColor(KHAKI3 , 0xCDC673, 0.803922, 0.776471, 0.450980), +RawColor(KHAKI4 , 0x8B864E, 0.545098, 0.525490, 0.305882), +RawColor(LAVENDER , 0xE6E6FA, 0.901961, 0.901961, 0.980392), +RawColor(LAVENDERBLUSH1 , 0xFFF0F5, 1.000000, 0.941176, 0.960784), +RawColor(LAVENDERBLUSH2 , 0xEEE0E5, 0.933333, 0.878431, 0.898039), +RawColor(LAVENDERBLUSH3 , 0xCDC1C5, 0.803922, 0.756863, 0.772549), +RawColor(LAVENDERBLUSH4 , 0x8B8386, 0.545098, 0.513725, 0.525490), +RawColor(LAWNGREEN , 0x7CFC00, 0.486275, 0.988235, 0.000000), +RawColor(LEMONCHIFFON1 , 0xFFFACD, 1.000000, 0.980392, 0.803922), +RawColor(LEMONCHIFFON2 , 0xEEE9BF, 0.933333, 0.913725, 0.749020), +RawColor(LEMONCHIFFON3 , 0xCDC9A5, 0.803922, 0.788235, 0.647059), +RawColor(LEMONCHIFFON4 , 0x8B8970, 0.545098, 0.537255, 0.439216), +RawColor(LIGHTBLUE , 0xADD8E6, 0.678431, 0.847059, 0.901961), +RawColor(LIGHTBLUE1 , 0xBFEFFF, 0.749020, 0.937255, 1.000000), +RawColor(LIGHTBLUE2 , 0xB2DFEE, 0.698039, 0.874510, 0.933333), +RawColor(LIGHTBLUE3 , 0x9AC0CD, 0.603922, 0.752941, 0.803922), +RawColor(LIGHTBLUE4 , 0x68838B, 0.407843, 0.513725, 0.545098), +RawColor(LIGHTCORAL , 0xF08080, 0.941176, 0.501961, 0.501961), +RawColor(LIGHTCYAN , 0xE0FFFF, 0.878431, 1.000000, 1.000000), +RawColor(LIGHTCYAN2 , 0xD1EEEE, 0.819608, 0.933333, 0.933333), +RawColor(LIGHTCYAN3 , 0xB4CDCD, 0.705882, 0.803922, 0.803922), +RawColor(LIGHTCYAN4 , 0x7A8B8B, 0.478431, 0.545098, 0.545098), +RawColor(LIGHTGOLDENROD , 0xEEDD82, 0.933333, 0.866667, 0.509804), +RawColor(LIGHTGOLDENROD1 , 0xFFEC8B, 1.000000, 0.925490, 0.545098), +RawColor(LIGHTGOLDENROD2 , 0xEEDC82, 0.933333, 0.862745, 0.509804), +RawColor(LIGHTGOLDENROD3 , 0xCDBE70, 0.803922, 0.745098, 0.439216), +RawColor(LIGHTGOLDENROD4 , 0x8B814C, 0.545098, 0.505882, 0.298039), +RawColor(LIGHTGOLDENRODYELLOW, 0xFAFAD2, 0.980392, 0.980392, 0.823529), +RawColor(LIGHTGRAY , 0xD3D3D3, 0.827451, 0.827451, 0.827451), +RawColor(LIGHTPINK , 0xFFB6C1, 1.000000, 0.713725, 0.756863), +RawColor(LIGHTPINK1 , 0xFFAEB9, 1.000000, 0.682353, 0.725490), +RawColor(LIGHTPINK2 , 0xEEA2AD, 0.933333, 0.635294, 0.678431), +RawColor(LIGHTPINK3 , 0xCD8C95, 0.803922, 0.549020, 0.584314), +RawColor(LIGHTPINK4 , 0x8B5F65, 0.545098, 0.372549, 0.396078), +RawColor(LIGHTSALMON1 , 0xFFA07A, 1.000000, 0.627451, 0.478431), +RawColor(LIGHTSALMON2 , 0xEE9572, 0.933333, 0.584314, 0.447059), +RawColor(LIGHTSALMON3 , 0xCD8162, 0.803922, 0.505882, 0.384314), +RawColor(LIGHTSALMON4 , 0x8B5742, 0.545098, 0.341176, 0.258824), +RawColor(LIGHTSEAGREEN , 0x20B2AA, 0.125490, 0.698039, 0.666667), +RawColor(LIGHTSKYBLUE , 0x87CEFA, 0.529412, 0.807843, 0.980392), +RawColor(LIGHTSKYBLUE1 , 0xB0E2FF, 0.690196, 0.886275, 1.000000), +RawColor(LIGHTSKYBLUE2 , 0xA4D3EE, 0.643137, 0.827451, 0.933333), +RawColor(LIGHTSKYBLUE3 , 0x8DB6CD, 0.552941, 0.713725, 0.803922), +RawColor(LIGHTSKYBLUE4 , 0x607B8B, 0.376471, 0.482353, 0.545098), +RawColor(LIGHTSLATEBLUE , 0x8470FF, 0.517647, 0.439216, 1.000000), +RawColor(LIGHTSLATEGRAY , 0x778899, 0.466667, 0.533333, 0.600000), +RawColor(LIGHTSTEELBLUE , 0xB0C4DE, 0.690196, 0.768627, 0.870588), +RawColor(LIGHTSTEELBLUE1 , 0xCAE1FF, 0.792157, 0.882353, 1.000000), +RawColor(LIGHTSTEELBLUE2 , 0xBCD2EE, 0.737255, 0.823529, 0.933333), +RawColor(LIGHTSTEELBLUE3 , 0xA2B5CD, 0.635294, 0.709804, 0.803922), +RawColor(LIGHTSTEELBLUE4 , 0x6E7B8B, 0.431373, 0.482353, 0.545098), +RawColor(LIGHTYELLOW , 0xFFFFE0, 1.000000, 1.000000, 0.878431), +RawColor(LIGHTYELLOW2 , 0xEEEED1, 0.933333, 0.933333, 0.819608), +RawColor(LIGHTYELLOW3 , 0xCDCDB4, 0.803922, 0.803922, 0.705882), +RawColor(LIGHTYELLOW4 , 0x8B8B7A, 0.545098, 0.545098, 0.478431), +RawColor(LIMEGREEN , 0x32CD32, 0.196078, 0.803922, 0.196078), +RawColor(LINEN , 0xFAF0E6, 0.980392, 0.941176, 0.901961), +RawColor(MAGENTA , 0xFF00FF, 1.000000, 0.000000, 1.000000), +RawColor(MAGENTA2 , 0xEE00EE, 0.933333, 0.000000, 0.933333), +RawColor(MAGENTA3 , 0xCD00CD, 0.803922, 0.000000, 0.803922), +RawColor(MAGENTA4 , 0x8B008B, 0.545098, 0.000000, 0.545098), +RawColor(MAROON , 0xB03060, 0.690196, 0.188235, 0.376471), +RawColor(MAROON1 , 0xFF34B3, 1.000000, 0.203922, 0.701961), +RawColor(MAROON2 , 0xEE30A7, 0.933333, 0.188235, 0.654902), +RawColor(MAROON3 , 0xCD2990, 0.803922, 0.160784, 0.564706), +RawColor(MAROON4 , 0x8B1C62, 0.545098, 0.109804, 0.384314), +RawColor(MEDIUMAQUAMARINE , 0x66CDAA, 0.400000, 0.803922, 0.666667), +RawColor(MEDIUMORCHID , 0xBA55D3, 0.729412, 0.333333, 0.827451), +RawColor(MEDIUMORCHID1 , 0xE066FF, 0.878431, 0.400000, 1.000000), +RawColor(MEDIUMORCHID2 , 0xD15FEE, 0.819608, 0.372549, 0.933333), +RawColor(MEDIUMORCHID3 , 0xB452CD, 0.705882, 0.321569, 0.803922), +RawColor(MEDIUMORCHID4 , 0x7A378B, 0.478431, 0.215686, 0.545098), +RawColor(MEDIUMPURPLE , 0x9370DB, 0.576471, 0.439216, 0.858824), +RawColor(MEDIUMPURPLE1 , 0xAB82FF, 0.670588, 0.509804, 1.000000), +RawColor(MEDIUMPURPLE2 , 0x9F79EE, 0.623529, 0.474510, 0.933333), +RawColor(MEDIUMPURPLE3 , 0x8968CD, 0.537255, 0.407843, 0.803922), +RawColor(MEDIUMPURPLE4 , 0x5D478B, 0.364706, 0.278431, 0.545098), +RawColor(MEDIUMSEAGREEN , 0x3CB371, 0.235294, 0.701961, 0.443137), +RawColor(MEDIUMSLATEBLUE , 0x7B68EE, 0.482353, 0.407843, 0.933333), +RawColor(MEDIUMSPRINGGREEN , 0x00FA9A, 0.000000, 0.980392, 0.603922), +RawColor(MEDIUMTURQUOISE , 0x48D1CC, 0.282353, 0.819608, 0.800000), +RawColor(MEDIUMVIOLETRED , 0xC71585, 0.780392, 0.082353, 0.521569), +RawColor(MIDNIGHTBLUE , 0x191970, 0.098039, 0.098039, 0.439216), +RawColor(MINTCREAM , 0xF5FFFA, 0.960784, 1.000000, 0.980392), +RawColor(MISTYROSE , 0xFFE4E1, 1.000000, 0.894118, 0.882353), +RawColor(MISTYROSE2 , 0xEED5D2, 0.933333, 0.835294, 0.823529), +RawColor(MISTYROSE3 , 0xCDB7B5, 0.803922, 0.717647, 0.709804), +RawColor(MISTYROSE4 , 0x8B7D7B, 0.545098, 0.490196, 0.482353), +RawColor(MOCCASIN , 0xFFE4B5, 1.000000, 0.894118, 0.709804), +RawColor(NAVAJOWHITE1 , 0xFFDEAD, 1.000000, 0.870588, 0.678431), +RawColor(NAVAJOWHITE2 , 0xEECFA1, 0.933333, 0.811765, 0.631373), +RawColor(NAVAJOWHITE3 , 0xCDB38B, 0.803922, 0.701961, 0.545098), +RawColor(NAVAJOWHITE4 , 0x8B795E, 0.545098, 0.474510, 0.368627), +RawColor(NAVYBLUE , 0x000080, 0.000000, 0.000000, 0.501961), +RawColor(OLDLACE , 0xFDF5E6, 0.992157, 0.960784, 0.901961), +RawColor(OLIVEDRAB , 0x6B8E23, 0.419608, 0.556863, 0.137255), +RawColor(OLIVEDRAB1 , 0xC0FF3E, 0.752941, 1.000000, 0.243137), +RawColor(OLIVEDRAB2 , 0xB3EE3A, 0.701961, 0.933333, 0.227451), +RawColor(OLIVEDRAB3 , 0x9ACD32, 0.603922, 0.803922, 0.196078), +RawColor(OLIVEDRAB4 , 0x698B22, 0.411765, 0.545098, 0.133333), +RawColor(ORANGE , 0xFFA500, 1.000000, 0.647059, 0.000000), +RawColor(ORANGE2 , 0xEE9A00, 0.933333, 0.603922, 0.000000), +RawColor(ORANGE3 , 0xCD8500, 0.803922, 0.521569, 0.000000), +RawColor(ORANGE4 , 0x8B5A00, 0.545098, 0.352941, 0.000000), +RawColor(ORANGERED , 0xFF4500, 1.000000, 0.270588, 0.000000), +RawColor(ORANGERED2 , 0xEE4000, 0.933333, 0.250980, 0.000000), +RawColor(ORANGERED3 , 0xCD3700, 0.803922, 0.215686, 0.000000), +RawColor(ORANGERED4 , 0x8B2500, 0.545098, 0.145098, 0.000000), +RawColor(ORCHID , 0xDA70D6, 0.854902, 0.439216, 0.839216), +RawColor(ORCHID1 , 0xFF83FA, 1.000000, 0.513725, 0.980392), +RawColor(ORCHID2 , 0xEE7AE9, 0.933333, 0.478431, 0.913725), +RawColor(ORCHID3 , 0xCD69C9, 0.803922, 0.411765, 0.788235), +RawColor(ORCHID4 , 0x8B4789, 0.545098, 0.278431, 0.537255), +RawColor(PALEGOLDENROD , 0xEEE8AA, 0.933333, 0.909804, 0.666667), +RawColor(PALEGREEN , 0x98FB98, 0.596078, 0.984314, 0.596078), +RawColor(PALEGREEN1 , 0x9AFF9A, 0.603922, 1.000000, 0.603922), +RawColor(PALEGREEN2 , 0x90EE90, 0.564706, 0.933333, 0.564706), +RawColor(PALEGREEN3 , 0x7CCD7C, 0.486275, 0.803922, 0.486275), +RawColor(PALEGREEN4 , 0x548B54, 0.329412, 0.545098, 0.329412), +RawColor(PALETURQUOISE , 0xAFEEEE, 0.686275, 0.933333, 0.933333), +RawColor(PALETURQUOISE1 , 0xBBFFFF, 0.733333, 1.000000, 1.000000), +RawColor(PALETURQUOISE2 , 0xAEEEEE, 0.682353, 0.933333, 0.933333), +RawColor(PALETURQUOISE3 , 0x96CDCD, 0.588235, 0.803922, 0.803922), +RawColor(PALETURQUOISE4 , 0x668B8B, 0.400000, 0.545098, 0.545098), +RawColor(PALEVIOLETRED , 0xDB7093, 0.858824, 0.439216, 0.576471), +RawColor(PALEVIOLETRED1 , 0xFF82AB, 1.000000, 0.509804, 0.670588), +RawColor(PALEVIOLETRED2 , 0xEE799F, 0.933333, 0.474510, 0.623529), +RawColor(PALEVIOLETRED3 , 0xCD6889, 0.803922, 0.407843, 0.537255), +RawColor(PALEVIOLETRED4 , 0x8B475D, 0.545098, 0.278431, 0.364706), +RawColor(PAPAYAWHIP , 0xFFEFD5, 1.000000, 0.937255, 0.835294), +RawColor(PEACHPUFF , 0xFFDAB9, 1.000000, 0.854902, 0.725490), +RawColor(PEACHPUFF2 , 0xEECBAD, 0.933333, 0.796078, 0.678431), +RawColor(PEACHPUFF3 , 0xCDAF95, 0.803922, 0.686275, 0.584314), +RawColor(PEACHPUFF4 , 0x8B7765, 0.545098, 0.466667, 0.396078), +RawColor(PERU , 0xCD853F, 0.803922, 0.521569, 0.247059), +RawColor(PINK , 0xFFC0CB, 1.000000, 0.752941, 0.796078), +RawColor(PINK1 , 0xFFB5C5, 1.000000, 0.709804, 0.772549), +RawColor(PINK2 , 0xEEA9B8, 0.933333, 0.662745, 0.721569), +RawColor(PINK3 , 0xCD919E, 0.803922, 0.568627, 0.619608), +RawColor(PINK4 , 0x8B636C, 0.545098, 0.388235, 0.423529), +RawColor(PLUM , 0xDDA0DD, 0.866667, 0.627451, 0.866667), +RawColor(PLUM1 , 0xFFBBFF, 1.000000, 0.733333, 1.000000), +RawColor(PLUM2 , 0xEEAEEE, 0.933333, 0.682353, 0.933333), +RawColor(PLUM3 , 0xCD96CD, 0.803922, 0.588235, 0.803922), +RawColor(PLUM4 , 0x8B668B, 0.545098, 0.400000, 0.545098), +RawColor(POWDERBLUE , 0xB0E0E6, 0.690196, 0.878431, 0.901961), +RawColor(PURPLE , 0xA020F0, 0.627451, 0.125490, 0.941176), +RawColor(PURPLE1 , 0x9B30FF, 0.607843, 0.188235, 1.000000), +RawColor(PURPLE2 , 0x912CEE, 0.568627, 0.172549, 0.933333), +RawColor(PURPLE3 , 0x7D26CD, 0.490196, 0.149020, 0.803922), +RawColor(PURPLE4 , 0x551A8B, 0.333333, 0.101961, 0.545098), +RawColor(RED , 0xFF0000, 1.000000, 0.000000, 0.000000), +RawColor(RED2 , 0xEE0000, 0.933333, 0.000000, 0.000000), +RawColor(RED3 , 0xCD0000, 0.803922, 0.000000, 0.000000), +RawColor(RED4 , 0x8B0000, 0.545098, 0.000000, 0.000000), +RawColor(ROSYBROWN , 0xBC8F8F, 0.737255, 0.560784, 0.560784), +RawColor(ROSYBROWN1 , 0xFFC1C1, 1.000000, 0.756863, 0.756863), +RawColor(ROSYBROWN2 , 0xEEB4B4, 0.933333, 0.705882, 0.705882), +RawColor(ROSYBROWN3 , 0xCD9B9B, 0.803922, 0.607843, 0.607843), +RawColor(ROSYBROWN4 , 0x8B6969, 0.545098, 0.411765, 0.411765), +RawColor(ROYALBLUE , 0x4169E1, 0.254902, 0.411765, 0.882353), +RawColor(ROYALBLUE1 , 0x4876FF, 0.282353, 0.462745, 1.000000), +RawColor(ROYALBLUE2 , 0x436EEE, 0.262745, 0.431373, 0.933333), +RawColor(ROYALBLUE3 , 0x3A5FCD, 0.227451, 0.372549, 0.803922), +RawColor(ROYALBLUE4 , 0x27408B, 0.152941, 0.250980, 0.545098), +RawColor(SADDLEBROWN , 0x8B4513, 0.545098, 0.270588, 0.074510), +RawColor(SALMON , 0xFA8072, 0.980392, 0.501961, 0.447059), +RawColor(SALMON1 , 0xFF8C69, 1.000000, 0.549020, 0.411765), +RawColor(SALMON2 , 0xEE8262, 0.933333, 0.509804, 0.384314), +RawColor(SALMON3 , 0xCD7054, 0.803922, 0.439216, 0.329412), +RawColor(SALMON4 , 0x8B4C39, 0.545098, 0.298039, 0.223529), +RawColor(SANDYBROWN , 0xF4A460, 0.956863, 0.643137, 0.376471), +RawColor(SEAGREEN , 0x2E8B57, 0.180392, 0.545098, 0.341176), +RawColor(SEAGREEN1 , 0x54FF9F, 0.329412, 1.000000, 0.623529), +RawColor(SEAGREEN2 , 0x4EEE94, 0.305882, 0.933333, 0.580392), +RawColor(SEAGREEN3 , 0x43CD80, 0.262745, 0.803922, 0.501961), +RawColor(SEAGREEN4 , 0x2E8B57, 0.180392, 0.545098, 0.341176), +RawColor(SEASHELL , 0xFFF5EE, 1.000000, 0.960784, 0.933333), +RawColor(SEASHELL2 , 0xEEE5DE, 0.933333, 0.898039, 0.870588), +RawColor(SEASHELL3 , 0xCDC5BF, 0.803922, 0.772549, 0.749020), +RawColor(SEASHELL4 , 0x8B8682, 0.545098, 0.525490, 0.509804), +RawColor(BEET , 0x8E388E, 0.556863, 0.219608, 0.556863), +RawColor(TEAL , 0x388E8E, 0.219608, 0.556863, 0.556863), +RawColor(SIENNA , 0xA0522D, 0.627451, 0.321569, 0.176471), +RawColor(SIENNA1 , 0xFF8247, 1.000000, 0.509804, 0.278431), +RawColor(SIENNA2 , 0xEE7942, 0.933333, 0.474510, 0.258824), +RawColor(SIENNA3 , 0xCD6839, 0.803922, 0.407843, 0.223529), +RawColor(SIENNA4 , 0x8B4726, 0.545098, 0.278431, 0.149020), +RawColor(SKYBLUE , 0x87CEEB, 0.529412, 0.807843, 0.921569), +RawColor(SKYBLUE1 , 0x87CEFF, 0.529412, 0.807843, 1.000000), +RawColor(SKYBLUE2 , 0x7EC0EE, 0.494118, 0.752941, 0.933333), +RawColor(SKYBLUE3 , 0x6CA6CD, 0.423529, 0.650980, 0.803922), +RawColor(SKYBLUE4 , 0x4A708B, 0.290196, 0.439216, 0.545098), +RawColor(SLATEBLUE , 0x6A5ACD, 0.415686, 0.352941, 0.803922), +RawColor(SLATEBLUE1 , 0x836FFF, 0.513725, 0.435294, 1.000000), +RawColor(SLATEBLUE2 , 0x7A67EE, 0.478431, 0.403922, 0.933333), +RawColor(SLATEBLUE3 , 0x6959CD, 0.411765, 0.349020, 0.803922), +RawColor(SLATEBLUE4 , 0x473C8B, 0.278431, 0.235294, 0.545098), +RawColor(SLATEGRAY1 , 0xC6E2FF, 0.776471, 0.886275, 1.000000), +RawColor(SLATEGRAY2 , 0xB9D3EE, 0.725490, 0.827451, 0.933333), +RawColor(SLATEGRAY3 , 0x9FB6CD, 0.623529, 0.713725, 0.803922), +RawColor(SLATEGRAY4 , 0x6C7B8B, 0.423529, 0.482353, 0.545098), +RawColor(SLATEGRAY , 0x708090, 0.439216, 0.501961, 0.564706), +RawColor(SNOW , 0xFFFAFA, 1.000000, 0.980392, 0.980392), +RawColor(SNOW2 , 0xEEE9E9, 0.933333, 0.913725, 0.913725), +RawColor(SNOW3 , 0xCDC9C9, 0.803922, 0.788235, 0.788235), +RawColor(SNOW4 , 0x8B8989, 0.545098, 0.537255, 0.537255), +RawColor(SPRINGGREEN , 0x00FF7F, 0.000000, 1.000000, 0.498039), +RawColor(SPRINGGREEN2 , 0x00EE76, 0.000000, 0.933333, 0.462745), +RawColor(SPRINGGREEN3 , 0x00CD66, 0.000000, 0.803922, 0.400000), +RawColor(SPRINGGREEN4 , 0x008B45, 0.000000, 0.545098, 0.270588), +RawColor(STEELBLUE , 0x4682B4, 0.274510, 0.509804, 0.705882), +RawColor(STEELBLUE1 , 0x63B8FF, 0.388235, 0.721569, 1.000000), +RawColor(STEELBLUE2 , 0x5CACEE, 0.360784, 0.674510, 0.933333), +RawColor(STEELBLUE3 , 0x4F94CD, 0.309804, 0.580392, 0.803922), +RawColor(STEELBLUE4 , 0x36648B, 0.211765, 0.392157, 0.545098), +RawColor(TAN , 0xD2B48C, 0.823529, 0.705882, 0.549020), +RawColor(TAN1 , 0xFFA54F, 1.000000, 0.647059, 0.309804), +RawColor(TAN2 , 0xEE9A49, 0.933333, 0.603922, 0.286275), +RawColor(TAN3 , 0xCD853F, 0.803922, 0.521569, 0.247059), +RawColor(TAN4 , 0x8B5A2B, 0.545098, 0.352941, 0.168627), +RawColor(THISTLE , 0xD8BFD8, 0.847059, 0.749020, 0.847059), +RawColor(THISTLE1 , 0xFFE1FF, 1.000000, 0.882353, 1.000000), +RawColor(THISTLE2 , 0xEED2EE, 0.933333, 0.823529, 0.933333), +RawColor(THISTLE3 , 0xCDB5CD, 0.803922, 0.709804, 0.803922), +RawColor(THISTLE4 , 0x8B7B8B, 0.545098, 0.482353, 0.545098), +RawColor(TOMATO , 0xFF6347, 1.000000, 0.388235, 0.278431), +RawColor(TOMATO2 , 0xEE5C42, 0.933333, 0.360784, 0.258824), +RawColor(TOMATO3 , 0xCD4F39, 0.803922, 0.309804, 0.223529), +RawColor(TOMATO4 , 0x8B3626, 0.545098, 0.211765, 0.149020), +RawColor(TURQUOISE , 0x40E0D0, 0.250980, 0.878431, 0.815686), +RawColor(TURQUOISE1 , 0x00F5FF, 0.000000, 0.960784, 1.000000), +RawColor(TURQUOISE2 , 0x00E5EE, 0.000000, 0.898039, 0.933333), +RawColor(TURQUOISE3 , 0x00C5CD, 0.000000, 0.772549, 0.803922), +RawColor(TURQUOISE4 , 0x00868B, 0.000000, 0.525490, 0.545098), +RawColor(VIOLET , 0xEE82EE, 0.933333, 0.509804, 0.933333), +RawColor(VIOLETRED , 0xD02090, 0.815686, 0.125490, 0.564706), +RawColor(VIOLETRED1 , 0xFF3E96, 1.000000, 0.243137, 0.588235), +RawColor(VIOLETRED2 , 0xEE3A8C, 0.933333, 0.227451, 0.549020), +RawColor(VIOLETRED3 , 0xCD3278, 0.803922, 0.196078, 0.470588), +RawColor(VIOLETRED4 , 0x8B2252, 0.545098, 0.133333, 0.321569), +RawColor(WHEAT , 0xF5DEB3, 0.960784, 0.870588, 0.701961), +RawColor(WHEAT1 , 0xFFE7BA, 1.000000, 0.905882, 0.729412), +RawColor(WHEAT2 , 0xEED8AE, 0.933333, 0.847059, 0.682353), +RawColor(WHEAT3 , 0xCDBA96, 0.803922, 0.729412, 0.588235), +RawColor(WHEAT4 , 0x8B7E66, 0.545098, 0.494118, 0.400000), +RawColor(WHITESMOKE , 0xF5F5F5, 0.960784, 0.960784, 0.960784), +RawColor(YELLOW , 0xFFFF00, 1.000000, 1.000000, 0.000000), +RawColor(YELLOW2 , 0xEEEE00, 0.933333, 0.933333, 0.000000), +RawColor(YELLOW3 , 0xCDCD00, 0.803922, 0.803922, 0.000000), +RawColor(YELLOW4 , 0x8B8B00, 0.545098, 0.545098, 0.000000), +RawColor(YELLOWGREEN , 0x9ACD32, 0.603922, 0.803922, 0.196078), +RawColor(WHITE , 0xFFFFFF, 1.000000, 1.000000, 1.000000), diff --git a/src/Quantity/Quantity_NameOfColor.hxx b/src/Quantity/Quantity_NameOfColor.hxx index 1ef519b274..53e4566397 100644 --- a/src/Quantity/Quantity_NameOfColor.hxx +++ b/src/Quantity/Quantity_NameOfColor.hxx @@ -43,7 +43,8 @@ Quantity_NOC_BISQUE2, Quantity_NOC_BISQUE3, Quantity_NOC_BISQUE4, Quantity_NOC_BLANCHEDALMOND, -Quantity_NOC_BLUE1, +Quantity_NOC_BLUE, +Quantity_NOC_BLUE1 = Quantity_NOC_BLUE, Quantity_NOC_BLUE2, Quantity_NOC_BLUE3, Quantity_NOC_BLUE4, @@ -64,7 +65,7 @@ Quantity_NOC_CADETBLUE2, Quantity_NOC_CADETBLUE3, Quantity_NOC_CADETBLUE4, Quantity_NOC_CHARTREUSE, -Quantity_NOC_CHARTREUSE1, +Quantity_NOC_CHARTREUSE1 = Quantity_NOC_CHARTREUSE, Quantity_NOC_CHARTREUSE2, Quantity_NOC_CHARTREUSE3, Quantity_NOC_CHARTREUSE4, @@ -83,7 +84,8 @@ Quantity_NOC_CORNSILK1, Quantity_NOC_CORNSILK2, Quantity_NOC_CORNSILK3, Quantity_NOC_CORNSILK4, -Quantity_NOC_CYAN1, +Quantity_NOC_CYAN, +Quantity_NOC_CYAN1 = Quantity_NOC_CYAN, Quantity_NOC_CYAN2, Quantity_NOC_CYAN3, Quantity_NOC_CYAN4, @@ -145,7 +147,7 @@ Quantity_NOC_FORESTGREEN, Quantity_NOC_GAINSBORO, Quantity_NOC_GHOSTWHITE, Quantity_NOC_GOLD, -Quantity_NOC_GOLD1, +Quantity_NOC_GOLD1 = Quantity_NOC_GOLD, Quantity_NOC_GOLD2, Quantity_NOC_GOLD3, Quantity_NOC_GOLD4, @@ -157,6 +159,14 @@ Quantity_NOC_GOLDENROD4, Quantity_NOC_GRAY, Quantity_NOC_GRAY0, Quantity_NOC_GRAY1, +Quantity_NOC_GRAY2, +Quantity_NOC_GRAY3, +Quantity_NOC_GRAY4, +Quantity_NOC_GRAY5, +Quantity_NOC_GRAY6, +Quantity_NOC_GRAY7, +Quantity_NOC_GRAY8, +Quantity_NOC_GRAY9, Quantity_NOC_GRAY10, Quantity_NOC_GRAY11, Quantity_NOC_GRAY12, @@ -167,7 +177,6 @@ Quantity_NOC_GRAY16, Quantity_NOC_GRAY17, Quantity_NOC_GRAY18, Quantity_NOC_GRAY19, -Quantity_NOC_GRAY2, Quantity_NOC_GRAY20, Quantity_NOC_GRAY21, Quantity_NOC_GRAY22, @@ -178,7 +187,6 @@ Quantity_NOC_GRAY26, Quantity_NOC_GRAY27, Quantity_NOC_GRAY28, Quantity_NOC_GRAY29, -Quantity_NOC_GRAY3, Quantity_NOC_GRAY30, Quantity_NOC_GRAY31, Quantity_NOC_GRAY32, @@ -189,7 +197,6 @@ Quantity_NOC_GRAY36, Quantity_NOC_GRAY37, Quantity_NOC_GRAY38, Quantity_NOC_GRAY39, -Quantity_NOC_GRAY4, Quantity_NOC_GRAY40, Quantity_NOC_GRAY41, Quantity_NOC_GRAY42, @@ -200,7 +207,6 @@ Quantity_NOC_GRAY46, Quantity_NOC_GRAY47, Quantity_NOC_GRAY48, Quantity_NOC_GRAY49, -Quantity_NOC_GRAY5, Quantity_NOC_GRAY50, Quantity_NOC_GRAY51, Quantity_NOC_GRAY52, @@ -211,7 +217,6 @@ Quantity_NOC_GRAY56, Quantity_NOC_GRAY57, Quantity_NOC_GRAY58, Quantity_NOC_GRAY59, -Quantity_NOC_GRAY6, Quantity_NOC_GRAY60, Quantity_NOC_GRAY61, Quantity_NOC_GRAY62, @@ -222,7 +227,6 @@ Quantity_NOC_GRAY66, Quantity_NOC_GRAY67, Quantity_NOC_GRAY68, Quantity_NOC_GRAY69, -Quantity_NOC_GRAY7, Quantity_NOC_GRAY70, Quantity_NOC_GRAY71, Quantity_NOC_GRAY72, @@ -233,7 +237,6 @@ Quantity_NOC_GRAY76, Quantity_NOC_GRAY77, Quantity_NOC_GRAY78, Quantity_NOC_GRAY79, -Quantity_NOC_GRAY8, Quantity_NOC_GRAY80, Quantity_NOC_GRAY81, Quantity_NOC_GRAY82, @@ -243,22 +246,21 @@ Quantity_NOC_GRAY86, Quantity_NOC_GRAY87, Quantity_NOC_GRAY88, Quantity_NOC_GRAY89, -Quantity_NOC_GRAY9, Quantity_NOC_GRAY90, Quantity_NOC_GRAY91, Quantity_NOC_GRAY92, Quantity_NOC_GRAY93, Quantity_NOC_GRAY94, Quantity_NOC_GRAY95, +Quantity_NOC_GRAY97, +Quantity_NOC_GRAY98, +Quantity_NOC_GRAY99, Quantity_NOC_GREEN, -Quantity_NOC_GREEN1, +Quantity_NOC_GREEN1 = Quantity_NOC_GREEN, Quantity_NOC_GREEN2, Quantity_NOC_GREEN3, Quantity_NOC_GREEN4, Quantity_NOC_GREENYELLOW, -Quantity_NOC_GRAY97, -Quantity_NOC_GRAY98, -Quantity_NOC_GRAY99, Quantity_NOC_HONEYDEW, Quantity_NOC_HONEYDEW2, Quantity_NOC_HONEYDEW3, @@ -298,7 +300,8 @@ Quantity_NOC_LIGHTBLUE2, Quantity_NOC_LIGHTBLUE3, Quantity_NOC_LIGHTBLUE4, Quantity_NOC_LIGHTCORAL, -Quantity_NOC_LIGHTCYAN1, +Quantity_NOC_LIGHTCYAN, +Quantity_NOC_LIGHTCYAN1 = Quantity_NOC_LIGHTCYAN, Quantity_NOC_LIGHTCYAN2, Quantity_NOC_LIGHTCYAN3, Quantity_NOC_LIGHTCYAN4, @@ -337,7 +340,8 @@ Quantity_NOC_LIGHTYELLOW3, Quantity_NOC_LIGHTYELLOW4, Quantity_NOC_LIMEGREEN, Quantity_NOC_LINEN, -Quantity_NOC_MAGENTA1, +Quantity_NOC_MAGENTA, +Quantity_NOC_MAGENTA1 = Quantity_NOC_MAGENTA, Quantity_NOC_MAGENTA2, Quantity_NOC_MAGENTA3, Quantity_NOC_MAGENTA4, @@ -381,12 +385,12 @@ Quantity_NOC_OLIVEDRAB2, Quantity_NOC_OLIVEDRAB3, Quantity_NOC_OLIVEDRAB4, Quantity_NOC_ORANGE, -Quantity_NOC_ORANGE1, +Quantity_NOC_ORANGE1 = Quantity_NOC_ORANGE, Quantity_NOC_ORANGE2, Quantity_NOC_ORANGE3, Quantity_NOC_ORANGE4, Quantity_NOC_ORANGERED, -Quantity_NOC_ORANGERED1, +Quantity_NOC_ORANGERED1 = Quantity_NOC_ORANGERED, Quantity_NOC_ORANGERED2, Quantity_NOC_ORANGERED3, Quantity_NOC_ORANGERED4, @@ -434,7 +438,7 @@ Quantity_NOC_PURPLE2, Quantity_NOC_PURPLE3, Quantity_NOC_PURPLE4, Quantity_NOC_RED, -Quantity_NOC_RED1, +Quantity_NOC_RED1 = Quantity_NOC_RED, Quantity_NOC_RED2, Quantity_NOC_RED3, Quantity_NOC_RED4, @@ -510,7 +514,7 @@ Quantity_NOC_THISTLE2, Quantity_NOC_THISTLE3, Quantity_NOC_THISTLE4, Quantity_NOC_TOMATO, -Quantity_NOC_TOMATO1, +Quantity_NOC_TOMATO1 = Quantity_NOC_TOMATO, Quantity_NOC_TOMATO2, Quantity_NOC_TOMATO3, Quantity_NOC_TOMATO4, @@ -532,7 +536,7 @@ Quantity_NOC_WHEAT3, Quantity_NOC_WHEAT4, Quantity_NOC_WHITESMOKE, Quantity_NOC_YELLOW, -Quantity_NOC_YELLOW1, +Quantity_NOC_YELLOW1 = Quantity_NOC_YELLOW, Quantity_NOC_YELLOW2, Quantity_NOC_YELLOW3, Quantity_NOC_YELLOW4, diff --git a/src/Quantity/Quantity_TypeOfColor.hxx b/src/Quantity/Quantity_TypeOfColor.hxx index 896d143e57..5077aba59b 100644 --- a/src/Quantity/Quantity_TypeOfColor.hxx +++ b/src/Quantity/Quantity_TypeOfColor.hxx @@ -17,19 +17,15 @@ #ifndef _Quantity_TypeOfColor_HeaderFile #define _Quantity_TypeOfColor_HeaderFile -//! Identifies color definition systems -//! - Quantity_TOC_RGB: with this system a -//! color is defined by its quantities of red, green and blue (R-G-B values). -//! - Quantity_TOC_HLS: with this system a -//! color is defined by its hue angle and its -//! lightness and saturation values (H-L-S values). -//! A Quantity_Color object may define a color -//! from three values R-G-B or H-L-S according -//! to a given color definition system. +//! Identifies color definition systems. enum Quantity_TypeOfColor { -Quantity_TOC_RGB, -Quantity_TOC_HLS + Quantity_TOC_RGB, //!< normalized linear RGB (red, green, blue) values within range [0..1] for each component + Quantity_TOC_HLS, //!< hue + light + saturation components, where: + //! - First component is the Hue (H) angle in degrees within range [0.0; 360.0], 0.0 being Red; + //! value -1.0 is a special value reserved for grayscale color (S should be 0.0). + //! - Second component is the Lightness (L) within range [0.0; 1.0] + //! - Third component is the Saturation (S) within range [0.0; 1.0] }; #endif // _Quantity_TypeOfColor_HeaderFile diff --git a/tests/3rdparty/fonts/A2 b/tests/3rdparty/fonts/A2 index f900c6aa98..b616e5b4a0 100755 --- a/tests/3rdparty/fonts/A2 +++ b/tests/3rdparty/fonts/A2 @@ -16,54 +16,54 @@ vtrihedron trihedr vpoint p1 100 100 -400 vpoint p2 000 000 -400 vpoint p3 -100 -100 -400 -vdrawtext OC0 OpenCascade -pos 100 100 -400 -color 0.0 1.0 1.0 -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext OC1 OpenCascade -pos 000 000 -400 -color 0.0 1.0 1.0 -halign center -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext OC2 OpenCascade -pos -100 -100 -400 -color 0.0 1.0 1.0 -halign right -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext OC0 OpenCascade -pos 100 100 -400 -color CYAN -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext OC1 OpenCascade -pos 000 000 -400 -color CYAN -halign center -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext OC2 OpenCascade -pos -100 -100 -400 -color CYAN -halign right -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint p4 100 100 -500 vpoint p5 000 000 -500 vpoint p6 -100 -100 -500 -vdrawtext OC3 OpenCascade -pos 100 100 -500 -color 1.0 0.0 0.0 -halign left -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext OC4 OpenCascade -pos 000 000 -500 -color 1.0 0.0 0.0 -halign center -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext OC5 OpenCascade -pos -100 -100 -500 -color 1.0 0.0 0.0 -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext OC3 OpenCascade -pos 100 100 -500 -color RED -halign left -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext OC4 OpenCascade -pos 000 000 -500 -color RED -halign center -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext OC5 OpenCascade -pos -100 -100 -500 -color RED -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint p7 100 100 -450 vpoint p8 000 000 -450 vpoint p9 -100 -100 -450 -vdrawtext OC6 OpenCascade -pos 100 100 -450 -color 0.02 1.0 0.0 -halign left -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext OC7 OpenCascade -pos 000 000 -450 -color 0.02 1.0 0.0 -halign center -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext OC8 OpenCascade -pos -100 -100 -450 -color 0.02 1.0 0.0 -halign right -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext OC6 OpenCascade -pos 100 100 -450 -color 05FF00 -halign left -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext OC7 OpenCascade -pos 000 000 -450 -color 05FF00 -halign center -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext OC8 OpenCascade -pos -100 -100 -450 -color 05FF00 -halign right -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext L0 _.Left._ -pos 200 200 200 -color 1.0 1.0 1.0 -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext L1 _.Left._ -pos 200 200 200 -color 1.0 1.0 0.0 -halign left -valign bottom -angle 090 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext L0 _.Left._ -pos 200 200 200 -color WHITE -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext L1 _.Left._ -pos 200 200 200 -color YELLOW -halign left -valign bottom -angle 090 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext R0 _.Right._ -pos 200 200 200 -color 1.0 0.0 1.0 -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext R1 _.Right._ -pos 200 200 200 -color 1.0 0.6078 0.5882 -halign right -valign top -angle 090 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext R0 _.Right._ -pos 200 200 200 -color MAGENTA -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext R1 _.Right._ -pos 200 200 200 -color FF9B96 -halign right -valign top -angle 090 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext N0 _.0123456789._ -pos 200 200 200 -color 0.0 0.0 1.0 -halign center -valign center -angle 045 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext N1 _.0123456789._ -pos 200 200 200 -color 1.0 0.0 0.0 -halign center -valign center -angle -45 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext N0 _.0123456789._ -pos 200 200 200 -color BLUE -halign center -valign center -angle 045 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext N1 _.0123456789._ -pos 200 200 200 -color RED -halign center -valign center -angle -45 -zoom 1 -height 50 -aspect regular -font SansFont -vdrawtext SS _.~!@#$%^&*:?|+-._ -pos -200 000 400 -color 1.0 0.0 0.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext SS _.~!@#$%^&*:?|+-._ -pos -200 000 400 -color RED -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font SansFont box atextbox -100 -100 -100 -200 -200 -200 vdisplay atextbox -vdrawtext OC9 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont -vdrawtext OC10 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont -vdrawtext OC11 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont -vdrawtext OC12 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont +vdrawtext OC9 OpenCascade -pos -300 -300 -300 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont +vdrawtext OC10 OpenCascade -pos -300 -300 -100 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont +vdrawtext OC11 OpenCascade -pos -100 -100 -300 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont +vdrawtext OC12 OpenCascade -pos -100 -100 -100 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont -vdrawtext OC13 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont -vdrawtext OC14 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont -vdrawtext OC15 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont -vdrawtext OC16 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont +vdrawtext OC13 OpenCascade -pos -300 -100 -300 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont +vdrawtext OC14 OpenCascade -pos -100 -300 -300 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont +vdrawtext OC15 OpenCascade -pos -300 -100 -100 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont +vdrawtext OC16 OpenCascade -pos -100 -300 -100 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font SerifFont -vdrawtext OC17 OpenCascade -pos -200 -200 100 -color 1.0 0.0 1.0 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font sans-serif -vdrawtext OC18 OpenCascade -pos -200 -200 150 -color 0.0 1.0 1.0 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font serif -vdrawtext OC19 OpenCascade -pos -200 -200 200 -color 1.0 1.0 0.0 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect italic -font serif -vdrawtext OC20 OpenCascade -pos -200 -200 250 -color 0.0 1.0 0.02 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect bolditalic -font monospace -vdrawtext OC21 OpenCascade -pos -200 -200 300 -color 1.0 0.0 0.02 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font monospace +vdrawtext OC17 OpenCascade -pos -200 -200 100 -color MAGENTA -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font sans-serif +vdrawtext OC18 OpenCascade -pos -200 -200 150 -color CYAN -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font serif +vdrawtext OC19 OpenCascade -pos -200 -200 200 -color YELLOW -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect italic -font serif +vdrawtext OC20 OpenCascade -pos -200 -200 250 -color 00FF05 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect bolditalic -font monospace +vdrawtext OC21 OpenCascade -pos -200 -200 300 -color FF0005 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font monospace vglinfo checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/3rdparty/fonts/A3 b/tests/3rdparty/fonts/A3 index a1a1d4011f..98132202ea 100644 --- a/tests/3rdparty/fonts/A3 +++ b/tests/3rdparty/fonts/A3 @@ -17,7 +17,7 @@ vpoint p1 0 10000 -400 vpoint p2 1000 0 -400 vfit -vdrawtext text "$aText" -pos 100 100 -400 -color 0.0 1.0 1.0 -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext text "$aText" -pos 100 100 -400 -color CYAN -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vfps diff --git a/tests/3rdparty/fonts/A4 b/tests/3rdparty/fonts/A4 index 7df93571ae..c956d29365 100644 --- a/tests/3rdparty/fonts/A4 +++ b/tests/3rdparty/fonts/A4 @@ -20,7 +20,7 @@ set data [split $aFileData "\n"] set aLineId 0 foreach aLine $data { set aLineY [expr $aLineId * 400] - vdrawtext "Line_$aLineId" "$aLine" -noupdate -pos 100 $aLineY -400 -color 0.0 1.0 1.0 -halign left -valign bottom -angle 000 -zoom 0 -height 20 -aspect regular -font SansFont + vdrawtext "Line_$aLineId" "$aLine" -noupdate -pos 100 $aLineY -400 -color CYAN -halign left -valign bottom -angle 000 -zoom 0 -height 20 -aspect regular -font SansFont set aLineId [expr $aLineId + 1] } diff --git a/tests/3rdparty/fonts/A5 b/tests/3rdparty/fonts/A5 index f3e4f53eb5..2a6a60217c 100644 --- a/tests/3rdparty/fonts/A5 +++ b/tests/3rdparty/fonts/A5 @@ -9,31 +9,31 @@ vfont add [locate_data_file DejaVuSans.ttf] SansFont vtrihedron trihedr vpoint pTL -700 100 600 -vdrawtext Text0 "Top-Left\nFirst line\nLion The Second\n3rd" -pos -700 100 600 -color 0.0 1.0 1.0 -halign left -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext Text0 "Top-Left\nFirst line\nLion The Second\n3rd" -pos -700 100 600 -color CYAN -halign left -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint pTC 0 100 600 -vdrawtext Text1 "Top-Center\nFirst line\nLion The Second\n3rd" -pos 0 100 600 -color 0.0 1.0 1.0 -halign center -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext Text1 "Top-Center\nFirst line\nLion The Second\n3rd" -pos 0 100 600 -color CYAN -halign center -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint pTR 700 100 600 -vdrawtext Text2 "Top-Right\nFirst line\nLion The Second\n3rd" -pos 700 100 600 -color 0.0 1.0 1.0 -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext Text2 "Top-Right\nFirst line\nLion The Second\n3rd" -pos 700 100 600 -color CYAN -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint pCL -700 100 -100 -vdrawtext Text3 "Center-Left\nFirst line\nLion The Second\n3rd" -pos -700 100 -100 -color 1.0 1.0 1.0 -halign left -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext Text3 "Center-Left\nFirst line\nLion The Second\n3rd" -pos -700 100 -100 -color WHITE -halign left -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint pCC 0 100 -100 -vdrawtext Text4 "Center-Center\nFirst line\nLion The Second\n3rd" -pos 0 100 -100 -color 1.0 1.0 1.0 -halign center -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext Text4 "Center-Center\nFirst line\nLion The Second\n3rd" -pos 0 100 -100 -color WHITE -halign center -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint pCR 700 100 -100 -vdrawtext Text5 "Center-Right\nFirst line\nLion The Second\n3rd" -pos 700 100 -100 -color 1.0 1.0 1.0 -halign right -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext Text5 "Center-Right\nFirst line\nLion The Second\n3rd" -pos 700 100 -100 -color WHITE -halign right -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint pBL -700 100 -700 -vdrawtext Text6 "Bottom-Left\nFirst line\nLion The Second\n3rd" -pos -700 100 -700 -color 1.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext Text6 "Bottom-Left\nFirst line\nLion The Second\n3rd" -pos -700 100 -700 -color YELLOW -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint pBC 0 100 -700 -vdrawtext Text7 "Bottom-Center\nFirst line\nLion The Second\n3rd" -pos 0 100 -700 -color 1.0 1.0 0.0 -halign center -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext Text7 "Bottom-Center\nFirst line\nLion The Second\n3rd" -pos 0 100 -700 -color YELLOW -halign center -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vpoint pBR 700 100 -700 -vdrawtext Text8 "Bottom-Right\nFirst line\nLion The Second\n3rd" -pos 700 100 -700 -color 1.0 1.0 0.0 -halign right -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext Text8 "Bottom-Right\nFirst line\nLion The Second\n3rd" -pos 700 100 -700 -color YELLOW -halign right -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font SansFont vfit diff --git a/tests/3rdparty/fonts/A6 b/tests/3rdparty/fonts/A6 index e43157669d..fb70d1180e 100644 --- a/tests/3rdparty/fonts/A6 +++ b/tests/3rdparty/fonts/A6 @@ -11,31 +11,31 @@ vfont -verbose 1 vtrihedron trihedr vpoint pTL -700 100 600 -vdrawtext Text0 " Top-Left\nFirst line \nLion The Second\n 3rd " -pos -700 100 600 -color 0.0 1.0 1.0 -halign left -valign top -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME +vdrawtext Text0 " Top-Left\nFirst line \nLion The Second\n 3rd " -pos -700 100 600 -color CYAN -halign left -valign top -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vpoint pTC 0 100 600 -vdrawtext Text1 " Top-Center\nFirst line \nLion The Second\n 3rd " -pos 0 100 600 -color 0.0 1.0 1.0 -halign center -valign top -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME +vdrawtext Text1 " Top-Center\nFirst line \nLion The Second\n 3rd " -pos 0 100 600 -color CYAN -halign center -valign top -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vpoint pTR 700 100 600 -vdrawtext Text2 " Top-Right\nFirst line \nLion The Second\n 3rd " -pos 700 100 600 -color 0.0 1.0 1.0 -halign right -valign top -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME +vdrawtext Text2 " Top-Right\nFirst line \nLion The Second\n 3rd " -pos 700 100 600 -color CYAN -halign right -valign top -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vpoint pCL -700 100 -100 -vdrawtext Text3 " Center-Left\nFirst line \nLion The Second\n 3rd " -pos -700 100 -100 -color 1.0 1.0 1.0 -halign left -valign center -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME +vdrawtext Text3 " Center-Left\nFirst line \nLion The Second\n 3rd " -pos -700 100 -100 -color WHITE -halign left -valign center -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vpoint pCC 0 100 -100 -vdrawtext Text4 " Center-Center\nFirst line \nLion The Second\n 3rd " -pos 0 100 -100 -color 1.0 1.0 1.0 -halign center -valign center -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME +vdrawtext Text4 " Center-Center\nFirst line \nLion The Second\n 3rd " -pos 0 100 -100 -color WHITE -halign center -valign center -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vpoint pCR 700 100 -100 -vdrawtext Text5 " Center-Right\nFirst line \nLion The Second\n 3rd " -pos 700 100 -100 -color 1.0 1.0 1.0 -halign right -valign center -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME +vdrawtext Text5 " Center-Right\nFirst line \nLion The Second\n 3rd " -pos 700 100 -100 -color WHITE -halign right -valign center -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vpoint pBL -700 100 -700 -vdrawtext Text6 " Bottom-Left\nFirst line \nLion The Second\n 3rd " -pos -700 100 -700 -color 1.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME +vdrawtext Text6 " Bottom-Left\nFirst line \nLion The Second\n 3rd " -pos -700 100 -700 -color YELLOW -halign left -valign bottom -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vpoint pBC 0 100 -700 -vdrawtext Text7 " Bottom-Center\nFirst line \nLion The Second\n 3rd " -pos 0 100 -700 -color 1.0 1.0 0.0 -halign center -valign bottom -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME +vdrawtext Text7 " Bottom-Center\nFirst line \nLion The Second\n 3rd " -pos 0 100 -700 -color YELLOW -halign center -valign bottom -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vpoint pBR 700 100 -700 -vdrawtext Text8 " Bottom-Right\nFirst line \nLion The Second\n 3rd " -pos 700 100 -700 -color 1.0 1.0 0.0 -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME +vdrawtext Text8 " Bottom-Right\nFirst line \nLion The Second\n 3rd " -pos 700 100 -700 -color YELLOW -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect bold -font $THE_FONT_NAME vfit vfps diff --git a/tests/3rdparty/fonts/A7 b/tests/3rdparty/fonts/A7 index 32931b66c8..b0a0d7484f 100644 --- a/tests/3rdparty/fonts/A7 +++ b/tests/3rdparty/fonts/A7 @@ -6,7 +6,7 @@ puts "" vfont add [locate_data_file DejaVuSans.ttf] SansFont -set aParams "-height 16 -font SansFont -2d -persPos -1 1 -subColor BLUE1" +set aParams "-height 16 -font SansFont -2d -persPos -1 1 -subColor BLUE" vclear vviewparams -scale 254.5 -proj 0.89 -0.37 0.26 -up -0.21 0.16 0.96 -at 0.69 1.05 1.46 diff --git a/tests/3rdparty/fonts/A8 b/tests/3rdparty/fonts/A8 index 1098e7f39c..f28d7fb125 100644 --- a/tests/3rdparty/fonts/A8 +++ b/tests/3rdparty/fonts/A8 @@ -14,54 +14,54 @@ vtrihedron trihedr vpoint p1 100 100 -400 vpoint p2 000 000 -400 vpoint p3 -100 -100 -400 -vdrawtext OC0 OpenCascade -pos 100 100 -400 -color 0.0 1.0 1.0 -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext OC1 OpenCascade -pos 000 000 -400 -color 0.0 1.0 1.0 -halign center -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext OC2 OpenCascade -pos -100 -100 -400 -color 0.0 1.0 1.0 -halign right -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext OC0 OpenCascade -pos 100 100 -400 -color CYAN -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext OC1 OpenCascade -pos 000 000 -400 -color CYAN -halign center -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext OC2 OpenCascade -pos -100 -100 -400 -color CYAN -halign right -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman vpoint p4 100 100 -500 vpoint p5 000 000 -500 vpoint p6 -100 -100 -500 -vdrawtext OC3 OpenCascade -pos 100 100 -500 -color 1.0 0.0 0.0 -halign left -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext OC4 OpenCascade -pos 000 000 -500 -color 1.0 0.0 0.0 -halign center -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext OC5 OpenCascade -pos -100 -100 -500 -color 1.0 0.0 0.0 -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext OC3 OpenCascade -pos 100 100 -500 -color RED -halign left -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext OC4 OpenCascade -pos 000 000 -500 -color RED -halign center -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext OC5 OpenCascade -pos -100 -100 -500 -color RED -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman vpoint p7 100 100 -450 vpoint p8 000 000 -450 vpoint p9 -100 -100 -450 -vdrawtext OC6 OpenCascade -pos 100 100 -450 -color 0.02 1.0 0.0 -halign left -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext OC7 OpenCascade -pos 000 000 -450 -color 0.02 1.0 0.0 -halign center -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext OC8 OpenCascade -pos -100 -100 -450 -color 0.02 1.0 0.0 -halign right -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext OC6 OpenCascade -pos 100 100 -450 -color 05FF00 -halign left -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext OC7 OpenCascade -pos 000 000 -450 -color 05FF00 -halign center -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext OC8 OpenCascade -pos -100 -100 -450 -color 05FF00 -halign right -valign center -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext L0 _.Left._ -pos 200 200 200 -color 1.0 1.0 1.0 -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext L1 _.Left._ -pos 200 200 200 -color 1.0 1.0 0.0 -halign left -valign bottom -angle 090 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext L0 _.Left._ -pos 200 200 200 -color WHITE -halign left -valign bottom -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext L1 _.Left._ -pos 200 200 200 -color YELLOW -halign left -valign bottom -angle 090 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext R0 _.Right._ -pos 200 200 200 -color 1.0 0.0 1.0 -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext R1 _.Right._ -pos 200 200 200 -color 1.0 0.6078 0.5882 -halign right -valign top -angle 090 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext R0 _.Right._ -pos 200 200 200 -color MAGENTA -halign right -valign top -angle 000 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext R1 _.Right._ -pos 200 200 200 -color FF9B96 -halign right -valign top -angle 090 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext N0 _.0123456789._ -pos 200 200 200 -color 0.0 0.0 1.0 -halign center -valign center -angle 045 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext N1 _.0123456789._ -pos 200 200 200 -color 1.0 0.0 0.0 -halign center -valign center -angle -45 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext N0 _.0123456789._ -pos 200 200 200 -color BLUE -halign center -valign center -angle 045 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext N1 _.0123456789._ -pos 200 200 200 -color RED -halign center -valign center -angle -45 -zoom 1 -height 50 -aspect regular -font Times-Roman -vdrawtext SS _.~!@#$%^&*:?|+-._ -pos -200 000 400 -color 1.0 0.0 0.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font Times-Roman +vdrawtext SS _.~!@#$%^&*:?|+-._ -pos -200 000 400 -color RED -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font Times-Roman box atextbox -100 -100 -100 -200 -200 -200 vdisplay atextbox -vdrawtext OC9 OpenCascade -pos -300 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier -vdrawtext OC10 OpenCascade -pos -300 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier -vdrawtext OC11 OpenCascade -pos -100 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier -vdrawtext OC12 OpenCascade -pos -100 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier +vdrawtext OC9 OpenCascade -pos -300 -300 -300 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier +vdrawtext OC10 OpenCascade -pos -300 -300 -100 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier +vdrawtext OC11 OpenCascade -pos -100 -100 -300 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier +vdrawtext OC12 OpenCascade -pos -100 -100 -100 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier -vdrawtext OC13 OpenCascade -pos -300 -100 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier -vdrawtext OC14 OpenCascade -pos -100 -300 -300 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier -vdrawtext OC15 OpenCascade -pos -300 -100 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier -vdrawtext OC16 OpenCascade -pos -100 -300 -100 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier +vdrawtext OC13 OpenCascade -pos -300 -100 -300 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier +vdrawtext OC14 OpenCascade -pos -100 -300 -300 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier +vdrawtext OC15 OpenCascade -pos -300 -100 -100 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier +vdrawtext OC16 OpenCascade -pos -100 -300 -100 -color GREEN -halign left -valign bottom -angle 000 -zoom 0 -height 15 -aspect regular -font Courier -vdrawtext OC17 OpenCascade -pos -200 -200 100 -color 1.0 0.0 1.0 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font Times-Roman -vdrawtext OC18 OpenCascade -pos -200 -200 150 -color 0.0 1.0 1.0 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font sans-serif -vdrawtext OC19 OpenCascade -pos -200 -200 200 -color 1.0 1.0 0.0 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect italic -font sans-serif -vdrawtext OC20 OpenCascade -pos -200 -200 250 -color 0.0 1.0 0.02 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect bolditalic -font sans-serif -vdrawtext OC21 OpenCascade -pos -200 -200 300 -color 1.0 0.0 0.02 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font Arial +vdrawtext OC17 OpenCascade -pos -200 -200 100 -color MAGENTA -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font Times-Roman +vdrawtext OC18 OpenCascade -pos -200 -200 150 -color CYAN -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font sans-serif +vdrawtext OC19 OpenCascade -pos -200 -200 200 -color YELLOW -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect italic -font sans-serif +vdrawtext OC20 OpenCascade -pos -200 -200 250 -color 00FF05 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect bolditalic -font sans-serif +vdrawtext OC21 OpenCascade -pos -200 -200 300 -color FF0005 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font Arial vglinfo checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/3rdparty/fonts/B1 b/tests/3rdparty/fonts/B1 index e10559ecce..3d6bee69ab 100644 --- a/tests/3rdparty/fonts/B1 +++ b/tests/3rdparty/fonts/B1 @@ -21,7 +21,7 @@ foreach aSize $THE_FONT_SIZES { set aText "\[$aSize\] $THE_TEXT" vpoint aPnt_$aSize 0.0 $aLine 0.0 - vdrawtext "Line_$aLineId" $aText -pos 0.0 $aLine 0.0 -color 0.0 1.0 1.0 -halign left -valign top -angle 000 -zoom 1 -height $aSize -aspect bolditalic -font $THE_FONT_NAME + vdrawtext "Line_$aLineId" $aText -pos 0.0 $aLine 0.0 -color CYAN -halign left -valign top -angle 000 -zoom 1 -height $aSize -aspect bolditalic -font $THE_FONT_NAME text2brep aBText_$aSize $aText -font $THE_FONT_NAME -height $aSize -aspect bolditalic -composite off -pos 0.0 $aLine 0.0 -valign topfirstline vdisplay aBText_$aSize diff --git a/tests/3rdparty/fonts/B2 b/tests/3rdparty/fonts/B2 index 0d49dac606..02cbdeb19e 100644 --- a/tests/3rdparty/fonts/B2 +++ b/tests/3rdparty/fonts/B2 @@ -21,7 +21,7 @@ foreach aSize $THE_FONT_SIZES { set aText "\[$aSize\] $THE_TEXT" vpoint aPnt_$aSize 0.0 $aLine 0.0 - vdrawtext "Line_$aLineId" $aText -pos 0.0 $aLine 0.0 -color 0.0 1.0 1.0 -halign left -valign top -angle 000 -zoom 1 -height $aSize -aspect bolditalic -font $THE_FONT_NAME + vdrawtext "Line_$aLineId" $aText -pos 0.0 $aLine 0.0 -color CYAN -halign left -valign top -angle 000 -zoom 1 -height $aSize -aspect bolditalic -font $THE_FONT_NAME text2brep aBText_$aSize $aText -font $THE_FONT_NAME -height $aSize -aspect bolditalic -composite on -pos 0.0 $aLine 0.0 -valign topfirstline vdisplay aBText_$aSize diff --git a/tests/3rdparty/fonts/B4 b/tests/3rdparty/fonts/B4 index 2b917e515e..1d2a49c1f9 100644 --- a/tests/3rdparty/fonts/B4 +++ b/tests/3rdparty/fonts/B4 @@ -37,9 +37,9 @@ vpoint pBR 700 100 -700 text2brep Text8 "Bottom-Right\nFirst line\nLion The Second\n3rd" -pos 700 100 -700 -halign right -valign bottom -height 50 -aspect regular -font Times-Roman -plane 0 -1 0 1 0 0 vdisplay Text0 Text1 Text2 Text3 Text4 Text5 Text6 Text7 Text8 -noupdate -vsetcolor Text0 Text1 Text2 0 1 1 -vsetcolor Text3 Text4 Text5 1 1 1 -vsetcolor Text6 Text7 Text8 1 1 0 +vsetcolor Text0 Text1 Text2 CYAN +vsetcolor Text3 Text4 Text5 WHITE +vsetcolor Text6 Text7 Text8 YELLOW vfit diff --git a/tests/3rdparty/fonts/B5 b/tests/3rdparty/fonts/B5 index deb25f84f8..4ffb8dd9fd 100644 --- a/tests/3rdparty/fonts/B5 +++ b/tests/3rdparty/fonts/B5 @@ -37,9 +37,9 @@ vpoint pBR 700 100 -700 text2brep Text8 " Bottom-Right\nFirst line \nLion The Second\n 3rd " -pos 700 100 -700 -halign right -valign bottom -height 50 -aspect bold -font Arial -plane 0 -1 0 1 0 0 vdisplay Text0 Text1 Text2 Text3 Text4 Text5 Text6 Text7 Text8 -noupdate -vsetcolor Text0 Text1 Text2 0 1 1 -vsetcolor Text3 Text4 Text5 1 1 1 -vsetcolor Text6 Text7 Text8 1 1 0 +vsetcolor Text0 Text1 Text2 CYAN +vsetcolor Text3 Text4 Text5 WHITE +vsetcolor Text6 Text7 Text8 YELLOW vfit diff --git a/tests/3rdparty/fonts/B7 b/tests/3rdparty/fonts/B7 index a3cfd6d1aa..c028fd7ddb 100644 --- a/tests/3rdparty/fonts/B7 +++ b/tests/3rdparty/fonts/B7 @@ -22,7 +22,7 @@ foreach aSize $THE_FONT_SIZES { set aText "\[$aSize\] $THE_TEXT" vpoint aPnt_$aSize 0.0 $aLine 0.0 - vdrawtext "Line_$aLineId" $aText -pos 0.0 $aLine 0.0 -color 0.0 1.0 1.0 -halign left -valign top -angle 000 -zoom 1 -height $aSize -aspect bolditalic -font $THE_FONT_NAME + vdrawtext "Line_$aLineId" $aText -pos 0.0 $aLine 0.0 -color CYAN -halign left -valign top -angle 000 -zoom 1 -height $aSize -aspect bolditalic -font $THE_FONT_NAME text2brep aBText_$aSize $aText -font $THE_FONT_NAME -height $aSize -aspect bolditalic -composite off -pos 0.0 $aLine 0.0 -valign topfirstline vdisplay -dispMode 1 aBText_$aSize diff --git a/tests/bugs/caf/bug1029 b/tests/bugs/caf/bug1029 index 7c5092ac15..bda1c255be 100755 --- a/tests/bugs/caf/bug1029 +++ b/tests/bugs/caf/bug1029 @@ -31,8 +31,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/bugs/caf/bug1030 b/tests/bugs/caf/bug1030 deleted file mode 100755 index be53659ce7..0000000000 --- a/tests/bugs/caf/bug1030 +++ /dev/null @@ -1,94 +0,0 @@ -puts "================" -puts "OCC1030" -puts "================" -# -# Note: Numerical control of setting color -# - -pload QAcommands - -NewDocument D BinOcaf -UndoLimit D 100 -NewCommand D - -# Set NamedShape attribute -box aBox1 100 200 300 -set aLabel 0:2 -SetShape D ${aLabel} aBox1 - -# Initialize 3D viewer -AISInitViewer D - -# Add AISPresentation attribute with parameter NS -AISSet D ${aLabel} NS - -# Display presentation of NamedShape in the viewer -AISDisplay D ${aLabel} - -# Close/Open transaction -NewCommand D - -set list [OCC1030_AISColor D ${aLabel}] -set AISColor1 [lindex ${list} [expr [llength ${list}] - 1] ] - -# Set a color of the shape as NOC_GREEN -set GreenColor 229 -AISColor D ${aLabel} ${GreenColor} - -set list [OCC1030_AISColor D ${aLabel}] -set AISColor2 [lindex ${list} [expr [llength ${list}] - 1] ] - -# Close/Open transaction -NewCommand D - -# Undo -Undo D - -# Update the viewer -AISRepaint D - -set list [OCC1030_AISColor D ${aLabel}] -set AISColor3 [lindex ${list} [expr [llength ${list}] - 1] ] - -# Redo -Redo D - -# Update the viewer -AISRepaint D - -set list [OCC1030_AISColor D ${aLabel}] -set AISColor4 [lindex ${list} [expr [llength ${list}] - 1] ] - -# Check the color -puts "AISColor1 = ${AISColor1}" -puts "AISColor2 = ${AISColor2}" -puts "AISColor3 = ${AISColor3}" -puts "AISColor4 = ${AISColor4}" - -set DefaultAISColor 516 -set status 0 -if { ${AISColor1} != ${DefaultAISColor} } { - puts "OCC1030_AISColor command: Error (case 1)" - set status 1 -} - -if { ${AISColor2} != ${GreenColor} } { - puts "OCC1030_AISColor command: Error (case 2)" - set status 1 -} - -if { ${AISColor3} != ${DefaultAISColor} } { - puts "OCC1030_AISColor command: Error (case 3)" - set status 1 -} - -if { ${AISColor4} != ${GreenColor} } { - puts "OCC1030_AISColor command: Error (case 4)" - set status 1 -} - -if { ${status} == 0} { - puts "OCC1030_AISColor command: OK" -} - - diff --git a/tests/bugs/caf/bug26290_newattribute_1 b/tests/bugs/caf/bug26290_newattribute_1 index 12252fad4f..77ff9e439a 100644 --- a/tests/bugs/caf/bug26290_newattribute_1 +++ b/tests/bugs/caf/bug26290_newattribute_1 @@ -23,7 +23,7 @@ vfit NewCommand D Undo D 1 Redo D 1 -AISColor D $Lab1 11 +AISColor D $Lab1 AQUAMARINE4 NewCommand D SaveAs D $imagedir/bug26290_new_1.cbf @@ -42,6 +42,6 @@ Open $imagedir/bug26290_new_1.cbf D AISInitViewer D vsetdispmode 1 vfit -AISColor D $Lab1 9 +AISColor D $Lab1 AQUAMARINE1 AISErase D $Lab1 Close D diff --git a/tests/bugs/caf/bug26290_newattribute_2 b/tests/bugs/caf/bug26290_newattribute_2 index bf2e2048a2..a79a631821 100644 --- a/tests/bugs/caf/bug26290_newattribute_2 +++ b/tests/bugs/caf/bug26290_newattribute_2 @@ -25,7 +25,7 @@ vfit NewCommand D Undo D 1 Redo D 1 -AISColor D $Lab1 11 +AISColor D $Lab1 AQUAMARINE4 NewCommand D SaveAs D $imagedir/bug26290_new_1.cbf Close D @@ -66,7 +66,7 @@ Open $imagedir/bug26290_new_2.cbf D AISInitViewer D vsetdispmode 1 vfit -AISColor D $Lab2 44 +AISColor D $Lab2 CHARTREUSE2 AISErase D $Lab2 AISErase D $Lab1 AISUnset D $Lab2 diff --git a/tests/bugs/iges/bug25518 b/tests/bugs/iges/bug25518 index e2f0de18b4..f7db17c538 100644 --- a/tests/bugs/iges/bug25518 +++ b/tests/bugs/iges/bug25518 @@ -14,7 +14,7 @@ XSetColor D s 0 0 1 param write.iges.brep.mode 1 WriteIges D ${imagedir}/OCC25518.igs ReadIges T ${imagedir}/OCC25518.igs -if {[string trim [XGetAllColors T]] != "BLUE1"} { +if {[string trim [XGetAllColors T]] != "BLUE"} { puts "ERROR: OCC25518 is reproduced. Color is lost." } XShow T diff --git a/tests/bugs/modalg_5/bug24244 b/tests/bugs/modalg_5/bug24244 index b2fbc1d462..d1d442252e 100755 --- a/tests/bugs/modalg_5/bug24244 +++ b/tests/bugs/modalg_5/bug24244 @@ -44,7 +44,7 @@ puts [checkshape result] # show compartments (solids) in shading with different colors set compartments [explode result so] set icol 0 -set colors {red green blue1 magenta1 yellow cyan1 brown} +set colors {red green blue magenta yellow cyan brown} foreach s [lrange $compartments 1 end] { vdisplay $s vsetcolor $s [lindex $colors [expr [incr icol] % [llength $colors]]] diff --git a/tests/bugs/step/bug30856 b/tests/bugs/step/bug30856 index 7ba75901ea..ee745e2abd 100644 --- a/tests/bugs/step/bug30856 +++ b/tests/bugs/step/bug30856 @@ -12,7 +12,7 @@ ReadStep D2 $imagedir/${casename}.stp # Blue set color1 [XGetShapeColor D1 0:1:1:1:1 s] set color2 [XGetShapeColor D2 0:1:1:1:1 s] -if {$color1 != "BLUE1" || $color2 != "BLUE1"} { +if {$color1 != "BLUE" || $color2 != "BLUE"} { puts "Error: wrong color." } diff --git a/tests/bugs/vis/bug21747_1 b/tests/bugs/vis/bug21747_1 index dfb7c27d9d..fe72437b5a 100755 --- a/tests/bugs/vis/bug21747_1 +++ b/tests/bugs/vis/bug21747_1 @@ -11,6 +11,6 @@ vinit puts "${BugNumber}" puts "Type=NONE, Color from RED to BLUE" -vbackground -gradient RED BLUE1 -gradientMode NONE +vbackground -gradient RED BLUE -gradientMode NONE checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_10 b/tests/bugs/vis/bug21747_10 index c73519c66d..2e0bee91cd 100755 --- a/tests/bugs/vis/bug21747_10 +++ b/tests/bugs/vis/bug21747_10 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=CORNER1, Color from RED to BLUE, Direction from LEFT TOP CORNER" -vbackground -gradient RED BLUE1 -gradientMode CORNER1 +vbackground -gradient RED BLUE -gradientMode CORNER1 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_11 b/tests/bugs/vis/bug21747_11 index bbca109533..b14c52efa5 100755 --- a/tests/bugs/vis/bug21747_11 +++ b/tests/bugs/vis/bug21747_11 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=CORNER2, Color from RED to BLUE, Direction from RIGHT TOP CORNER" -vbackground -gradient RED BLUE1 -gradientMode CORNER2 +vbackground -gradient RED BLUE -gradientMode CORNER2 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_12 b/tests/bugs/vis/bug21747_12 index eccff5eb47..e62d341888 100755 --- a/tests/bugs/vis/bug21747_12 +++ b/tests/bugs/vis/bug21747_12 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=CORNER3, Color from RED to BLUE, Direction from RIGHT BOTTOM CORNER" -vbackground -gradient RED BLUE1 -gradientMode CORNER3 +vbackground -gradient RED BLUE -gradientMode CORNER3 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_13 b/tests/bugs/vis/bug21747_13 index e11807c3f6..6bacaa0c81 100755 --- a/tests/bugs/vis/bug21747_13 +++ b/tests/bugs/vis/bug21747_13 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=CORNER4, Color from RED to BLUE, Direction from LEFT BOTTOM CORNER" -vbackground -gradient RED BLUE1 -gradientMode CORNER4 +vbackground -gradient RED BLUE -gradientMode CORNER4 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_14 b/tests/bugs/vis/bug21747_14 index dc69bcf073..6607312ef8 100755 --- a/tests/bugs/vis/bug21747_14 +++ b/tests/bugs/vis/bug21747_14 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=CORNER1, Color from BLUE to RED, Direction from LEFT TOP CORNER" -vbackground -gradient BLUE1 RED -gradientMode CORNER1 +vbackground -gradient BLUE RED -gradientMode CORNER1 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_15 b/tests/bugs/vis/bug21747_15 index a3eaec9424..14ffe0e2e8 100755 --- a/tests/bugs/vis/bug21747_15 +++ b/tests/bugs/vis/bug21747_15 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=CORNER2, Color from BLUE to RED, Direction from RIGHT TOP CORNER" -vbackground -gradient BLUE1 RED -gradientMode CORNER2 +vbackground -gradient BLUE RED -gradientMode CORNER2 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_16 b/tests/bugs/vis/bug21747_16 index 4823543095..8764931054 100755 --- a/tests/bugs/vis/bug21747_16 +++ b/tests/bugs/vis/bug21747_16 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=CORNER3, Color from BLUE to RED, Direction from RIGHT BOTTOM CORNER" -vbackground -gradient BLUE1 RED -gradientMode CORNER3 +vbackground -gradient BLUE RED -gradientMode CORNER3 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_17 b/tests/bugs/vis/bug21747_17 index 0f881adc77..a77d18570f 100755 --- a/tests/bugs/vis/bug21747_17 +++ b/tests/bugs/vis/bug21747_17 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=CORNER4, Color from BLUE to RED, Direction from LEFT BOTTOM CORNER" -vbackground -gradient BLUE1 RED -gradientMode CORNER4 +vbackground -gradient BLUE RED -gradientMode CORNER4 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_2 b/tests/bugs/vis/bug21747_2 index d5b40f8748..95155b5f89 100755 --- a/tests/bugs/vis/bug21747_2 +++ b/tests/bugs/vis/bug21747_2 @@ -11,6 +11,6 @@ vinit puts "${BugNumber}" puts "Type=HORIZONTAL, Color from RED to BLUE, Direction from LEFT to RIGHT" -vbackground -gradient RED BLUE1 -gradientMode HORIZONTAL +vbackground -gradient RED BLUE -gradientMode HORIZONTAL checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_3 b/tests/bugs/vis/bug21747_3 index 120c64b240..18dcff0094 100755 --- a/tests/bugs/vis/bug21747_3 +++ b/tests/bugs/vis/bug21747_3 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=HORIZONTAL, Color from BLUE to RED, Direction from LEFT to RIGHT" -vbackground -gradient BLUE1 RED -gradientMode HORIZONTAL +vbackground -gradient BLUE RED -gradientMode HORIZONTAL checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_4 b/tests/bugs/vis/bug21747_4 index ac8031a04f..d9294324c3 100755 --- a/tests/bugs/vis/bug21747_4 +++ b/tests/bugs/vis/bug21747_4 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=VERTICAL, Color from RED to BLUE, Direction from TOP to BOTTOM" -vbackground -gradient RED BLUE1 -gradientMode VERTICAL +vbackground -gradient RED BLUE -gradientMode VERTICAL checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_5 b/tests/bugs/vis/bug21747_5 index 2cf45cc042..36cbc1d482 100755 --- a/tests/bugs/vis/bug21747_5 +++ b/tests/bugs/vis/bug21747_5 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=VERTICAL, Color from BLUE to RED, Direction from TOP to BOTTOM" -vbackground -gradient BLUE1 RED -gradientMode VERTICAL +vbackground -gradient BLUE RED -gradientMode VERTICAL checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_6 b/tests/bugs/vis/bug21747_6 index 1f5fbc51b0..30cf46eede 100755 --- a/tests/bugs/vis/bug21747_6 +++ b/tests/bugs/vis/bug21747_6 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=DIAGONAL1, Color from RED to BLUE, Direction from LEFT TOP CORNER to RIGHT BOTTOM CORNER" -vbackground -gradient RED BLUE1 -gradientMode DIAGONAL1 +vbackground -gradient RED BLUE -gradientMode DIAGONAL1 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_7 b/tests/bugs/vis/bug21747_7 index 1d5445470f..8a20196170 100755 --- a/tests/bugs/vis/bug21747_7 +++ b/tests/bugs/vis/bug21747_7 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=DIAGONAL1, Color from BLUE to RED, Direction from LEFT TOP CORNER to RIGHT BOTTOM CORNER" -vbackground -gradient BLUE1 RED -gradientMode DIAGONAL1 +vbackground -gradient BLUE RED -gradientMode DIAGONAL1 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_8 b/tests/bugs/vis/bug21747_8 index 92b9ba828b..36924ddbb8 100755 --- a/tests/bugs/vis/bug21747_8 +++ b/tests/bugs/vis/bug21747_8 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=DIAGONAL2, Color from RED to BLUE, Direction from RIGHT TOP CORNER to LEFT BOTTOM CORNER" -vbackground -gradient RED BLUE1 -gradientMode DIAGONAL2 +vbackground -gradient RED BLUE -gradientMode DIAGONAL2 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug21747_9 b/tests/bugs/vis/bug21747_9 index 80fcccf809..7259bffbc0 100755 --- a/tests/bugs/vis/bug21747_9 +++ b/tests/bugs/vis/bug21747_9 @@ -10,6 +10,6 @@ vinit puts "${BugNumber}" puts "Type=DIAGONAL2, Color from BLUE to RED, Direction from RIGHT TOP CORNER to LEFT BOTTOM CORNER" -vbackground -gradient BLUE1 RED -gradientMode DIAGONAL2 +vbackground -gradient BLUE RED -gradientMode DIAGONAL2 checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22149 b/tests/bugs/vis/bug22149 index 9a26be5ccd..eb62133484 100755 --- a/tests/bugs/vis/bug22149 +++ b/tests/bugs/vis/bug22149 @@ -11,9 +11,9 @@ vfont add [locate_data_file bug22149_mona.ttf] Mona vclear vinit View1 vaxo -vdrawtext text0 HELLO -pos 0 0 0 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -vdrawtext text1 [encoding convertfrom unicode \x42\x30] -pos 0 0 200 -color 1.0 0.0 0.0 -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font Mona -vdrawtext text2 [encoding convertfrom unicode \x42\x30] -pos 0 0 400 -color 0.0 0.0 1.0 -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font cjk -vdrawtext text3 [encoding convertfrom unicode \x5C\xD5\x6D\xAD\xB4\xC5] -pos 0 0 -200 -color 1.0 0.0 1.0 -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font korean +vdrawtext text0 HELLO -pos 0 0 0 -color GREEN -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular +vdrawtext text1 [encoding convertfrom unicode \x42\x30] -pos 0 0 200 -color RED -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font Mona +vdrawtext text2 [encoding convertfrom unicode \x42\x30] -pos 0 0 400 -color BLUE -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font cjk +vdrawtext text3 [encoding convertfrom unicode \x5C\xD5\x6D\xAD\xB4\xC5] -pos 0 0 -200 -color MAGENTA -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font korean vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug22796_1 b/tests/bugs/vis/bug22796_1 index ee98e0bc1c..98d42d2ffa 100755 --- a/tests/bugs/vis/bug22796_1 +++ b/tests/bugs/vis/bug22796_1 @@ -11,7 +11,7 @@ vfont add [locate_data_file DejaVuSans.ttf] SansFont set BugNumber OCC22796 vinit -vdrawtext text0 "MyTest1\rHello,\tWor\vld!\nMyTest2\t\a\bMyTest3" -pos 0 0 0 -color 1.0 1.0 1.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext text0 "MyTest1\rHello,\tWor\vld!\nMyTest2\t\a\bMyTest3" -pos 0 0 0 -color WHITE -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font SansFont checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22796_2 b/tests/bugs/vis/bug22796_2 index 10ebb3e11c..5c8e94bc8f 100755 --- a/tests/bugs/vis/bug22796_2 +++ b/tests/bugs/vis/bug22796_2 @@ -11,8 +11,7 @@ set BugNumber OCC22796 vinit vfont add [locate_data_file bug22149_mona.ttf] Mona set s [encoding convertfrom unicode "\x42\x30\x09\x00\x79\x30\x0A\x00\x6F\x30\x42\x26"] -#vdrawtext "\x30\x42\x00\x09\x30\x79\x00\x0A\x30\x6F" 0 0 0 255 255 255 0 0 0 1 50 0 Mona 1 -vdrawtext text0 $s -pos 0 0 0 -color 1.0 1.0 1.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font Mona +vdrawtext text0 $s -pos 0 0 0 -color WHITE -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular -font Mona checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug22879 b/tests/bugs/vis/bug22879 index 295c33a1a1..64fbe54faa 100755 --- a/tests/bugs/vis/bug22879 +++ b/tests/bugs/vis/bug22879 @@ -12,13 +12,13 @@ set BugNumber OCC22879 vinit -vdrawtext t1 "Text Height=14" -2d -perspos -1 1 -pos 10 -10 0 -height 14 -color 1 1 1 -font SansFont -vdrawtext t2 "Text Height=25" -2d -perspos -1 1 -pos 10 -40 0 -height 25 -color 1 1 1 -font SansFont -vdrawtext t3 "Arial" -2d -perspos -1 1 -pos 10 -60 0 -height 18 -font SansFont -color 1 0 0 -vdrawtext t4 "Times New Roman" -2d -perspos -1 1 -pos 10 -80 0 -height 18 -font SansFont -color 0 0 1 -vdrawtext t5 "Subtitle" -2d -perspos -1 1 -pos 10 -110 0 -height 20 -font SansFont -color 0 1 0 -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 0 0 1 -disptype decal -subcolor 1 0 0 -vdrawtext t7 "Blend" -2d -perspos -1 1 -pos 10 -170 0 -height 20 -font SansFont -color 1 0 0 -disptype blend +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 diff --git a/tests/bugs/vis/bug22906 b/tests/bugs/vis/bug22906 index ab6558a1b8..98fd7e1ac9 100755 --- a/tests/bugs/vis/bug22906 +++ b/tests/bugs/vis/bug22906 @@ -21,7 +21,7 @@ set x4 87 set y4 232 vinit -vbackground -gradient RED BLUE1 -gradientMode DIAGONAL2 +vbackground -gradient RED BLUE -gradientMode DIAGONAL2 set Color1 [vreadpixel ${x1} ${y1} rgb] set Color2 [vreadpixel ${x2} ${y2} rgb] set Color3 [vreadpixel ${x3} ${y3} rgb] diff --git a/tests/bugs/vis/bug23363 b/tests/bugs/vis/bug23363 index cfc3865b52..30f73d7c95 100755 --- a/tests/bugs/vis/bug23363 +++ b/tests/bugs/vis/bug23363 @@ -6,7 +6,7 @@ puts "" vclear vinit View1 vaxo -vbackground -gradient 0.980392 0 0 GREEN -gradientMode VERTICAL +vbackground -gradient FA0000 GREEN -gradientMode VERTICAL pcylinder p 100 200 vdisplay -dispMode 1 p vaspects p -setInteriorStyle HOLLOW -setDrawEdges 1 diff --git a/tests/bugs/vis/bug23652 b/tests/bugs/vis/bug23652 index 28e466e91e..d6d5aa23b2 100755 --- a/tests/bugs/vis/bug23652 +++ b/tests/bugs/vis/bug23652 @@ -10,8 +10,8 @@ vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit vtrihedron tri -vdrawtext text0 Default -pos 0.0 0.0 0.0 -color 1.0 1.0 1.0 -halign left -valign bottom -angle 0 -zoom 1 -height 20 -aspect regular -font SansFont -vdrawtext text1 Right_Align -pos 0.0 0.0 0.0 -color 1.0 1.0 1.0 -halign right -valign bottom -angle 0 -zoom 1 -height 20 -aspect regular -font SansFont +vdrawtext text0 Default -pos 0.0 0.0 0.0 -color WHITE -halign left -valign bottom -angle 0 -zoom 1 -height 20 -aspect regular -font SansFont +vdrawtext text1 Right_Align -pos 0.0 0.0 0.0 -color WHITE -halign right -valign bottom -angle 0 -zoom 1 -height 20 -aspect regular -font SansFont set scale 3.1783114563761763 set proj_X 0.57735025882720947 diff --git a/tests/bugs/vis/bug24391 b/tests/bugs/vis/bug24391 index ce754ac771..bae0c71760 100644 --- a/tests/bugs/vis/bug24391 +++ b/tests/bugs/vis/bug24391 @@ -18,7 +18,7 @@ vfit vaspects -setwidth 5 vmoveto 204 205 -if { "[vreadpixel 204 205 rgb name]" != "CYAN1" } { +if { "[vreadpixel 204 205 rgb name]" != "CYAN" } { puts "Error : Erased object is not displayed after its removing." } diff --git a/tests/bugs/vis/bug24555 b/tests/bugs/vis/bug24555 index 712072980f..6c229a5d48 100755 --- a/tests/bugs/vis/bug24555 +++ b/tests/bugs/vis/bug24555 @@ -11,9 +11,9 @@ vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit vclear vaxo -vdrawtext text0 "This program" -pos 0 0 0 -color 0.0 1.0 0.0 -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font SansFont +vdrawtext text0 "This program" -pos 0 0 0 -color GREEN -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font SansFont -vdrawtext text1 "This program" -pos 0 0 0 -color 1.0 0.0 0.0 -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font SansFont +vdrawtext text1 "This program" -pos 0 0 0 -color RED -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font SansFont set x 346 set y 190 diff --git a/tests/bugs/vis/bug24564 b/tests/bugs/vis/bug24564 index 7da16a0d36..a612eceb97 100644 --- a/tests/bugs/vis/bug24564 +++ b/tests/bugs/vis/bug24564 @@ -25,7 +25,7 @@ vtop vaspects -setwidth 5 vmoveto 200 200 -if { "[vreadpixel 200 200 rgb name]" != "CYAN1" } { +if { "[vreadpixel 200 200 rgb name]" != "CYAN" } { puts "Error : The box is not selectable!" } @@ -34,6 +34,6 @@ vaxo vfit vmoveto 200 200 -if { "[vreadpixel 199 200 rgb name]" != "CYAN1" } { +if { "[vreadpixel 199 200 rgb name]" != "CYAN" } { puts "Error : The box is not selectable!" } diff --git a/tests/bugs/vis/bug24714 b/tests/bugs/vis/bug24714 index cda19e2611..a882379b8e 100644 --- a/tests/bugs/vis/bug24714 +++ b/tests/bugs/vis/bug24714 @@ -21,7 +21,7 @@ vviewparams -size 22 vaspects -setwidth 5 vmoveto 200 100 -if { "[vreadpixel 200 9 rgb name]" != "CYAN1" } { +if { "[vreadpixel 200 9 rgb name]" != "CYAN" } { puts "Error : the view projection size is incorrect!" } diff --git a/tests/bugs/vis/bug24717 b/tests/bugs/vis/bug24717 index 5acd33fef5..fcf06a538c 100644 --- a/tests/bugs/vis/bug24717 +++ b/tests/bugs/vis/bug24717 @@ -22,7 +22,7 @@ vclipplane change pln1 equation 0 1 0 0 vfit vaspects -setwidth 5 -if { "[vreadpixel $check_x $check_y rgb name]" != "CYAN1" } { +if { "[vreadpixel $check_x $check_y rgb name]" != "CYAN" } { puts "Error : Viewer clipping is broken." } diff --git a/tests/bugs/vis/bug24837_2 b/tests/bugs/vis/bug24837_2 index 01117fc1c2..8cac47c940 100644 --- a/tests/bugs/vis/bug24837_2 +++ b/tests/bugs/vis/bug24837_2 @@ -20,10 +20,10 @@ vsetdispmode 0 vdisplay o1 o2 vdisplay b1 b2 vfit -vdrawtext tb1 "b1" -pos 0 -3 3 -color 1.0 0.098 0.098 -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect regular -font SansFont -vdrawtext tb2 "b2" -pos 3 0 3 -color 0.098 1.0 0.098 -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect regular -font SansFont -vdrawtext bc_1 "bc_1" -pos 0 -9 3 -color 1.0 0.8823 0.8823 -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect regular -font SansFont -vdrawtext bc_2 "bc_2" -pos 3 -6 3 -color 1.0 0.8823 0.8823 -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect regular -font SansFont +vdrawtext tb1 "b1" -pos 0 -3 3 -color FF1919 -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect regular -font SansFont +vdrawtext tb2 "b2" -pos 3 0 3 -color 19FF19 -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect regular -font SansFont +vdrawtext bc_1 "bc_1" -pos 0 -9 3 -color FFE1E1 -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect regular -font SansFont +vdrawtext bc_2 "bc_2" -pos 3 -6 3 -color FFE1E1 -halign right -valign bottom -angle 000 -zoom 0 -height 14 -aspect regular -font SansFont vsetdispmode 1 set anImage ${imagedir}/${casename}_2_1.png vdump ${anImage} diff --git a/tests/bugs/vis/bug24867 b/tests/bugs/vis/bug24867 index 3d87f0fb2a..8e25d75979 100644 --- a/tests/bugs/vis/bug24867 +++ b/tests/bugs/vis/bug24867 @@ -13,11 +13,11 @@ vfit vsetdispmode 1 vaspects -setwidth 5 vmoveto 200 200 -if { "[vreadpixel 264 288 rgb name]" != "CYAN1" } { +if { "[vreadpixel 264 288 rgb name]" != "CYAN" } { puts "Error : Highlighting of dimension with flipping in local context failed." } -if { "[vreadpixel 251 271 rgb name]" != "CYAN1" } { +if { "[vreadpixel 251 271 rgb name]" != "CYAN" } { puts "Error : Highlighting of dimension with flipping in local context failed." } diff --git a/tests/bugs/vis/bug24901 b/tests/bugs/vis/bug24901 index ab84fa30c4..8661ec5338 100755 --- a/tests/bugs/vis/bug24901 +++ b/tests/bugs/vis/bug24901 @@ -18,7 +18,7 @@ vclipplane change pln1 capping on vfit vmoveto 304 146 -if { "[vreadpixel 304 146 rgb name]" != "CYAN1" } { +if { "[vreadpixel 304 146 rgb name]" != "CYAN" } { puts "Error : Highlighting is broken." } diff --git a/tests/bugs/vis/bug25121 b/tests/bugs/vis/bug25121 index 26f0cb676f..3485ef6b6b 100644 --- a/tests/bugs/vis/bug25121 +++ b/tests/bugs/vis/bug25121 @@ -15,13 +15,13 @@ vdisplay -noupdate b vtop vfit -vdrawtext 000_3D "000 3D" -pos 0.0 0.0 0.0 -color 1.0 1.0 1.0 -halign center -valign center -angle 000 -zoom 0 -height 16 -aspect regular -font SansFont -vdrawtext 001_3D "001 3D" -pos 0.0 1.0 0.0 -color 1.0 1.0 1.0 -halign center -valign center -angle 000 -zoom 0 -height 16 -aspect regular -font SansFont -vdrawtext 101_3D "101 3D" -pos 0.0 2.0 0.0 -color 1.0 1.0 1.0 -halign center -valign center -angle 000 -zoom 0 -height 16 -aspect regular -font SansFont -vdrawtext 110_3D "110 3D" -pos 0.0 3.0 0.0 -color 1.0 1.0 1.0 -halign center -valign center -angle 000 -zoom 0 -height 16 -aspect regular -font SansFont -vdrawtext t1 "000 2D" -2d -perspos -1 1 -pos 100 -200 0 -height 16 -font SansFont -color 1 1 1 -disptype normal -subcolor 0 0 1 -vdrawtext t2 "001 2D" -2d -perspos -1 1 -pos 100 -250 0 -height 16 -font SansFont -color 1 1 1 -disptype normal -subcolor 0 0 1 -vdrawtext t3 "101 2D" -2d -perspos -1 1 -pos 100 -300 0 -height 16 -font SansFont -color 1 1 1 -disptype normal -subcolor 0 0 1 -vdrawtext t4 "110 2D" -2d -perspos -1 1 -pos 100 -350 0 -height 16 -font SansFont -color 1 1 1 -disptype normal -subcolor 0 0 1 +vdrawtext 000_3D "000 3D" -pos 0.0 0.0 0.0 -color WHITE -halign center -valign center -angle 000 -zoom 0 -height 16 -aspect regular -font SansFont +vdrawtext 001_3D "001 3D" -pos 0.0 1.0 0.0 -color WHITE -halign center -valign center -angle 000 -zoom 0 -height 16 -aspect regular -font SansFont +vdrawtext 101_3D "101 3D" -pos 0.0 2.0 0.0 -color WHITE -halign center -valign center -angle 000 -zoom 0 -height 16 -aspect regular -font SansFont +vdrawtext 110_3D "110 3D" -pos 0.0 3.0 0.0 -color WHITE -halign center -valign center -angle 000 -zoom 0 -height 16 -aspect regular -font SansFont +vdrawtext t1 "000 2D" -2d -perspos -1 1 -pos 100 -200 0 -height 16 -font SansFont -color WHITE -disptype normal -subcolor BLUE +vdrawtext t2 "001 2D" -2d -perspos -1 1 -pos 100 -250 0 -height 16 -font SansFont -color WHITE -disptype normal -subcolor BLUE +vdrawtext t3 "101 2D" -2d -perspos -1 1 -pos 100 -300 0 -height 16 -font SansFont -color WHITE -disptype normal -subcolor BLUE +vdrawtext t4 "110 2D" -2d -perspos -1 1 -pos 100 -350 0 -height 16 -font SansFont -color WHITE -disptype normal -subcolor BLUE checkview -screenshot -3d -path ${imagedir}/${test_image}.png diff --git a/tests/bugs/vis/bug25136 b/tests/bugs/vis/bug25136 index f63a497a13..ca2bf70bac 100644 --- a/tests/bugs/vis/bug25136 +++ b/tests/bugs/vis/bug25136 @@ -10,15 +10,15 @@ 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 CYAN1 330 DODGERBLUE1 370 BLUE1} { 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" } } # reduce color scale range and number of intervals vcolorscale cs2 -range 0 20 5 -xy 60 0 -foreach {y aColor} {40 RED 120 YELLOW 200 GREEN 280 CYAN2 350 BLUE1} { if { [vreadpixel 75 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } +foreach {y aColor} {40 RED 120 YELLOW 200 GREEN 280 CYAN2 350 BLUE} { if { [vreadpixel 75 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } # set user-defined colors and labels for color scale vcolorscale cs3 -range 0 20 5 -colors white 0 0 1 green 1 0 0 1 1 1 -labels start 1 2 3 4 end -xy 120 0 -foreach {y aColor} {40 WHITE 120 RED 200 GREEN 280 BLUE1 350 WHITE} { if { [vreadpixel 135 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } +foreach {y aColor} {40 WHITE 120 RED 200 GREEN 280 BLUE 350 WHITE} { if { [vreadpixel 135 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } # change colors of first and last intervals vcolorscale cs4 -range 0 20 5 -colors white 0 0 1 green 1 0 0 1 1 1 -labels start 1 2 3 4 end -xy 200 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 BLUE1 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 SLATEBLUE} { if { [vreadpixel 215 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } vdump ${imagedir}/${casename}.png diff --git a/tests/bugs/vis/bug25369 b/tests/bugs/vis/bug25369 index 952cf7e35f..3629503503 100644 --- a/tests/bugs/vis/bug25369 +++ b/tests/bugs/vis/bug25369 @@ -16,7 +16,7 @@ vdisplay b vfit set s [encoding convertfrom unicode "\x3A\x04\x30\x04\x40\x04\x2E\x00\x70\x00\x6E\x00\x67\x00"] -vdrawtext text0 $s -pos 0 0 0 -color 1.0 1.0 1.0 -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font SansFont +vdrawtext text0 $s -pos 0 0 0 -color WHITE -halign left -valign bottom -angle 0 -zoom 0 -height 50 -aspect regular -font SansFont vdump $::imagedir/$s vtexture b $::imagedir/$s file delete $::imagedir/$s diff --git a/tests/bugs/vis/bug25475 b/tests/bugs/vis/bug25475 index 078dfc92aa..e10d019c81 100644 --- a/tests/bugs/vis/bug25475 +++ b/tests/bugs/vis/bug25475 @@ -16,7 +16,7 @@ vbackground -image $aTextureFile -imageMode NONE vbackground -image $aTextureFile -imageMode TILED vdump $imagedir/${casename}_2.png -vbackground -gradient RED BLUE1 -gradientMode HORIZONTAL +vbackground -gradient RED BLUE -gradientMode HORIZONTAL vbackground -image $aTextureFile -imageMode CENTERED vdump $imagedir/${casename}_3.png diff --git a/tests/bugs/vis/bug25732_1 b/tests/bugs/vis/bug25732_1 index 6190376afb..f869de3fe6 100644 --- a/tests/bugs/vis/bug25732_1 +++ b/tests/bugs/vis/bug25732_1 @@ -18,7 +18,7 @@ vdisplay b vfit vsetdispmode b 1 -vdrawtext text "Open\nCASCADE" -pos 0 0 0 -color 1.0 0.0 0.0 -halign center -valign center -angle -45 -zoom 1 -height 50 -aspect regular -font SansFont +vdrawtext text "Open\nCASCADE" -pos 0 0 0 -color RED -halign center -valign center -angle -45 -zoom 1 -height 50 -aspect regular -font SansFont set x_coord 255 set y_coord 277 diff --git a/tests/bugs/vis/bug25732_2 b/tests/bugs/vis/bug25732_2 index 4cd3239ee2..736ff00466 100644 --- a/tests/bugs/vis/bug25732_2 +++ b/tests/bugs/vis/bug25732_2 @@ -17,7 +17,7 @@ vsetdispmode 1 vdisplay b_1 b_2 vfit -vdrawtext text "SAMPLE TEXT" -pos 1 0 3 -color 1.0 0.0 0.0 -halign left -valign bottom -angle 0 -zoom 0 -height 30 -aspect regular -font SansFont +vdrawtext text "SAMPLE TEXT" -pos 1 0 3 -color RED -halign left -valign bottom -angle 0 -zoom 0 -height 30 -aspect regular -font SansFont set bug_info [vreadpixel 260 137 rgb name] if {$bug_info != "RED"} { diff --git a/tests/bugs/vis/bug25775 b/tests/bugs/vis/bug25775 index f1b7aba15c..32937d05d9 100644 --- a/tests/bugs/vis/bug25775 +++ b/tests/bugs/vis/bug25775 @@ -1,25 +1,16 @@ puts "========" -puts "OCC25775" +puts "0025775: Default Gradient Backgound in V3d_Viewer has no effect in new created V3d_View" puts "========" puts "" -################################################################ -# "Default Gradient Backgound" in V3d_Viewer has no effect in new created V3d_View. -################################################################ -pload ALL +pload VISUALIZATION vbackground -default -gradient BLACK GRAY25 -gradientMode HORIZONTAL vinit View1 w=400 h=400 -if { [checkcolor 399 100 0.25 0.25 0.25] != 1 } { - puts "Error: bug with default gradient color is reproduced." -} +if { [vreadpixel 399 100 -rgb -name] != "GRAY25" } { puts "Error: bug with default gradient color is reproduced." } vinit View2 w=400 h=400 -if { [checkcolor 399 100 0.25 0.25 0.25] != 1 } { - puts "Error: bug with default gradient color is reproduced." -} +if { [vreadpixel 399 100 -rgb -name] != "GRAY25" } { puts "Error: bug with default gradient color is reproduced." } -vbackground -default -color 0.501961 0.501961 0.501961 +vbackground -default -color GRAY50 vinit View3 -if { [checkcolor 100 100 0.5 0.5 0.5] != 1 } { - puts "Error: bug with default background color is reproduced." -} +if { [vreadpixel 100 100 -rgb -name] != "GRAY50" } { puts "Error: bug with default background color is reproduced." } diff --git a/tests/bugs/vis/bug26404 b/tests/bugs/vis/bug26404 index 21cfdbf73b..e88575a225 100644 --- a/tests/bugs/vis/bug26404 +++ b/tests/bugs/vis/bug26404 @@ -19,8 +19,8 @@ set bug_info_1 [vreadpixel 50 50 rgb name] if {$bug_info_1 != "GRAY4"} { puts "ERROR: OCC26404 is reproduced. Background color is invalid (case #1)." } -vbackground -gradient RED BLUE1 -gradientMode HORIZONTAL -vbackground -gradient RED BLUE1 -gradientMode NONE +vbackground -gradient RED BLUE -gradientMode HORIZONTAL +vbackground -gradient RED BLUE -gradientMode NONE set bug_info_2 [vreadpixel 50 50 rgb name] if {$bug_info_2 != "GRAY4"} { puts "ERROR: OCC26404 is reproduced. Background color is invalid (case #2)." diff --git a/tests/bugs/vis/bug26599 b/tests/bugs/vis/bug26599 index 6ae9f9b103..7906621a1b 100755 --- a/tests/bugs/vis/bug26599 +++ b/tests/bugs/vis/bug26599 @@ -13,7 +13,7 @@ vinit View1 vclear vaxo -vbackground -gradient RED BLUE1 -gradientMode VERTICAL +vbackground -gradient RED BLUE -gradientMode VERTICAL box b 1 2 3 vdisplay b diff --git a/tests/bugs/vis/bug26680 b/tests/bugs/vis/bug26680 index 73db38ba25..6ea3068d34 100644 --- a/tests/bugs/vis/bug26680 +++ b/tests/bugs/vis/bug26680 @@ -16,7 +16,7 @@ meshcolors m elem2 1 vselmode 0 1 vmoveto 200 200 -if {[vreadpixel 197 257 rgb name] != "CYAN1"} { +if {[vreadpixel 197 257 rgb name] != "CYAN"} { puts "ERROR: presentation for dynamic highlight of the object is wrong!" } vmoveto 0 0 diff --git a/tests/bugs/vis/bug26719_1 b/tests/bugs/vis/bug26719_1 index 6a8b01f724..5f7462f48a 100644 --- a/tests/bugs/vis/bug26719_1 +++ b/tests/bugs/vis/bug26719_1 @@ -25,7 +25,7 @@ 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] != "CYAN1 1"} { +if {[vreadpixel 297 297 name] != "CYAN 1"} { puts "ERROR: zoom persistent box is not highlighted dynamically!" } if {[vreadpixel 372 210 name] != "GOLDENROD1 1"} { @@ -46,7 +46,7 @@ vviewparams -eye 0.96 1.053 0.31 # will be highlighted dynamically vmoveto 264 135 -if {[vreadpixel 275 142 name] != "CYAN1 1"} { +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"} { @@ -61,7 +61,7 @@ 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] != "CYAN1 1"} { +if {[vreadpixel 243 123 name] != "CYAN 1"} { puts "ERROR: the shape behind zoom persistent object was not highlighted dynamically in precision test!" } vdump ${imagedir}/${casename}_3.png diff --git a/tests/bugs/vis/bug26870 b/tests/bugs/vis/bug26870 index 978391931c..91ade09d0d 100644 --- a/tests/bugs/vis/bug26870 +++ b/tests/bugs/vis/bug26870 @@ -26,7 +26,7 @@ vselmode 4 1 # pick a point onto previously computed face vmoveto 80 265 -if {[vreadpixel 90 206 name] == "CYAN1 1"} { +if {[vreadpixel 90 206 name] == "CYAN 1"} { puts "ERROR: previously computed entities are highlighted! Selection mode 4 was not updated after redisplaying the box." } # pick a point onto box diff --git a/tests/bugs/vis/bug26959 b/tests/bugs/vis/bug26959 index 77122ffb0a..26d4aab60f 100644 --- a/tests/bugs/vis/bug26959 +++ b/tests/bugs/vis/bug26959 @@ -20,7 +20,7 @@ vselmode aFace1 2 1 vfit vmoveto 142 127 -if {[vreadpixel 142 127 name] == "CYAN1 1"} { +if {[vreadpixel 142 127 name] == "CYAN 1"} { puts "OK" } elseif {[vreadpixel 142 127 name] == "GREEN 1"} { puts "ERROR: the upper edge cannot be highlighted!" diff --git a/tests/bugs/vis/bug27530 b/tests/bugs/vis/bug27530 index c3e61e6485..42695959e2 100644 --- a/tests/bugs/vis/bug27530 +++ b/tests/bugs/vis/bug27530 @@ -13,7 +13,7 @@ proc check_highlighting { theHiBoxIdx theCoords } { set nextColor [vreadpixel [lindex $theCoords [expr $aNext * 2] ] [lindex $theCoords [expr $aNext * 2 + 1] ] name] set nextNextColor [vreadpixel [lindex $theCoords [expr $aNextNext * 2] ] [lindex $theCoords [expr $aNextNext * 2 + 1] ] name] - if {$hiColor == "CYAN1 1" && $nextColor == "YELLOW 1" && $nextNextColor == "YELLOW 1"} { + if {$hiColor == "CYAN 1" && $nextColor == "YELLOW 1" && $nextNextColor == "YELLOW 1"} { return true } else { return false diff --git a/tests/bugs/vis/bug27573 b/tests/bugs/vis/bug27573 index 6e16f70a36..d7310a43db 100644 --- a/tests/bugs/vis/bug27573 +++ b/tests/bugs/vis/bug27573 @@ -12,7 +12,7 @@ vcolorscale cs -demo vcolorscale cs -range 0 20 5 # Set user-defined colors and labels for color scale -vcolorscale cs -colors white red green blue1 gray +vcolorscale cs -colors white red green BLUE gray vdump ${imagedir}/${casename}_pos.png if {[vcolorscale cs -findcolor 0] != "WHITE"} { puts "ERROR: wrong 1st segment сolor" } diff --git a/tests/bugs/vis/bug27624 b/tests/bugs/vis/bug27624 index b8fc4c6b17..b3ac09030c 100644 --- a/tests/bugs/vis/bug27624 +++ b/tests/bugs/vis/bug27624 @@ -9,6 +9,6 @@ puts "Draw Harness, ViewerTest - vdrawtext command ignores text display options" vfont add [locate_data_file DejaVuSans.ttf] SansFont vinit -vdrawtext t1 "Subtitle" -height 20 -font SansFont -color 0 1 0 -disptype subtitle -subcolor 0.3 0.3 0.3 +vdrawtext t1 "Subtitle" -height 20 -font SansFont -color GREEN -disptype subtitle -subcolor 4C4C4C vfit vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug27739 b/tests/bugs/vis/bug27739 index 2b33d24e40..7e3e34e68a 100644 --- a/tests/bugs/vis/bug27739 +++ b/tests/bugs/vis/bug27739 @@ -47,15 +47,15 @@ set test_2 {350 150}; # box2d_pos set test_3 { 50 350}; # box2d_loc vmoveto {*}$test_1 -if {[vreadpixel {*}$test_1 name] != "CYAN1 1"} { puts "ERROR: zoom persistent box is not detected!" } +if {[vreadpixel {*}$test_1 name] != "CYAN 1"} { puts "ERROR: zoom persistent box is not detected!" } vdump $imagedir/${casename}_1.png vmoveto {*}$test_2 -if {[vreadpixel {*}$test_2 name] != "CYAN1 1"} { puts "ERROR: zoom persistent box is not detected!" } +if {[vreadpixel {*}$test_2 name] != "CYAN 1"} { puts "ERROR: zoom persistent box is not detected!" } vdump $imagedir/${casename}_2.png vmoveto {*}$test_3 -if {[vreadpixel {*}$test_3 name] != "CYAN1 1"} { puts "ERROR: zoom persistent box is not detected!" } +if {[vreadpixel {*}$test_3 name] != "CYAN 1"} { puts "ERROR: zoom persistent box is not detected!" } vdump $imagedir/${casename}_3.png # ========================================= @@ -69,13 +69,13 @@ set test_2 {350 150}; # box2d_pos set test_3 { 50 350}; # box2d_loc vmoveto {*}$test_1 -if {[vreadpixel {*}$test_1 name] != "CYAN1 1"} { puts "ERROR: zoom persistent box is not detected!" } +if {[vreadpixel {*}$test_1 name] != "CYAN 1"} { puts "ERROR: zoom persistent box is not detected!" } vdump $imagedir/${casename}_4.png vmoveto {*}$test_2 -if {[vreadpixel {*}$test_2 name] != "CYAN1 1"} { puts "ERROR: zoom persistent box is not detected!" } +if {[vreadpixel {*}$test_2 name] != "CYAN 1"} { puts "ERROR: zoom persistent box is not detected!" } vdump $imagedir/${casename}_5.png vmoveto {*}$test_3 -if {[vreadpixel {*}$test_3 name] != "CYAN1 1"} { puts "ERROR: zoom persistent box is not detected!" } +if {[vreadpixel {*}$test_3 name] != "CYAN 1"} { puts "ERROR: zoom persistent box is not detected!" } vdump $imagedir/${casename}_6.png diff --git a/tests/bugs/vis/bug27751_capping b/tests/bugs/vis/bug27751_capping index 130c0874a4..b53e55edfd 100644 --- a/tests/bugs/vis/bug27751_capping +++ b/tests/bugs/vis/bug27751_capping @@ -17,7 +17,7 @@ box b4 0 10 0 10 30 70 box b5 0 0 0 30 10 70 set aNbParts 6 -set aColors { RED YELLOW GREEN GRAY MAGENTA1 ORANGE } +set aColors { RED YELLOW GREEN GRAY MAGENTA ORANGE } compound b0 b1 b2 b3 b4 b5 cc diff --git a/tests/bugs/vis/bug27796 b/tests/bugs/vis/bug27796 index 0b195ae839..6a055b11c6 100644 --- a/tests/bugs/vis/bug27796 +++ b/tests/bugs/vis/bug27796 @@ -76,8 +76,8 @@ vdisplay -dispMode 1 -highMode 1 -2d -trsfPersPos 0 0 {*}$aList vsetmaterial b1 b2 b3 b4 t PLASTIC vsetcolor b1 RED vsetcolor b2 GREEN -vsetcolor b3 BLUE1 -vsetcolor b4 MAGENTA1 +vsetcolor b3 BLUE +vsetcolor b4 MAGENTA vsetcolor t GOLD vsetlocation s 0 0 -1 diff --git a/tests/bugs/vis/bug27836 b/tests/bugs/vis/bug27836 index cc70b24692..eb3ee1051f 100644 --- a/tests/bugs/vis/bug27836 +++ b/tests/bugs/vis/bug27836 @@ -11,7 +11,7 @@ box b 0 0 -100 100 90 10 vclear vinit View1 vaxo -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL vzbufftrihedron vdisplay -dispMode 1 b vsetlocation b 0 0 1000 diff --git a/tests/bugs/vis/bug27958 b/tests/bugs/vis/bug27958 index 8939925870..952e0f0f59 100644 --- a/tests/bugs/vis/bug27958 +++ b/tests/bugs/vis/bug27958 @@ -25,7 +25,7 @@ vtrihedron t1 -attribute TubeRadiusPercent 0.03 vtrihedron t1 -attribute ConeRadiusPercent|OriginRadiusPercent 0.05 vtrihedron t1 -color XAxis Quantity_NOC_RED vtrihedron t1 -color YAxis Quantity_NOC_GREEN -vtrihedron t1 -color ZAxis|Origin Quantity_NOC_BLUE1 +vtrihedron t1 -color ZAxis|Origin Quantity_NOC_BLUE vtrihedron t1 -textColor 1.0 1.0 1.0 vtrihedron t1 -arrowColor 0.0 0.0 1.0 diff --git a/tests/bugs/vis/bug28004 b/tests/bugs/vis/bug28004 index 7ab866dd12..6060681fba 100644 --- a/tests/bugs/vis/bug28004 +++ b/tests/bugs/vis/bug28004 @@ -11,19 +11,19 @@ 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 CYAN1 330 DODGERBLUE1 370 BLUE1} { 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 CYAN1 330 DODGERBLUE1 370 BLUE1} { 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 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" } } # 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 vcolorscale cs4 -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 1 -xy 180 0 -foreach {y aColor} {40 WHITE 120 RED 200 GREEN 280 BLUE1 350 WHITE} { if { [vreadpixel 135 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } +foreach {y aColor} {40 WHITE 120 RED 200 GREEN 280 BLUE 350 WHITE} { if { [vreadpixel 135 $y rgb name] != "$aColor" } { puts "Error: wrong color at $y" } } # 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 BLUE1 250 BLUE1 290 BLUEVIOLET 330 PURPLE 370 MAGENTA1} { 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 BLUE1 290 BLUE1 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 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" } } # 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 f2a610cfc8..538b9f6ecf 100644 --- a/tests/bugs/vis/bug28036_1 +++ b/tests/bugs/vis/bug28036_1 @@ -17,7 +17,7 @@ vaxo vdisplay -dispMode 1 c vfit -vaspects c -setColor BLUE1 +vaspects c -setColor BLUE vaspects c -subshapes b1 -setColor RED vaspects c -subshapes c12 -setColor GREEN diff --git a/tests/bugs/vis/bug28036_2 b/tests/bugs/vis/bug28036_2 index 6f4e15a74c..1063bf8861 100644 --- a/tests/bugs/vis/bug28036_2 +++ b/tests/bugs/vis/bug28036_2 @@ -24,17 +24,17 @@ vaxo vdisplay b1_1 b1_2 b1_3 vsetcolor b1_1 RED vsetcolor b1_2 GREEN -vsetcolor b1_3 BLUE1 +vsetcolor b1_3 BLUE vdisplay b2_1 b2_2 b2_3 vsetcolor b2_1 RED vsetcolor b2_2 GREEN -vsetcolor b2_3 BLUE1 +vsetcolor b2_3 BLUE vdisplay b3_1 b3_2 b3_3 vsetcolor b3_1 RED vsetcolor b3_2 GREEN -vsetcolor b3_3 BLUE1 +vsetcolor b3_3 BLUE vfit vdump $imagedir/${casename}_ref.png @@ -54,8 +54,8 @@ vaspects b123_123 -subshapes b2_123 -setColor RED vaspects b123_123 -subshapes b3_123 -setColor RED compound b2_3 b3_3 b23_3 -vaspects b123_123 -subshapes b1_3 -setColor BLUE1 -vaspects b123_123 -subshapes b23_3 -setColor BLUE1 +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" } diff --git a/tests/bugs/vis/bug28061 b/tests/bugs/vis/bug28061 index 0f5f6c9e71..3efaa9d7a9 100644 --- a/tests/bugs/vis/bug28061 +++ b/tests/bugs/vis/bug28061 @@ -14,6 +14,6 @@ vfit vhlr on vmoveto 250 250 -if { [vreadpixel 321 150 rgb name] != "CYAN1" } { puts "Error: the box is not highlighted" } +if { [vreadpixel 321 150 rgb name] != "CYAN" } { puts "Error: the box is not highlighted" } vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug28099_text_core b/tests/bugs/vis/bug28099_text_core index 57f2172c71..402f7f765f 100644 --- a/tests/bugs/vis/bug28099_text_core +++ b/tests/bugs/vis/bug28099_text_core @@ -12,15 +12,15 @@ vinit View1 vaxo vfont add [locate_data_file DejaVuSans.ttf] SansFont -vdrawtext t1 "Overlay Test Blend" -2d -perspos -1 1 -pos 100 -50 0 -height 16 -font SansFont -color 1 1 0 -disptype blend -subcolor 0 0 1 -vdrawtext t2 "Overlay Test Decal" -2d -perspos -1 1 -pos 100 -100 0 -height 16 -font SansFont -color 1 1 0 -disptype decal -subcolor 0 0 1 -vdrawtext t3 "Overlay Test Subtitle" -2d -perspos -1 1 -pos 100 -150 0 -height 16 -font SansFont -color 1 1 0 -disptype subtitle -subcolor 0 0 1 -vdrawtext t4 "Overlay Test Normal" -2d -perspos -1 1 -pos 100 -200 0 -height 16 -font SansFont -color 0 1 1 -disptype normal -subcolor 0 0 1 +vdrawtext t1 "Overlay Test Blend" -2d -perspos -1 1 -pos 100 -50 0 -height 16 -font SansFont -color YELLOW -disptype blend -subcolor BLUE +vdrawtext t2 "Overlay Test Decal" -2d -perspos -1 1 -pos 100 -100 0 -height 16 -font SansFont -color YELLOW -disptype decal -subcolor BLUE +vdrawtext t3 "Overlay Test Subtitle" -2d -perspos -1 1 -pos 100 -150 0 -height 16 -font SansFont -color YELLOW -disptype subtitle -subcolor BLUE +vdrawtext t4 "Overlay Test Normal" -2d -perspos -1 1 -pos 100 -200 0 -height 16 -font SansFont -color CYAN -disptype normal -subcolor BLUE -vdrawtext t5 " Overlay Test Normal \n Second line" -2d -perspos -1 1 -pos 100 -250 0 -height 16 -font SansFont -color 0 1 1 -disptype normal -subcolor 0 0 1 -vdrawtext t6 " Overlay Test Subtitle\n Second line" -2d -perspos -1 1 -pos 100 -300 0 -height 16 -font SansFont -color 1 1 0 -disptype subtitle -subcolor 0 0 1 -vdrawtext t7 " Overlay Test Decal \n Second line" -2d -perspos -1 1 -pos 100 -350 0 -height 16 -font SansFont -color 1 1 0 -disptype decal -subcolor 0 0 1 -vdrawtext t8 " Overlay Test Blend \n Second line" -2d -perspos -1 1 -pos 100 -400 0 -height 16 -font SansFont -color 1 1 0 -disptype blend -subcolor 0 0 1 +vdrawtext t5 " Overlay Test Normal \n Second line" -2d -perspos -1 1 -pos 100 -250 0 -height 16 -font SansFont -color CYAN -disptype normal -subcolor BLUE +vdrawtext t6 " Overlay Test Subtitle\n Second line" -2d -perspos -1 1 -pos 100 -300 0 -height 16 -font SansFont -color YELLOW -disptype subtitle -subcolor BLUE +vdrawtext t7 " Overlay Test Decal \n Second line" -2d -perspos -1 1 -pos 100 -350 0 -height 16 -font SansFont -color YELLOW -disptype decal -subcolor BLUE +vdrawtext t8 " Overlay Test Blend \n Second line" -2d -perspos -1 1 -pos 100 -400 0 -height 16 -font SansFont -color YELLOW -disptype blend -subcolor BLUE box b 50 50 50 vdisplay -dispMode 1 b diff --git a/tests/bugs/vis/bug28127 b/tests/bugs/vis/bug28127 index 7578a1406c..7a7e029d54 100644 --- a/tests/bugs/vis/bug28127 +++ b/tests/bugs/vis/bug28127 @@ -15,7 +15,7 @@ vaxo vdisplay -noupdate -dispMode 1 -top r g b vsetcolor -noupdate r RED vsetcolor -noupdate g GREEN -vsetcolor -noupdate b BLUE1 +vsetcolor -noupdate b BLUE vfit vdisplay -topmost g diff --git a/tests/bugs/vis/bug28361 b/tests/bugs/vis/bug28361 index c4c24659c3..5cdf810452 100644 --- a/tests/bugs/vis/bug28361 +++ b/tests/bugs/vis/bug28361 @@ -9,6 +9,6 @@ pload MODELING VISUALIZATION box b 10 10 10 vdisplay b -trsfPers zoomRotate -trsfPersPos 90 90 90 vmoveto 266 164 -if { [vreadpixel 256 174 rgb name] != "CYAN1" } { puts "Error: the box is not highlighted" } +if { [vreadpixel 256 174 rgb name] != "CYAN" } { puts "Error: the box is not highlighted" } vdump $imagedir/${casename}.png diff --git a/tests/bugs/vis/bug30076 b/tests/bugs/vis/bug30076 index 8575bd8f05..cf7fea7ecd 100644 --- a/tests/bugs/vis/bug30076 +++ b/tests/bugs/vis/bug30076 @@ -14,5 +14,5 @@ vfit vdump $imagedir/${casename}_1.png vdrawparray a -patch triangles -deinterleaved -mutable v 10 0 0 {*}$c2 v 11 0 0 {*}$c2 v 11 1 0 {*}$c2 v 11 1 0 {*}$c1 v 10 1 0 {*}$c1 v 10 0 0 {*}$c1 if { [vreadpixel 200 150 rgb name] != "RED" } { puts "Error: array was not updated" } -if { [vreadpixel 200 250 rgb name] != "BLUE1" } { puts "Error: array was not updated" } +if { [vreadpixel 200 250 rgb name] != "BLUE" } { puts "Error: array was not updated" } vdump $imagedir/${casename}_2.png diff --git a/tests/bugs/vis/bug30630_1 b/tests/bugs/vis/bug30630_1 index c1a12f5bca..9fa8bfbe95 100644 --- a/tests/bugs/vis/bug30630_1 +++ b/tests/bugs/vis/bug30630_1 @@ -30,7 +30,7 @@ vaspects a -setBackFaceColor RED vfit box aa -0.5 0.5 0.5 0.1 0.1 0.1 vdisplay -dispMode 1 aa -vsetcolor aa BLUE1 +vsetcolor aa BLUE vdump $imagedir/${casename}_mirror.png if { [vreadpixel 300 200 rgb name] != "RED2" } { puts "Error: shell of mirrored box should show back faces" } verase a diff --git a/tests/bugs/vis/bug30630_2 b/tests/bugs/vis/bug30630_2 index 1c6379a01d..6018a32c94 100644 --- a/tests/bugs/vis/bug30630_2 +++ b/tests/bugs/vis/bug30630_2 @@ -18,7 +18,7 @@ vdisplay -dispMode 1 b vaspects b -setBackFaceColor RED box bb 0.5 0.5 -0.5 0.1 0.1 0.1 vdisplay -dispMode 1 bb -vsetcolor bb BLUE1 +vsetcolor bb BLUE vfit vdump $imagedir/${casename}_simple.png if { [vreadpixel 195 220 rgb name] != "BLUE2" } { puts "Error: mirrored box should look inside out" } diff --git a/tests/bugs/vis/bug30630_3 b/tests/bugs/vis/bug30630_3 index b92bb342b8..0f93917a37 100644 --- a/tests/bugs/vis/bug30630_3 +++ b/tests/bugs/vis/bug30630_3 @@ -26,7 +26,7 @@ vaspects a -setBackFaceColor RED vfit box aa -0.5 0.5 0.5 0.1 0.1 0.1 vdisplay -dispMode 1 aa -vsetcolor aa BLUE1 +vsetcolor aa BLUE vdump $imagedir/${casename}_mirror.png if { [vreadpixel 195 220 rgb name] != "BLUE2" } { puts "Error: mirrored box should look inside out" } verase a diff --git a/tests/bugs/vis/bug5990 b/tests/bugs/vis/bug5990 index 209a2470d7..2f1851a95a 100755 --- a/tests/bugs/vis/bug5990 +++ b/tests/bugs/vis/bug5990 @@ -38,9 +38,9 @@ vinit vdisplay b1 e1 c1 vsetdispmode 1 vfit -vsetcolor b1 BLUE1 -vsetcolor e1 BLUE1 -vsetcolor c1 BLUE1 +vsetcolor b1 BLUE +vsetcolor e1 BLUE +vsetcolor c1 BLUE checkcolor ${x1} ${y1} ${KUB_R} ${KUB_G} ${KUB_B} checkcolor ${x2} ${y2} ${LINE_R} ${LINE_G} ${LINE_B} diff --git a/tests/bugs/vis/bug6897_1 b/tests/bugs/vis/bug6897_1 index a7a86ce056..92d8b0a792 100644 --- a/tests/bugs/vis/bug6897_1 +++ b/tests/bugs/vis/bug6897_1 @@ -15,7 +15,7 @@ vfit vaspects b -setInteriorStyle SOLID vdump $imagedir/${casename}_3.png -vaspects b -setInteriorStyle SOLID -setDrawEdges 1 -setEdgeType DASH -setEdgeColor 0.392 1.0 0.392 +vaspects b -setInteriorStyle SOLID -setDrawEdges 1 -setEdgeType DASH -setEdgeColor 64FF64 vdump $imagedir/${casename}_1.png vaspects b -setInteriorStyle HOLLOW -setDrawEdges 1 diff --git a/tests/bugs/vis/bug74 b/tests/bugs/vis/bug74 index d0b44936b1..1a2aab2169 100755 --- a/tests/bugs/vis/bug74 +++ b/tests/bugs/vis/bug74 @@ -59,7 +59,7 @@ if { ${GetSelectMode} != ${SetSelectMode} } { } vmoveto ${Shape_X} ${Shape_Y} -if { [vreadpixel ${Shape_X} ${Shape_Y} rgb name] != "CYAN1" } { +if { [vreadpixel ${Shape_X} ${Shape_Y} rgb name] != "CYAN" } { puts "Error : shape color is not cyan" } diff --git a/tests/bugs/vis/bug85_1 b/tests/bugs/vis/bug85_1 index a9d8abc0ed..d12fac6b05 100755 --- a/tests/bugs/vis/bug85_1 +++ b/tests/bugs/vis/bug85_1 @@ -31,7 +31,7 @@ AISMaterial D 0:1:1 plastic AISMaterial D 0:1:2 plastic AISMaterial D 0:1:3 plastic AISTransparency D 0:1:1 0.6 -AISColor D 0:1:1 1 +AISColor D 0:1:1 MATRABLUE AISDisplay D 0:1:1 AISDisplay D 0:1:2 AISDisplay D 0:1:3 diff --git a/tests/bugs/vis/bug85_2 b/tests/bugs/vis/bug85_2 index 5fa00f6c55..f2e267c84c 100755 --- a/tests/bugs/vis/bug85_2 +++ b/tests/bugs/vis/bug85_2 @@ -30,7 +30,7 @@ AISMaterial D 0:1:1 plastic AISMaterial D 0:1:2 plastic AISMaterial D 0:1:3 plastic AISTransparency D 0:1:1 0.6 -AISColor D 0:1:1 1 +AISColor D 0:1:1 MATRABLUE AISDisplay D 0:1:1 AISDisplay D 0:1:2 AISDisplay D 0:1:3 diff --git a/tests/bugs/xde/bug26216 b/tests/bugs/xde/bug26216 index 90c92c3202..c203f5f33f 100644 --- a/tests/bugs/xde/bug26216 +++ b/tests/bugs/xde/bug26216 @@ -30,7 +30,7 @@ if { [regexp "ASSEMBLY COMPOUND 0:1:1:1 \"COMPOUND\"" [Xdump D]] != 1 } { if { [regexp "GREEN" [XGetShapeColor D 0:1:1:3]] != 1 } { puts "ERROR: Structure of document is wrong." } else { - if { [regexp "BLUE1" [XGetShapeColor D 0:1:1:4]] != 1 } { + if { [regexp "BLUE" [XGetShapeColor D 0:1:1:4]] != 1 } { puts "ERROR: Structure of document is wrong." } } diff --git a/tests/bugs/xde/bug28641 b/tests/bugs/xde/bug28641 index 73305b8059..5627d6707d 100644 --- a/tests/bugs/xde/bug28641 +++ b/tests/bugs/xde/bug28641 @@ -62,7 +62,7 @@ if {[expr abs(0.2 - $alpha)] > $prec} { } #0:1:2:4 set res [XGetColor D_Second 0:1:2:4] -if {$res != "CYAN1"} { +if {$res != "CYAN"} { set isOK 0 } #0:1:2:5 diff --git a/tests/bugs/xde/bug29436_1 b/tests/bugs/xde/bug29436_1 index 8229140101..ef93d4bff4 100644 --- a/tests/bugs/xde/bug29436_1 +++ b/tests/bugs/xde/bug29436_1 @@ -20,7 +20,7 @@ if {$color != "GREEN"} { puts "Error: metadata lost during expand" } set color [XGetShapeColor D 0:1:1:2:1] -if {$color != "CYAN1"} { +if {$color != "CYAN"} { puts "Error: metadata lost during expand" } diff --git a/tests/caf/bugs/D2 b/tests/caf/bugs/D2 index ef122e5b3a..6c347f0d1e 100644 --- a/tests/caf/bugs/D2 +++ b/tests/caf/bugs/D2 @@ -43,7 +43,7 @@ set test_failure 1 set test_driver "G" set test_driver_id "2a96b604-ec8b-11d0-bee7-080009dc3333" set test_transp 0.5 -set test_color 11 +set test_color AQUAMARINE4 set test_material 22 set test_positionX 100 set test_positionY 200 diff --git a/tests/caf/parse.rules b/tests/caf/parse.rules index c60d88f31e..ae76123129 100755 --- a/tests/caf/parse.rules +++ b/tests/caf/parse.rules @@ -1,3 +1,3 @@ IGNORE /on screen buffer is used for image dump - content might be invalid/ reported when software Microsoft OpenGL driver is used (remote desktop) -IGNORE /^\s*DPrsStd_AISColor\s*:\s*Error\b/ ignore presentation K2 error message +IGNORE /^\s*Syntax error: '0:2' label has no presentation\b/ ignore presentation K2 error message FAILED /\binvalid\b/ error diff --git a/tests/caf/presentation/B2 b/tests/caf/presentation/B2 index 8759181abe..68b40d6870 100755 --- a/tests/caf/presentation/B2 +++ b/tests/caf/presentation/B2 @@ -27,9 +27,8 @@ AISDisplay D ${aLabel} # Close/Open transaction NewCommand D -# Set a color of the shape as NOC_GREEN -set GreenColor 229 -AISColor D ${aLabel} ${GreenColor} +# Set a color of the shape +AISColor D ${aLabel} GREEN # Close/Open transaction NewCommand D diff --git a/tests/caf/presentation/B3 b/tests/caf/presentation/B3 index 513630023d..9b8959c33c 100755 --- a/tests/caf/presentation/B3 +++ b/tests/caf/presentation/B3 @@ -26,8 +26,8 @@ AISDisplay D ${aLabel} # Close/Open transaction NewCommand D -# Set a color of the shape as NOC_GREEN -AISColor D ${aLabel} 229 +# Set a color of the shape +AISColor D ${aLabel} GREEN # Close/Open transaction NewCommand D diff --git a/tests/caf/presentation/B4 b/tests/caf/presentation/B4 index 2fdb190be6..fef2508160 100755 --- a/tests/caf/presentation/B4 +++ b/tests/caf/presentation/B4 @@ -26,9 +26,8 @@ AISDisplay D ${aLabel} # Close/Open transaction NewCommand D -# Set a color of the shape as NOC_GREEN -set GreenColor 229 -AISColor D ${aLabel} ${GreenColor} +# Set a color of the shape +AISColor D ${aLabel} GREEN # Close/Open transaction NewCommand D @@ -54,8 +53,8 @@ set aColor [lindex ${tmpLine} [expr ${tmpLength} - 1]] puts "It is not necessary to have the photo for this case." -if { ${aColor} != ${GreenColor} } { - puts "GreenColor=${GreenColor}" +if { ${aColor} != "GREEN" } { + puts "GreenColor=GREEN" puts "aColor=${aColor}" puts "The box's color is not NOC_GREEN; AISColor command: Error" return diff --git a/tests/caf/presentation/C1 b/tests/caf/presentation/C1 index 6315e19aa3..e03ce1c5cc 100755 --- a/tests/caf/presentation/C1 +++ b/tests/caf/presentation/C1 @@ -24,9 +24,8 @@ AISSet D ${aLabel} NS # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel} -# Set a color of the shape as NOC_GREEN -set GreenColor 229 -AISColor D ${aLabel} ${GreenColor} +# Set a color of the shape +AISColor D ${aLabel} GREEN # Close/Open transaction NewCommand D diff --git a/tests/caf/presentation/F2 b/tests/caf/presentation/F2 index 1b5a109ae3..b831b5acad 100755 --- a/tests/caf/presentation/F2 +++ b/tests/caf/presentation/F2 @@ -29,8 +29,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/F3 b/tests/caf/presentation/F3 index 4dedc469e8..3d61196abe 100755 --- a/tests/caf/presentation/F3 +++ b/tests/caf/presentation/F3 @@ -28,8 +28,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/F4 b/tests/caf/presentation/F4 index ff7a29f89c..5452720b0e 100755 --- a/tests/caf/presentation/F4 +++ b/tests/caf/presentation/F4 @@ -28,8 +28,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/G1 b/tests/caf/presentation/G1 index c1c71b673c..e9290b7c42 100755 --- a/tests/caf/presentation/G1 +++ b/tests/caf/presentation/G1 @@ -29,8 +29,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/H1 b/tests/caf/presentation/H1 index 10757b8551..fb1e950754 100755 --- a/tests/caf/presentation/H1 +++ b/tests/caf/presentation/H1 @@ -30,8 +30,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/H2 b/tests/caf/presentation/H2 index 260ef6df24..34bd1abb21 100755 --- a/tests/caf/presentation/H2 +++ b/tests/caf/presentation/H2 @@ -30,8 +30,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/I1 b/tests/caf/presentation/I1 index dd96d4d4f6..d35876e936 100755 --- a/tests/caf/presentation/I1 +++ b/tests/caf/presentation/I1 @@ -27,8 +27,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/I2 b/tests/caf/presentation/I2 index 3903354001..6d8e4aa5e1 100755 --- a/tests/caf/presentation/I2 +++ b/tests/caf/presentation/I2 @@ -27,8 +27,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/J1 b/tests/caf/presentation/J1 index 1b25ef1378..c1eb9df72e 100755 --- a/tests/caf/presentation/J1 +++ b/tests/caf/presentation/J1 @@ -27,8 +27,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/J2 b/tests/caf/presentation/J2 index c25030cc06..428a13ffdc 100755 --- a/tests/caf/presentation/J2 +++ b/tests/caf/presentation/J2 @@ -27,8 +27,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/K1 b/tests/caf/presentation/K1 index 7cf126b085..def4bd8f3e 100755 --- a/tests/caf/presentation/K1 +++ b/tests/caf/presentation/K1 @@ -27,8 +27,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/caf/presentation/K2 b/tests/caf/presentation/K2 index 47e73059d8..88d3f7be4e 100755 --- a/tests/caf/presentation/K2 +++ b/tests/caf/presentation/K2 @@ -27,8 +27,8 @@ AISSet D ${aLabel2} NS # Set shading mode vsetdispmode 1 -# Set a color of the second shape as NOC_GREEN -AISColor D ${aLabel2} 229 +# Set a color of the second shape +AISColor D ${aLabel2} GREEN # Display presentation of NamedShape in the viewer AISDisplay D ${aLabel1} diff --git a/tests/de/iges_1/C7 b/tests/de/iges_1/C7 index 7b49e3a611..ea25c7c056 100644 --- a/tests/de/iges_1/C7 +++ b/tests/de/iges_1/C7 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.2688118771 ( 0.2688118774 ) AvgTol = 0.00067 LABELS : N0Labels = 210 ( 210 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 210 ( 210 ) NameLabels = 210 ( 210 ) ColorLabels = 210 ( 210 ) LayerLabels = 210 ( 210 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = BURLYWOOD1 DARKORANGE DEEPSKYBLUE1 GRAY79 MAGENTA1 MEDIUMSPRINGGREEN WHITE ( BURLYWOOD1 DARKORANGE DEEPSKYBLUE1 GRAY79 MAGENTA1 MEDIUMSPRINGGREEN WHITE ) +COLORS : Colors = BURLYWOOD1 DARKORANGE DEEPSKYBLUE1 GRAY79 MAGENTA MEDIUMSPRINGGREEN WHITE ( BURLYWOOD1 DARKORANGE DEEPSKYBLUE1 GRAY79 MAGENTA MEDIUMSPRINGGREEN WHITE ) NLAYERS : NLayers = 10 ( 10 ) LAYERS : Layers = 2 3 4 50 52 53 54 55 58 59 ( 2 3 4 50 52 53 54 55 58 59 ) diff --git a/tests/de/iges_1/E1 b/tests/de/iges_1/E1 index de045f812f..3f6b969bb1 100644 --- a/tests/de/iges_1/E1 +++ b/tests/de/iges_1/E1 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.05529392 ( 0.05529391994 ) AvgTol = 0.00036 LABELS : N0Labels = 2136 ( 2136 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 2136 ( 2136 ) NameLabels = 2136 ( 2136 ) ColorLabels = 2136 ( 2136 ) LayerLabels = 2136 ( 2136 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLACK CYAN1 YELLOW ( BLACK CYAN1 YELLOW ) +COLORS : Colors = BLACK CYAN YELLOW ( BLACK CYAN YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 1 ( 1 ) diff --git a/tests/de/iges_1/G2 b/tests/de/iges_1/G2 index 77ece1164a..54692010d3 100644 --- a/tests/de/iges_1/G2 +++ b/tests/de/iges_1/G2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.2057401816 ( 0.205740183 ) AvgTol = 0.00118 LABELS : N0Labels = 55 ( 55 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 55 ( 55 ) NameLabels = 55 ( 55 ) ColorLabels = 53 ( 53 ) LayerLabels = 55 ( 55 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = CYAN1 MAGENTA1 ( CYAN1 MAGENTA1 ) +COLORS : Colors = CYAN MAGENTA ( CYAN MAGENTA ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 6 ( 6 ) diff --git a/tests/de/iges_1/H1 b/tests/de/iges_1/H1 index 01e3217051..1a49faf499 100644 --- a/tests/de/iges_1/H1 +++ b/tests/de/iges_1/H1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.4654616407 ( 0.4654616407 ) AvgTol = 0.0153 LABELS : N0Labels = 1 ( 1 ) N1Labels = 48 ( 304 ) N2Labels = 0 ( 0 ) TotalLabels = 49 ( 305 ) NameLabels = 49 ( 72 ) ColorLabels = 48 ( 304 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 DARKGREEN WHITE YELLOW ( BLUE1 DARKGREEN WHITE YELLOW ) +COLORS : Colors = BLUE DARKGREEN WHITE YELLOW ( BLUE DARKGREEN WHITE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_1/H5 b/tests/de/iges_1/H5 index dad4098603..4cf0d1c823 100755 --- a/tests/de/iges_1/H5 +++ b/tests/de/iges_1/H5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.01444583491 ( 0.01444583491 ) AvgTol = 0.00029 LABELS : N0Labels = 3 ( 6 ) N1Labels = 193 ( 264 ) N2Labels = 0 ( 0 ) TotalLabels = 196 ( 270 ) NameLabels = 144 ( 230 ) ColorLabels = 193 ( 261 ) LayerLabels = 192 ( 209 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 MAGENTA2 RED TURQUOISE3 WHITE ( BLUE1 CYAN1 MAGENTA2 RED TURQUOISE3 WHITE ) +COLORS : Colors = BLUE CYAN MAGENTA2 RED TURQUOISE3 WHITE ( BLUE CYAN MAGENTA2 RED TURQUOISE3 WHITE ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 1 252 ( 1 252 ) diff --git a/tests/de/iges_1/H6 b/tests/de/iges_1/H6 index b953902bae..9f9427d2da 100644 --- a/tests/de/iges_1/H6 +++ b/tests/de/iges_1/H6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.9049033554 ( 0.9049033554 ) AvgTol = 0.0122 LABELS : N0Labels = 1 ( 1 ) N1Labels = 246 ( 2191 ) N2Labels = 0 ( 0 ) TotalLabels = 247 ( 2192 ) NameLabels = 247 ( 374 ) ColorLabels = 246 ( 2191 ) LayerLabels = 241 ( 2186 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = CYAN1 GREEN RED WHITE YELLOW ( CYAN1 GREEN RED WHITE YELLOW ) +COLORS : Colors = CYAN GREEN RED WHITE YELLOW ( CYAN GREEN RED WHITE YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 100 101 ( 100 101 ) diff --git a/tests/de/iges_1/H7 b/tests/de/iges_1/H7 index d743ccaa79..ef988babdf 100755 --- a/tests/de/iges_1/H7 +++ b/tests/de/iges_1/H7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.1881003203 ( 0.1881003203 ) AvgTol = 0.00045 LABELS : N0Labels = 3 ( 6 ) N1Labels = 1868 ( 3154 ) N2Labels = 0 ( 0 ) TotalLabels = 1871 ( 3160 ) NameLabels = 1819 ( 2019 ) ColorLabels = 1868 ( 3151 ) LayerLabels = 1868 ( 3100 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 MAGENTA2 ORANGE RED WHITE ( BLUE1 MAGENTA2 ORANGE RED WHITE ) +COLORS : Colors = BLUE MAGENTA2 ORANGE RED WHITE ( BLUE MAGENTA2 ORANGE RED WHITE ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 2 252 3 4 ( 2 252 3 4 ) diff --git a/tests/de/iges_1/H8 b/tests/de/iges_1/H8 index 21c2620127..9584ff2a71 100644 --- a/tests/de/iges_1/H8 +++ b/tests/de/iges_1/H8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.1393674657 ( 0.1393674657 ) AvgTol = 0.00309 LABELS : N0Labels = 1 ( 1 ) N1Labels = 214 ( 3725 ) N2Labels = 0 ( 0 ) TotalLabels = 215 ( 3726 ) NameLabels = 215 ( 330 ) ColorLabels = 214 ( 3725 ) LayerLabels = 209 ( 3720 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = CYAN1 GREEN RED WHITE YELLOW ( CYAN1 GREEN RED WHITE YELLOW ) +COLORS : Colors = CYAN GREEN RED WHITE YELLOW ( CYAN GREEN RED WHITE YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 100 101 ( 100 101 ) diff --git a/tests/de/iges_1/H9 b/tests/de/iges_1/H9 index f4fd91dc7a..c37838dd03 100644 --- a/tests/de/iges_1/H9 +++ b/tests/de/iges_1/H9 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.9257818164 ( 0.9257819919 ) AvgTol = 0.0230 LABELS : N0Labels = 1 ( 1 ) N1Labels = 131 ( 244 ) N2Labels = 0 ( 0 ) TotalLabels = 132 ( 245 ) NameLabels = 132 ( 149 ) ColorLabels = 131 ( 244 ) LayerLabels = 131 ( 244 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN STEELBLUE2 VIOLETRED2 ( BLUE1 GREEN STEELBLUE2 VIOLETRED2 ) +COLORS : Colors = BLUE GREEN STEELBLUE2 VIOLETRED2 ( BLUE GREEN STEELBLUE2 VIOLETRED2 ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 2 3 51 9 ( 2 3 51 9 ) diff --git a/tests/de/iges_1/I1 b/tests/de/iges_1/I1 index 6452d7162e..e6946a16c5 100644 --- a/tests/de/iges_1/I1 +++ b/tests/de/iges_1/I1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.1504135906 ( 0.1504135906 ) AvgTol = 0.00042 LABELS : N0Labels = 2 ( 2 ) N1Labels = 1279 ( 3474 ) N2Labels = 0 ( 0 ) TotalLabels = 1281 ( 3476 ) NameLabels = 1281 ( 1491 ) ColorLabels = 1280 ( 3475 ) LayerLabels = 284 ( 2422 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = GREEN MAGENTA1 WHITE YELLOW ( GREEN MAGENTA1 WHITE YELLOW ) +COLORS : Colors = GREEN MAGENTA WHITE YELLOW ( GREEN MAGENTA WHITE YELLOW ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 2 3 ( 1 2 3 ) diff --git a/tests/de/iges_1/I2 b/tests/de/iges_1/I2 index a0efeb1026..f7613a907d 100644 --- a/tests/de/iges_1/I2 +++ b/tests/de/iges_1/I2 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.763617442 ( 0.7636174422 ) AvgTol = 0.00129 LABELS : N0Labels = 1051 ( 1051 ) N1Labels = 0 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 1051 ( 1064 ) NameLabels = 1051 ( 1051 ) ColorLabels = 971 ( 1064 ) LayerLabels = 971 ( 1051 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) -COLORS : Colors = BLACK BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ( BLACK BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLACK BLUE CYAN GREEN MAGENTA RED WHITE YELLOW ( BLACK BLUE CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 7 ( 7 ) LAYERS : Layers = 1 100 63 70 97 98 99 ( 1 100 63 70 97 98 99 ) diff --git a/tests/de/iges_1/I4 b/tests/de/iges_1/I4 index 625f177934..39732353b8 100644 --- a/tests/de/iges_1/I4 +++ b/tests/de/iges_1/I4 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.02364292093 ( 0.0236405571 ) AvgTol = 9.63986 LABELS : N0Labels = 285 ( 287 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 285 ( 287 ) NameLabels = 285 ( 287 ) ColorLabels = 279 ( 285 ) LayerLabels = 279 ( 285 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = MAGENTA1 WHITE ( MAGENTA1 WHITE ) +COLORS : Colors = MAGENTA WHITE ( MAGENTA WHITE ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 1 2 ( 1 2 ) diff --git a/tests/de/iges_1/I6 b/tests/de/iges_1/I6 index fd1733aaed..bd98274ece 100644 --- a/tests/de/iges_1/I6 +++ b/tests/de/iges_1/I6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.0305692698 ( 0.03056926518 ) AvgTol = 0.0014 LABELS : N0Labels = 296 ( 296 ) N1Labels = 0 ( 1 ) N2Labels = 0 ( 0 ) TotalLabels = 296 ( 297 ) NameLabels = 296 ( 297 ) ColorLabels = 293 ( 294 ) LayerLabels = 31 ( 31 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 CYAN1 GREEN YELLOW ( BLUE1 CYAN1 GREEN YELLOW ) +COLORS : Colors = BLUE CYAN GREEN YELLOW ( BLUE CYAN GREEN YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 1 ( 1 ) diff --git a/tests/de/iges_1/I8 b/tests/de/iges_1/I8 index af4fc4536a..cdcf2557bc 100644 --- a/tests/de/iges_1/I8 +++ b/tests/de/iges_1/I8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.9982953477 ( 0.9982953477 ) AvgTol = 0.0153 LABELS : N0Labels = 403 ( 403 ) N1Labels = 3841 ( 15575 ) N2Labels = 0 ( 0 ) TotalLabels = 4244 ( 15978 ) NameLabels = 4242 ( 6516 ) ColorLabels = 4090 ( 15977 ) LayerLabels = 4090 ( 15977 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 CHARTREUSE CYAN1 DARKKHAKI LIGHTPINK1 ( BLUE1 CHARTREUSE CYAN1 DARKKHAKI LIGHTPINK1 ) +COLORS : Colors = BLUE CHARTREUSE CYAN DARKKHAKI LIGHTPINK1 ( BLUE CHARTREUSE CYAN DARKKHAKI LIGHTPINK1 ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 110 111 116 35 ( 110 111 116 35 ) diff --git a/tests/de/iges_1/J5 b/tests/de/iges_1/J5 index 8a9bab2e06..18438471df 100644 --- a/tests/de/iges_1/J5 +++ b/tests/de/iges_1/J5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.9967131592 ( 0.9967131592 ) AvgTol = 0.0513 LABELS : N0Labels = 1 ( 1 ) N1Labels = 396 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 397 ( 38 ) NameLabels = 1 ( 1 ) ColorLabels = 396 ( 38 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = MAGENTA1 RED ( MAGENTA1 RED ) +COLORS : Colors = MAGENTA RED ( MAGENTA RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_1/J6 b/tests/de/iges_1/J6 index 6fc9cfdaf8..b5d18d3eaf 100644 --- a/tests/de/iges_1/J6 +++ b/tests/de/iges_1/J6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.820956344 ( 0.821038439 ) AvgTol = 0.00802 LABELS : N0Labels = 289 ( 289 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 289 ( 289 ) NameLabels = 289 ( 289 ) ColorLabels = 101 ( 101 ) LayerLabels = 288 ( 288 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 8 ) -COLORS : Colors = RED WHITE ( BURLYWOOD1 DARKORANGE DEEPSKYBLUE1 LEMONCHIFFON1 MAGENTA1 MEDIUMSPRINGGREEN RED WHITE ) +COLORS : Colors = RED WHITE ( BURLYWOOD1 DARKORANGE DEEPSKYBLUE1 LEMONCHIFFON1 MAGENTA MEDIUMSPRINGGREEN RED WHITE ) NLAYERS : NLayers = 9 ( 9 ) LAYERS : Layers = 1 11 19 2 3 5 6 8 9 ( 1 11 19 2 3 5 6 8 9 ) diff --git a/tests/de/iges_1/J7 b/tests/de/iges_1/J7 index e1e9584e07..ce3d72465c 100644 --- a/tests/de/iges_1/J7 +++ b/tests/de/iges_1/J7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.6112323056 ( 0.6112323056 ) AvgTol = 0.00091 LABELS : N0Labels = 1 ( 1 ) N1Labels = 481 ( 739 ) N2Labels = 0 ( 0 ) TotalLabels = 482 ( 740 ) NameLabels = 482 ( 559 ) ColorLabels = 481 ( 739 ) LayerLabels = 479 ( 737 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) -COLORS : Colors = BLUE1 CYAN1 DARKORANGE GOLD3 PALETURQUOISE2 RED WHITE YELLOW ( BLUE1 CYAN1 DARKORANGE GOLD3 PALETURQUOISE2 RED WHITE YELLOW ) +COLORS : Colors = BLUE CYAN DARKORANGE GOLD3 PALETURQUOISE2 RED WHITE YELLOW ( BLUE CYAN DARKORANGE GOLD3 PALETURQUOISE2 RED WHITE YELLOW ) NLAYERS : NLayers = 6 ( 6 ) LAYERS : Layers = 15 20 25 30 50 60 ( 15 20 25 30 50 60 ) diff --git a/tests/de/iges_1/J8 b/tests/de/iges_1/J8 index 66ee17188d..2dd2583998 100644 --- a/tests/de/iges_1/J8 +++ b/tests/de/iges_1/J8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.9778021574 ( 0.9778021574 ) AvgTol = 0.035 LABELS : N0Labels = 1 ( 1 ) N1Labels = 1089 ( 2056 ) N2Labels = 0 ( 0 ) TotalLabels = 1090 ( 2057 ) NameLabels = 1090 ( 1285 ) ColorLabels = 1089 ( 2056 ) LayerLabels = 168 ( 311 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ( BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE GREEN MAGENTA RED WHITE YELLOW ( BLUE GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 5 ( 5 ) LAYERS : Layers = 10 101 105 15 20 ( 10 101 105 15 20 ) diff --git a/tests/de/iges_1/K1 b/tests/de/iges_1/K1 index 8314e0289d..99a2a8d331 100644 --- a/tests/de/iges_1/K1 +++ b/tests/de/iges_1/K1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1819 ( 1819 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1819 ( 1819 ) NameLabels = 1819 ( 1819 ) ColorLabels = 1601 ( 1819 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ( BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE GREEN MAGENTA RED WHITE YELLOW ( BLUE GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_1/K3 b/tests/de/iges_1/K3 index 73d571a24d..887a38ffee 100644 --- a/tests/de/iges_1/K3 +++ b/tests/de/iges_1/K3 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.9874083984 ( 0.9875071265 ) AvgTol = 0.0111 LABELS : N0Labels = 5392 ( 5458 ) N1Labels = 18 ( 4483 ) N2Labels = 0 ( 0 ) TotalLabels = 5410 ( 9941 ) NameLabels = 5392 ( 5458 ) ColorLabels = 5391 ( 9875 ) LayerLabels = 5391 ( 9875 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLACK BLUE1 CYAN1 GREEN ( BLACK BLUE1 CYAN1 GREEN ) +COLORS : Colors = BLACK BLUE CYAN GREEN ( BLACK BLUE CYAN GREEN ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 51 6 ( 1 51 6 ) diff --git a/tests/de/iges_1/K4 b/tests/de/iges_1/K4 index 4396846c15..592909a36a 100644 --- a/tests/de/iges_1/K4 +++ b/tests/de/iges_1/K4 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1.005912368e-005 ( 1.005909788e-005 ) AvgTol = 6.2 LABELS : N0Labels = 406 ( 406 ) N1Labels = 0 ( 282 ) N2Labels = 0 ( 0 ) TotalLabels = 406 ( 688 ) NameLabels = 406 ( 406 ) ColorLabels = 406 ( 688 ) LayerLabels = 406 ( 688 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ( CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = CYAN GREEN MAGENTA RED WHITE YELLOW ( CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 1 ( 1 ) diff --git a/tests/de/iges_1/K8 b/tests/de/iges_1/K8 index bd9422301b..7578f41901 100644 --- a/tests/de/iges_1/K8 +++ b/tests/de/iges_1/K8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.04263273989 ( 0.04263273988 ) AvgTol = 0.00012 LABELS : N0Labels = 2344 ( 2344 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 2344 ( 2344 ) NameLabels = 2344 ( 2344 ) ColorLabels = 2344 ( 2344 ) LayerLabels = 2344 ( 2344 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = CYAN1 RED ( CYAN1 RED ) +COLORS : Colors = CYAN RED ( CYAN RED ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 1 3 5 9 ( 1 3 5 9 ) diff --git a/tests/de/iges_1/K9 b/tests/de/iges_1/K9 index d9fdd80b80..d70f21e8be 100644 --- a/tests/de/iges_1/K9 +++ b/tests/de/iges_1/K9 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.9393822539 ( 0.9393822539 ) AvgTol = 0.0125 LABELS : N0Labels = 1 ( 1 ) N1Labels = 1695 ( 3509 ) N2Labels = 0 ( 0 ) TotalLabels = 1696 ( 3510 ) NameLabels = 1696 ( 1972 ) ColorLabels = 1695 ( 3509 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN WHITE YELLOW ( BLUE1 GREEN WHITE YELLOW ) +COLORS : Colors = BLUE GREEN WHITE YELLOW ( BLUE GREEN WHITE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_1/L2 b/tests/de/iges_1/L2 index 1511091106..66d8cdb2ff 100644 --- a/tests/de/iges_1/L2 +++ b/tests/de/iges_1/L2 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.90877121 ( 0.9087712052 ) AvgTol = 0.0134 LABELS : N0Labels = 1571 ( 1571 ) N1Labels = 0 ( 615 ) N2Labels = 0 ( 0 ) TotalLabels = 1571 ( 2186 ) NameLabels = 1571 ( 2173 ) ColorLabels = 1481 ( 2186 ) LayerLabels = 1481 ( 2186 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = GREEN MAGENTA1 RED YELLOW ( GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = GREEN MAGENTA RED YELLOW ( GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 8 ( 8 ) LAYERS : Layers = 1 10 100 20 30 40 50 60 ( 1 10 100 20 30 40 50 60 ) diff --git a/tests/de/iges_1/L8 b/tests/de/iges_1/L8 index 57168a0b23..a21fbea802 100755 --- a/tests/de/iges_1/L8 +++ b/tests/de/iges_1/L8 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.3140268251 ( 0.3140268243 ) AvgTol = 0.00047 LABELS : N0Labels = 61 ( 61 ) N1Labels = 0 ( 1080 ) N2Labels = 0 ( 0 ) TotalLabels = 61 ( 1141 ) NameLabels = 61 ( 61 ) ColorLabels = 61 ( 1141 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 GREEN WHITE ( CYAN1 GREEN WHITE ) +COLORS : Colors = CYAN GREEN WHITE ( CYAN GREEN WHITE ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_1/L9 b/tests/de/iges_1/L9 index 8b1484b6ef..691baae531 100644 --- a/tests/de/iges_1/L9 +++ b/tests/de/iges_1/L9 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.2778575821 ( 0.2778575802 ) AvgTol = 0.0011 LABELS : N0Labels = 2329 ( 2329 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 2329 ( 2329 ) NameLabels = 2329 ( 2329 ) ColorLabels = 2319 ( 2329 ) LayerLabels = 2319 ( 2329 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) -COLORS : Colors = CYAN1 CYAN2 GREEN LEMONCHIFFON1 MAGENTA1 MAGENTA2 WHITE YELLOW ( CYAN1 CYAN2 GREEN LEMONCHIFFON1 MAGENTA1 MAGENTA2 WHITE YELLOW ) +COLORS : Colors = CYAN CYAN2 GREEN LEMONCHIFFON1 MAGENTA MAGENTA2 WHITE YELLOW ( CYAN CYAN2 GREEN LEMONCHIFFON1 MAGENTA MAGENTA2 WHITE YELLOW ) NLAYERS : NLayers = 10 ( 10 ) LAYERS : Layers = 80 81 82 83 84 85 90 91 92 93 ( 80 81 82 83 84 85 90 91 92 93 ) diff --git a/tests/de/iges_1/M1 b/tests/de/iges_1/M1 index 902c48ce4d..9485be290c 100644 --- a/tests/de/iges_1/M1 +++ b/tests/de/iges_1/M1 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 1e-005 ( 1.00030003e-005 ) AvgTol = 1.8008 LABELS : N0Labels = 1528 ( 1528 ) N1Labels = 0 ( 1296 ) N2Labels = 0 ( 0 ) TotalLabels = 1528 ( 2824 ) NameLabels = 1528 ( 1528 ) ColorLabels = 1507 ( 2824 ) LayerLabels = 1504 ( 2820 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 CYAN1 WHITE ( BLUE1 CYAN1 WHITE ) +COLORS : Colors = BLUE CYAN WHITE ( BLUE CYAN WHITE ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 1 2 ( 1 2 ) diff --git a/tests/de/iges_1/M6 b/tests/de/iges_1/M6 index f88a7048c0..2142d02daa 100755 --- a/tests/de/iges_1/M6 +++ b/tests/de/iges_1/M6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.888818095 ( 0.8888180952 ) AvgTol = 0.0 LABELS : N0Labels = 1 ( 1 ) N1Labels = 534 ( 4073 ) N2Labels = 0 ( 0 ) TotalLabels = 535 ( 4074 ) NameLabels = 535 ( 833 ) ColorLabels = 534 ( 4073 ) LayerLabels = 532 ( 4071 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 WHITE ( BLUE1 WHITE ) +COLORS : Colors = BLUE WHITE ( BLUE WHITE ) NLAYERS : NLayers = 6 ( 6 ) LAYERS : Layers = 193 198 223 233 243 253 ( 193 198 223 233 243 253 ) diff --git a/tests/de/iges_1/N1 b/tests/de/iges_1/N1 index 4aff33ea42..954d7e9ad0 100644 --- a/tests/de/iges_1/N1 +++ b/tests/de/iges_1/N1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 148 ( 148 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 148 ( 148 ) NameLabels = 148 ( 148 ) ColorLabels = 135 ( 148 ) LayerLabels = 135 ( 148 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = CYAN1 GREEN MAGENTA1 YELLOW ( CYAN1 GREEN MAGENTA1 YELLOW ) +COLORS : Colors = CYAN GREEN MAGENTA YELLOW ( CYAN GREEN MAGENTA YELLOW ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 2 3 ( 1 2 3 ) diff --git a/tests/de/iges_1/N2 b/tests/de/iges_1/N2 index bf67c2ec46..4bee4599a4 100644 --- a/tests/de/iges_1/N2 +++ b/tests/de/iges_1/N2 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.01171108481 ( 0.01550345628 ) AvgTol = 0.00017 LABELS : N0Labels = 7 ( 7 ) N1Labels = 471 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 478 ( 7 ) NameLabels = 7 ( 7 ) ColorLabels = 477 ( 7 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 DARKOLIVEGREEN1 ( BLUE1 DARKOLIVEGREEN1 ) +COLORS : Colors = BLUE DARKOLIVEGREEN1 ( BLUE DARKOLIVEGREEN1 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_1/O1 b/tests/de/iges_1/O1 index 290e1f970f..4a32b9c44b 100644 --- a/tests/de/iges_1/O1 +++ b/tests/de/iges_1/O1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.9221308818 ( 0.9221308818 ) AvgTol = 0.0148 LABELS : N0Labels = 244 ( 244 ) N1Labels = 0 ( 216 ) N2Labels = 0 ( 0 ) TotalLabels = 244 ( 460 ) NameLabels = 244 ( 460 ) ColorLabels = 238 ( 460 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED YELLOW ( DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED YELLOW ) +COLORS : Colors = DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED YELLOW ( DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_1/O4 b/tests/de/iges_1/O4 index d86b466634..d0a83de12f 100644 --- a/tests/de/iges_1/O4 +++ b/tests/de/iges_1/O4 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-005 ( 0.06099237775 ) AvgTol = 3.18487 LABELS : N0Labels = 432 ( 432 ) N1Labels = 12 ( 845 ) N2Labels = 0 ( 0 ) TotalLabels = 444 ( 1277 ) NameLabels = 432 ( 687 ) ColorLabels = 320 ( 1277 ) LayerLabels = 320 ( 1277 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ( CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = CYAN GREEN MAGENTA RED WHITE YELLOW ( CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 1 2 3 4 ( 1 2 3 4 ) diff --git a/tests/de/iges_1/O6 b/tests/de/iges_1/O6 index 3392102b1b..2e7b86a78d 100644 --- a/tests/de/iges_1/O6 +++ b/tests/de/iges_1/O6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 4160 ( 4160 ) N1Labels = 286 ( 562 ) N2Labels = 0 ( 0 ) TotalLabels = 4446 ( 4722 ) NameLabels = 4160 ( 4160 ) ColorLabels = 3040 ( 3061 ) LayerLabels = 4382 ( 4402 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA RED YELLOW ( BLUE CYAN GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 36 ( 36 ) LAYERS : Layers = 1 10 104 106 107 11 12 14 17 2 20 200 21 22 24 3 30 31 4 41 44 5 50 52 60 61 62 64 7 70 71 72 80 81 82 9 ( 1 10 104 106 107 11 12 14 17 2 20 200 21 22 24 3 30 31 4 41 44 5 50 52 60 61 62 64 7 70 71 72 80 81 82 9 ) diff --git a/tests/de/iges_1/O7 b/tests/de/iges_1/O7 index 8e9726f683..d2cb4344b6 100644 --- a/tests/de/iges_1/O7 +++ b/tests/de/iges_1/O7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3170 ( 3170 ) N1Labels = 524 ( 526 ) N2Labels = 0 ( 0 ) TotalLabels = 3694 ( 3696 ) NameLabels = 3170 ( 3170 ) ColorLabels = 2514 ( 2564 ) LayerLabels = 3596 ( 3662 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA RED YELLOW ( BLUE CYAN GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 31 ( 31 ) LAYERS : Layers = 1 10 100 106 107 11 12 14 17 19 2 20 21 22 24 3 30 31 32 4 5 50 6 60 7 70 72 74 80 81 82 ( 1 10 100 106 107 11 12 14 17 19 2 20 21 22 24 3 30 31 32 4 5 50 6 60 7 70 72 74 80 81 82 ) diff --git a/tests/de/iges_1/O8 b/tests/de/iges_1/O8 index c617e29630..9deb6c5c93 100644 --- a/tests/de/iges_1/O8 +++ b/tests/de/iges_1/O8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 4555 ( 4555 ) N1Labels = 328 ( 884 ) N2Labels = 0 ( 0 ) TotalLabels = 4883 ( 5439 ) NameLabels = 4555 ( 4555 ) ColorLabels = 3752 ( 4340 ) LayerLabels = 4851 ( 4868 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA RED YELLOW ( BLUE CYAN GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 38 ( 38 ) LAYERS : Layers = 1 10 100 102 106 107 11 12 14 15 2 20 21 22 24 25 3 30 31 32 34 4 40 41 5 50 51 52 6 60 61 62 7 70 71 80 81 82 ( 1 10 100 102 106 107 11 12 14 15 2 20 21 22 24 25 3 30 31 32 34 4 40 41 5 50 51 52 6 60 61 62 7 70 71 80 81 82 ) diff --git a/tests/de/iges_1/O9 b/tests/de/iges_1/O9 index 9bfb49d35b..87883ff99a 100644 --- a/tests/de/iges_1/O9 +++ b/tests/de/iges_1/O9 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3397 ( 3397 ) N1Labels = 134 ( 134 ) N2Labels = 0 ( 0 ) TotalLabels = 3531 ( 3531 ) NameLabels = 3397 ( 3397 ) ColorLabels = 2538 ( 2578 ) LayerLabels = 3467 ( 3500 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA RED YELLOW ( BLUE CYAN GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 29 ( 29 ) LAYERS : Layers = 1 10 100 102 104 106 107 11 12 14 2 20 21 22 24 3 30 31 32 4 40 5 50 52 7 70 71 74 80 ( 1 10 100 102 104 106 107 11 12 14 2 20 21 22 24 3 30 31 32 4 40 5 50 52 7 70 71 74 80 ) diff --git a/tests/de/iges_1/P1 b/tests/de/iges_1/P1 index ec2cc9ba0b..552e5eab57 100644 --- a/tests/de/iges_1/P1 +++ b/tests/de/iges_1/P1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 2998 ( 2998 ) N1Labels = 195 ( 202 ) N2Labels = 0 ( 0 ) TotalLabels = 3193 ( 3200 ) NameLabels = 2998 ( 2998 ) ColorLabels = 2187 ( 2225 ) LayerLabels = 3162 ( 3184 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA RED YELLOW ( BLUE CYAN GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 34 ( 34 ) LAYERS : Layers = 1 10 100 106 107 11 12 14 2 20 21 22 24 25 250 3 30 31 4 40 42 5 50 51 52 54 6 60 62 7 70 71 80 81 ( 1 10 100 106 107 11 12 14 2 20 21 22 24 25 250 3 30 31 4 40 42 5 50 51 52 54 6 60 62 7 70 71 80 81 ) diff --git a/tests/de/iges_1/P2 b/tests/de/iges_1/P2 index 4eb690859a..b022d830c7 100755 --- a/tests/de/iges_1/P2 +++ b/tests/de/iges_1/P2 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.9292857408 ( 0.9292857413 ) AvgTol = 0.0547 LABELS : N0Labels = 800 ( 800 ) N1Labels = 2 ( 1047 ) N2Labels = 0 ( 0 ) TotalLabels = 802 ( 1847 ) NameLabels = 800 ( 800 ) ColorLabels = 801 ( 1847 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 9 ( 9 ) -COLORS : Colors = BLUE1 BURLYWOOD2 CYAN1 GREEN LIGHTSTEELBLUE ORCHID2 RED SEAGREEN2 YELLOW ( BLUE1 BURLYWOOD2 CYAN1 GREEN LIGHTSTEELBLUE ORCHID2 RED SEAGREEN2 YELLOW ) +COLORS : Colors = BLUE BURLYWOOD2 CYAN GREEN LIGHTSTEELBLUE ORCHID2 RED SEAGREEN2 YELLOW ( BLUE BURLYWOOD2 CYAN GREEN LIGHTSTEELBLUE ORCHID2 RED SEAGREEN2 YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_1/P5 b/tests/de/iges_1/P5 index 9d047d9fc0..cd42baca1b 100755 --- a/tests/de/iges_1/P5 +++ b/tests/de/iges_1/P5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.991254355 ( 0.991254355 ) AvgTol = 0.0115 LABELS : N0Labels = 223 ( 223 ) N1Labels = 0 ( 242 ) N2Labels = 0 ( 0 ) TotalLabels = 223 ( 465 ) NameLabels = 223 ( 388 ) ColorLabels = 223 ( 465 ) LayerLabels = 223 ( 465 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 MAGENTA1 YELLOW ( BLUE1 MAGENTA1 YELLOW ) +COLORS : Colors = BLUE MAGENTA YELLOW ( BLUE MAGENTA YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 4 ( 4 ) diff --git a/tests/de/iges_1/P6 b/tests/de/iges_1/P6 index fa1fc8ebbc..1e96ccc8bc 100644 --- a/tests/de/iges_1/P6 +++ b/tests/de/iges_1/P6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.7255001399 ( 0.7254994252 ) AvgTol = 0.0015 LABELS : N0Labels = 1 ( 1 ) N1Labels = 856 ( 1636 ) N2Labels = 0 ( 0 ) TotalLabels = 857 ( 1637 ) NameLabels = 857 ( 1390 ) ColorLabels = 856 ( 1636 ) LayerLabels = 856 ( 1636 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 10 ( 10 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 MAGENTA3 RED TURQUOISE4 WHITE YELLOW YELLOW4 ( BLUE1 CYAN1 GREEN MAGENTA1 MAGENTA3 RED TURQUOISE4 WHITE YELLOW YELLOW4 ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA MAGENTA3 RED TURQUOISE4 WHITE YELLOW YELLOW4 ( BLUE CYAN GREEN MAGENTA MAGENTA3 RED TURQUOISE4 WHITE YELLOW YELLOW4 ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 141 71 ( 1 141 71 ) diff --git a/tests/de/iges_1/Q7 b/tests/de/iges_1/Q7 index 3f3a51da92..ae274835bb 100644 --- a/tests/de/iges_1/Q7 +++ b/tests/de/iges_1/Q7 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.9002295152 ( 0.9002295152 ) AvgTol = 0.0518 LABELS : N0Labels = 1 ( 1 ) N1Labels = 237 ( 584 ) N2Labels = 0 ( 0 ) TotalLabels = 238 ( 585 ) NameLabels = 238 ( 284 ) ColorLabels = 237 ( 584 ) LayerLabels = 234 ( 581 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 11 ) -COLORS : Colors = CYAN1 GREEN GREEN4 MAGENTA1 MAGENTA3 RED3 TURQUOISE3 WHITE ( BLUE1 CYAN1 GREEN GREEN4 MAGENTA1 MAGENTA3 RED RED3 TURQUOISE3 WHITE YELLOW ) +COLORS : Colors = CYAN GREEN GREEN4 MAGENTA MAGENTA3 RED3 TURQUOISE3 WHITE ( BLUE CYAN GREEN GREEN4 MAGENTA MAGENTA3 RED RED3 TURQUOISE3 WHITE YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 1 3 ( 1 3 ) diff --git a/tests/de/iges_1/R3 b/tests/de/iges_1/R3 index edfe62421e..56b737f189 100644 --- a/tests/de/iges_1/R3 +++ b/tests/de/iges_1/R3 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.9989623361 ( 0.9989623361 ) AvgTol = 0.00936 LABELS : N0Labels = 1063 ( 1063 ) N1Labels = 0 ( 1675 ) N2Labels = 0 ( 0 ) TotalLabels = 1063 ( 2738 ) NameLabels = 1063 ( 1644 ) ColorLabels = 1024 ( 2738 ) LayerLabels = 1024 ( 2738 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 5 ) -COLORS : Colors = BLUE1 MAGENTA1 RED WHITE ( BLUE1 GREEN MAGENTA1 RED WHITE ) +COLORS : Colors = BLUE MAGENTA RED WHITE ( BLUE GREEN MAGENTA RED WHITE ) NLAYERS : NLayers = 5 ( 5 ) LAYERS : Layers = 1 10 12 2 4 ( 1 10 12 2 4 ) diff --git a/tests/de/iges_1/R4 b/tests/de/iges_1/R4 index ebfb3cdd8b..026c6c40b3 100644 --- a/tests/de/iges_1/R4 +++ b/tests/de/iges_1/R4 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.9439922076 ( 0.944086605 ) AvgTol = 0.0059 LABELS : N0Labels = 2062 ( 2062 ) N1Labels = 6 ( 1161 ) N2Labels = 0 ( 0 ) TotalLabels = 2068 ( 3223 ) NameLabels = 2062 ( 2062 ) ColorLabels = 2037 ( 3223 ) LayerLabels = 2037 ( 3223 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) -COLORS : Colors = BLACK MAGENTA1 RED ( BLACK MAGENTA1 RED WHITE ) +COLORS : Colors = BLACK MAGENTA RED ( BLACK MAGENTA RED WHITE ) NLAYERS : NLayers = 6 ( 6 ) LAYERS : Layers = 101 151 152 154 156 230 ( 101 151 152 154 156 230 ) diff --git a/tests/de/iges_1/R5 b/tests/de/iges_1/R5 index aee5471f5b..c67dd275f8 100644 --- a/tests/de/iges_1/R5 +++ b/tests/de/iges_1/R5 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.4274072109 ( 0.4274072101 ) AvgTol = 0.00182 LABELS : N0Labels = 10 ( 10 ) N1Labels = 1565 ( 2865 ) N2Labels = 0 ( 0 ) TotalLabels = 1575 ( 2875 ) NameLabels = 1575 ( 1851 ) ColorLabels = 1570 ( 2870 ) LayerLabels = 1570 ( 2870 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) -COLORS : Colors = BLUE1 GREEN GREEN4 MEDIUMORCHID RED TURQUOISE1 WHITE YELLOW ( BLUE1 GREEN GREEN4 MEDIUMORCHID RED TURQUOISE1 WHITE YELLOW ) +COLORS : Colors = BLUE GREEN GREEN4 MEDIUMORCHID RED TURQUOISE1 WHITE YELLOW ( BLUE GREEN GREEN4 MEDIUMORCHID RED TURQUOISE1 WHITE YELLOW ) NLAYERS : NLayers = 18 ( 19 ) LAYERS : Layers = 101 110 115 116 117 118 119 120 130 135 136 137 138 181 40 41 43 44 ( 101 110 115 116 117 118 119 120 130 135 136 137 138 181 185 40 41 43 44 ) diff --git a/tests/de/iges_1/R6 b/tests/de/iges_1/R6 index f2202e4e95..98968d7402 100755 --- a/tests/de/iges_1/R6 +++ b/tests/de/iges_1/R6 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.5505691323 ( 0.5505691341 ) AvgTol = 0.00835 LABELS : N0Labels = 8 ( 8 ) N1Labels = 1544 ( 3130 ) N2Labels = 0 ( 0 ) TotalLabels = 1552 ( 3138 ) NameLabels = 1552 ( 1918 ) ColorLabels = 1544 ( 3130 ) LayerLabels = 1544 ( 3128 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 10 ( 10 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 MAGENTA3 MEDIUMPURPLE1 RED WHITE YELLOW YELLOW3 ( BLUE1 CYAN1 GREEN MAGENTA1 MAGENTA3 MEDIUMPURPLE1 RED WHITE YELLOW YELLOW3 ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA MAGENTA3 MEDIUMPURPLE1 RED WHITE YELLOW YELLOW3 ( BLUE CYAN GREEN MAGENTA MAGENTA3 MEDIUMPURPLE1 RED WHITE YELLOW YELLOW3 ) NLAYERS : NLayers = 35 ( 36 ) LAYERS : Layers = 100 101 102 110 111 120 121 122 123 125 126 127 128 130 131 132 133 134 135 136 137 138 140 141 142 150 20 21 254 31 5 50 51 52 53 ( 100 101 102 110 111 120 121 122 123 125 126 127 128 130 131 132 133 134 135 136 137 138 140 141 142 150 20 21 254 30 31 5 50 51 52 53 ) diff --git a/tests/de/iges_1/R7 b/tests/de/iges_1/R7 index 78e80f70dd..c2765cdd0e 100644 --- a/tests/de/iges_1/R7 +++ b/tests/de/iges_1/R7 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 1.421161348e-006 ( 1e-005 ) AvgTol = 1.219 LABELS : N0Labels = 1051 ( 1051 ) N1Labels = 0 ( 448 ) N2Labels = 0 ( 0 ) TotalLabels = 1051 ( 1499 ) NameLabels = 1051 ( 1051 ) ColorLabels = 822 ( 1300 ) LayerLabels = 971 ( 1499 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 3 ) -COLORS : Colors = CYAN1 WHITE ( CYAN1 RED WHITE ) +COLORS : Colors = CYAN WHITE ( CYAN RED WHITE ) NLAYERS : NLayers = 7 ( 7 ) LAYERS : Layers = 1 100 63 70 97 98 99 ( 1 100 63 70 97 98 99 ) diff --git a/tests/de/iges_1/R8 b/tests/de/iges_1/R8 index b3852c6cdb..e99e0d4890 100755 --- a/tests/de/iges_1/R8 +++ b/tests/de/iges_1/R8 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 3.742696236 ( 5.769095076 ) AvgTol = 0.0162 LABELS : N0Labels = 11 ( 11 ) N1Labels = 2891 ( 6329 ) N2Labels = 0 ( 0 ) TotalLabels = 2902 ( 6340 ) NameLabels = 2900 ( 5879 ) ColorLabels = 2891 ( 6329 ) LayerLabels = 2411 ( 5260 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLACK BLUE1 RED YELLOW ( BLACK BLUE1 RED YELLOW ) +COLORS : Colors = BLACK BLUE RED YELLOW ( BLACK BLUE RED YELLOW ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 200 3 4 ( 200 3 4 ) diff --git a/tests/de/iges_2/A3 b/tests/de/iges_2/A3 index 1670cc3c0b..7d988fe77c 100644 --- a/tests/de/iges_2/A3 +++ b/tests/de/iges_2/A3 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.4238514895 ( 0.4238514534 ) AvgTol = 0.00609 LABELS : N0Labels = 1 ( 1 ) N1Labels = 252 ( 542 ) N2Labels = 0 ( 0 ) TotalLabels = 253 ( 543 ) NameLabels = 253 ( 331 ) ColorLabels = 252 ( 542 ) LayerLabels = 178 ( 206 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 5 ) -COLORS : Colors = BLUE1 MAGENTA1 RED WHITE ( BLUE1 MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE MAGENTA RED WHITE ( BLUE MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 10 ( 10 ) diff --git a/tests/de/iges_2/A5 b/tests/de/iges_2/A5 index d8025f9ab9..414c4ba27c 100644 --- a/tests/de/iges_2/A5 +++ b/tests/de/iges_2/A5 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.7925892163 ( 0.7925891552 ) AvgTol = 0.00158 LABELS : N0Labels = 28 ( 28 ) N1Labels = 13487 ( 17629 ) N2Labels = 0 ( 0 ) TotalLabels = 13515 ( 17657 ) NameLabels = 13515 ( 17494 ) ColorLabels = 13489 ( 17629 ) LayerLabels = 13438 ( 17573 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 18 ( 18 ) -COLORS : Colors = BLUE1 CYAN1 DARKKHAKI DARKSEAGREEN2 DEEPSKYBLUE2 DODGERBLUE2 GOLD3 GREEN GREEN4 KHAKI1 LIGHTPINK1 LIGHTSEAGREEN ORANGE PALEVIOLETRED4 PLUM1 RED WHITE YELLOW ( BLUE1 CYAN1 DARKKHAKI DARKSEAGREEN2 DEEPSKYBLUE2 DODGERBLUE2 GOLD3 GREEN GREEN4 KHAKI1 LIGHTPINK1 LIGHTSEAGREEN ORANGE PALEVIOLETRED4 PLUM1 RED WHITE YELLOW ) +COLORS : Colors = BLUE CYAN DARKKHAKI DARKSEAGREEN2 DEEPSKYBLUE2 DODGERBLUE2 GOLD3 GREEN GREEN4 KHAKI1 LIGHTPINK1 LIGHTSEAGREEN ORANGE PALEVIOLETRED4 PLUM1 RED WHITE YELLOW ( BLUE CYAN DARKKHAKI DARKSEAGREEN2 DEEPSKYBLUE2 DODGERBLUE2 GOLD3 GREEN GREEN4 KHAKI1 LIGHTPINK1 LIGHTSEAGREEN ORANGE PALEVIOLETRED4 PLUM1 RED WHITE YELLOW ) NLAYERS : NLayers = 45 ( 46 ) LAYERS : Layers = 1 11 12 121 122 123 124 125 127 128 129 13 131 136 137 139 14 140 141 142 144 145 146 147 148 149 150 151 16 17 181 2 238 239 240 241 242 252 254 3 4 5 7 8 9 ( 1 11 12 121 122 123 124 125 127 128 129 13 131 136 137 139 14 140 141 142 144 145 146 147 148 149 150 151 16 17 181 2 238 239 240 241 242 250 252 254 3 4 5 7 8 9 ) diff --git a/tests/de/iges_2/A6 b/tests/de/iges_2/A6 index 2118b19e81..eef7b0c516 100755 --- a/tests/de/iges_2/A6 +++ b/tests/de/iges_2/A6 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 1e-005 ( 0.9051733624 ) AvgTol = 9.89442 LABELS : N0Labels = 1 ( 8 ) N1Labels = 93 ( 11 ) N2Labels = 0 ( 0 ) TotalLabels = 94 ( 19 ) NameLabels = 1 ( 14 ) ColorLabels = 93 ( 12 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 6 ) -COLORS : Colors = BLUE1 GREEN MAGENTA1 RED YELLOW ( BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE GREEN MAGENTA RED YELLOW ( BLUE GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_2/A7 b/tests/de/iges_2/A7 index 923d549557..0841e3e1bb 100644 --- a/tests/de/iges_2/A7 +++ b/tests/de/iges_2/A7 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.7510769849 ( 0.7510769849 ) AvgTol = 0.00691 LABELS : N0Labels = 65 ( 65 ) N1Labels = 2112 ( 4443 ) N2Labels = 0 ( 0 ) TotalLabels = 2177 ( 4508 ) NameLabels = 2177 ( 2778 ) ColorLabels = 2123 ( 4458 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) -COLORS : Colors = BLUE1 WHITE YELLOW ( BLUE1 GREEN WHITE YELLOW ) +COLORS : Colors = BLUE WHITE YELLOW ( BLUE GREEN WHITE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_2/A8 b/tests/de/iges_2/A8 index 0e2ab82903..6b18a948dc 100644 --- a/tests/de/iges_2/A8 +++ b/tests/de/iges_2/A8 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.9504514132 ( 1.074871981 ) AvgTol = 0.017 LABELS : N0Labels = 1 ( 1 ) N1Labels = 545 ( 1285 ) N2Labels = 0 ( 0 ) TotalLabels = 546 ( 1286 ) NameLabels = 546 ( 645 ) ColorLabels = 545 ( 1285 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) -COLORS : Colors = GREEN GREEN4 MAGENTA1 WHITE YELLOW YELLOW3 ( BLUE1 GREEN GREEN4 MAGENTA1 WHITE YELLOW YELLOW3 ) +COLORS : Colors = GREEN GREEN4 MAGENTA WHITE YELLOW YELLOW3 ( BLUE GREEN GREEN4 MAGENTA WHITE YELLOW YELLOW3 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_2/A9 b/tests/de/iges_2/A9 index eada673f8b..58b7bcf1f7 100755 --- a/tests/de/iges_2/A9 +++ b/tests/de/iges_2/A9 @@ -18,7 +18,7 @@ TOLERANCE : MaxTol = 0.9711309062 ( 0.9711309063 ) AvgTol = 0.0191 LABELS : N0Labels = 250 ( 250 ) N1Labels = 2268 ( 3204 ) N2Labels = 0 ( 0 ) TotalLabels = 2518 ( 3454 ) NameLabels = 2518 ( 3454 ) ColorLabels = 2512 ( 3448 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = CYAN1 LIGHTPINK PALEGOLDENROD ROSYBROWN ( CYAN1 LIGHTPINK PALEGOLDENROD ROSYBROWN ) +COLORS : Colors = CYAN LIGHTPINK PALEGOLDENROD ROSYBROWN ( CYAN LIGHTPINK PALEGOLDENROD ROSYBROWN ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_2/B1 b/tests/de/iges_2/B1 index 5559a50249..d9717d3478 100755 --- a/tests/de/iges_2/B1 +++ b/tests/de/iges_2/B1 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.6032674714 ( 0.6032674714 ) AvgTol = 0.00148 LABELS : N0Labels = 4 ( 7 ) N1Labels = 11017 ( 18087 ) N2Labels = 0 ( 0 ) TotalLabels = 11021 ( 18094 ) NameLabels = 10620 ( 13085 ) ColorLabels = 11018 ( 18086 ) LayerLabels = 10917 ( 17934 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 17 ( 17 ) -COLORS : Colors = BLUE1 CYAN1 DARKGOLDENROD1 DARKSLATEGRAY1 GREEN GREEN4 LIGHTPINK1 MAGENTA1 MEDIUMPURPLE1 MEDIUMSPRINGGREEN PURPLE RED RED3 ROYALBLUE2 SEAGREEN2 WHITE YELLOW ( BLUE1 CYAN1 DARKGOLDENROD1 DARKSLATEGRAY1 GREEN GREEN4 LIGHTPINK1 MAGENTA1 MEDIUMPURPLE1 MEDIUMSPRINGGREEN PURPLE RED RED3 ROYALBLUE2 SEAGREEN2 WHITE YELLOW ) +COLORS : Colors = BLUE CYAN DARKGOLDENROD1 DARKSLATEGRAY1 GREEN GREEN4 LIGHTPINK1 MAGENTA MEDIUMPURPLE1 MEDIUMSPRINGGREEN PURPLE RED RED3 ROYALBLUE2 SEAGREEN2 WHITE YELLOW ( BLUE CYAN DARKGOLDENROD1 DARKSLATEGRAY1 GREEN GREEN4 LIGHTPINK1 MAGENTA MEDIUMPURPLE1 MEDIUMSPRINGGREEN PURPLE RED RED3 ROYALBLUE2 SEAGREEN2 WHITE YELLOW ) NLAYERS : NLayers = 16 ( 17 ) LAYERS : Layers = 1 101 102 104 106 107 108 152 154 156 158 2 240 255 6 7 ( 1 101 102 104 106 107 108 152 154 156 158 2 239 240 255 6 7 ) diff --git a/tests/de/iges_2/B2 b/tests/de/iges_2/B2 index ec30c3039e..e1326c3f39 100644 --- a/tests/de/iges_2/B2 +++ b/tests/de/iges_2/B2 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.5322014093 ( 0.5322014093 ) AvgTol = 0.00229 LABELS : N0Labels = 7 ( 7 ) N1Labels = 1982 ( 2455 ) N2Labels = 0 ( 0 ) TotalLabels = 1989 ( 2462 ) NameLabels = 1989 ( 2062 ) ColorLabels = 1982 ( 2455 ) LayerLabels = 1982 ( 2455 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) -COLORS : Colors = GRAY67 GREEN YELLOW ( GRAY67 GREEN MAGENTA1 YELLOW ) +COLORS : Colors = GRAY67 GREEN YELLOW ( GRAY67 GREEN MAGENTA YELLOW ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 100 110 120 ( 100 110 120 ) diff --git a/tests/de/iges_2/B8 b/tests/de/iges_2/B8 index 994eb0c168..ed372fae53 100644 --- a/tests/de/iges_2/B8 +++ b/tests/de/iges_2/B8 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.9804479161 ( 0.9805459497 ) AvgTol = 0.0115 LABELS : N0Labels = 5089 ( 5165 ) N1Labels = 26 ( 3878 ) N2Labels = 0 ( 0 ) TotalLabels = 5115 ( 9043 ) NameLabels = 5089 ( 5165 ) ColorLabels = 5086 ( 8967 ) LayerLabels = 5086 ( 8967 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 CYAN1 GREEN ( BLUE1 CYAN1 GREEN ) +COLORS : Colors = BLUE CYAN GREEN ( BLUE CYAN GREEN ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 200 51 ( 1 200 51 ) diff --git a/tests/de/iges_2/B9 b/tests/de/iges_2/B9 index 983f8b7663..1033ad43a9 100644 --- a/tests/de/iges_2/B9 +++ b/tests/de/iges_2/B9 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.09919926743 ( 0.09919926743 ) AvgTol = 0.00246 LABELS : N0Labels = 926 ( 926 ) N1Labels = 0 ( 638 ) N2Labels = 0 ( 0 ) TotalLabels = 926 ( 1564 ) NameLabels = 926 ( 1035 ) ColorLabels = 926 ( 1564 ) LayerLabels = 19 ( 19 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 4 ) -COLORS : Colors = BLUE1 RED ( BLUE1 GREEN RED YELLOW ) +COLORS : Colors = BLUE RED ( BLUE GREEN RED YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 40 ( 40 ) diff --git a/tests/de/iges_2/C1 b/tests/de/iges_2/C1 index bea318fd0f..a9069f5a73 100644 --- a/tests/de/iges_2/C1 +++ b/tests/de/iges_2/C1 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.09192532719 ( 0.09192532719 ) AvgTol = 0.00055 LABELS : N0Labels = 1 ( 1 ) N1Labels = 1153 ( 1298 ) N2Labels = 0 ( 0 ) TotalLabels = 1154 ( 1299 ) NameLabels = 1154 ( 1195 ) ColorLabels = 1153 ( 1298 ) LayerLabels = 1153 ( 1298 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 GOLDENROD2 GREEN YELLOW ( BLUE1 CYAN1 GOLDENROD2 GREEN RED YELLOW ) +COLORS : Colors = BLUE CYAN GOLDENROD2 GREEN YELLOW ( BLUE CYAN GOLDENROD2 GREEN RED YELLOW ) NLAYERS : NLayers = 5 ( 5 ) LAYERS : Layers = 14 3 4 5 7 ( 14 3 4 5 7 ) diff --git a/tests/de/iges_2/C3 b/tests/de/iges_2/C3 index e930d23a1b..e0830b59d7 100644 --- a/tests/de/iges_2/C3 +++ b/tests/de/iges_2/C3 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.75178756 ( 0.7517875657 ) AvgTol = 0.00167 LABELS : N0Labels = 2030 ( 2204 ) N1Labels = 8 ( 673 ) N2Labels = 0 ( 0 ) TotalLabels = 2038 ( 2877 ) NameLabels = 2030 ( 2204 ) ColorLabels = 2006 ( 2703 ) LayerLabels = 2006 ( 2703 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 12 ( 12 ) -COLORS : Colors = GRAY61 GREEN LIGHTSALMON2 MAGENTA1 MAGENTA3 RED ROSYBROWN SPRINGGREEN4 TURQUOISE TURQUOISE2 WHITE YELLOW ( GRAY61 GREEN LIGHTSALMON2 MAGENTA1 MAGENTA3 RED ROSYBROWN SPRINGGREEN4 TURQUOISE TURQUOISE2 WHITE YELLOW ) +COLORS : Colors = GRAY61 GREEN LIGHTSALMON2 MAGENTA MAGENTA3 RED ROSYBROWN SPRINGGREEN4 TURQUOISE TURQUOISE2 WHITE YELLOW ( GRAY61 GREEN LIGHTSALMON2 MAGENTA MAGENTA3 RED ROSYBROWN SPRINGGREEN4 TURQUOISE TURQUOISE2 WHITE YELLOW ) NLAYERS : NLayers = 5 ( 6 ) LAYERS : Layers = 107 109 152 155 156 ( 107 109 150 152 155 156 ) diff --git a/tests/de/iges_2/C4 b/tests/de/iges_2/C4 index 9d2c965f33..79d3fe465d 100644 --- a/tests/de/iges_2/C4 +++ b/tests/de/iges_2/C4 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.9672552763 ( 0.776676229 ) AvgTol = 0.0157 LABELS : N0Labels = 564 ( 564 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 564 ( 564 ) NameLabels = 564 ( 564 ) ColorLabels = 543 ( 564 ) LayerLabels = 543 ( 564 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = CYAN1 GRAY57 ( CYAN1 GRAY57 ) +COLORS : Colors = CYAN GRAY57 ( CYAN GRAY57 ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 1 25 ( 1 25 ) diff --git a/tests/de/iges_2/C5 b/tests/de/iges_2/C5 index 44924bd8f6..a773052085 100644 --- a/tests/de/iges_2/C5 +++ b/tests/de/iges_2/C5 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.08172710091 ( 0.05040240237 ) AvgTol = 0.00060 LABELS : N0Labels = 3785 ( 3785 ) N1Labels = 2 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 3787 ( 3785 ) NameLabels = 3785 ( 3785 ) ColorLabels = 3786 ( 3785 ) LayerLabels = 3786 ( 3785 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA RED YELLOW ( BLUE CYAN GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 5 ( 5 ) LAYERS : Layers = 1 100 3 4 5 ( 1 100 3 4 5 ) diff --git a/tests/de/iges_2/C6 b/tests/de/iges_2/C6 index aea197bb40..7023f1114e 100644 --- a/tests/de/iges_2/C6 +++ b/tests/de/iges_2/C6 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.04476896343 ( 0.04476636368 ) AvgTol = 0.0240 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 5 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 6 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 6 ) LayerLabels = 1 ( 6 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 2 ) -COLORS : Colors = WHITE ( CYAN1 WHITE ) +COLORS : Colors = WHITE ( CYAN WHITE ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 31 ( 31 ) diff --git a/tests/de/iges_2/C7 b/tests/de/iges_2/C7 index 45bc4bdb3b..7c4494c4dd 100755 --- a/tests/de/iges_2/C7 +++ b/tests/de/iges_2/C7 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.002386883227 ( 0.002386886993 ) AvgTol = 1.57380 LABELS : N0Labels = 2053 ( 2148 ) N1Labels = 381 ( 253 ) N2Labels = 0 ( 0 ) TotalLabels = 2434 ( 2401 ) NameLabels = 2053 ( 2148 ) ColorLabels = 1932 ( 2306 ) LayerLabels = 1932 ( 2306 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 13 ( 13 ) -COLORS : Colors = BLUE1 CYAN1 CYAN3 DARKORANGE2 DEEPPINK4 GREEN GREEN4 LIGHTPINK2 MAGENTA1 MATRAGRAY RED SIENNA3 YELLOW ( BLUE1 CYAN1 CYAN3 DARKORANGE2 DEEPPINK4 GREEN GREEN4 LIGHTPINK2 MAGENTA1 MATRAGRAY RED SIENNA3 YELLOW ) +COLORS : Colors = BLUE CYAN CYAN3 DARKORANGE2 DEEPPINK4 GREEN GREEN4 LIGHTPINK2 MAGENTA MATRAGRAY RED SIENNA3 YELLOW ( BLUE CYAN CYAN3 DARKORANGE2 DEEPPINK4 GREEN GREEN4 LIGHTPINK2 MAGENTA MATRAGRAY RED SIENNA3 YELLOW ) NLAYERS : NLayers = 21 ( 22 ) LAYERS : Layers = 501 510 511 512 513 515 550 560 651 700 701 702 703 704 705 706 707 708 801 851 894 ( 1000 501 510 511 512 513 515 550 560 651 700 701 702 703 704 705 706 707 708 801 851 894 ) diff --git a/tests/de/iges_2/D1 b/tests/de/iges_2/D1 index b343a98ead..4a11b3037f 100755 --- a/tests/de/iges_2/D1 +++ b/tests/de/iges_2/D1 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.1765497108 ( 0.1765497101 ) AvgTol = 0.00041 LABELS : N0Labels = 1 ( 1 ) N1Labels = 981 ( 2201 ) N2Labels = 0 ( 0 ) TotalLabels = 982 ( 2202 ) NameLabels = 982 ( 1142 ) ColorLabels = 981 ( 2201 ) LayerLabels = 981 ( 2201 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 WHITE YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 WHITE YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA WHITE YELLOW ( BLUE CYAN GREEN MAGENTA WHITE YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 200 ( 200 ) diff --git a/tests/de/iges_2/D3 b/tests/de/iges_2/D3 index 83c495fc64..c759221d97 100644 --- a/tests/de/iges_2/D3 +++ b/tests/de/iges_2/D3 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 7.725102137e-006 ( 1e-005 ) AvgTol = 2.262 LABELS : N0Labels = 513 ( 513 ) N1Labels = 0 ( 15 ) N2Labels = 0 ( 0 ) TotalLabels = 513 ( 528 ) NameLabels = 513 ( 513 ) ColorLabels = 402 ( 422 ) LayerLabels = 508 ( 528 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = GREEN MAGENTA1 RED WHITE YELLOW ( GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = GREEN MAGENTA RED WHITE YELLOW ( GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 50 51 7 9 ( 50 51 7 9 ) diff --git a/tests/de/iges_2/D4 b/tests/de/iges_2/D4 index 5a179b0be9..7afe7cf116 100644 --- a/tests/de/iges_2/D4 +++ b/tests/de/iges_2/D4 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.8737801249 ( 0.873776131 ) AvgTol = 0.0139 LABELS : N0Labels = 416 ( 416 ) N1Labels = 2 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 418 ( 416 ) NameLabels = 416 ( 416 ) ColorLabels = 247 ( 416 ) LayerLabels = 247 ( 416 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 5 ) -COLORS : Colors = CYAN1 GRAY33 GRAY6 YELLOW ( CYAN1 GRAY33 GRAY6 WHITE YELLOW ) +COLORS : Colors = CYAN GRAY33 GRAY6 YELLOW ( CYAN GRAY33 GRAY6 WHITE YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 10 2 ( 10 2 ) diff --git a/tests/de/iges_2/D7 b/tests/de/iges_2/D7 index 5385a5bd46..58ea5c82f6 100644 --- a/tests/de/iges_2/D7 +++ b/tests/de/iges_2/D7 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 2969 ( 2969 ) N1Labels = 535 ( 419 ) N2Labels = 0 ( 0 ) TotalLabels = 3504 ( 3388 ) NameLabels = 2969 ( 2969 ) ColorLabels = 2305 ( 2287 ) LayerLabels = 3288 ( 3308 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA RED YELLOW ( BLUE CYAN GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 28 ( 29 ) LAYERS : Layers = 10 106 107 11 12 13 14 2 20 21 22 24 250 3 30 31 32 4 40 5 52 6 60 61 7 70 72 9 ( 10 106 107 11 12 13 14 199 2 20 21 22 24 250 3 30 31 32 4 40 5 52 6 60 61 7 70 72 9 ) diff --git a/tests/de/iges_2/D8 b/tests/de/iges_2/D8 index 12d4e399a5..72da01df46 100644 --- a/tests/de/iges_2/D8 +++ b/tests/de/iges_2/D8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1.089725986e-005 ( 1.089659658e-005 ) AvgTol = 1.9 LABELS : N0Labels = 693 ( 693 ) N1Labels = 10 ( 1399 ) N2Labels = 0 ( 0 ) TotalLabels = 703 ( 2092 ) NameLabels = 693 ( 1341 ) ColorLabels = 692 ( 2092 ) LayerLabels = 692 ( 2092 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) -COLORS : Colors = CYAN1 WHITE YELLOW ( CYAN1 GREEN3 WHITE YELLOW ) +COLORS : Colors = CYAN WHITE YELLOW ( CYAN GREEN3 WHITE YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 10 3 ( 10 3 ) diff --git a/tests/de/iges_2/D9 b/tests/de/iges_2/D9 index 6269c2ab0d..f9b2feeca0 100644 --- a/tests/de/iges_2/D9 +++ b/tests/de/iges_2/D9 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.07954526757 ( 0.04419037521 ) AvgTol = 0.00084 LABELS : N0Labels = 47 ( 47 ) N1Labels = 426 ( 426 ) N2Labels = 0 ( 0 ) TotalLabels = 473 ( 473 ) NameLabels = 473 ( 473 ) ColorLabels = 439 ( 439 ) LayerLabels = 452 ( 472 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 GREEN RED WHITE YELLOW ( BLUE1 GREEN RED WHITE YELLOW ) +COLORS : Colors = BLUE GREEN RED WHITE YELLOW ( BLUE GREEN RED WHITE YELLOW ) NLAYERS : NLayers = 5 ( 5 ) LAYERS : Layers = 1 12 2 3 6 ( 1 12 2 3 6 ) diff --git a/tests/de/iges_2/E3 b/tests/de/iges_2/E3 index b86d99cffd..eb7d209fb3 100644 --- a/tests/de/iges_2/E3 +++ b/tests/de/iges_2/E3 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.08196317057 ( 0.08606507237 ) AvgTol = 0.00360 LABELS : N0Labels = 1 ( 1 ) N1Labels = 214 ( 1233 ) N2Labels = 0 ( 0 ) TotalLabels = 215 ( 1234 ) NameLabels = 215 ( 311 ) ColorLabels = 214 ( 1233 ) LayerLabels = 214 ( 1233 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 5 ) -COLORS : Colors = BLUE1 GRAY73 WHITE YELLOW ( BLUE1 GRAY73 GREEN WHITE YELLOW ) +COLORS : Colors = BLUE GRAY73 WHITE YELLOW ( BLUE GRAY73 GREEN WHITE YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 2 ( 2 ) diff --git a/tests/de/iges_2/E4 b/tests/de/iges_2/E4 index 7ac6786dee..45c4189691 100644 --- a/tests/de/iges_2/E4 +++ b/tests/de/iges_2/E4 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.4901518209 ( 0.4901518209 ) AvgTol = 0.0174 LABELS : N0Labels = 48 ( 48 ) N1Labels = 0 ( 394 ) N2Labels = 0 ( 0 ) TotalLabels = 48 ( 442 ) NameLabels = 48 ( 77 ) ColorLabels = 47 ( 442 ) LayerLabels = 47 ( 442 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 2 ) -COLORS : Colors = MAGENTA1 ( MAGENTA1 YELLOW ) +COLORS : Colors = MAGENTA ( MAGENTA YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 2 ( 2 ) diff --git a/tests/de/iges_2/E6 b/tests/de/iges_2/E6 index 6321bb6dc0..9ba4a812cc 100644 --- a/tests/de/iges_2/E6 +++ b/tests/de/iges_2/E6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.8261873294 ( 0.8261873283 ) AvgTol = 0.0107 LABELS : N0Labels = 1884 ( 1885 ) N1Labels = 0 ( 1036 ) N2Labels = 0 ( 0 ) TotalLabels = 1884 ( 2921 ) NameLabels = 1884 ( 1885 ) ColorLabels = 1873 ( 2920 ) LayerLabels = 1873 ( 2920 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = BLACK BLUE1 CYAN1 GREEN RED WHITE YELLOW ( BLACK BLUE1 CYAN1 GREEN RED WHITE YELLOW ) +COLORS : Colors = BLACK BLUE CYAN GREEN RED WHITE YELLOW ( BLACK BLUE CYAN GREEN RED WHITE YELLOW ) NLAYERS : NLayers = 28 ( 28 ) LAYERS : Layers = 1 101 103 104 107 108 114 12 121 122 124 125 126 127 128 13 14 15 2 20 3 30 31 33 48 49 50 51 ( 1 101 103 104 107 108 114 12 121 122 124 125 126 127 128 13 14 15 2 20 3 30 31 33 48 49 50 51 ) diff --git a/tests/de/iges_2/E7 b/tests/de/iges_2/E7 index 193d19d16f..14e3de14fd 100644 --- a/tests/de/iges_2/E7 +++ b/tests/de/iges_2/E7 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.9993613167 ( 0.9993613167 ) AvgTol = 0.0163 LABELS : N0Labels = 3 ( 3 ) N1Labels = 1632 ( 3631 ) N2Labels = 0 ( 0 ) TotalLabels = 1635 ( 3634 ) NameLabels = 1635 ( 2037 ) ColorLabels = 1632 ( 3633 ) LayerLabels = 1632 ( 3633 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) -COLORS : Colors = BLUE1 GREEN MAGENTA1 ( BLUE1 GREEN MAGENTA1 RED ) +COLORS : Colors = BLUE GREEN MAGENTA ( BLUE GREEN MAGENTA RED ) NLAYERS : NLayers = 6 ( 7 ) LAYERS : Layers = 1 10 15 18 20 30 ( 1 10 13 15 18 20 30 ) diff --git a/tests/de/iges_2/E8 b/tests/de/iges_2/E8 index 5c9d1941a1..a010fc4b59 100644 --- a/tests/de/iges_2/E8 +++ b/tests/de/iges_2/E8 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.7848432514 ( 0.7848432514 ) AvgTol = 0.0153 LABELS : N0Labels = 1 ( 1 ) N1Labels = 530 ( 1068 ) N2Labels = 0 ( 0 ) TotalLabels = 531 ( 1069 ) NameLabels = 531 ( 738 ) ColorLabels = 530 ( 1068 ) LayerLabels = 494 ( 1010 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 WHITE YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA WHITE YELLOW ( BLUE CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 11 ( 12 ) LAYERS : Layers = 10 110 111 121 131 2 3 5 51 7 9 ( 10 110 111 121 131 2 3 5 51 6 7 9 ) diff --git a/tests/de/iges_2/F1 b/tests/de/iges_2/F1 index 3f705a6e42..e9cd002b01 100755 --- a/tests/de/iges_2/F1 +++ b/tests/de/iges_2/F1 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 2.113937626e+017 ( 2.113937968e+017 ) AvgTol = 9.7 LABELS : N0Labels = 7 ( 7 ) N1Labels = 450 ( 2042 ) N2Labels = 0 ( 0 ) TotalLabels = 457 ( 2049 ) NameLabels = 457 ( 698 ) ColorLabels = 450 ( 2043 ) LayerLabels = 449 ( 2042 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = BLUE1 GREEN MAGENTA1 RED RED3 WHITE YELLOW ( BLUE1 GREEN MAGENTA1 RED RED3 WHITE YELLOW ) +COLORS : Colors = BLUE GREEN MAGENTA RED RED3 WHITE YELLOW ( BLUE GREEN MAGENTA RED RED3 WHITE YELLOW ) NLAYERS : NLayers = 27 ( 29 ) LAYERS : Layers = 10 11 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 180 4 5 6 7 8 ( 1 10 11 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 4 5 6 7 8 ) diff --git a/tests/de/iges_2/F2 b/tests/de/iges_2/F2 index 7fbc94ff80..565bbfd334 100755 --- a/tests/de/iges_2/F2 +++ b/tests/de/iges_2/F2 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.6679845366 ( 0.6679845366 ) AvgTol = 0.00440 LABELS : N0Labels = 4 ( 7 ) N1Labels = 804 ( 1805 ) N2Labels = 0 ( 0 ) TotalLabels = 808 ( 1812 ) NameLabels = 744 ( 1292 ) ColorLabels = 804 ( 1802 ) LayerLabels = 272 ( 884 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) -COLORS : Colors = CYAN1 GREEN MAGENTA1 MAGENTA4 RED WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 MAGENTA4 RED WHITE ) +COLORS : Colors = CYAN GREEN MAGENTA MAGENTA4 RED WHITE ( BLUE CYAN GREEN MAGENTA MAGENTA4 RED WHITE ) NLAYERS : NLayers = 7 ( 10 ) LAYERS : Layers = 200 214 240 255 4 51 7 ( 192 200 214 221 239 240 255 4 51 7 ) diff --git a/tests/de/iges_2/F3 b/tests/de/iges_2/F3 index a053f5e070..6c5248fd03 100755 --- a/tests/de/iges_2/F3 +++ b/tests/de/iges_2/F3 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.9498862984 ( 0.9498862984 ) AvgTol = 0.0082 LABELS : N0Labels = 3 ( 6 ) N1Labels = 454 ( 1943 ) N2Labels = 0 ( 0 ) TotalLabels = 457 ( 1949 ) NameLabels = 393 ( 870 ) ColorLabels = 454 ( 1940 ) LayerLabels = 450 ( 1923 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 7 ) -COLORS : Colors = CYAN1 GREEN MAGENTA1 RED WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = CYAN GREEN MAGENTA RED WHITE ( BLUE CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 4 ( 6 ) LAYERS : Layers = 200 240 255 4 ( 192 200 239 240 255 4 ) diff --git a/tests/de/iges_2/F4 b/tests/de/iges_2/F4 index 504206b59e..e4c24b7f81 100755 --- a/tests/de/iges_2/F4 +++ b/tests/de/iges_2/F4 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.9816000285 ( 5.284023931 ) AvgTol = 0.0248 LABELS : N0Labels = 12 ( 32 ) N1Labels = 3661 ( 3676 ) N2Labels = 0 ( 0 ) TotalLabels = 3673 ( 3708 ) NameLabels = 12 ( 3696 ) ColorLabels = 3661 ( 3672 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 10 ( 11 ) -COLORS : Colors = BLUE1 DEEPSKYBLUE2 DODGERBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED TURQUOISE4 WHITE ( BLUE1 DEEPSKYBLUE2 DODGERBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED TURQUOISE4 WHITE YELLOW ) +COLORS : Colors = BLUE DEEPSKYBLUE2 DODGERBLUE2 GREEN MAGENTA ORANGE ORANGERED RED TURQUOISE4 WHITE ( BLUE DEEPSKYBLUE2 DODGERBLUE2 GREEN MAGENTA ORANGE ORANGERED RED TURQUOISE4 WHITE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_2/F5 b/tests/de/iges_2/F5 index 477283ced2..da0abdaba0 100755 --- a/tests/de/iges_2/F5 +++ b/tests/de/iges_2/F5 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.0779303086 ( 0.07793030858 ) AvgTol = 6.70809 LABELS : N0Labels = 4 ( 39 ) N1Labels = 2431 ( 4252 ) N2Labels = 0 ( 0 ) TotalLabels = 2435 ( 4291 ) NameLabels = 2357 ( 2885 ) ColorLabels = 2431 ( 4217 ) LayerLabels = 220 ( 515 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) -COLORS : Colors = BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE GREEN MAGENTA RED WHITE YELLOW ( BLUE CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 1 ( 4 ) LAYERS : Layers = 50 ( 255 30 5 50 ) diff --git a/tests/de/iges_2/F6 b/tests/de/iges_2/F6 index 35bc1ba303..e4ff862a15 100755 --- a/tests/de/iges_2/F6 +++ b/tests/de/iges_2/F6 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 5 ( 17 ) N1Labels = 284 ( 298 ) N2Labels = 0 ( 0 ) TotalLabels = 289 ( 315 ) NameLabels = 5 ( 28 ) ColorLabels = 284 ( 309 ) LayerLabels = 0 ( 309 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 5 ) -COLORS : Colors = RED WHITE ( CYAN1 GREEN RED WHITE YELLOW ) +COLORS : Colors = RED WHITE ( CYAN GREEN RED WHITE YELLOW ) NLAYERS : NLayers = 0 ( 4 ) LAYERS : Layers = ( 1 11 2 3 ) diff --git a/tests/de/iges_2/F8 b/tests/de/iges_2/F8 index c62eff699b..103ed61ff6 100755 --- a/tests/de/iges_2/F8 +++ b/tests/de/iges_2/F8 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.07760384877 ( 0.07760384877 ) AvgTol = 0.00199 LABELS : N0Labels = 19 ( 19 ) N1Labels = 347 ( 612 ) N2Labels = 0 ( 0 ) TotalLabels = 366 ( 631 ) NameLabels = 366 ( 433 ) ColorLabels = 357 ( 629 ) LayerLabels = 357 ( 629 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 6 ) -COLORS : Colors = BLUE1 GREEN MAGENTA2 WHITE YELLOW ( BLUE1 GREEN MAGENTA2 RED WHITE YELLOW ) +COLORS : Colors = BLUE GREEN MAGENTA2 WHITE YELLOW ( BLUE GREEN MAGENTA2 RED WHITE YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 20 ( 20 ) diff --git a/tests/de/iges_2/G2 b/tests/de/iges_2/G2 index fbb1e81d75..b20d62ad94 100644 --- a/tests/de/iges_2/G2 +++ b/tests/de/iges_2/G2 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.4314224119 ( 0.2157335194 ) AvgTol = 0.00127 LABELS : N0Labels = 560 ( 560 ) N1Labels = 94 ( 90 ) N2Labels = 0 ( 0 ) TotalLabels = 654 ( 650 ) NameLabels = 648 ( 650 ) ColorLabels = 554 ( 640 ) LayerLabels = 554 ( 640 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 GREEN RED ( CYAN1 GREEN RED ) +COLORS : Colors = CYAN GREEN RED ( CYAN GREEN RED ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 10 20 ( 1 10 20 ) diff --git a/tests/de/iges_2/G3 b/tests/de/iges_2/G3 index 79af28d531..3aa2940fc6 100644 --- a/tests/de/iges_2/G3 +++ b/tests/de/iges_2/G3 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 784 ( 784 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 784 ( 784 ) NameLabels = 784 ( 784 ) ColorLabels = 783 ( 784 ) LayerLabels = 783 ( 784 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 2 ) -COLORS : Colors = YELLOW ( MAGENTA1 YELLOW ) +COLORS : Colors = YELLOW ( MAGENTA YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 5 ( 5 ) diff --git a/tests/de/iges_2/G4 b/tests/de/iges_2/G4 index 1bc87e049c..1959deeaab 100755 --- a/tests/de/iges_2/G4 +++ b/tests/de/iges_2/G4 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.01225276587 ( 0.01225276466 ) AvgTol = 0.00018 LABELS : N0Labels = 1524 ( 1524 ) N1Labels = 0 ( 26428 ) N2Labels = 0 ( 0 ) TotalLabels = 1524 ( 27952 ) NameLabels = 1524 ( 1530 ) ColorLabels = 1497 ( 27952 ) LayerLabels = 1107 ( 1134 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = CYAN1 WHITE ( CYAN1 WHITE ) +COLORS : Colors = CYAN WHITE ( CYAN WHITE ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 1 ( 1 ) diff --git a/tests/de/iges_2/G5 b/tests/de/iges_2/G5 index 898f6fbd0f..1c13348135 100644 --- a/tests/de/iges_2/G5 +++ b/tests/de/iges_2/G5 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.01698924283 ( 0.03769875288 ) AvgTol = 0.00027 LABELS : N0Labels = 1784 ( 1784 ) N1Labels = 0 ( 1660 ) N2Labels = 0 ( 0 ) TotalLabels = 1784 ( 3444 ) NameLabels = 1784 ( 1784 ) ColorLabels = 1761 ( 3444 ) LayerLabels = 1761 ( 1784 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 8 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ( BLACK BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA RED WHITE YELLOW ( BLACK BLUE CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 5 ( 5 ) LAYERS : Layers = 1 11 214 239 4 ( 1 11 214 239 4 ) diff --git a/tests/de/iges_2/G7 b/tests/de/iges_2/G7 index c3e5599ec4..6155cdf9f1 100644 --- a/tests/de/iges_2/G7 +++ b/tests/de/iges_2/G7 @@ -18,7 +18,7 @@ TOLERANCE : MaxTol = 0.9978911708 ( 0.9978911666 ) AvgTol = 0.0121 LABELS : N0Labels = 1 ( 1 ) N1Labels = 1596 ( 5187 ) N2Labels = 0 ( 0 ) TotalLabels = 1597 ( 5188 ) NameLabels = 1597 ( 2711 ) ColorLabels = 1596 ( 5187 ) LayerLabels = 1596 ( 5187 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 7 ) -COLORS : Colors = BLUE1 WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE WHITE ( BLUE CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 1 254 ( 1 254 ) diff --git a/tests/de/iges_2/G8 b/tests/de/iges_2/G8 index 42cd9f191b..eb408ac2f2 100644 --- a/tests/de/iges_2/G8 +++ b/tests/de/iges_2/G8 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.04838312754 ( 0.0483782783 ) AvgTol = 0.00292 LABELS : N0Labels = 8 ( 8 ) N1Labels = 269 ( 2700 ) N2Labels = 0 ( 0 ) TotalLabels = 277 ( 2708 ) NameLabels = 277 ( 384 ) ColorLabels = 272 ( 2706 ) LayerLabels = 272 ( 2706 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) -COLORS : Colors = BLUE1 WHITE YELLOW ( BLUE1 GREEN WHITE YELLOW ) +COLORS : Colors = BLUE WHITE YELLOW ( BLUE GREEN WHITE YELLOW ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 101 201 51 61 ( 101 201 51 61 ) diff --git a/tests/de/iges_2/G9 b/tests/de/iges_2/G9 index 51b5b1a002..980629099a 100755 --- a/tests/de/iges_2/G9 +++ b/tests/de/iges_2/G9 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.05705560511 ( 0.05705560511 ) AvgTol = 0.00026 LABELS : N0Labels = 54 ( 54 ) N1Labels = 10590 ( 27260 ) N2Labels = 0 ( 0 ) TotalLabels = 10644 ( 27314 ) NameLabels = 10644 ( 13414 ) ColorLabels = 10590 ( 27312 ) LayerLabels = 7 ( 18 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) -COLORS : Colors = BLUE1 CYAN1 GREEN GREEN3 MAGENTA1 RED WHITE YELLOW ( BLUE1 CYAN1 GREEN GREEN3 MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE CYAN GREEN GREEN3 MAGENTA RED WHITE YELLOW ( BLUE CYAN GREEN GREEN3 MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 204 ( 204 ) diff --git a/tests/de/iges_2/H2 b/tests/de/iges_2/H2 index 42d180f545..920620c3d5 100644 --- a/tests/de/iges_2/H2 +++ b/tests/de/iges_2/H2 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 139 ( 139 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 139 ( 139 ) NameLabels = 139 ( 139 ) ColorLabels = 0 ( 139 ) LayerLabels = 0 ( 139 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 0 ( 1 ) -COLORS : Colors = ( CYAN1 ) +COLORS : Colors = ( CYAN ) NLAYERS : NLayers = 0 ( 139 ) LAYERS : Layers = ( 10 100 101 102 103 104 105 106 107 108 109 11 110 111 112 113 114 115 116 117 118 119 12 120 121 122 123 124 125 126 127 128 129 13 130 131 132 133 134 135 136 137 138 139 14 140 15 16 17 18 19 2 20 21 22 23 24 25 26 27 28 29 3 30 31 32 33 34 35 36 37 38 39 4 40 41 42 43 44 45 46 47 48 49 5 50 51 52 53 54 55 56 57 58 59 6 60 61 62 63 64 65 66 67 68 69 7 70 71 72 73 74 75 76 77 78 79 8 80 81 82 83 84 85 86 87 88 89 9 90 91 92 93 94 95 96 97 98 99 ) diff --git a/tests/de/iges_2/H3 b/tests/de/iges_2/H3 index 8f848a791c..933b88f554 100755 --- a/tests/de/iges_2/H3 +++ b/tests/de/iges_2/H3 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.6023944505 ( 0.6023945025 ) AvgTol = 0.00729 LABELS : N0Labels = 8 ( 11 ) N1Labels = 949 ( 1809 ) N2Labels = 0 ( 0 ) TotalLabels = 957 ( 1820 ) NameLabels = 955 ( 1263 ) ColorLabels = 949 ( 1807 ) LayerLabels = 917 ( 1774 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 12 ( 14 ) -COLORS : Colors = BLUE1 CHOCOLATE2 DARKGOLDENROD4 DEEPSKYBLUE2 GOLD4 GREEN KHAKI1 KHAKI2 LEMONCHIFFON1 RED WHITE YELLOW ( BLUE1 CHOCOLATE2 DARKGOLDENROD4 DEEPSKYBLUE2 FIREBRICK4 GOLD4 GREEN KHAKI1 KHAKI2 LEMONCHIFFON1 RED TURQUOISE4 WHITE YELLOW ) +COLORS : Colors = BLUE CHOCOLATE2 DARKGOLDENROD4 DEEPSKYBLUE2 GOLD4 GREEN KHAKI1 KHAKI2 LEMONCHIFFON1 RED WHITE YELLOW ( BLUE CHOCOLATE2 DARKGOLDENROD4 DEEPSKYBLUE2 FIREBRICK4 GOLD4 GREEN KHAKI1 KHAKI2 LEMONCHIFFON1 RED TURQUOISE4 WHITE YELLOW ) NLAYERS : NLayers = 10 ( 13 ) LAYERS : Layers = 12 13 23 249 252 50 52 54 60 71 ( 12 13 23 244 246 249 252 50 52 54 60 70 71 ) diff --git a/tests/de/iges_2/H4 b/tests/de/iges_2/H4 index 8518edbb9b..6b926c3cd0 100755 --- a/tests/de/iges_2/H4 +++ b/tests/de/iges_2/H4 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.9970503224 ( 0.9970502696 ) AvgTol = 0.0172 LABELS : N0Labels = 9 ( 9 ) N1Labels = 896 ( 1691 ) N2Labels = 0 ( 0 ) TotalLabels = 905 ( 1700 ) NameLabels = 905 ( 1233 ) ColorLabels = 896 ( 1692 ) LayerLabels = 864 ( 1659 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) -COLORS : Colors = BLUE1 LEMONCHIFFON1 RED RED4 WHITE YELLOW ( BLUE1 GREEN LEMONCHIFFON1 RED RED4 WHITE YELLOW ) +COLORS : Colors = BLUE LEMONCHIFFON1 RED RED4 WHITE YELLOW ( BLUE GREEN LEMONCHIFFON1 RED RED4 WHITE YELLOW ) NLAYERS : NLayers = 12 ( 16 ) LAYERS : Layers = 11 12 13 20 249 252 50 52 54 55 60 71 ( 10 11 12 13 20 246 249 252 50 52 54 55 60 65 70 71 ) diff --git a/tests/de/iges_2/H5 b/tests/de/iges_2/H5 index 82c399384b..a396834c4d 100755 --- a/tests/de/iges_2/H5 +++ b/tests/de/iges_2/H5 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.7457094468 ( 0.7457094468 ) AvgTol = 0.0227 LABELS : N0Labels = 2 ( 2 ) N1Labels = 164 ( 766 ) N2Labels = 0 ( 0 ) TotalLabels = 166 ( 768 ) NameLabels = 164 ( 259 ) ColorLabels = 164 ( 766 ) LayerLabels = 162 ( 764 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 3 ) -COLORS : Colors = MAGENTA1 WHITE ( CYAN1 MAGENTA1 WHITE ) +COLORS : Colors = MAGENTA WHITE ( CYAN MAGENTA WHITE ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 4 ( 4 ) diff --git a/tests/de/iges_2/H7 b/tests/de/iges_2/H7 index bc9aac47dd..edb7c373d6 100644 --- a/tests/de/iges_2/H7 +++ b/tests/de/iges_2/H7 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.5291749398 ( 0.5291749268 ) AvgTol = 0.00849 LABELS : N0Labels = 1597 ( 1597 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1597 ( 1597 ) NameLabels = 1597 ( 1597 ) ColorLabels = 1580 ( 1597 ) LayerLabels = 1580 ( 1597 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 11 ( 12 ) -COLORS : Colors = BURLYWOOD1 CHARTREUSE CYAN1 DARKORANGE GREEN KHAKI1 LIGHTSALMON1 LIGHTSTEELBLUE2 ORCHID1 WHITE YELLOW ( BURLYWOOD1 CHARTREUSE CYAN1 DARKORANGE DEEPSKYBLUE1 GREEN KHAKI1 LIGHTSALMON1 LIGHTSTEELBLUE2 ORCHID1 WHITE YELLOW ) +COLORS : Colors = BURLYWOOD1 CHARTREUSE CYAN DARKORANGE GREEN KHAKI1 LIGHTSALMON1 LIGHTSTEELBLUE2 ORCHID1 WHITE YELLOW ( BURLYWOOD1 CHARTREUSE CYAN DARKORANGE DEEPSKYBLUE1 GREEN KHAKI1 LIGHTSALMON1 LIGHTSTEELBLUE2 ORCHID1 WHITE YELLOW ) NLAYERS : NLayers = 17 ( 19 ) LAYERS : Layers = 11 12 130 14 15 16 17 18 19 21 62 63 65 66 68 69 75 ( 11 12 130 14 15 16 17 18 19 21 61 62 63 64 65 66 68 69 75 ) diff --git a/tests/de/iges_2/H8 b/tests/de/iges_2/H8 index 7d82b240cb..36f928f872 100644 --- a/tests/de/iges_2/H8 +++ b/tests/de/iges_2/H8 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 5705 ( 5705 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 5705 ( 5705 ) NameLabels = 5705 ( 5705 ) ColorLabels = 4 ( 5705 ) LayerLabels = 0 ( 5700 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 3 ) -COLORS : Colors = BLUE1 GREEN ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 1 ) LAYERS : Layers = ( 1 ) diff --git a/tests/de/iges_2/H9 b/tests/de/iges_2/H9 index 6bdff01c72..e66e62c1a0 100755 --- a/tests/de/iges_2/H9 +++ b/tests/de/iges_2/H9 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 9.510579727e+086 ( 8.081584677e+086 ) AvgTol = 8.5 LABELS : N0Labels = 6 ( 6 ) N1Labels = 1643 ( 9836 ) N2Labels = 0 ( 0 ) TotalLabels = 1649 ( 9842 ) NameLabels = 1649 ( 2893 ) ColorLabels = 1645 ( 9841 ) LayerLabels = 489 ( 4144 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 5 ) -COLORS : Colors = BLUE1 CYAN1 GOLD3 GREEN ( BLUE1 CYAN1 GOLD3 GREEN YELLOW ) +COLORS : Colors = BLUE CYAN GOLD3 GREEN ( BLUE CYAN GOLD3 GREEN YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 1 ( 1 ) diff --git a/tests/de/iges_2/I1 b/tests/de/iges_2/I1 index cfa6443f04..25e462adb7 100644 --- a/tests/de/iges_2/I1 +++ b/tests/de/iges_2/I1 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.9892459055 ( 0.9892459128 ) AvgTol = 0.00474 LABELS : N0Labels = 10 ( 10 ) N1Labels = 553 ( 1961 ) N2Labels = 0 ( 0 ) TotalLabels = 563 ( 1971 ) NameLabels = 563 ( 909 ) ColorLabels = 553 ( 1970 ) LayerLabels = 533 ( 1938 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 8 ) -COLORS : Colors = BLACK BLUE1 GREEN RED WHITE YELLOW ( BLACK BLUE1 CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLACK BLUE GREEN RED WHITE YELLOW ( BLACK BLUE CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 11 ( 13 ) LAYERS : Layers = 1 101 103 2 3 32 4 52 61 70 77 ( 1 101 102 103 2 3 30 32 4 52 61 70 77 ) diff --git a/tests/de/iges_2/I2 b/tests/de/iges_2/I2 index bf10b6cd47..6233f68d4e 100644 --- a/tests/de/iges_2/I2 +++ b/tests/de/iges_2/I2 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 1e-005 ( 1e-005 ) AvgTol = 3.09023 LABELS : N0Labels = 212 ( 212 ) N1Labels = 0 ( 72 ) N2Labels = 0 ( 0 ) TotalLabels = 212 ( 284 ) NameLabels = 212 ( 212 ) ColorLabels = 211 ( 284 ) LayerLabels = 211 ( 284 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 5 ) -COLORS : Colors = BLUE1 CYAN1 GREEN WHITE ( BLUE1 CYAN1 GREEN MAGENTA1 WHITE ) +COLORS : Colors = BLUE CYAN GREEN WHITE ( BLUE CYAN GREEN MAGENTA WHITE ) NLAYERS : NLayers = 1 ( 2 ) LAYERS : Layers = 1 ( 1 220 ) diff --git a/tests/de/iges_2/I4 b/tests/de/iges_2/I4 index 9ba20c67c2..43904eca82 100644 --- a/tests/de/iges_2/I4 +++ b/tests/de/iges_2/I4 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.9808242672 ( 0.9808242374 ) AvgTol = 0.00497 LABELS : N0Labels = 4 ( 4 ) N1Labels = 422 ( 771 ) N2Labels = 0 ( 0 ) TotalLabels = 426 ( 775 ) NameLabels = 426 ( 528 ) ColorLabels = 422 ( 771 ) LayerLabels = 422 ( 771 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 8 ) -COLORS : Colors = BLUE1 GREEN3 RED TURQUOISE1 WHITE YELLOW ( BLUE1 GREEN3 GREEN4 MEDIUMORCHID RED TURQUOISE1 WHITE YELLOW ) +COLORS : Colors = BLUE GREEN3 RED TURQUOISE1 WHITE YELLOW ( BLUE GREEN3 GREEN4 MEDIUMORCHID RED TURQUOISE1 WHITE YELLOW ) NLAYERS : NLayers = 11 ( 12 ) LAYERS : Layers = 101 102 103 104 110 130 190 40 41 42 43 ( 101 102 103 104 110 130 185 190 40 41 42 43 ) diff --git a/tests/de/iges_2/I5 b/tests/de/iges_2/I5 index fc2de6afdf..89f0791656 100755 --- a/tests/de/iges_2/I5 +++ b/tests/de/iges_2/I5 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.9589015104 ( 0.9589015104 ) AvgTol = 0.0182 LABELS : N0Labels = 33 ( 33 ) N1Labels = 4502 ( 6695 ) N2Labels = 0 ( 0 ) TotalLabels = 4535 ( 6728 ) NameLabels = 4535 ( 4624 ) ColorLabels = 4522 ( 6715 ) LayerLabels = 4281 ( 6430 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 9 ) -COLORS : Colors = BLUE1 CYAN1 GREEN GREEN3 MAGENTA1 RED WHITE YELLOW ( BLUE1 CYAN1 GRAY80 GREEN GREEN3 MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE CYAN GREEN GREEN3 MAGENTA RED WHITE YELLOW ( BLUE CYAN GRAY80 GREEN GREEN3 MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 6 ( 6 ) LAYERS : Layers = 10 200 201 3 40 45 ( 10 200 201 3 40 45 ) diff --git a/tests/de/iges_2/I6 b/tests/de/iges_2/I6 index b43c5cc6f2..36d40f5303 100644 --- a/tests/de/iges_2/I6 +++ b/tests/de/iges_2/I6 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.03734358068 ( 0.03734358027 ) AvgTol = 0.00032 LABELS : N0Labels = 1 ( 1 ) N1Labels = 158 ( 421 ) N2Labels = 0 ( 0 ) TotalLabels = 159 ( 422 ) NameLabels = 159 ( 334 ) ColorLabels = 158 ( 421 ) LayerLabels = 0 ( 96 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 4 ) -COLORS : Colors = MAGENTA1 YELLOW ( BLUE1 MAGENTA1 RED YELLOW ) +COLORS : Colors = MAGENTA YELLOW ( BLUE MAGENTA RED YELLOW ) NLAYERS : NLayers = 0 ( 1 ) LAYERS : Layers = ( 60 ) diff --git a/tests/de/iges_2/I7 b/tests/de/iges_2/I7 index 2d27f04968..3f4ef19a88 100644 --- a/tests/de/iges_2/I7 +++ b/tests/de/iges_2/I7 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.2092687841 ( 0.2092687804 ) AvgTol = 0.00109 LABELS : N0Labels = 503 ( 503 ) N1Labels = 0 ( 200 ) N2Labels = 0 ( 0 ) TotalLabels = 503 ( 703 ) NameLabels = 503 ( 503 ) ColorLabels = 470 ( 703 ) LayerLabels = 313 ( 344 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) -COLORS : Colors = CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ( BLACK CYAN1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = CYAN GREEN MAGENTA RED WHITE YELLOW ( BLACK CYAN GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 8 ( 8 ) LAYERS : Layers = 1 101 102 103 104 106 107 200 ( 1 101 102 103 104 106 107 200 ) diff --git a/tests/de/iges_2/I8 b/tests/de/iges_2/I8 index f4420da1b7..1b5c8f1f62 100755 --- a/tests/de/iges_2/I8 +++ b/tests/de/iges_2/I8 @@ -18,7 +18,7 @@ TOLERANCE : MaxTol = 0.5957823778 ( 0.5957823778 ) AvgTol = 0.0024 LABELS : N0Labels = 2 ( 2 ) N1Labels = 657 ( 1428 ) N2Labels = 0 ( 0 ) TotalLabels = 659 ( 1430 ) NameLabels = 659 ( 1008 ) ColorLabels = 657 ( 1428 ) LayerLabels = 440 ( 1106 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 9 ( 10 ) -COLORS : Colors = BLUE1 BURLYWOOD1 CYAN1 DEEPSKYBLUE1 GREEN MAGENTA1 RED WHITE YELLOW ( BLUE1 BURLYWOOD1 CYAN1 DEEPSKYBLUE1 GREEN LEMONCHIFFON1 MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE BURLYWOOD1 CYAN DEEPSKYBLUE1 GREEN MAGENTA RED WHITE YELLOW ( BLUE BURLYWOOD1 CYAN DEEPSKYBLUE1 GREEN LEMONCHIFFON1 MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 10 ( 11 ) LAYERS : Layers = 10 100 11 2 24 25 27 3 4 66 ( 1 10 100 11 2 24 25 27 3 4 66 ) diff --git a/tests/de/iges_2/I9 b/tests/de/iges_2/I9 index 3f2644e617..4e4dd321ca 100644 --- a/tests/de/iges_2/I9 +++ b/tests/de/iges_2/I9 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.7859817704 ( 0.7859817704 ) AvgTol = 0.00573 LABELS : N0Labels = 2 ( 2 ) N1Labels = 2639 ( 3369 ) N2Labels = 0 ( 0 ) TotalLabels = 2641 ( 3371 ) NameLabels = 2641 ( 2850 ) ColorLabels = 2639 ( 3369 ) LayerLabels = 2607 ( 3332 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 9 ) -COLORS : Colors = CYAN1 DARKOLIVEGREEN2 GRAY67 LIGHTSKYBLUE1 MAGENTA3 MEDIUMPURPLE1 TAN1 ( CYAN1 DARKOLIVEGREEN2 GRAY67 HONEYDEW LIGHTSKYBLUE1 MAGENTA3 MEDIUMPURPLE1 PALETURQUOISE1 TAN1 ) +COLORS : Colors = CYAN DARKOLIVEGREEN2 GRAY67 LIGHTSKYBLUE1 MAGENTA3 MEDIUMPURPLE1 TAN1 ( CYAN DARKOLIVEGREEN2 GRAY67 HONEYDEW LIGHTSKYBLUE1 MAGENTA3 MEDIUMPURPLE1 PALETURQUOISE1 TAN1 ) NLAYERS : NLayers = 6 ( 7 ) LAYERS : Layers = 120 130 131 70 71 73 ( 120 121 130 131 70 71 73 ) diff --git a/tests/de/iges_2/J1 b/tests/de/iges_2/J1 index 5fb13c456c..40be648cf8 100644 --- a/tests/de/iges_2/J1 +++ b/tests/de/iges_2/J1 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.9940193324 ( 0.9940193324 ) AvgTol = 0.0161 LABELS : N0Labels = 1 ( 1 ) N1Labels = 711 ( 11812 ) N2Labels = 0 ( 0 ) TotalLabels = 712 ( 11813 ) NameLabels = 708 ( 765 ) ColorLabels = 711 ( 11812 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 5 ) -COLORS : Colors = BLUE1 RED WHITE ( BLUE1 GREEN RED TURQUOISE2 WHITE ) +COLORS : Colors = BLUE RED WHITE ( BLUE GREEN RED TURQUOISE2 WHITE ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/iges_3/A1 b/tests/de/iges_3/A1 index 5a983e6040..1334bd0dd6 100644 --- a/tests/de/iges_3/A1 +++ b/tests/de/iges_3/A1 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.08512566596 ( 0.08512566591 ) AvgTol = 0.00530 LABELS : N0Labels = 1155 ( 1155 ) N1Labels = 0 ( 1498 ) N2Labels = 0 ( 0 ) TotalLabels = 1155 ( 2653 ) NameLabels = 1155 ( 2265 ) ColorLabels = 1125 ( 2653 ) LayerLabels = 1125 ( 1125 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 4 ) -COLORS : Colors = GREEN ( GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = GREEN ( GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 16 18 ( 16 18 ) diff --git a/tests/de/iges_3/A2 b/tests/de/iges_3/A2 index 3a2367ab7d..a283bf5c6f 100755 --- a/tests/de/iges_3/A2 +++ b/tests/de/iges_3/A2 @@ -21,7 +21,7 @@ TOLERANCE : MaxTol = 3.181671016 ( 2716.882548 ) AvgTol = 0.00854 LABELS : N0Labels = 3 ( 3 ) N1Labels = 325 ( 1841 ) N2Labels = 0 ( 0 ) TotalLabels = 328 ( 1844 ) NameLabels = 328 ( 425 ) ColorLabels = 325 ( 1841 ) LayerLabels = 193 ( 1576 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 7 ) -COLORS : Colors = GREEN MATRABLUE RED RED4 WHITE YELLOW ( GREEN MAGENTA1 MATRABLUE RED RED4 WHITE YELLOW ) +COLORS : Colors = GREEN MATRABLUE RED RED4 WHITE YELLOW ( GREEN MAGENTA MATRABLUE RED RED4 WHITE YELLOW ) NLAYERS : NLayers = 2 ( 3 ) LAYERS : Layers = 1 253 ( 1 2 253 ) diff --git a/tests/de/iges_3/A4 b/tests/de/iges_3/A4 index df267c45a3..77afbac78d 100755 --- a/tests/de/iges_3/A4 +++ b/tests/de/iges_3/A4 @@ -19,7 +19,7 @@ TOLERANCE : MaxTol = 0.8099726869 ( 1.367966665 ) AvgTol = 0.00804 LABELS : N0Labels = 27 ( 27 ) N1Labels = 2100 ( 6248 ) N2Labels = 0 ( 0 ) TotalLabels = 2127 ( 6275 ) NameLabels = 2127 ( 2596 ) ColorLabels = 2114 ( 6274 ) LayerLabels = 2114 ( 6274 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 11 ( 12 ) -COLORS : Colors = BLUE1 CYAN1 CYAN2 DARKGOLDENROD GREEN MAGENTA1 PALEVIOLETRED1 RED TURQUOISE2 WHITE YELLOW ( BLUE1 CYAN1 CYAN2 DARKGOLDENROD GRAY53 GREEN MAGENTA1 PALEVIOLETRED1 RED TURQUOISE2 WHITE YELLOW ) +COLORS : Colors = BLUE CYAN CYAN2 DARKGOLDENROD GREEN MAGENTA PALEVIOLETRED1 RED TURQUOISE2 WHITE YELLOW ( BLUE CYAN CYAN2 DARKGOLDENROD GRAY53 GREEN MAGENTA PALEVIOLETRED1 RED TURQUOISE2 WHITE YELLOW ) NLAYERS : NLayers = 26 ( 27 ) LAYERS : Layers = 10 101 102 104 105 106 11 13 200 201 21 23 25 250 29 32 38 50 53 61 63 73 74 75 83 9 ( 10 101 102 104 105 106 11 13 200 201 21 23 24 25 250 29 32 38 50 53 61 63 73 74 75 83 9 ) diff --git a/tests/de/iges_3/A7 b/tests/de/iges_3/A7 index 41f8f2918d..dc7d5a48d5 100644 --- a/tests/de/iges_3/A7 +++ b/tests/de/iges_3/A7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.6305328468 ( 0.6305328468 ) AvgTol = 0.00037 LABELS : N0Labels = 1 ( 1 ) N1Labels = 31624 ( 37142 ) N2Labels = 0 ( 0 ) TotalLabels = 31625 ( 37143 ) NameLabels = 31621 ( 36777 ) ColorLabels = 31624 ( 37142 ) LayerLabels = 29174 ( 34054 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = GOLD3 MAGENTA1 WHITE YELLOW ( GOLD3 MAGENTA1 WHITE YELLOW ) +COLORS : Colors = GOLD3 MAGENTA WHITE YELLOW ( GOLD3 MAGENTA WHITE YELLOW ) NLAYERS : NLayers = 36 ( 36 ) LAYERS : Layers = 1 101 102 103 104 105 106 107 108 110 111 112 113 116 117 118 123 190 192 2 200 22 229 241 253 3 34 50 51 52 54 55 56 57 58 59 ( 1 101 102 103 104 105 106 107 108 110 111 112 113 116 117 118 123 190 192 2 200 22 229 241 253 3 34 50 51 52 54 55 56 57 58 59 ) diff --git a/tests/de/iges_3/A8 b/tests/de/iges_3/A8 index 6ee6864649..db7b46cb21 100755 --- a/tests/de/iges_3/A8 +++ b/tests/de/iges_3/A8 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.8904045146 ( 0.8904045345 ) AvgTol = 0.0124 LABELS : N0Labels = 1 ( 1 ) N1Labels = 501 ( 2306 ) N2Labels = 0 ( 0 ) TotalLabels = 502 ( 2307 ) NameLabels = 502 ( 770 ) ColorLabels = 501 ( 2306 ) LayerLabels = 443 ( 2228 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN RED WHITE ( BLUE1 GREEN RED WHITE ) +COLORS : Colors = BLUE GREEN RED WHITE ( BLUE GREEN RED WHITE ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 10 20 30 50 ( 10 20 30 50 ) diff --git a/tests/de/step_1/A5 b/tests/de/step_1/A5 index e6dd0f1e36..dc12c8c3d4 100644 --- a/tests/de/step_1/A5 +++ b/tests/de/step_1/A5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 4 ( 4 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 1 ( 1 ) ColorLabels = 4 ( 4 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN RED YELLOW ( BLUE1 GREEN RED YELLOW ) +COLORS : Colors = BLUE GREEN RED YELLOW ( BLUE GREEN RED YELLOW ) NLAYERS : NLayers = 0 ( 1 ) LAYERS : Layers = ( LayerA ) diff --git a/tests/de/step_1/A6 b/tests/de/step_1/A6 index 57e3acb3c7..1ab1d128e3 100644 --- a/tests/de/step_1/A6 +++ b/tests/de/step_1/A6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 17 ( 17 ) N1Labels = 25 ( 25 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 42 ( 42 ) ColorLabels = 12 ( 12 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 17 ( 42 ) Volume = 13 ( 13 ) Area = 13 ( 13 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 GREEN LIGHTSKYBLUE3 ( CYAN1 GREEN LIGHTSKYBLUE3 ) +COLORS : Colors = CYAN GREEN LIGHTSKYBLUE3 ( CYAN GREEN LIGHTSKYBLUE3 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/A7 b/tests/de/step_1/A7 index 8c07e86a09..145a0c27c9 100644 --- a/tests/de/step_1/A7 +++ b/tests/de/step_1/A7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.0002663644062 ( 0.004247173074 ) AvgTol = 6.0376 LABELS : N0Labels = 13 ( 13 ) N1Labels = 18 ( 23 ) N2Labels = 0 ( 5 ) TotalLabels = 31 ( 41 ) NameLabels = 27 ( 32 ) ColorLabels = 12 ( 12 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/A8 b/tests/de/step_1/A8 index cefb578344..f494efe406 100644 --- a/tests/de/step_1/A8 +++ b/tests/de/step_1/A8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 11 ( 11 ) N1Labels = 30 ( 30 ) N2Labels = 0 ( 0 ) TotalLabels = 41 ( 41 ) NameLabels = 26 ( 26 ) ColorLabels = 20 ( 20 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 14 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 DODGERBLUE2 GREEN RED ( BLUE1 DODGERBLUE2 GREEN RED ) +COLORS : Colors = BLUE DODGERBLUE2 GREEN RED ( BLUE DODGERBLUE2 GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/B4 b/tests/de/step_1/B4 index 136f14e2ed..cf696097b2 100644 --- a/tests/de/step_1/B4 +++ b/tests/de/step_1/B4 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.007676795012 ( 0.01770527621 ) AvgTol = 0.00014 LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 36 ( 36 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = MAGENTA1 MEDIUMSEAGREEN RED4 ( MAGENTA1 MEDIUMSEAGREEN RED4 ) +COLORS : Colors = MAGENTA MEDIUMSEAGREEN RED4 ( MAGENTA MEDIUMSEAGREEN RED4 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/B6 b/tests/de/step_1/B6 index a8db252e45..81c4be62fe 100644 --- a/tests/de/step_1/B6 +++ b/tests/de/step_1/B6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.01475021965 ( 0.01475021965 ) AvgTol = 0.00040 LABELS : N0Labels = 1 ( 1 ) N1Labels = 59 ( 61 ) N2Labels = 0 ( 0 ) TotalLabels = 60 ( 62 ) NameLabels = 1 ( 1 ) ColorLabels = 60 ( 62 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ) +COLORS : Colors = DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/B7 b/tests/de/step_1/B7 index fdfc0faade..88411f6bb9 100644 --- a/tests/de/step_1/B7 +++ b/tests/de/step_1/B7 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.01553531324 ( 0.04002196131 ) AvgTol = 0.00925 LABELS : N0Labels = 1 ( 1 ) N1Labels = 1 ( 1 ) N2Labels = 0 ( 0 ) TotalLabels = 2 ( 2 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = CYAN1 ( CYAN1 ) +COLORS : Colors = CYAN ( CYAN ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/B8 b/tests/de/step_1/B8 index ecff59972f..d3ea9ce4c7 100644 --- a/tests/de/step_1/B8 +++ b/tests/de/step_1/B8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.0004869324906 ( 0.0004869324906 ) AvgTol = 2.610 LABELS : N0Labels = 6 ( 6 ) N1Labels = 5 ( 6 ) N2Labels = 0 ( 1 ) TotalLabels = 11 ( 13 ) NameLabels = 11 ( 12 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 CHARTREUSE CYAN1 RED YELLOW ( BLUE1 CHARTREUSE CYAN1 RED YELLOW ) +COLORS : Colors = BLUE CHARTREUSE CYAN RED YELLOW ( BLUE CHARTREUSE CYAN RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/C1 b/tests/de/step_1/C1 index 592898dbdf..be62e023c2 100644 --- a/tests/de/step_1/C1 +++ b/tests/de/step_1/C1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 35 ( 35 ) N2Labels = 0 ( 0 ) TotalLabels = 44 ( 44 ) NameLabels = 22 ( 22 ) ColorLabels = 27 ( 27 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 22 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = BLUE1 DARKORANGE DARKORANGE GREEN RED YELLOW3 YELLOW3 ( BLUE1 DARKORANGE DARKORANGE GREEN RED YELLOW3 YELLOW3 ) +COLORS : Colors = BLUE DARKORANGE DARKORANGE GREEN RED YELLOW3 YELLOW3 ( BLUE DARKORANGE DARKORANGE GREEN RED YELLOW3 YELLOW3 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 256 ( 256 ) diff --git a/tests/de/step_1/F5 b/tests/de/step_1/F5 index dc8cb37b3c..a17a32ff74 100644 --- a/tests/de/step_1/F5 +++ b/tests/de/step_1/F5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 22 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 DARKORANGE GREEN RED YELLOW3 ( BLUE1 DARKORANGE GREEN RED YELLOW3 ) +COLORS : Colors = BLUE DARKORANGE GREEN RED YELLOW3 ( BLUE DARKORANGE GREEN RED YELLOW3 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 000 ( 000 ) diff --git a/tests/de/step_1/F7 b/tests/de/step_1/F7 index e0ed09ac3c..0508b7c828 100644 --- a/tests/de/step_1/F7 +++ b/tests/de/step_1/F7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 35 ( 35 ) N2Labels = 0 ( 0 ) TotalLabels = 44 ( 44 ) NameLabels = 22 ( 22 ) ColorLabels = 27 ( 27 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 22 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = BLUE1 DARKORANGE DARKORANGE GREEN RED YELLOW3 YELLOW3 ( BLUE1 DARKORANGE DARKORANGE GREEN RED YELLOW3 YELLOW3 ) +COLORS : Colors = BLUE DARKORANGE DARKORANGE GREEN RED YELLOW3 YELLOW3 ( BLUE DARKORANGE DARKORANGE GREEN RED YELLOW3 YELLOW3 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 256 ( 256 ) diff --git a/tests/de/step_1/G5 b/tests/de/step_1/G5 index d20e2f694b..1bae68cb76 100644 --- a/tests/de/step_1/G5 +++ b/tests/de/step_1/G5 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 0.0182458548 ( 0.0182458548 ) AvgTol = 0.00019 LABELS : N0Labels = 9 ( 9 ) N1Labels = 12 ( 12 ) N2Labels = 0 ( 0 ) TotalLabels = 21 ( 21 ) NameLabels = 19 ( 19 ) ColorLabels = 9 ( 9 ) LayerLabels = 9 ( 19 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = DODGERBLUE2 MAGENTA1 RED WHITE YELLOW ( DODGERBLUE2 MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = DODGERBLUE2 MAGENTA RED WHITE YELLOW ( DODGERBLUE2 MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 1 ( 2 ) LAYERS : Layers = 0 ( { 0} 255 ) diff --git a/tests/de/step_1/G6 b/tests/de/step_1/G6 index 1fe92bdda5..16b782657d 100644 --- a/tests/de/step_1/G6 +++ b/tests/de/step_1/G6 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 7.326475973e-006 ( 7.326473926e-006 ) AvgTol = 2.6 LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 19 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 12 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = CYAN1 GOLD3 RED3 TURQUOISE4 YELLOW ( CYAN1 GOLD3 RED3 TURQUOISE4 YELLOW ) +COLORS : Colors = CYAN GOLD3 RED3 TURQUOISE4 YELLOW ( CYAN GOLD3 RED3 TURQUOISE4 YELLOW ) NLAYERS : NLayers = 1 ( 2 ) LAYERS : Layers = 0 ( { 0} 255 ) diff --git a/tests/de/step_1/G7 b/tests/de/step_1/G7 index a7870f0652..80dc2505e3 100644 --- a/tests/de/step_1/G7 +++ b/tests/de/step_1/G7 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 19 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 12 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = CYAN1 GOLD3 RED3 TURQUOISE4 YELLOW ( CYAN1 GOLD3 RED3 TURQUOISE4 YELLOW ) +COLORS : Colors = CYAN GOLD3 RED3 TURQUOISE4 YELLOW ( CYAN GOLD3 RED3 TURQUOISE4 YELLOW ) NLAYERS : NLayers = 1 ( 2 ) LAYERS : Layers = 0 ( { 0} 255 ) diff --git a/tests/de/step_1/M3 b/tests/de/step_1/M3 index 6d9292e78b..d4ac5a4075 100644 --- a/tests/de/step_1/M3 +++ b/tests/de/step_1/M3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 5.221332616e-007 ( 5.221324664e-007 ) AvgTol = 1.1 LABELS : N0Labels = 1 ( 1 ) N1Labels = 16 ( 16 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 17 ) NameLabels = 1 ( 1 ) ColorLabels = 16 ( 16 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/M4 b/tests/de/step_1/M4 index 42c1395d6e..e113486d39 100644 --- a/tests/de/step_1/M4 +++ b/tests/de/step_1/M4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 5.202162431e-007 ( 5.202134543e-007 ) AvgTol = 1.1 LABELS : N0Labels = 1 ( 1 ) N1Labels = 16 ( 16 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 17 ) NameLabels = 1 ( 1 ) ColorLabels = 16 ( 16 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/M5 b/tests/de/step_1/M5 index 61861dd680..5f741b29f7 100644 --- a/tests/de/step_1/M5 +++ b/tests/de/step_1/M5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 5.221332616e-007 ( 5.221324664e-007 ) AvgTol = 1.1 LABELS : N0Labels = 1 ( 1 ) N1Labels = 16 ( 16 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 17 ) NameLabels = 1 ( 1 ) ColorLabels = 16 ( 16 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/M6 b/tests/de/step_1/M6 index 51038852a8..ca7ae8a4af 100644 --- a/tests/de/step_1/M6 +++ b/tests/de/step_1/M6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 5.202162431e-007 ( 5.202134543e-007 ) AvgTol = 1.2 LABELS : N0Labels = 1 ( 1 ) N1Labels = 16 ( 16 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 17 ) NameLabels = 1 ( 1 ) ColorLabels = 16 ( 16 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/N4 b/tests/de/step_1/N4 index b058be5278..474dfb030d 100644 --- a/tests/de/step_1/N4 +++ b/tests/de/step_1/N4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.003734968074 ( 0.009941326565 ) AvgTol = 0.00036 LABELS : N0Labels = 1 ( 1 ) N1Labels = 116 ( 116 ) N2Labels = 0 ( 0 ) TotalLabels = 117 ( 117 ) NameLabels = 1 ( 1 ) ColorLabels = 117 ( 117 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = MAGENTA1 RED ( MAGENTA1 RED ) +COLORS : Colors = MAGENTA RED ( MAGENTA RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/N5 b/tests/de/step_1/N5 index e18b68793d..7ea7325799 100644 --- a/tests/de/step_1/N5 +++ b/tests/de/step_1/N5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.003734968074 ( 0.00847629334 ) AvgTol = 0.00037 LABELS : N0Labels = 1 ( 1 ) N1Labels = 116 ( 116 ) N2Labels = 0 ( 0 ) TotalLabels = 117 ( 117 ) NameLabels = 1 ( 1 ) ColorLabels = 117 ( 117 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = MAGENTA1 RED ( MAGENTA1 RED ) +COLORS : Colors = MAGENTA RED ( MAGENTA RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/N6 b/tests/de/step_1/N6 index cb32f69562..8757f27ca1 100644 --- a/tests/de/step_1/N6 +++ b/tests/de/step_1/N6 @@ -13,7 +13,7 @@ TOLERANCE : MaxTol = 0.007713423702 ( 0.00997839292 ) AvgTol = 0.00075 LABELS : N0Labels = 7 ( 7 ) N1Labels = 10 ( 6 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 13 ) NameLabels = 13 ( 13 ) ColorLabels = 6 ( 4 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/N7 b/tests/de/step_1/N7 index 9e20b6d408..8d3bfc4926 100644 --- a/tests/de/step_1/N7 +++ b/tests/de/step_1/N7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.009731375059 ( 0.01295381237 ) AvgTol = 0.00038 LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 4 ( 4 ) LayerLabels = 33 ( 33 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = A_FLAECHEN ( A_FLAECHEN ) diff --git a/tests/de/step_1/N8 b/tests/de/step_1/N8 index 6790116aad..0129ca103c 100644 --- a/tests/de/step_1/N8 +++ b/tests/de/step_1/N8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.007676795012 ( 0.01770527621 ) AvgTol = 0.00014 LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 36 ( 36 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = MAGENTA1 MEDIUMSEAGREEN RED4 ( MAGENTA1 MEDIUMSEAGREEN RED4 ) +COLORS : Colors = MAGENTA MEDIUMSEAGREEN RED4 ( MAGENTA MEDIUMSEAGREEN RED4 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/N9 b/tests/de/step_1/N9 index 15bba985c5..937fef1468 100644 --- a/tests/de/step_1/N9 +++ b/tests/de/step_1/N9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.001493912454 ( 0.001493912451 ) AvgTol = 2.38859 LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 36 ( 36 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = MAGENTA1 MEDIUMSEAGREEN RED4 ( MAGENTA1 MEDIUMSEAGREEN RED4 ) +COLORS : Colors = MAGENTA MEDIUMSEAGREEN RED4 ( MAGENTA MEDIUMSEAGREEN RED4 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/Q4 b/tests/de/step_1/Q4 index 118a03389a..bfdcf1759e 100644 --- a/tests/de/step_1/Q4 +++ b/tests/de/step_1/Q4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.003591433268 ( 0.006109048795 ) AvgTol = 0.00047 LABELS : N0Labels = 3 ( 3 ) N1Labels = 87 ( 87 ) N2Labels = 0 ( 0 ) TotalLabels = 90 ( 90 ) NameLabels = 5 ( 5 ) ColorLabels = 86 ( 86 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ) +COLORS : Colors = DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/Q5 b/tests/de/step_1/Q5 index 2195d2f639..52f7c9e234 100644 --- a/tests/de/step_1/Q5 +++ b/tests/de/step_1/Q5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.003591433268 ( 0.006109048795 ) AvgTol = 0.00059 LABELS : N0Labels = 3 ( 3 ) N1Labels = 87 ( 87 ) N2Labels = 0 ( 0 ) TotalLabels = 90 ( 90 ) NameLabels = 5 ( 5 ) ColorLabels = 86 ( 86 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ) +COLORS : Colors = DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/R8 b/tests/de/step_1/R8 index a49090b61a..d51fd08bba 100644 --- a/tests/de/step_1/R8 +++ b/tests/de/step_1/R8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 14 ( 14 ) N1Labels = 19 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 33 ( 33 ) NameLabels = 33 ( 33 ) ColorLabels = 8 ( 8 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN MATRAGRAY RED ( BLUE1 GREEN MATRAGRAY RED ) +COLORS : Colors = BLUE GREEN MATRAGRAY RED ( BLUE GREEN MATRAGRAY RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/S2 b/tests/de/step_1/S2 index d18bd2c5d0..5e6f1da4ca 100644 --- a/tests/de/step_1/S2 +++ b/tests/de/step_1/S2 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.0001243142426 ( 0.0001243142426 ) AvgTol = 1.797 LABELS : N0Labels = 1 ( 1 ) N1Labels = 96 ( 96 ) N2Labels = 0 ( 0 ) TotalLabels = 97 ( 97 ) NameLabels = 1 ( 1 ) ColorLabels = 12 ( 12 ) LayerLabels = 84 ( 84 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 9 ( 9 ) -COLORS : Colors = CYAN1 DODGERBLUE2 GRAY67 GREEN MAGENTA1 MAGENTA3 RED WHITE YELLOW ( CYAN1 DODGERBLUE2 GRAY67 GREEN MAGENTA1 MAGENTA3 RED WHITE YELLOW ) +COLORS : Colors = CYAN DODGERBLUE2 GRAY67 GREEN MAGENTA MAGENTA3 RED WHITE YELLOW ( CYAN DODGERBLUE2 GRAY67 GREEN MAGENTA MAGENTA3 RED WHITE YELLOW ) NLAYERS : NLayers = 12 ( 12 ) LAYERS : Layers = 0 10 20 40 41 42 43 44 45 47 48 49 ( 0 10 20 40 41 42 43 44 45 47 48 49 ) diff --git a/tests/de/step_1/S9 b/tests/de/step_1/S9 index 021fc0e56e..c92cb2bb16 100644 --- a/tests/de/step_1/S9 +++ b/tests/de/step_1/S9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 16 ( 16 ) N2Labels = 0 ( 0 ) TotalLabels = 25 ( 25 ) NameLabels = 22 ( 22 ) ColorLabels = 8 ( 8 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/T7 b/tests/de/step_1/T7 index 9cb2fd0214..961bc2b882 100644 --- a/tests/de/step_1/T7 +++ b/tests/de/step_1/T7 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 6 ( 6 ) N1Labels = 71 ( 71 ) N2Labels = 0 ( 0 ) TotalLabels = 77 ( 77 ) NameLabels = 24 ( 24 ) ColorLabels = 8 ( 8 ) LayerLabels = 53 ( 53 ) PROPS : Centroid = 6 ( 6 ) Volume = 6 ( 6 ) Area = 6 ( 6 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN4 RED3 ( BLUE1 GREEN4 RED3 ) +COLORS : Colors = BLUE GREEN4 RED3 ( BLUE GREEN4 RED3 ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = LAYER_1 LAYER_2 LAYER_3 ( LAYER_1 LAYER_2 LAYER_3 ) diff --git a/tests/de/step_1/T8 b/tests/de/step_1/T8 index 112534a9df..96adb8d7df 100644 --- a/tests/de/step_1/T8 +++ b/tests/de/step_1/T8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 DARKORANGE GREEN RED YELLOW3 ( BLUE1 DARKORANGE GREEN RED YELLOW3 ) +COLORS : Colors = BLUE DARKORANGE GREEN RED YELLOW3 ( BLUE DARKORANGE GREEN RED YELLOW3 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 000 ( 000 ) diff --git a/tests/de/step_1/T9 b/tests/de/step_1/T9 index b01357b141..75c09a9354 100644 --- a/tests/de/step_1/T9 +++ b/tests/de/step_1/T9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/U1 b/tests/de/step_1/U1 index aa48a7020d..55c5c34557 100644 --- a/tests/de/step_1/U1 +++ b/tests/de/step_1/U1 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 99 ( 99 ) N2Labels = 0 ( 0 ) TotalLabels = 100 ( 100 ) NameLabels = 1 ( 1 ) ColorLabels = 99 ( 99 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/U4 b/tests/de/step_1/U4 index ecfd189fcb..8b00ad04d6 100644 --- a/tests/de/step_1/U4 +++ b/tests/de/step_1/U4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 16 ( 16 ) N2Labels = 0 ( 0 ) TotalLabels = 25 ( 25 ) NameLabels = 22 ( 22 ) ColorLabels = 8 ( 8 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN4 RED3 ( BLUE1 GREEN4 RED3 ) +COLORS : Colors = BLUE GREEN4 RED3 ( BLUE GREEN4 RED3 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/U6 b/tests/de/step_1/U6 index 9cf346a2bb..d4f92d4358 100644 --- a/tests/de/step_1/U6 +++ b/tests/de/step_1/U6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 DARKORANGE GREEN RED YELLOW3 ( BLUE1 DARKORANGE GREEN RED YELLOW3 ) +COLORS : Colors = BLUE DARKORANGE GREEN RED YELLOW3 ( BLUE DARKORANGE GREEN RED YELLOW3 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 000 ( 000 ) diff --git a/tests/de/step_1/U8 b/tests/de/step_1/U8 index b05ed1f3c2..0a4b62b7c6 100644 --- a/tests/de/step_1/U8 +++ b/tests/de/step_1/U8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.06901335768 ( 0.07236095994 ) AvgTol = 0.00082 LABELS : N0Labels = 13 ( 13 ) N1Labels = 21 ( 21 ) N2Labels = 0 ( 0 ) TotalLabels = 34 ( 34 ) NameLabels = 27 ( 27 ) ColorLabels = 15 ( 15 ) LayerLabels = 8 ( 8 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_1/U9 b/tests/de/step_1/U9 index 792a70b698..024f2147f3 100644 --- a/tests/de/step_1/U9 +++ b/tests/de/step_1/U9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.06901335768 ( 0.07236095994 ) AvgTol = 0.00082 LABELS : N0Labels = 13 ( 13 ) N1Labels = 21 ( 21 ) N2Labels = 0 ( 0 ) TotalLabels = 34 ( 34 ) NameLabels = 27 ( 27 ) ColorLabels = 15 ( 15 ) LayerLabels = 8 ( 8 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_1/V1 b/tests/de/step_1/V1 index 528fde6d7b..7670252291 100644 --- a/tests/de/step_1/V1 +++ b/tests/de/step_1/V1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 2.374473352e-006 ( 2.374473352e-006 ) AvgTol = 1.5 LABELS : N0Labels = 14 ( 14 ) N1Labels = 19 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 33 ( 33 ) NameLabels = 30 ( 30 ) ColorLabels = 11 ( 11 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/V2 b/tests/de/step_1/V2 index 28a7554ba0..10dcc11d83 100644 --- a/tests/de/step_1/V2 +++ b/tests/de/step_1/V2 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 2.374473352e-006 ( 2.374473352e-006 ) AvgTol = 1.5 LABELS : N0Labels = 14 ( 14 ) N1Labels = 19 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 33 ( 33 ) NameLabels = 30 ( 30 ) ColorLabels = 11 ( 11 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/V3 b/tests/de/step_1/V3 index 411b19bf53..ff045c3e8b 100644 --- a/tests/de/step_1/V3 +++ b/tests/de/step_1/V3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.0009770882201 ( 0.08941549678 ) AvgTol = 2.3882 LABELS : N0Labels = 14 ( 14 ) N1Labels = 14 ( 14 ) N2Labels = 0 ( 0 ) TotalLabels = 28 ( 28 ) NameLabels = 28 ( 28 ) ColorLabels = 9 ( 9 ) LayerLabels = 9 ( 9 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = CYAN1 DARKORANGE1 DARKORANGE3 GREEN MAGENTA1 RED YELLOW ( CYAN1 DARKORANGE1 DARKORANGE3 GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = CYAN DARKORANGE1 DARKORANGE3 GREEN MAGENTA RED YELLOW ( CYAN DARKORANGE1 DARKORANGE3 GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 1 110 28263 5 ( 1 110 28263 5 ) diff --git a/tests/de/step_1/V4 b/tests/de/step_1/V4 index 4368978e81..d70ebe6118 100644 --- a/tests/de/step_1/V4 +++ b/tests/de/step_1/V4 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.0007596213789 ( 0.0007596213789 ) AvgTol = 1.028 LABELS : N0Labels = 13 ( 13 ) N1Labels = 17 ( 17 ) N2Labels = 0 ( 0 ) TotalLabels = 30 ( 30 ) NameLabels = 27 ( 27 ) ColorLabels = 11 ( 11 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 13 ( 13 ) Volume = 13 ( 13 ) Area = 13 ( 13 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/V5 b/tests/de/step_1/V5 index 4ff324fb33..a627651aae 100644 --- a/tests/de/step_1/V5 +++ b/tests/de/step_1/V5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 6.233869107e-005 ( 6.542585968e-005 ) AvgTol = 1.1 LABELS : N0Labels = 13 ( 13 ) N1Labels = 19 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 32 ( 32 ) NameLabels = 27 ( 27 ) ColorLabels = 13 ( 13 ) LayerLabels = 8 ( 8 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 8 ( 8 ) LAYERS : Layers = 000 010 020 030 040 050 060 070 ( 000 010 020 030 040 050 060 070 ) diff --git a/tests/de/step_1/V8 b/tests/de/step_1/V8 index cd8dedb6e9..b661849ae1 100644 --- a/tests/de/step_1/V8 +++ b/tests/de/step_1/V8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.01475021965 ( 0.01475021965 ) AvgTol = 0.00040 LABELS : N0Labels = 1 ( 1 ) N1Labels = 59 ( 59 ) N2Labels = 0 ( 0 ) TotalLabels = 60 ( 60 ) NameLabels = 1 ( 1 ) ColorLabels = 60 ( 60 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ) +COLORS : Colors = DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/W4 b/tests/de/step_1/W4 index 31773b9308..bb7315412c 100644 --- a/tests/de/step_1/W4 +++ b/tests/de/step_1/W4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.0003598511661 ( 0.0003598511659 ) AvgTol = 3.390 LABELS : N0Labels = 8 ( 8 ) N1Labels = 7 ( 7 ) N2Labels = 0 ( 0 ) TotalLabels = 15 ( 15 ) NameLabels = 15 ( 15 ) ColorLabels = 7 ( 7 ) LayerLabels = 7 ( 7 ) PROPS : Centroid = 8 ( 8 ) Volume = 8 ( 8 ) Area = 8 ( 8 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ( BLUE1 GREEN MAGENTA1 RED WHITE YELLOW ) +COLORS : Colors = BLUE GREEN MAGENTA RED WHITE YELLOW ( BLUE GREEN MAGENTA RED WHITE YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_1/W6 b/tests/de/step_1/W6 index ad65122760..245fb39d5b 100644 --- a/tests/de/step_1/W6 +++ b/tests/de/step_1/W6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 2.374473352e-006 ( 5.010077728e-006 ) AvgTol = 1.6 LABELS : N0Labels = 14 ( 14 ) N1Labels = 18 ( 18 ) N2Labels = 0 ( 0 ) TotalLabels = 32 ( 32 ) NameLabels = 30 ( 30 ) ColorLabels = 9 ( 9 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 14 ( 14 ) Volume = 14 ( 14 ) Area = 14 ( 14 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/X3 b/tests/de/step_1/X3 index f7b9a3687a..399b359693 100644 --- a/tests/de/step_1/X3 +++ b/tests/de/step_1/X3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.01475021965 ( 0.01475021965 ) AvgTol = 0.00040 LABELS : N0Labels = 1 ( 1 ) N1Labels = 59 ( 59 ) N2Labels = 0 ( 0 ) TotalLabels = 60 ( 60 ) NameLabels = 1 ( 1 ) ColorLabels = 60 ( 60 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED RED ) +COLORS : Colors = DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ( DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/X8 b/tests/de/step_1/X8 index f1a60aa648..ffc863ce7e 100644 --- a/tests/de/step_1/X8 +++ b/tests/de/step_1/X8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.0006410770116 ( 0.000641077009 ) AvgTol = 1.7152 LABELS : N0Labels = 13 ( 13 ) N1Labels = 14 ( 14 ) N2Labels = 0 ( 0 ) TotalLabels = 27 ( 27 ) NameLabels = 27 ( 27 ) ColorLabels = 8 ( 8 ) LayerLabels = 8 ( 8 ) PROPS : Centroid = 13 ( 13 ) Volume = 13 ( 13 ) Area = 13 ( 13 ) NCOLORS : NColors = 8 ( 8 ) -COLORS : Colors = BLUE1 CYAN1 DARKGOLDENROD1 GREEN LIGHTPINK4 RED TURQUOISE4 YELLOW ( BLUE1 CYAN1 DARKGOLDENROD1 GREEN LIGHTPINK4 RED TURQUOISE4 YELLOW ) +COLORS : Colors = BLUE CYAN DARKGOLDENROD1 GREEN LIGHTPINK4 RED TURQUOISE4 YELLOW ( BLUE CYAN DARKGOLDENROD1 GREEN LIGHTPINK4 RED TURQUOISE4 YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_1/X9 b/tests/de/step_1/X9 index 810b1a1a9a..d2e9835fb7 100644 --- a/tests/de/step_1/X9 +++ b/tests/de/step_1/X9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.0006380346848 ( 0.0006380346818 ) AvgTol = 1.220 LABELS : N0Labels = 13 ( 13 ) N1Labels = 14 ( 14 ) N2Labels = 0 ( 0 ) TotalLabels = 27 ( 27 ) NameLabels = 27 ( 27 ) ColorLabels = 8 ( 8 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) -COLORS : Colors = BLUE3 CYAN1 DEEPSKYBLUE3 INDIANRED2 RED3 SANDYBROWN SPRINGGREEN3 YELLOW3 ( BLUE3 CYAN1 DEEPSKYBLUE3 INDIANRED2 RED3 SANDYBROWN SPRINGGREEN3 YELLOW3 ) +COLORS : Colors = BLUE3 CYAN DEEPSKYBLUE3 INDIANRED2 RED3 SANDYBROWN SPRINGGREEN3 YELLOW3 ( BLUE3 CYAN DEEPSKYBLUE3 INDIANRED2 RED3 SANDYBROWN SPRINGGREEN3 YELLOW3 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/Y2 b/tests/de/step_1/Y2 index ff9bb747ff..f94f909473 100644 --- a/tests/de/step_1/Y2 +++ b/tests/de/step_1/Y2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 15 ( 15 ) N1Labels = 66 ( 66 ) N2Labels = 0 ( 0 ) TotalLabels = 81 ( 81 ) NameLabels = 42 ( 42 ) ColorLabels = 39 ( 39 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 5 ( 5 ) Volume = 5 ( 5 ) Area = 5 ( 5 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/Z2 b/tests/de/step_1/Z2 index cc2dd19b73..2df007bd5e 100644 --- a/tests/de/step_1/Z2 +++ b/tests/de/step_1/Z2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 15 ( 15 ) N1Labels = 27 ( 27 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 42 ( 42 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 15 ( 15 ) Volume = 15 ( 15 ) Area = 15 ( 15 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/Z3 b/tests/de/step_1/Z3 index cd3982bf42..7a29d75b9e 100644 --- a/tests/de/step_1/Z3 +++ b/tests/de/step_1/Z3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 15 ( 15 ) N1Labels = 35 ( 35 ) N2Labels = 0 ( 0 ) TotalLabels = 50 ( 50 ) NameLabels = 42 ( 42 ) ColorLabels = 13 ( 13 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 6 ( 6 ) Volume = 6 ( 6 ) Area = 6 ( 6 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZB7 b/tests/de/step_1/ZB7 index 8de000f184..d936dae805 100644 --- a/tests/de/step_1/ZB7 +++ b/tests/de/step_1/ZB7 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.008981237811 ( 0.03359150725 ) AvgTol = 0.0019 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = MAGENTA1 ( MAGENTA1 ) +COLORS : Colors = MAGENTA ( MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZD8 b/tests/de/step_1/ZD8 index 8a975ed994..e0ad17d9d8 100644 --- a/tests/de/step_1/ZD8 +++ b/tests/de/step_1/ZD8 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 4 ( 4 ) N1Labels = 5 ( 5 ) N2Labels = 0 ( 0 ) TotalLabels = 9 ( 9 ) NameLabels = 8 ( 8 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = CYAN1 GREEN ( CYAN1 GREEN ) +COLORS : Colors = CYAN GREEN ( CYAN GREEN ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZD9 b/tests/de/step_1/ZD9 index 8686012547..6b87e4ba45 100644 --- a/tests/de/step_1/ZD9 +++ b/tests/de/step_1/ZD9 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 6 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZE3 b/tests/de/step_1/ZE3 index b308a1f46a..87d497bd85 100644 --- a/tests/de/step_1/ZE3 +++ b/tests/de/step_1/ZE3 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 6 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZE5 b/tests/de/step_1/ZE5 index f061a12b8a..d053d46510 100644 --- a/tests/de/step_1/ZE5 +++ b/tests/de/step_1/ZE5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 6 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZE6 b/tests/de/step_1/ZE6 index d0616546d9..e2421dabfa 100644 --- a/tests/de/step_1/ZE6 +++ b/tests/de/step_1/ZE6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 3 ( 4 ) N2Labels = 0 ( 0 ) TotalLabels = 6 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 2 ( 2 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 1 ( 1 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 YELLOW ( BLUE1 YELLOW ) +COLORS : Colors = BLUE YELLOW ( BLUE YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 03___PRT_ALL_CURVES 06___PRT_ALL_SURFS ( 03___PRT_ALL_CURVES 06___PRT_ALL_SURFS ) diff --git a/tests/de/step_1/ZE8 b/tests/de/step_1/ZE8 index b9025a3806..fa9e970029 100644 --- a/tests/de/step_1/ZE8 +++ b/tests/de/step_1/ZE8 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 26 ( 26 ) N2Labels = 0 ( 0 ) TotalLabels = 29 ( 29 ) NameLabels = 5 ( 5 ) ColorLabels = 24 ( 24 ) LayerLabels = 4 ( 4 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = CYAN1 GOLD3 GREEN GREEN4 MAGENTA1 MAGENTA3 YELLOW ( CYAN1 GOLD3 GREEN GREEN4 MAGENTA1 MAGENTA3 YELLOW ) +COLORS : Colors = CYAN GOLD3 GREEN GREEN4 MAGENTA MAGENTA3 YELLOW ( CYAN GOLD3 GREEN GREEN4 MAGENTA MAGENTA3 YELLOW ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 001 002 003 004 ( 001 002 003 004 ) diff --git a/tests/de/step_1/ZE9 b/tests/de/step_1/ZE9 index 43b8045ba6..e55392de50 100644 --- a/tests/de/step_1/ZE9 +++ b/tests/de/step_1/ZE9 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 3 ( 4 ) N2Labels = 0 ( 0 ) TotalLabels = 6 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 2 ( 2 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 1 ( 1 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 YELLOW ( BLUE1 YELLOW ) +COLORS : Colors = BLUE YELLOW ( BLUE YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 03___PRT_ALL_CURVES 06___PRT_ALL_SURFS ( 03___PRT_ALL_CURVES 06___PRT_ALL_SURFS ) diff --git a/tests/de/step_1/ZF3 b/tests/de/step_1/ZF3 index badb8c2835..8bde9af22f 100644 --- a/tests/de/step_1/ZF3 +++ b/tests/de/step_1/ZF3 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 5 ( 5 ) N1Labels = 18 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 23 ( 24 ) NameLabels = 9 ( 9 ) ColorLabels = 18 ( 19 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN RED YELLOW ( BLUE1 GREEN RED YELLOW ) +COLORS : Colors = BLUE GREEN RED YELLOW ( BLUE GREEN RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZF4 b/tests/de/step_1/ZF4 index 5111d702a7..47285a161d 100644 --- a/tests/de/step_1/ZF4 +++ b/tests/de/step_1/ZF4 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 6 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZF5 b/tests/de/step_1/ZF5 index 0724fcc7aa..8b57fb4dac 100644 --- a/tests/de/step_1/ZF5 +++ b/tests/de/step_1/ZF5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 3 ( 4 ) N2Labels = 0 ( 0 ) TotalLabels = 6 ( 7 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 2 ( 2 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 1 ( 1 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 YELLOW ( BLUE1 YELLOW ) +COLORS : Colors = BLUE YELLOW ( BLUE YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 03___PRT_ALL_CURVES 06___PRT_ALL_SURFS ( 03___PRT_ALL_CURVES 06___PRT_ALL_SURFS ) diff --git a/tests/de/step_1/ZF8 b/tests/de/step_1/ZF8 index 3cb2348e3e..a2e9bbef41 100644 --- a/tests/de/step_1/ZF8 +++ b/tests/de/step_1/ZF8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 6 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZF9 b/tests/de/step_1/ZF9 index 213b264eb9..af172dffab 100644 --- a/tests/de/step_1/ZF9 +++ b/tests/de/step_1/ZF9 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 4 ) NameLabels = 1 ( 1 ) ColorLabels = 2 ( 2 ) LayerLabels = 2 ( 2 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = DODGERBLUE2 MAGENTA1 ( DODGERBLUE2 MAGENTA1 ) +COLORS : Colors = DODGERBLUE2 MAGENTA ( DODGERBLUE2 MAGENTA ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( { 0} ) diff --git a/tests/de/step_1/ZG3 b/tests/de/step_1/ZG3 index 8a8ea329f6..aac382e1d4 100644 --- a/tests/de/step_1/ZG3 +++ b/tests/de/step_1/ZG3 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 7.325240325e-006 ( 7.325239943e-006 ) AvgTol = 2.4 LABELS : N0Labels = 13 ( 13 ) N1Labels = 26 ( 35 ) N2Labels = 0 ( 9 ) TotalLabels = 39 ( 57 ) NameLabels = 26 ( 31 ) ColorLabels = 5 ( 5 ) LayerLabels = 16 ( 16 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = CYAN1 GOLD3 RED3 TURQUOISE4 YELLOW ( CYAN1 GOLD3 RED3 TURQUOISE4 YELLOW ) +COLORS : Colors = CYAN GOLD3 RED3 TURQUOISE4 YELLOW ( CYAN GOLD3 RED3 TURQUOISE4 YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( { 0} ) diff --git a/tests/de/step_1/ZG7 b/tests/de/step_1/ZG7 index b7e1188dda..99f7770fab 100644 --- a/tests/de/step_1/ZG7 +++ b/tests/de/step_1/ZG7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 18 ) N2Labels = 0 ( 5 ) TotalLabels = 22 ( 32 ) NameLabels = 22 ( 27 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 DARKORANGE GREEN RED YELLOW3 ( BLUE1 DARKORANGE GREEN RED YELLOW3 ) +COLORS : Colors = BLUE DARKORANGE GREEN RED YELLOW3 ( BLUE DARKORANGE GREEN RED YELLOW3 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 000 ( 000 ) diff --git a/tests/de/step_1/ZG8 b/tests/de/step_1/ZG8 index 49949400e3..988d1e7a77 100644 --- a/tests/de/step_1/ZG8 +++ b/tests/de/step_1/ZG8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 18 ) N2Labels = 0 ( 5 ) TotalLabels = 22 ( 32 ) NameLabels = 22 ( 27 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 DARKORANGE GREEN RED YELLOW3 ( BLUE1 DARKORANGE GREEN RED YELLOW3 ) +COLORS : Colors = BLUE DARKORANGE GREEN RED YELLOW3 ( BLUE DARKORANGE GREEN RED YELLOW3 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 256 ( 256 ) diff --git a/tests/de/step_1/ZH2 b/tests/de/step_1/ZH2 index 530ff57339..5a81082d6b 100644 --- a/tests/de/step_1/ZH2 +++ b/tests/de/step_1/ZH2 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 4 ( 4 ) N1Labels = 14 ( 15 ) N2Labels = 0 ( 0 ) TotalLabels = 18 ( 19 ) NameLabels = 7 ( 7 ) ColorLabels = 14 ( 14 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 GREEN MAGENTA1 RED YELLOW ( BLUE1 GREEN MAGENTA1 RED YELLOW ) +COLORS : Colors = BLUE GREEN MAGENTA RED YELLOW ( BLUE GREEN MAGENTA RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZH5 b/tests/de/step_1/ZH5 index e9bc51157b..9f41eba1e1 100644 --- a/tests/de/step_1/ZH5 +++ b/tests/de/step_1/ZH5 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 4 ( 4 ) N1Labels = 4 ( 5 ) N2Labels = 0 ( 0 ) TotalLabels = 8 ( 9 ) NameLabels = 7 ( 7 ) ColorLabels = 2 ( 3 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 3 ) -COLORS : Colors = BLUE1 WHITE ( BLUE1 GREEN WHITE ) +COLORS : Colors = BLUE WHITE ( BLUE GREEN WHITE ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZH6 b/tests/de/step_1/ZH6 index 481e8e3849..3354fae984 100644 --- a/tests/de/step_1/ZH6 +++ b/tests/de/step_1/ZH6 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 4 ( 4 ) N1Labels = 5 ( 6 ) N2Labels = 0 ( 0 ) TotalLabels = 9 ( 10 ) NameLabels = 7 ( 7 ) ColorLabels = 3 ( 4 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 4 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 GREEN RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE GREEN RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZH8 b/tests/de/step_1/ZH8 index b7b71d4c05..212488c43e 100644 --- a/tests/de/step_1/ZH8 +++ b/tests/de/step_1/ZH8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZH9 b/tests/de/step_1/ZH9 index cfd2fd6bec..50f9d3d241 100644 --- a/tests/de/step_1/ZH9 +++ b/tests/de/step_1/ZH9 @@ -18,7 +18,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 4 ) NameLabels = 1 ( 1 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 1 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 YELLOW ( BLUE1 YELLOW ) +COLORS : Colors = BLUE YELLOW ( BLUE YELLOW ) NLAYERS : NLayers = 0 ( 1 ) LAYERS : Layers = ( 06___PRT_ALL_SURFS ) diff --git a/tests/de/step_1/ZI1 b/tests/de/step_1/ZI1 index daeac26a7f..eb45e73ed6 100644 --- a/tests/de/step_1/ZI1 +++ b/tests/de/step_1/ZI1 @@ -18,7 +18,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 2 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 4 ) NameLabels = 1 ( 1 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 1 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 YELLOW ( BLUE1 YELLOW ) +COLORS : Colors = BLUE YELLOW ( BLUE YELLOW ) NLAYERS : NLayers = 0 ( 1 ) LAYERS : Layers = ( 06___PRT_ALL_SURFS ) diff --git a/tests/de/step_1/ZI4 b/tests/de/step_1/ZI4 index 5348d1fc4c..97c6776847 100644 --- a/tests/de/step_1/ZI4 +++ b/tests/de/step_1/ZI4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 4.774870401e-005 ( 4.883502558e-005 ) AvgTol = 7.6 LABELS : N0Labels = 1 ( 1 ) N1Labels = 6 ( 6 ) N2Labels = 0 ( 0 ) TotalLabels = 7 ( 7 ) NameLabels = 1 ( 1 ) ColorLabels = 6 ( 6 ) LayerLabels = 4 ( 4 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN RED YELLOW ( BLUE1 GREEN RED YELLOW ) +COLORS : Colors = BLUE GREEN RED YELLOW ( BLUE GREEN RED YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 1 15 ( 1 15 ) diff --git a/tests/de/step_1/ZI5 b/tests/de/step_1/ZI5 index e6b92ec539..27f7008d7b 100644 --- a/tests/de/step_1/ZI5 +++ b/tests/de/step_1/ZI5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 27 ( 27 ) N2Labels = 0 ( 0 ) TotalLabels = 28 ( 28 ) NameLabels = 1 ( 1 ) ColorLabels = 28 ( 28 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE RED ( DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE RED ) +COLORS : Colors = DEEPSKYBLUE2 GREEN MAGENTA ORANGE RED ( DEEPSKYBLUE2 GREEN MAGENTA ORANGE RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZM6 b/tests/de/step_1/ZM6 index f72893311d..93bc733c86 100644 --- a/tests/de/step_1/ZM6 +++ b/tests/de/step_1/ZM6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 3 ) NameLabels = 1 ( 1 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 GREEN ( BLUE1 GREEN ) +COLORS : Colors = BLUE GREEN ( BLUE GREEN ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZM7 b/tests/de/step_1/ZM7 index 7c1ee22b7c..56e614e2bc 100644 --- a/tests/de/step_1/ZM7 +++ b/tests/de/step_1/ZM7 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 1 ( 1 ) N2Labels = 0 ( 0 ) TotalLabels = 2 ( 2 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = BLUE1 ( BLUE1 ) +COLORS : Colors = BLUE ( BLUE ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZM8 b/tests/de/step_1/ZM8 index 9e9893e91d..bab83c10e8 100644 --- a/tests/de/step_1/ZM8 +++ b/tests/de/step_1/ZM8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.0089224118 ( 0.03514915045 ) AvgTol = 0.00095 LABELS : N0Labels = 1 ( 1 ) N1Labels = 4 ( 4 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 1 ( 1 ) ColorLabels = 4 ( 4 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN RED YELLOW ( BLUE1 GREEN RED YELLOW ) +COLORS : Colors = BLUE GREEN RED YELLOW ( BLUE GREEN RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZM9 b/tests/de/step_1/ZM9 index 9652024a39..f6b79467a6 100644 --- a/tests/de/step_1/ZM9 +++ b/tests/de/step_1/ZM9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 4 ( 4 ) N1Labels = 1 ( 1 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 4 ( 4 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN RED YELLOW ( BLUE1 GREEN RED YELLOW ) +COLORS : Colors = BLUE GREEN RED YELLOW ( BLUE GREEN RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZN2 b/tests/de/step_1/ZN2 index 1a2ff8a12b..8d49540db4 100644 --- a/tests/de/step_1/ZN2 +++ b/tests/de/step_1/ZN2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.004260881238 ( 0.004260881238 ) AvgTol = 0.00025 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = CYAN1 ( CYAN1 ) +COLORS : Colors = CYAN ( CYAN ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 1 ( 1 ) diff --git a/tests/de/step_1/ZO1 b/tests/de/step_1/ZO1 index 938660a5b2..93b4d83af1 100644 --- a/tests/de/step_1/ZO1 +++ b/tests/de/step_1/ZO1 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 DARKORANGE1 GREEN RED ( BLUE1 DARKORANGE1 GREEN RED ) +COLORS : Colors = BLUE DARKORANGE1 GREEN RED ( BLUE DARKORANGE1 GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZO6 b/tests/de/step_1/ZO6 index 9947e2617d..d34b48b252 100644 --- a/tests/de/step_1/ZO6 +++ b/tests/de/step_1/ZO6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 36 ( 36 ) N2Labels = 0 ( 0 ) TotalLabels = 37 ( 37 ) NameLabels = 1 ( 1 ) ColorLabels = 37 ( 37 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = DEEPSKYBLUE2 MAGENTA1 ORANGE ( DEEPSKYBLUE2 MAGENTA1 ORANGE ) +COLORS : Colors = DEEPSKYBLUE2 MAGENTA ORANGE ( DEEPSKYBLUE2 MAGENTA ORANGE ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZP5 b/tests/de/step_1/ZP5 index 51f6067480..67c78c03b0 100644 --- a/tests/de/step_1/ZP5 +++ b/tests/de/step_1/ZP5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 36 ( 36 ) N2Labels = 0 ( 0 ) TotalLabels = 37 ( 37 ) NameLabels = 1 ( 1 ) ColorLabels = 37 ( 37 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = DEEPSKYBLUE2 MAGENTA1 ORANGE ( DEEPSKYBLUE2 MAGENTA1 ORANGE ) +COLORS : Colors = DEEPSKYBLUE2 MAGENTA ORANGE ( DEEPSKYBLUE2 MAGENTA ORANGE ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZQ2 b/tests/de/step_1/ZQ2 index cc50a347f1..ab2ff8fcba 100644 --- a/tests/de/step_1/ZQ2 +++ b/tests/de/step_1/ZQ2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 6 ( 6 ) N2Labels = 0 ( 0 ) TotalLabels = 7 ( 7 ) NameLabels = 1 ( 1 ) ColorLabels = 4 ( 4 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = MAGENTA1 RED ( MAGENTA1 RED ) +COLORS : Colors = MAGENTA RED ( MAGENTA RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZQ4 b/tests/de/step_1/ZQ4 index 67b27c9a63..08a4c235a5 100644 --- a/tests/de/step_1/ZQ4 +++ b/tests/de/step_1/ZQ4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 CYAN1 GREEN RED YELLOW ( BLUE1 CYAN1 GREEN RED YELLOW ) +COLORS : Colors = BLUE CYAN GREEN RED YELLOW ( BLUE CYAN GREEN RED YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_1/ZQ5 b/tests/de/step_1/ZQ5 index 09a3f78c3f..3f7dec475c 100644 --- a/tests/de/step_1/ZQ5 +++ b/tests/de/step_1/ZQ5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 2 3 ( 1 2 3 ) diff --git a/tests/de/step_1/ZQ6 b/tests/de/step_1/ZQ6 index 07a0432005..39fc4adbd6 100644 --- a/tests/de/step_1/ZQ6 +++ b/tests/de/step_1/ZQ6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZQ9 b/tests/de/step_1/ZQ9 index f115e645b5..3dc435002e 100644 --- a/tests/de/step_1/ZQ9 +++ b/tests/de/step_1/ZQ9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.0007775016544 ( 0.0008554238004 ) AvgTol = 6.182 LABELS : N0Labels = 1 ( 1 ) N1Labels = 26 ( 26 ) N2Labels = 0 ( 0 ) TotalLabels = 27 ( 27 ) NameLabels = 1 ( 1 ) ColorLabels = 27 ( 27 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_1/ZR1 b/tests/de/step_1/ZR1 index 4870b77e5a..79245b102e 100644 --- a/tests/de/step_1/ZR1 +++ b/tests/de/step_1/ZR1 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 14 ( 14 ) NameLabels = 1 ( 1 ) ColorLabels = 14 ( 14 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZR2 b/tests/de/step_1/ZR2 index d436d43992..8ff7508e09 100644 --- a/tests/de/step_1/ZR2 +++ b/tests/de/step_1/ZR2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 16 ( 16 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 17 ) NameLabels = 1 ( 1 ) ColorLabels = 17 ( 17 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZR4 b/tests/de/step_1/ZR4 index a915fc87f4..d4217a422a 100644 --- a/tests/de/step_1/ZR4 +++ b/tests/de/step_1/ZR4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 32 ( 32 ) N2Labels = 0 ( 0 ) TotalLabels = 33 ( 33 ) NameLabels = 1 ( 1 ) ColorLabels = 33 ( 33 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 010 ( 010 ) diff --git a/tests/de/step_1/ZR7 b/tests/de/step_1/ZR7 index 3859092c1b..ed0abbedb3 100644 --- a/tests/de/step_1/ZR7 +++ b/tests/de/step_1/ZR7 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_1/ZR8 b/tests/de/step_1/ZR8 index 22a0a2f4a2..d9068f0af7 100644 --- a/tests/de/step_1/ZR8 +++ b/tests/de/step_1/ZR8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 2 3 ( 1 2 3 ) diff --git a/tests/de/step_1/ZR9 b/tests/de/step_1/ZR9 index 46ca49c403..72ce868915 100644 --- a/tests/de/step_1/ZR9 +++ b/tests/de/step_1/ZR9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZT2 b/tests/de/step_1/ZT2 index 144e8f0f1e..ede3af61b0 100644 --- a/tests/de/step_1/ZT2 +++ b/tests/de/step_1/ZT2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-005 ) AvgTol = LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 2 3 ( 1 2 3 ) diff --git a/tests/de/step_1/ZT3 b/tests/de/step_1/ZT3 index 495b0de942..c8ed425ef5 100644 --- a/tests/de/step_1/ZT3 +++ b/tests/de/step_1/ZT3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 5 ( 5 ) N2Labels = 0 ( 0 ) TotalLabels = 8 ( 8 ) NameLabels = 5 ( 5 ) ColorLabels = 4 ( 4 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN RED YELLOW ( BLUE1 GREEN RED YELLOW ) +COLORS : Colors = BLUE GREEN RED YELLOW ( BLUE GREEN RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZT6 b/tests/de/step_1/ZT6 index 9fa64391a4..62d836d9b2 100644 --- a/tests/de/step_1/ZT6 +++ b/tests/de/step_1/ZT6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 5 ( 5 ) N1Labels = 4 ( 4 ) N2Labels = 0 ( 0 ) TotalLabels = 9 ( 9 ) NameLabels = 7 ( 7 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 MATRAGRAY MEDIUMTURQUOISE RED ( BLUE1 MATRAGRAY MEDIUMTURQUOISE RED ) +COLORS : Colors = BLUE MATRAGRAY MEDIUMTURQUOISE RED ( BLUE MATRAGRAY MEDIUMTURQUOISE RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZT7 b/tests/de/step_1/ZT7 index 32d7aeba63..41298d2e45 100644 --- a/tests/de/step_1/ZT7 +++ b/tests/de/step_1/ZT7 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 9 ( 9 ) N2Labels = 0 ( 0 ) TotalLabels = 10 ( 10 ) NameLabels = 1 ( 1 ) ColorLabels = 9 ( 9 ) LayerLabels = 2 ( 2 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 CYAN1 GREEN RED YELLOW ( BLUE1 CYAN1 GREEN RED YELLOW ) +COLORS : Colors = BLUE CYAN GREEN RED YELLOW ( BLUE CYAN GREEN RED YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 001 002 ( 001 002 ) diff --git a/tests/de/step_1/ZT8 b/tests/de/step_1/ZT8 index d1add56ae7..16d8edc717 100644 --- a/tests/de/step_1/ZT8 +++ b/tests/de/step_1/ZT8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 4 ( 4 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 1 ( 1 ) ColorLabels = 4 ( 4 ) LayerLabels = 2 ( 2 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 CYAN1 RED YELLOW ( BLUE1 CYAN1 RED YELLOW ) +COLORS : Colors = BLUE CYAN RED YELLOW ( BLUE CYAN RED YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 010 ( 010 ) diff --git a/tests/de/step_1/ZT9 b/tests/de/step_1/ZT9 index e9aad35e95..4527e01f04 100644 --- a/tests/de/step_1/ZT9 +++ b/tests/de/step_1/ZT9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 4 ( 4 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 1 ( 1 ) ColorLabels = 4 ( 4 ) LayerLabels = 3 ( 3 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 RED SALMON1 YELLOW ( BLUE1 RED SALMON1 YELLOW ) +COLORS : Colors = BLUE RED SALMON1 YELLOW ( BLUE RED SALMON1 YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 1 ( 1 ) diff --git a/tests/de/step_1/ZU5 b/tests/de/step_1/ZU5 index 0c37bf83e3..8d5833ce79 100644 --- a/tests/de/step_1/ZU5 +++ b/tests/de/step_1/ZU5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 3 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 6 ( 6 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 RED ( BLUE1 RED ) +COLORS : Colors = BLUE RED ( BLUE RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZU6 b/tests/de/step_1/ZU6 index b0400fa9fe..e80ec56c75 100644 --- a/tests/de/step_1/ZU6 +++ b/tests/de/step_1/ZU6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 4 ( 4 ) N1Labels = 3 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 7 ( 7 ) NameLabels = 6 ( 6 ) ColorLabels = 3 ( 3 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 CYAN1 MEDIUMTURQUOISE ( BLUE1 CYAN1 MEDIUMTURQUOISE ) +COLORS : Colors = BLUE CYAN MEDIUMTURQUOISE ( BLUE CYAN MEDIUMTURQUOISE ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZU8 b/tests/de/step_1/ZU8 index 44bff743a8..881140a6e7 100644 --- a/tests/de/step_1/ZU8 +++ b/tests/de/step_1/ZU8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 3 ) NameLabels = 1 ( 1 ) ColorLabels = 2 ( 2 ) LayerLabels = 2 ( 2 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 SALMON1 ( BLUE1 SALMON1 ) +COLORS : Colors = BLUE SALMON1 ( BLUE SALMON1 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 1 ( 1 ) diff --git a/tests/de/step_1/ZU9 b/tests/de/step_1/ZU9 index 18e1ae7a05..2398e708af 100644 --- a/tests/de/step_1/ZU9 +++ b/tests/de/step_1/ZU9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZV2 b/tests/de/step_1/ZV2 index 405ab2bdfd..65a07391ed 100644 --- a/tests/de/step_1/ZV2 +++ b/tests/de/step_1/ZV2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 RED ( BLUE1 RED ) +COLORS : Colors = BLUE RED ( BLUE RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZV3 b/tests/de/step_1/ZV3 index ba59a9332a..b166097f16 100644 --- a/tests/de/step_1/ZV3 +++ b/tests/de/step_1/ZV3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 2 ( 2 ) N1Labels = 1 ( 1 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 3 ) NameLabels = 3 ( 3 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = BLUE1 ( BLUE1 ) +COLORS : Colors = BLUE ( BLUE ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZV4 b/tests/de/step_1/ZV4 index 7238aa7270..06dd19da11 100644 --- a/tests/de/step_1/ZV4 +++ b/tests/de/step_1/ZV4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 3 ) NameLabels = 1 ( 1 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZV5 b/tests/de/step_1/ZV5 index 4f1c0b3c55..66f55b27e0 100644 --- a/tests/de/step_1/ZV5 +++ b/tests/de/step_1/ZV5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 1 ( 1 ) N2Labels = 0 ( 0 ) TotalLabels = 2 ( 2 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 1 ( 1 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = BLUE1 ( BLUE1 ) +COLORS : Colors = BLUE ( BLUE ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 06___PRT_ALL_SURFS ( 06___PRT_ALL_SURFS ) diff --git a/tests/de/step_1/ZV7 b/tests/de/step_1/ZV7 index 5f7b8791e1..b00ebe3c39 100644 --- a/tests/de/step_1/ZV7 +++ b/tests/de/step_1/ZV7 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 3 ( 3 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 5 ( 5 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZV8 b/tests/de/step_1/ZV8 index 4f328471d2..9c13430921 100644 --- a/tests/de/step_1/ZV8 +++ b/tests/de/step_1/ZV8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 2 ( 2 ) N2Labels = 0 ( 0 ) TotalLabels = 3 ( 3 ) NameLabels = 1 ( 1 ) ColorLabels = 2 ( 2 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZV9 b/tests/de/step_1/ZV9 index 101ed79b4f..8c837b1fa7 100644 --- a/tests/de/step_1/ZV9 +++ b/tests/de/step_1/ZV9 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 16 ( 16 ) N2Labels = 0 ( 0 ) TotalLabels = 17 ( 17 ) NameLabels = 1 ( 1 ) ColorLabels = 17 ( 17 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZW1 b/tests/de/step_1/ZW1 index 3f4e9f3314..70edacf54c 100644 --- a/tests/de/step_1/ZW1 +++ b/tests/de/step_1/ZW1 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 7 ( 7 ) N2Labels = 0 ( 0 ) TotalLabels = 8 ( 8 ) NameLabels = 1 ( 1 ) ColorLabels = 8 ( 8 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_1/ZW6 b/tests/de/step_1/ZW6 index 5fd8c5b710..85c11d0b79 100644 --- a/tests/de/step_1/ZW6 +++ b/tests/de/step_1/ZW6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = MAGENTA1 ( MAGENTA1 ) +COLORS : Colors = MAGENTA ( MAGENTA ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_1/ZY4 b/tests/de/step_1/ZY4 index bff0376223..79d915d1e9 100644 --- a/tests/de/step_1/ZY4 +++ b/tests/de/step_1/ZY4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.004260881238 ( 0.004260881238 ) AvgTol = 0.00025 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = CYAN1 ( CYAN1 ) +COLORS : Colors = CYAN ( CYAN ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 1 ( 1 ) diff --git a/tests/de/step_2/A3 b/tests/de/step_2/A3 index 26cbcab150..c2038865d5 100755 --- a/tests/de/step_2/A3 +++ b/tests/de/step_2/A3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1.956021749e-005 ( 0.0003145873437 ) AvgTol = 8.89 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = MAGENTA1 ( MAGENTA1 ) +COLORS : Colors = MAGENTA ( MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/A4 b/tests/de/step_2/A4 index 53a69d5b46..2ef0504e5a 100644 --- a/tests/de/step_2/A4 +++ b/tests/de/step_2/A4 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.001493912454 ( 0.001493912451 ) AvgTol = 2.38549 LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 36 ( 36 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = MAGENTA1 MEDIUMSEAGREEN RED4 ( MAGENTA1 MEDIUMSEAGREEN RED4 ) +COLORS : Colors = MAGENTA MEDIUMSEAGREEN RED4 ( MAGENTA MEDIUMSEAGREEN RED4 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/A7 b/tests/de/step_2/A7 index f99f13e05e..4bddabbd5f 100644 --- a/tests/de/step_2/A7 +++ b/tests/de/step_2/A7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.007650470101 ( 0.007928962522 ) AvgTol = 8.84598 LABELS : N0Labels = 78 ( 78 ) N1Labels = 196 ( 202 ) N2Labels = 0 ( 0 ) TotalLabels = 274 ( 280 ) NameLabels = 178 ( 178 ) ColorLabels = 145 ( 145 ) LayerLabels = 145 ( 151 ) PROPS : Centroid = 74 ( 74 ) Volume = 74 ( 74 ) Area = 74 ( 74 ) NCOLORS : NColors = 16 ( 16 ) -COLORS : Colors = BLUE1 CYAN1 DARKGREEN DARKORANGE1 DEEPPINK2 FIREBRICK FIREBRICK1 GREEN LIGHTGOLDENROD1 MAGENTA1 ORANGE4 PALEGREEN PURPLE RED WHITE YELLOW ( BLUE1 CYAN1 DARKGREEN DARKORANGE1 DEEPPINK2 FIREBRICK FIREBRICK1 GREEN LIGHTGOLDENROD1 MAGENTA1 ORANGE4 PALEGREEN PURPLE RED WHITE YELLOW ) +COLORS : Colors = BLUE CYAN DARKGREEN DARKORANGE1 DEEPPINK2 FIREBRICK FIREBRICK1 GREEN LIGHTGOLDENROD1 MAGENTA ORANGE4 PALEGREEN PURPLE RED WHITE YELLOW ( BLUE CYAN DARKGREEN DARKORANGE1 DEEPPINK2 FIREBRICK FIREBRICK1 GREEN LIGHTGOLDENROD1 MAGENTA ORANGE4 PALEGREEN PURPLE RED WHITE YELLOW ) NLAYERS : NLayers = 10 ( 10 ) LAYERS : Layers = 0 15 18 26 27 9153S07|06 9153S08|07 9153S09|08 GU2_assy|26 TEMP ( 0 15 18 26 27 9153S07|06 9153S08|07 9153S09|08 GU2_assy|26 TEMP ) diff --git a/tests/de/step_2/C5 b/tests/de/step_2/C5 index 79703ae435..5388932758 100644 --- a/tests/de/step_2/C5 +++ b/tests/de/step_2/C5 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.0003019315208 ( 0.009909450702 ) AvgTol = 1.0378 LABELS : N0Labels = 3 ( 3 ) N1Labels = 64 ( 64 ) N2Labels = 0 ( 0 ) TotalLabels = 67 ( 67 ) NameLabels = 5 ( 5 ) ColorLabels = 62 ( 62 ) LayerLabels = 62 ( 62 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 1 ( 1 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = CYAN1 YELLOW4 ( CYAN1 YELLOW4 ) +COLORS : Colors = CYAN YELLOW4 ( CYAN YELLOW4 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_2/C8 b/tests/de/step_2/C8 index f33f917a17..0f3a8a2bda 100644 --- a/tests/de/step_2/C8 +++ b/tests/de/step_2/C8 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.0007596213789 ( 0.0007596213789 ) AvgTol = 1.028 LABELS : N0Labels = 13 ( 13 ) N1Labels = 17 ( 17 ) N2Labels = 0 ( 0 ) TotalLabels = 30 ( 30 ) NameLabels = 27 ( 27 ) ColorLabels = 11 ( 11 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 13 ( 27 ) Volume = 13 ( 13 ) Area = 13 ( 13 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/D5 b/tests/de/step_2/D5 index d1b62fef68..eb96cea1ba 100644 --- a/tests/de/step_2/D5 +++ b/tests/de/step_2/D5 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.007471806745 ( 0.007471806744 ) AvgTol = 2.49209 LABELS : N0Labels = 6 ( 6 ) N1Labels = 19 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 25 ( 25 ) NameLabels = 11 ( 11 ) ColorLabels = 17 ( 17 ) LayerLabels = 17 ( 17 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_2/E1 b/tests/de/step_2/E1 index 03f94469db..77d8c178b9 100644 --- a/tests/de/step_2/E1 +++ b/tests/de/step_2/E1 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.03657395095 ( 0.9781270945 ) AvgTol = 0.00114 LABELS : N0Labels = 1 ( 1 ) N1Labels = 196 ( 197 ) N2Labels = 0 ( 0 ) TotalLabels = 197 ( 198 ) NameLabels = 1 ( 1 ) ColorLabels = 19 ( 19 ) LayerLabels = 177 ( 178 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 RED YELLOW ( BLUE1 RED YELLOW ) +COLORS : Colors = BLUE RED YELLOW ( BLUE RED YELLOW ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = CRVS DATAMS SRFS WHEELS ( CRVS DATAMS SRFS WHEELS ) diff --git a/tests/de/step_2/E2 b/tests/de/step_2/E2 index 580b2dd147..25c357d7ca 100644 --- a/tests/de/step_2/E2 +++ b/tests/de/step_2/E2 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 20 ( 20 ) N1Labels = 29 ( 30 ) N2Labels = 0 ( 0 ) TotalLabels = 49 ( 50 ) NameLabels = 48 ( 48 ) ColorLabels = 13 ( 13 ) LayerLabels = 13 ( 13 ) PROPS : Centroid = 17 ( 17 ) Volume = 17 ( 17 ) Area = 17 ( 17 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = GRAY22 GRAY73 KHAKI4 MAGENTA1 MATRAGRAY PURPLE4 WHITE ( GRAY22 GRAY73 KHAKI4 MAGENTA1 MATRAGRAY PURPLE4 WHITE ) +COLORS : Colors = GRAY22 GRAY73 KHAKI4 MAGENTA MATRAGRAY PURPLE4 WHITE ( GRAY22 GRAY73 KHAKI4 MAGENTA MATRAGRAY PURPLE4 WHITE ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 0 1 ( 0 1 ) diff --git a/tests/de/step_2/E3 b/tests/de/step_2/E3 index c54c5349ce..771d930d17 100644 --- a/tests/de/step_2/E3 +++ b/tests/de/step_2/E3 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.02408475069 ( 0.03962304188 ) AvgTol = 0.00166 LABELS : N0Labels = 4 ( 4 ) N1Labels = 136 ( 215 ) N2Labels = 0 ( 0 ) TotalLabels = 140 ( 219 ) NameLabels = 7 ( 7 ) ColorLabels = 133 ( 133 ) LayerLabels = 133 ( 212 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN LIGHTPINK1 WHITE ( BLUE1 GREEN LIGHTPINK1 WHITE ) +COLORS : Colors = BLUE GREEN LIGHTPINK1 WHITE ( BLUE GREEN LIGHTPINK1 WHITE ) NLAYERS : NLayers = 18 ( 19 ) LAYERS : Layers = 0 11 12 13 131 14 15 20 200 21 22 30 31 32 33 34 35 36 ( 0 11 12 13 131 14 15 20 200 21 22 30 31 32 33 34 35 36 99 ) diff --git a/tests/de/step_2/E4 b/tests/de/step_2/E4 index e4204d1153..e065f66b4d 100644 --- a/tests/de/step_2/E4 +++ b/tests/de/step_2/E4 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.001020021556 ( 0.001020021556 ) AvgTol = 6.94721 LABELS : N0Labels = 31 ( 31 ) N1Labels = 535 ( 491 ) N2Labels = 0 ( 0 ) TotalLabels = 566 ( 522 ) NameLabels = 62 ( 62 ) ColorLabels = 520 ( 481 ) LayerLabels = 16 ( 16 ) PROPS : Centroid = 26 ( 43 ) Volume = 26 ( 26 ) Area = 26 ( 26 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = DEEPSKYBLUE2 DODGERBLUE2 MAGENTA1 ORANGE ORANGERED RED WHITE ( DEEPSKYBLUE2 DODGERBLUE2 MAGENTA1 ORANGE ORANGERED RED WHITE ) +COLORS : Colors = DEEPSKYBLUE2 DODGERBLUE2 MAGENTA ORANGE ORANGERED RED WHITE ( DEEPSKYBLUE2 DODGERBLUE2 MAGENTA ORANGE ORANGERED RED WHITE ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 000 ( 000 ) diff --git a/tests/de/step_2/F1 b/tests/de/step_2/F1 index 309910514b..d2adff8f12 100755 --- a/tests/de/step_2/F1 +++ b/tests/de/step_2/F1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 6.149434256e-007 ( 6.149442753e-007 ) AvgTol = 1.4 LABELS : N0Labels = 5 ( 5 ) N1Labels = 35 ( 35 ) N2Labels = 0 ( 0 ) TotalLabels = 40 ( 40 ) NameLabels = 9 ( 9 ) ColorLabels = 35 ( 35 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/F2 b/tests/de/step_2/F2 index d3e1fb14d2..94e34fd761 100644 --- a/tests/de/step_2/F2 +++ b/tests/de/step_2/F2 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 1.593765994e-007 ( 1.593765994e-007 ) AvgTol = 1.0 LABELS : N0Labels = 7 ( 7 ) N1Labels = 33 ( 33 ) N2Labels = 0 ( 0 ) TotalLabels = 40 ( 40 ) NameLabels = 39 ( 36 ) ColorLabels = 3 ( 3 ) LayerLabels = 4 ( 35 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 WHITE YELLOW ( CYAN1 WHITE YELLOW ) +COLORS : Colors = CYAN WHITE YELLOW ( CYAN WHITE YELLOW ) NLAYERS : NLayers = 4 ( 6 ) LAYERS : Layers = 1 10 255 5 ( { 0} { 1} { 5} { 10} 200 255 ) diff --git a/tests/de/step_2/F3 b/tests/de/step_2/F3 index de376bd6f8..38b794765e 100644 --- a/tests/de/step_2/F3 +++ b/tests/de/step_2/F3 @@ -16,7 +16,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 7 ( 7 ) N1Labels = 33 ( 33 ) N2Labels = 0 ( 0 ) TotalLabels = 40 ( 40 ) NameLabels = 39 ( 36 ) ColorLabels = 3 ( 3 ) LayerLabels = 4 ( 35 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 WHITE YELLOW ( CYAN1 WHITE YELLOW ) +COLORS : Colors = CYAN WHITE YELLOW ( CYAN WHITE YELLOW ) NLAYERS : NLayers = 4 ( 6 ) LAYERS : Layers = 1 10 255 5 ( { 0} { 1} { 5} { 10} 200 255 ) diff --git a/tests/de/step_2/H1 b/tests/de/step_2/H1 index cb1f905cfc..a4667e7744 100644 --- a/tests/de/step_2/H1 +++ b/tests/de/step_2/H1 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.1618939735 ( 0.3526151761 ) AvgTol = 0.0379 LABELS : N0Labels = 3 ( 3 ) N1Labels = 124 ( 124 ) N2Labels = 0 ( 0 ) TotalLabels = 127 ( 127 ) NameLabels = 5 ( 5 ) ColorLabels = 123 ( 123 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = CYAN1 FORESTGREEN GREEN INDIANRED1 MAGENTA1 WHITE YELLOW ( CYAN1 FORESTGREEN GREEN INDIANRED1 MAGENTA1 WHITE YELLOW ) +COLORS : Colors = CYAN FORESTGREEN GREEN INDIANRED1 MAGENTA WHITE YELLOW ( CYAN FORESTGREEN GREEN INDIANRED1 MAGENTA WHITE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/H4 b/tests/de/step_2/H4 index 97a3e9ef2c..0e2c95063e 100644 --- a/tests/de/step_2/H4 +++ b/tests/de/step_2/H4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.0005195064467 ( 0.0005195064467 ) AvgTol = 5.643 LABELS : N0Labels = 4 ( 4 ) N1Labels = 442 ( 442 ) N2Labels = 0 ( 0 ) TotalLabels = 446 ( 446 ) NameLabels = 7 ( 7 ) ColorLabels = 439 ( 439 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 9 ( 9 ) -COLORS : Colors = BLUE1 CYAN1 DARKORANGE1 FORESTGREEN GRAY40 GREEN MAGENTA1 WHITE YELLOW ( BLUE1 CYAN1 DARKORANGE1 FORESTGREEN GRAY40 GREEN MAGENTA1 WHITE YELLOW ) +COLORS : Colors = BLUE CYAN DARKORANGE1 FORESTGREEN GRAY40 GREEN MAGENTA WHITE YELLOW ( BLUE CYAN DARKORANGE1 FORESTGREEN GRAY40 GREEN MAGENTA WHITE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/H8 b/tests/de/step_2/H8 index 8a9aebd8e8..9b3dc672a8 100644 --- a/tests/de/step_2/H8 +++ b/tests/de/step_2/H8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.004786225035 ( 0.009138362239 ) AvgTol = 0.00042 LABELS : N0Labels = 3 ( 3 ) N1Labels = 192 ( 192 ) N2Labels = 0 ( 0 ) TotalLabels = 195 ( 195 ) NameLabels = 5 ( 5 ) ColorLabels = 191 ( 191 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED ( BLUE1 DEEPSKYBLUE2 MAGENTA1 ORANGE ORANGERED ) +COLORS : Colors = BLUE DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED ( BLUE DEEPSKYBLUE2 MAGENTA ORANGE ORANGERED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/J3 b/tests/de/step_2/J3 index 1d6e0add23..a5e3b718d1 100644 --- a/tests/de/step_2/J3 +++ b/tests/de/step_2/J3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 5 ( 5 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 36 ( 36 ) NameLabels = 36 ( 36 ) ColorLabels = 3 ( 3 ) LayerLabels = 3 ( 3 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 GREEN YELLOW ( CYAN1 GREEN YELLOW ) +COLORS : Colors = CYAN GREEN YELLOW ( CYAN GREEN YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 0 5 ( 0 5 ) diff --git a/tests/de/step_2/J4 b/tests/de/step_2/J4 index 536d22c811..49cc9f073f 100644 --- a/tests/de/step_2/J4 +++ b/tests/de/step_2/J4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 5 ( 5 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 36 ( 36 ) NameLabels = 36 ( 36 ) ColorLabels = 3 ( 3 ) LayerLabels = 3 ( 3 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 GREEN YELLOW ( CYAN1 GREEN YELLOW ) +COLORS : Colors = CYAN GREEN YELLOW ( CYAN GREEN YELLOW ) NLAYERS : NLayers = 3 ( 3 ) LAYERS : Layers = 1 10 5 ( 1 10 5 ) diff --git a/tests/de/step_2/J6 b/tests/de/step_2/J6 index 95eb87ec02..a9d72c78c4 100644 --- a/tests/de/step_2/J6 +++ b/tests/de/step_2/J6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 7 ( 7 ) N1Labels = 239 ( 239 ) N2Labels = 0 ( 0 ) TotalLabels = 246 ( 246 ) NameLabels = 40 ( 40 ) ColorLabels = 209 ( 209 ) LayerLabels = 209 ( 209 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 CYAN1 RED YELLOW ( BLUE1 CYAN1 RED YELLOW ) +COLORS : Colors = BLUE CYAN RED YELLOW ( BLUE CYAN RED YELLOW ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 0 1 10 5 ( 0 1 10 5 ) diff --git a/tests/de/step_2/J7 b/tests/de/step_2/J7 index 1ea02f6eb8..1a902976e9 100644 --- a/tests/de/step_2/J7 +++ b/tests/de/step_2/J7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.01857875733 ( 0.344407912 ) AvgTol = 0.00025 LABELS : N0Labels = 6 ( 6 ) N1Labels = 45 ( 45 ) N2Labels = 0 ( 0 ) TotalLabels = 51 ( 51 ) NameLabels = 11 ( 11 ) ColorLabels = 41 ( 41 ) LayerLabels = 21 ( 21 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = BLUE1 GREEN RED YELLOW ( BLUE1 GREEN RED YELLOW ) +COLORS : Colors = BLUE GREEN RED YELLOW ( BLUE GREEN RED YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( 0 ) diff --git a/tests/de/step_2/K1 b/tests/de/step_2/K1 index fa315d1bd8..09897b763e 100644 --- a/tests/de/step_2/K1 +++ b/tests/de/step_2/K1 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.007715220965 ( 0.00997839292 ) AvgTol = 0.00077 LABELS : N0Labels = 7 ( 7 ) N1Labels = 6 ( 6 ) N2Labels = 0 ( 0 ) TotalLabels = 13 ( 13 ) NameLabels = 13 ( 13 ) ColorLabels = 4 ( 4 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/K4 b/tests/de/step_2/K4 index cf566b4422..50f99b358e 100644 --- a/tests/de/step_2/K4 +++ b/tests/de/step_2/K4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 5 ( 5 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 36 ( 36 ) NameLabels = 36 ( 36 ) ColorLabels = 3 ( 3 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 GREEN YELLOW ( CYAN1 GREEN YELLOW ) +COLORS : Colors = CYAN GREEN YELLOW ( CYAN GREEN YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/K5 b/tests/de/step_2/K5 index 081d218b6a..a09559240c 100644 --- a/tests/de/step_2/K5 +++ b/tests/de/step_2/K5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1e-007 ( 1e-007 ) AvgTol = LABELS : N0Labels = 5 ( 5 ) N1Labels = 31 ( 31 ) N2Labels = 0 ( 0 ) TotalLabels = 36 ( 36 ) NameLabels = 36 ( 36 ) ColorLabels = 3 ( 3 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 GREEN YELLOW ( CYAN1 GREEN YELLOW ) +COLORS : Colors = CYAN GREEN YELLOW ( CYAN GREEN YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/K8 b/tests/de/step_2/K8 index 63daedd39f..7f3c9db496 100644 --- a/tests/de/step_2/K8 +++ b/tests/de/step_2/K8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.009731375059 ( 0.01295381237 ) AvgTol = 0.00059 LABELS : N0Labels = 5 ( 5 ) N1Labels = 37 ( 37 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 9 ( 9 ) ColorLabels = 4 ( 4 ) LayerLabels = 33 ( 33 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = A_FLAECHEN_1 ( A_FLAECHEN_1 ) diff --git a/tests/de/step_2/L5 b/tests/de/step_2/L5 index f681e80648..cf74f25abe 100644 --- a/tests/de/step_2/L5 +++ b/tests/de/step_2/L5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 6.149434256e-007 ( 6.149442753e-007 ) AvgTol = 1.4 LABELS : N0Labels = 5 ( 5 ) N1Labels = 41 ( 41 ) N2Labels = 0 ( 0 ) TotalLabels = 46 ( 46 ) NameLabels = 9 ( 9 ) ColorLabels = 41 ( 41 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/L6 b/tests/de/step_2/L6 index c023a5615c..fe27680723 100644 --- a/tests/de/step_2/L6 +++ b/tests/de/step_2/L6 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 6.188728153e-007 ( 7.498981519e-007 ) AvgTol = 1.4 LABELS : N0Labels = 5 ( 5 ) N1Labels = 41 ( 41 ) N2Labels = 0 ( 0 ) TotalLabels = 46 ( 46 ) NameLabels = 9 ( 9 ) ColorLabels = 41 ( 41 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/M4 b/tests/de/step_2/M4 index 1b6fe49854..f9e9f579a2 100644 --- a/tests/de/step_2/M4 +++ b/tests/de/step_2/M4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.7571410919 ( 0.7571410919 ) AvgTol = 0.042 LABELS : N0Labels = 1 ( 1 ) N1Labels = 4 ( 4 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 1 ( 1 ) ColorLabels = 4 ( 4 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 MAGENTA1 ( BLUE1 MAGENTA1 ) +COLORS : Colors = BLUE MAGENTA ( BLUE MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/S1 b/tests/de/step_2/S1 index 89ac1f17c7..0e45c77abe 100755 --- a/tests/de/step_2/S1 +++ b/tests/de/step_2/S1 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 116.4921053 ( 5.033069571 ) AvgTol = 0.56 LABELS : N0Labels = 10 ( 10 ) N1Labels = 32 ( 32 ) N2Labels = 0 ( 0 ) TotalLabels = 42 ( 42 ) NameLabels = 22 ( 22 ) ColorLabels = 22 ( 22 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = DEEPSKYBLUE1 GREEN MAGENTA1 RED SIENNA YELLOW2 ( DEEPSKYBLUE1 GREEN MAGENTA1 RED SIENNA YELLOW2 ) +COLORS : Colors = DEEPSKYBLUE1 GREEN MAGENTA RED SIENNA YELLOW2 ( DEEPSKYBLUE1 GREEN MAGENTA RED SIENNA YELLOW2 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/S4 b/tests/de/step_2/S4 index 5b45f1b71f..0df5e8e1e8 100644 --- a/tests/de/step_2/S4 +++ b/tests/de/step_2/S4 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.00325269835 ( 0.03359302302 ) AvgTol = 0.00041 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = MAGENTA1 ( MAGENTA1 ) +COLORS : Colors = MAGENTA ( MAGENTA ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/T8 b/tests/de/step_2/T8 index 0199dd7770..17a816d652 100644 --- a/tests/de/step_2/T8 +++ b/tests/de/step_2/T8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.00694845675 ( 0.00694845675 ) AvgTol = 0.00139 LABELS : N0Labels = 1 ( 1 ) N1Labels = 30 ( 30 ) N2Labels = 0 ( 0 ) TotalLabels = 31 ( 31 ) NameLabels = 1 ( 1 ) ColorLabels = 31 ( 31 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = CYAN1 LIGHTSTEELBLUE1 ( CYAN1 LIGHTSTEELBLUE1 ) +COLORS : Colors = CYAN LIGHTSTEELBLUE1 ( CYAN LIGHTSTEELBLUE1 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/U6 b/tests/de/step_2/U6 index 70b4f8ceb6..34907cf49d 100644 --- a/tests/de/step_2/U6 +++ b/tests/de/step_2/U6 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.001020021414 ( 0.001020021414 ) AvgTol = 7.03820 LABELS : N0Labels = 21 ( 21 ) N1Labels = 485 ( 485 ) N2Labels = 0 ( 0 ) TotalLabels = 506 ( 506 ) NameLabels = 42 ( 42 ) ColorLabels = 476 ( 476 ) LayerLabels = 16 ( 16 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = DEEPSKYBLUE2 DODGERBLUE2 MAGENTA1 ORANGE ORANGERED RED WHITE ( DEEPSKYBLUE2 DODGERBLUE2 MAGENTA1 ORANGE ORANGERED RED WHITE ) +COLORS : Colors = DEEPSKYBLUE2 DODGERBLUE2 MAGENTA ORANGE ORANGERED RED WHITE ( DEEPSKYBLUE2 DODGERBLUE2 MAGENTA ORANGE ORANGERED RED WHITE ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 000 ( 000 ) diff --git a/tests/de/step_2/U7 b/tests/de/step_2/U7 index bb37487780..e462a09e30 100644 --- a/tests/de/step_2/U7 +++ b/tests/de/step_2/U7 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.001828077728 ( 0.001828077728 ) AvgTol = 0.00021 LABELS : N0Labels = 1 ( 1 ) N1Labels = 403 ( 403 ) N2Labels = 0 ( 0 ) TotalLabels = 404 ( 404 ) NameLabels = 1 ( 1 ) ColorLabels = 404 ( 404 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = CYAN1 LIGHTSTEELBLUE1 RED ( CYAN1 LIGHTSTEELBLUE1 RED ) +COLORS : Colors = CYAN LIGHTSTEELBLUE1 RED ( CYAN LIGHTSTEELBLUE1 RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_2/X3 b/tests/de/step_2/X3 index 5ab2dfa71b..946065f303 100644 --- a/tests/de/step_2/X3 +++ b/tests/de/step_2/X3 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.004437798931 ( 0.03878259147 ) AvgTol = 0.00027 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = MAGENTA1 ( MAGENTA1 ) +COLORS : Colors = MAGENTA ( MAGENTA ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( { 0} ) diff --git a/tests/de/step_2/X5 b/tests/de/step_2/X5 index aef30b7747..3dea2ddc43 100644 --- a/tests/de/step_2/X5 +++ b/tests/de/step_2/X5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 1.225663151e-005 ( 1.235634162e-005 ) AvgTol = 1.8 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = CYAN1 ( CYAN1 ) +COLORS : Colors = CYAN ( CYAN ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_3/B1 b/tests/de/step_3/B1 index 18ecdeee62..8519c17a57 100644 --- a/tests/de/step_3/B1 +++ b/tests/de/step_3/B1 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.001020020881 ( 0.001020020966 ) AvgTol = 6.94566 LABELS : N0Labels = 27 ( 27 ) N1Labels = 257 ( 257 ) N2Labels = 0 ( 0 ) TotalLabels = 284 ( 284 ) NameLabels = 54 ( 54 ) ColorLabels = 242 ( 242 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 15 ( 32 ) Volume = 15 ( 15 ) Area = 15 ( 15 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = DEEPSKYBLUE2 DODGERBLUE2 MAGENTA1 ORANGE ORANGERED RED ( DEEPSKYBLUE2 DODGERBLUE2 MAGENTA1 ORANGE ORANGERED RED ) +COLORS : Colors = DEEPSKYBLUE2 DODGERBLUE2 MAGENTA ORANGE ORANGERED RED ( DEEPSKYBLUE2 DODGERBLUE2 MAGENTA ORANGE ORANGERED RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_3/B4 b/tests/de/step_3/B4 index 28d310f11f..44a2a71006 100644 --- a/tests/de/step_3/B4 +++ b/tests/de/step_3/B4 @@ -15,7 +15,7 @@ TOLERANCE : MaxTol = 0.01535715949 ( 0.01940030459 ) AvgTol = 0.00051 LABELS : N0Labels = 13 ( 13 ) N1Labels = 2197 ( 2323 ) N2Labels = 0 ( 0 ) TotalLabels = 2210 ( 2336 ) NameLabels = 31 ( 31 ) ColorLabels = 2183 ( 2183 ) LayerLabels = 483 ( 609 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 7 ( 7 ) -COLORS : Colors = BLUE1 GREEN GREEN4 MAGENTA1 TURQUOISE3 WHITE YELLOW ( BLUE1 GREEN GREEN4 MAGENTA1 TURQUOISE3 WHITE YELLOW ) +COLORS : Colors = BLUE GREEN GREEN4 MAGENTA TURQUOISE3 WHITE YELLOW ( BLUE GREEN GREEN4 MAGENTA TURQUOISE3 WHITE YELLOW ) NLAYERS : NLayers = 11 ( 11 ) LAYERS : Layers = 0 1 10 2 3 4 5 6 7 8 9 ( 0 1 10 2 3 4 5 6 7 8 9 ) diff --git a/tests/de/step_3/C9 b/tests/de/step_3/C9 index 2e44babbc8..e2e3bab92c 100644 --- a/tests/de/step_3/C9 +++ b/tests/de/step_3/C9 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.2357145058 ( 0.2065786276 ) AvgTol = 0.00958 LABELS : N0Labels = 9 ( 9 ) N1Labels = 1311 ( 1311 ) N2Labels = 0 ( 0 ) TotalLabels = 1320 ( 1320 ) NameLabels = 17 ( 17 ) ColorLabels = 1303 ( 1303 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 10 ( 10 ) -COLORS : Colors = AZURE4 CYAN1 GRAY10 GRAY10 GRAY26 GRAY33 GRAY74 ORANGERED RED YELLOW ( AZURE4 CYAN1 GRAY10 GRAY10 GRAY26 GRAY33 GRAY74 ORANGERED RED YELLOW ) +COLORS : Colors = AZURE4 CYAN GRAY10 GRAY10 GRAY26 GRAY33 GRAY74 ORANGERED RED YELLOW ( AZURE4 CYAN GRAY10 GRAY10 GRAY26 GRAY33 GRAY74 ORANGERED RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_3/E1 b/tests/de/step_3/E1 index 98c63e901c..a5187aef71 100644 --- a/tests/de/step_3/E1 +++ b/tests/de/step_3/E1 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.02930428273 ( 0.09893741783 ) AvgTol = 0.00035 LABELS : N0Labels = 7 ( 7 ) N1Labels = 504 ( 515 ) N2Labels = 0 ( 0 ) TotalLabels = 511 ( 522 ) NameLabels = 12 ( 12 ) ColorLabels = 498 ( 498 ) LayerLabels = 407 ( 418 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 CYAN1 GREEN MAGENTA1 YELLOW ( BLUE1 CYAN1 GREEN MAGENTA1 YELLOW ) +COLORS : Colors = BLUE CYAN GREEN MAGENTA YELLOW ( BLUE CYAN GREEN MAGENTA YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 0 2 ( 0 2 ) diff --git a/tests/de/step_3/E3 b/tests/de/step_3/E3 index 3ba2cbc374..a1ec0bb77c 100644 --- a/tests/de/step_3/E3 +++ b/tests/de/step_3/E3 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.01535715949 ( 0.016276422 ) AvgTol = 0.00077 LABELS : N0Labels = 5 ( 5 ) N1Labels = 2126 ( 2252 ) N2Labels = 0 ( 0 ) TotalLabels = 2131 ( 2257 ) NameLabels = 10 ( 10 ) ColorLabels = 2113 ( 2113 ) LayerLabels = 498 ( 624 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = BLUE1 GREEN GREEN4 TURQUOISE3 WHITE YELLOW ( BLUE1 GREEN GREEN4 TURQUOISE3 WHITE YELLOW ) +COLORS : Colors = BLUE GREEN GREEN4 TURQUOISE3 WHITE YELLOW ( BLUE GREEN GREEN4 TURQUOISE3 WHITE YELLOW ) NLAYERS : NLayers = 6 ( 6 ) LAYERS : Layers = 0 1 10 2 3 7 ( 0 1 10 2 3 7 ) diff --git a/tests/de/step_3/E7 b/tests/de/step_3/E7 index ad0c3b8f04..c61d23fb77 100644 --- a/tests/de/step_3/E7 +++ b/tests/de/step_3/E7 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.6657106829 ( 0.6657106829 ) AvgTol = 0.00118 LABELS : N0Labels = 1 ( 1 ) N1Labels = 1838 ( 1839 ) N2Labels = 0 ( 0 ) TotalLabels = 1839 ( 1840 ) NameLabels = 1 ( 1 ) ColorLabels = 164 ( 164 ) LayerLabels = 1761 ( 1762 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 9 ( 9 ) -COLORS : Colors = CYAN1 DARKORANGE1 DODGERBLUE2 GREEN MAGENTA1 MAGENTA4 RED WHITE YELLOW ( CYAN1 DARKORANGE1 DODGERBLUE2 GREEN MAGENTA1 MAGENTA4 RED WHITE YELLOW ) +COLORS : Colors = CYAN DARKORANGE1 DODGERBLUE2 GREEN MAGENTA MAGENTA4 RED WHITE YELLOW ( CYAN DARKORANGE1 DODGERBLUE2 GREEN MAGENTA MAGENTA4 RED WHITE YELLOW ) NLAYERS : NLayers = 19 ( 19 ) LAYERS : Layers = 0 10 101 103 104 105 122 15 16 17 171 18 20 21 25 27 51 71 72 ( { 0} { 10} { 15} { 16} { 17} { 18} { 20} { 21} { 25} { 27} { 51} { 71} { 72} 101 103 104 105 122 171 ) diff --git a/tests/de/step_3/E8 b/tests/de/step_3/E8 index 451bad3810..36d7a1c3a6 100644 --- a/tests/de/step_3/E8 +++ b/tests/de/step_3/E8 @@ -17,7 +17,7 @@ TOLERANCE : MaxTol = 0.6657106806 ( 0.6657106806 ) AvgTol = 0.00101 LABELS : N0Labels = 1 ( 1 ) N1Labels = 1839 ( 1840 ) N2Labels = 0 ( 0 ) TotalLabels = 1840 ( 1841 ) NameLabels = 1 ( 1 ) ColorLabels = 165 ( 165 ) LayerLabels = 1762 ( 1763 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 9 ( 9 ) -COLORS : Colors = CYAN1 DARKORANGE1 DODGERBLUE2 GREEN MAGENTA1 MAGENTA4 RED WHITE YELLOW ( CYAN1 DARKORANGE1 DODGERBLUE2 GREEN MAGENTA1 MAGENTA4 RED WHITE YELLOW ) +COLORS : Colors = CYAN DARKORANGE1 DODGERBLUE2 GREEN MAGENTA MAGENTA4 RED WHITE YELLOW ( CYAN DARKORANGE1 DODGERBLUE2 GREEN MAGENTA MAGENTA4 RED WHITE YELLOW ) NLAYERS : NLayers = 19 ( 19 ) LAYERS : Layers = 0 10 101 103 104 105 122 15 16 17 171 18 20 21 25 27 51 71 72 ( { 0} { 10} { 15} { 16} { 17} { 18} { 20} { 21} { 25} { 27} { 51} { 71} { 72} 101 103 104 105 122 171 ) diff --git a/tests/de/step_3/F4 b/tests/de/step_3/F4 index 814ae305ae..85976af025 100644 --- a/tests/de/step_3/F4 +++ b/tests/de/step_3/F4 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.009023403931 ( 0.009980833943 ) AvgTol = 0.00033 LABELS : N0Labels = 1 ( 1 ) N1Labels = 3047 ( 3047 ) N2Labels = 0 ( 0 ) TotalLabels = 3048 ( 3048 ) NameLabels = 1 ( 1 ) ColorLabels = 3048 ( 3048 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 YELLOW ( BLUE1 YELLOW ) +COLORS : Colors = BLUE YELLOW ( BLUE YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_4/A4 b/tests/de/step_4/A4 index cceb0735de..b7fe3263e3 100644 --- a/tests/de/step_4/A4 +++ b/tests/de/step_4/A4 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.08129076078 ( 0.1779929979 ) AvgTol = 0.00245 LABELS : N0Labels = 1 ( 1 ) N1Labels = 893 ( 893 ) N2Labels = 0 ( 0 ) TotalLabels = 894 ( 894 ) NameLabels = 1 ( 1 ) ColorLabels = 448 ( 448 ) LayerLabels = 448 ( 448 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = CYAN1 GRAY53 GREEN RED WHITE YELLOW ( CYAN1 GRAY53 GREEN RED WHITE YELLOW ) +COLORS : Colors = CYAN GRAY53 GREEN RED WHITE YELLOW ( CYAN GRAY53 GREEN RED WHITE YELLOW ) NLAYERS : NLayers = 4 ( 4 ) LAYERS : Layers = 215 242 254 5 ( 215 242 254 5 ) diff --git a/tests/de/step_4/A5 b/tests/de/step_4/A5 index 5dcc3209d6..4b0af3eaad 100644 --- a/tests/de/step_4/A5 +++ b/tests/de/step_4/A5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.01755144512 ( 0.05734823138 ) AvgTol = 0.00402 LABELS : N0Labels = 3 ( 3 ) N1Labels = 19 ( 19 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 5 ( 5 ) ColorLabels = 18 ( 18 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = CYAN1 GREEN MAGENTA1 MEDIUMSEAGREEN ( CYAN1 GREEN MAGENTA1 MEDIUMSEAGREEN ) +COLORS : Colors = CYAN GREEN MAGENTA MEDIUMSEAGREEN ( CYAN GREEN MAGENTA MEDIUMSEAGREEN ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_4/C7 b/tests/de/step_4/C7 index c82480147d..9594f20916 100644 --- a/tests/de/step_4/C7 +++ b/tests/de/step_4/C7 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 6.188728153e-007 ( 7.498980951e-007 ) AvgTol = 1.4 LABELS : N0Labels = 5 ( 5 ) N1Labels = 41 ( 41 ) N2Labels = 0 ( 0 ) TotalLabels = 46 ( 46 ) NameLabels = 9 ( 9 ) ColorLabels = 41 ( 41 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 3 ( 3 ) -COLORS : Colors = BLUE1 GREEN RED ( BLUE1 GREEN RED ) +COLORS : Colors = BLUE GREEN RED ( BLUE GREEN RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_4/D8 b/tests/de/step_4/D8 index b33266c63e..cd27d77c62 100644 --- a/tests/de/step_4/D8 +++ b/tests/de/step_4/D8 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.09813029449 ( 0.1674907116 ) AvgTol = 0.00280 LABELS : N0Labels = 1 ( 1 ) N1Labels = 582 ( 582 ) N2Labels = 0 ( 0 ) TotalLabels = 583 ( 583 ) NameLabels = 1 ( 1 ) ColorLabels = 289 ( 289 ) LayerLabels = 297 ( 297 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = CYAN1 DODGERBLUE2 GREEN MAGENTA1 WHITE YELLOW ( CYAN1 DODGERBLUE2 GREEN MAGENTA1 WHITE YELLOW ) +COLORS : Colors = CYAN DODGERBLUE2 GREEN MAGENTA WHITE YELLOW ( CYAN DODGERBLUE2 GREEN MAGENTA WHITE YELLOW ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 0 ( { 0} ) diff --git a/tests/de/step_4/E2 b/tests/de/step_4/E2 index 87c2277d15..6ce3514d62 100644 --- a/tests/de/step_4/E2 +++ b/tests/de/step_4/E2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.005574366633 ( 0.00856471198 ) AvgTol = 0.0011 LABELS : N0Labels = 2 ( 2 ) N1Labels = 3 ( 3 ) N2Labels = 0 ( 0 ) TotalLabels = 5 ( 5 ) NameLabels = 2 ( 2 ) ColorLabels = 4 ( 4 ) LayerLabels = 4 ( 4 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = MAGENTA1 RED ( MAGENTA1 RED ) +COLORS : Colors = MAGENTA RED ( MAGENTA RED ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 3 4 ( 3 4 ) diff --git a/tests/de/step_4/E5 b/tests/de/step_4/E5 index a14ec699d8..d4655e1ca1 100644 --- a/tests/de/step_4/E5 +++ b/tests/de/step_4/E5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 7.535366389e-007 ( 7.535358205e-007 ) AvgTol = 1.4 LABELS : N0Labels = 19 ( 19 ) N1Labels = 33 ( 33 ) N2Labels = 0 ( 0 ) TotalLabels = 52 ( 52 ) NameLabels = 52 ( 52 ) ColorLabels = 16 ( 16 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 CYAN1 MATRAGRAY RED YELLOW ( BLUE1 CYAN1 MATRAGRAY RED YELLOW ) +COLORS : Colors = BLUE CYAN MATRAGRAY RED YELLOW ( BLUE CYAN MATRAGRAY RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_4/F3 b/tests/de/step_4/F3 index 3add6beae0..972f43e7b3 100644 --- a/tests/de/step_4/F3 +++ b/tests/de/step_4/F3 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.06047362453 ( 0.09420204256 ) AvgTol = 0.00415 LABELS : N0Labels = 1 ( 1 ) N1Labels = 17 ( 17 ) N2Labels = 0 ( 0 ) TotalLabels = 18 ( 18 ) NameLabels = 1 ( 1 ) ColorLabels = 18 ( 18 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 PALETURQUOISE2 ( BLUE1 PALETURQUOISE2 ) +COLORS : Colors = BLUE PALETURQUOISE2 ( BLUE PALETURQUOISE2 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_4/G3 b/tests/de/step_4/G3 index 278b0dccc2..76269a360c 100644 --- a/tests/de/step_4/G3 +++ b/tests/de/step_4/G3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.003174666549 ( 0.008013430378 ) AvgTol = 0.00083 LABELS : N0Labels = 1 ( 1 ) N1Labels = 5 ( 5 ) N2Labels = 0 ( 0 ) TotalLabels = 6 ( 6 ) NameLabels = 1 ( 1 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 RED4 ( BLUE1 RED4 ) +COLORS : Colors = BLUE RED4 ( BLUE RED4 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_4/G4 b/tests/de/step_4/G4 index dbbcaa4cd8..e1d3407bb4 100644 --- a/tests/de/step_4/G4 +++ b/tests/de/step_4/G4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.001062650163 ( 0.003953918419 ) AvgTol = 0.00024 LABELS : N0Labels = 1 ( 1 ) N1Labels = 5 ( 5 ) N2Labels = 0 ( 0 ) TotalLabels = 6 ( 6 ) NameLabels = 1 ( 1 ) ColorLabels = 5 ( 5 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 2 ( 2 ) -COLORS : Colors = BLUE1 RED4 ( BLUE1 RED4 ) +COLORS : Colors = BLUE RED4 ( BLUE RED4 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_4/H2 b/tests/de/step_4/H2 index 04d4e10e12..473377b927 100644 --- a/tests/de/step_4/H2 +++ b/tests/de/step_4/H2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.009678785757 ( 0.009678785757 ) AvgTol = 1.72870 LABELS : N0Labels = 55 ( 55 ) N1Labels = 76 ( 76 ) N2Labels = 0 ( 0 ) TotalLabels = 131 ( 131 ) NameLabels = 125 ( 125 ) ColorLabels = 31 ( 31 ) LayerLabels = 31 ( 31 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 21 ( 21 ) -COLORS : Colors = BLUE1 BURLYWOOD2 DARKGOLDENROD1 DARKGREEN DARKORANGE1 DARKSLATEBLUE DARKSLATEGRAY GRAY15 GRAY9 KHAKI4 KHAKI4 LIGHTGOLDENROD4 MAGENTA1 MATRABLUE MEDIUMPURPLE1 MEDIUMSPRINGGREEN ORANGE4 RED STEELBLUE TURQUOISE4 YELLOW ( BLUE1 BURLYWOOD2 DARKGOLDENROD1 DARKGREEN DARKORANGE1 DARKSLATEBLUE DARKSLATEGRAY GRAY15 GRAY9 KHAKI4 KHAKI4 LIGHTGOLDENROD4 MAGENTA1 MATRABLUE MEDIUMPURPLE1 MEDIUMSPRINGGREEN ORANGE4 RED STEELBLUE TURQUOISE4 YELLOW ) +COLORS : Colors = BLUE BURLYWOOD2 DARKGOLDENROD1 DARKGREEN DARKORANGE1 DARKSLATEBLUE DARKSLATEGRAY GRAY15 GRAY9 KHAKI4 KHAKI4 LIGHTGOLDENROD4 MAGENTA MATRABLUE MEDIUMPURPLE1 MEDIUMSPRINGGREEN ORANGE4 RED STEELBLUE TURQUOISE4 YELLOW ( BLUE BURLYWOOD2 DARKGOLDENROD1 DARKGREEN DARKORANGE1 DARKSLATEBLUE DARKSLATEGRAY GRAY15 GRAY9 KHAKI4 KHAKI4 LIGHTGOLDENROD4 MAGENTA MATRABLUE MEDIUMPURPLE1 MEDIUMSPRINGGREEN ORANGE4 RED STEELBLUE TURQUOISE4 YELLOW ) NLAYERS : NLayers = 2 ( 2 ) LAYERS : Layers = 0 Slider_Button|AMV_9_HATCH ( 0 Slider_Button|AMV_9_HATCH ) diff --git a/tests/de/step_4/H3 b/tests/de/step_4/H3 index 7638bcd09e..300d80f206 100644 --- a/tests/de/step_4/H3 +++ b/tests/de/step_4/H3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.1201139499 ( 0.1201139499 ) AvgTol = 0.00174 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 1 ( 1 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = CYAN1 ( CYAN1 ) +COLORS : Colors = CYAN ( CYAN ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 4 ( 4 ) diff --git a/tests/de/step_4/H4 b/tests/de/step_4/H4 index 4a7a26d57b..f665bcadde 100644 --- a/tests/de/step_4/H4 +++ b/tests/de/step_4/H4 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.2529768951 ( 0.2529768951 ) AvgTol = 0.0126 LABELS : N0Labels = 1 ( 1 ) N1Labels = 5366 ( 5366 ) N2Labels = 0 ( 0 ) TotalLabels = 5367 ( 5367 ) NameLabels = 1 ( 1 ) ColorLabels = 5367 ( 5367 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED ( DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED ) +COLORS : Colors = DEEPSKYBLUE2 GREEN MAGENTA ORANGE ORANGERED RED ( DEEPSKYBLUE2 GREEN MAGENTA ORANGE ORANGERED RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_4/H5 b/tests/de/step_4/H5 index 88882de0b7..2214077cd8 100644 --- a/tests/de/step_4/H5 +++ b/tests/de/step_4/H5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.01991987466 ( 0.05869680859 ) AvgTol = 0.00324 LABELS : N0Labels = 1 ( 1 ) N1Labels = 347 ( 347 ) N2Labels = 0 ( 0 ) TotalLabels = 348 ( 348 ) NameLabels = 1 ( 1 ) ColorLabels = 348 ( 348 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = CYAN1 DARKORANGE1 FORESTGREEN GREEN ( CYAN1 DARKORANGE1 FORESTGREEN GREEN ) +COLORS : Colors = CYAN DARKORANGE1 FORESTGREEN GREEN ( CYAN DARKORANGE1 FORESTGREEN GREEN ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 60 ( 60 ) diff --git a/tests/de/step_4/H8 b/tests/de/step_4/H8 index 46c3c5a09a..b492187b61 100644 --- a/tests/de/step_4/H8 +++ b/tests/de/step_4/H8 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.2096553196 ( 0.2096553196 ) AvgTol = 0.00120 LABELS : N0Labels = 1 ( 1 ) N1Labels = 0 ( 0 ) N2Labels = 0 ( 0 ) TotalLabels = 1 ( 1 ) NameLabels = 1 ( 1 ) ColorLabels = 1 ( 1 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 1 ( 1 ) -COLORS : Colors = CYAN1 ( CYAN1 ) +COLORS : Colors = CYAN ( CYAN ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_5/A2 b/tests/de/step_5/A2 index ac3dce1784..18143adbd3 100644 --- a/tests/de/step_5/A2 +++ b/tests/de/step_5/A2 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 0.005454457084 ( 0.009853801448 ) AvgTol = 0.00044 LABELS : N0Labels = 1 ( 1 ) N1Labels = 5448 ( 5448 ) N2Labels = 0 ( 0 ) TotalLabels = 5449 ( 5449 ) NameLabels = 1 ( 1 ) ColorLabels = 5449 ( 5449 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 1 ( 1 ) Volume = 1 ( 1 ) Area = 1 ( 1 ) NCOLORS : NColors = 6 ( 6 ) -COLORS : Colors = DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED ( DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED ) +COLORS : Colors = DEEPSKYBLUE2 GREEN MAGENTA ORANGE ORANGERED RED ( DEEPSKYBLUE2 GREEN MAGENTA ORANGE ORANGERED RED ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_5/A3 b/tests/de/step_5/A3 index e860428623..ad5025287b 100644 --- a/tests/de/step_5/A3 +++ b/tests/de/step_5/A3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.01991987466 ( 0.05869680859 ) AvgTol = 0.0032 LABELS : N0Labels = 1 ( 1 ) N1Labels = 347 ( 347 ) N2Labels = 0 ( 0 ) TotalLabels = 348 ( 348 ) NameLabels = 1 ( 1 ) ColorLabels = 348 ( 348 ) LayerLabels = 1 ( 1 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 4 ( 4 ) -COLORS : Colors = CYAN1 DARKORANGE1 FORESTGREEN GREEN ( CYAN1 DARKORANGE1 FORESTGREEN GREEN ) +COLORS : Colors = CYAN DARKORANGE1 FORESTGREEN GREEN ( CYAN DARKORANGE1 FORESTGREEN GREEN ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 60 ( 60 ) diff --git a/tests/de/step_5/A5 b/tests/de/step_5/A5 index 3017481e06..642ead23bf 100644 --- a/tests/de/step_5/A5 +++ b/tests/de/step_5/A5 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.0796871773 ( 0.07968717732 ) AvgTol = 0.00067 LABELS : N0Labels = 3 ( 3 ) N1Labels = 3707 ( 3707 ) N2Labels = 0 ( 0 ) TotalLabels = 3710 ( 3710 ) NameLabels = 5 ( 5 ) ColorLabels = 3706 ( 3706 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) -COLORS : Colors = DARKGREEN DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED YELLOW ( DARKGREEN DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED YELLOW ) +COLORS : Colors = DARKGREEN DEEPSKYBLUE2 GREEN MAGENTA ORANGE ORANGERED RED YELLOW ( DARKGREEN DEEPSKYBLUE2 GREEN MAGENTA ORANGE ORANGERED RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_5/B1 b/tests/de/step_5/B1 index 2c3d894546..ba1f244543 100644 --- a/tests/de/step_5/B1 +++ b/tests/de/step_5/B1 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.004460467092 ( 0.004460467091 ) AvgTol = 2.95757 LABELS : N0Labels = 52 ( 52 ) N1Labels = 161 ( 161 ) N2Labels = 0 ( 0 ) TotalLabels = 213 ( 213 ) NameLabels = 121 ( 121 ) ColorLabels = 114 ( 114 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 24 ( 24 ) Volume = 24 ( 24 ) Area = 24 ( 24 ) NCOLORS : NColors = 18 ( 18 ) -COLORS : Colors = ALICEBLUE BLANCHEDALMOND BROWN DARKGREEN DEEPSKYBLUE2 DEEPSKYBLUE3 GOLD GRAY45 LIGHTBLUE2 LIGHTSEAGREEN LIGHTSKYBLUE1 LIGHTSKYBLUE2 MAGENTA1 ROYALBLUE ROYALBLUE1 SKYBLUE1 SKYBLUE3 SLATEBLUE1 ( ALICEBLUE BLANCHEDALMOND BROWN DARKGREEN DEEPSKYBLUE2 DEEPSKYBLUE3 GOLD GRAY45 LIGHTBLUE2 LIGHTSEAGREEN LIGHTSKYBLUE1 LIGHTSKYBLUE2 MAGENTA1 ROYALBLUE ROYALBLUE1 SKYBLUE1 SKYBLUE3 SLATEBLUE1 ) +COLORS : Colors = ALICEBLUE BLANCHEDALMOND BROWN DARKGREEN DEEPSKYBLUE2 DEEPSKYBLUE3 GOLD GRAY45 LIGHTBLUE2 LIGHTSEAGREEN LIGHTSKYBLUE1 LIGHTSKYBLUE2 MAGENTA ROYALBLUE ROYALBLUE1 SKYBLUE1 SKYBLUE3 SLATEBLUE1 ( ALICEBLUE BLANCHEDALMOND BROWN DARKGREEN DEEPSKYBLUE2 DEEPSKYBLUE3 GOLD GRAY45 LIGHTBLUE2 LIGHTSEAGREEN LIGHTSKYBLUE1 LIGHTSKYBLUE2 MAGENTA ROYALBLUE ROYALBLUE1 SKYBLUE1 SKYBLUE3 SLATEBLUE1 ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_5/B2 b/tests/de/step_5/B2 index 2580f77be6..444da2b355 100644 --- a/tests/de/step_5/B2 +++ b/tests/de/step_5/B2 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.0796871773 ( 0.07968717732 ) AvgTol = 0.00067 LABELS : N0Labels = 3 ( 3 ) N1Labels = 3707 ( 3707 ) N2Labels = 0 ( 0 ) TotalLabels = 3710 ( 3710 ) NameLabels = 5 ( 5 ) ColorLabels = 3706 ( 3706 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 8 ( 8 ) -COLORS : Colors = DARKGREEN DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED YELLOW ( DARKGREEN DEEPSKYBLUE2 GREEN MAGENTA1 ORANGE ORANGERED RED YELLOW ) +COLORS : Colors = DARKGREEN DEEPSKYBLUE2 GREEN MAGENTA ORANGE ORANGERED RED YELLOW ( DARKGREEN DEEPSKYBLUE2 GREEN MAGENTA ORANGE ORANGERED RED YELLOW ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_5/B3 b/tests/de/step_5/B3 index d58c7f26e9..4d826c35b5 100644 --- a/tests/de/step_5/B3 +++ b/tests/de/step_5/B3 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 0.218398467 ( 0.218398467 ) AvgTol = 0.00144 LABELS : N0Labels = 63 ( 63 ) N1Labels = 529 ( 529 ) N2Labels = 0 ( 0 ) TotalLabels = 592 ( 592 ) NameLabels = 592 ( 592 ) ColorLabels = 61 ( 61 ) LayerLabels = 61 ( 61 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 16 ( 16 ) -COLORS : Colors = BURLYWOOD2 CADETBLUE CYAN1 DARKORANGE1 DEEPSKYBLUE1 FIREBRICK1 KHAKI1 LIGHTGOLDENROD4 LIGHTSALMON1 LIGHTSEAGREEN MEDIUMPURPLE1 MEDIUMSPRINGGREEN SKYBLUE1 VIOLET WHITE YELLOW ( BURLYWOOD2 CADETBLUE CYAN1 DARKORANGE1 DEEPSKYBLUE1 FIREBRICK1 KHAKI1 LIGHTGOLDENROD4 LIGHTSALMON1 LIGHTSEAGREEN MEDIUMPURPLE1 MEDIUMSPRINGGREEN SKYBLUE1 VIOLET WHITE YELLOW ) +COLORS : Colors = BURLYWOOD2 CADETBLUE CYAN DARKORANGE1 DEEPSKYBLUE1 FIREBRICK1 KHAKI1 LIGHTGOLDENROD4 LIGHTSALMON1 LIGHTSEAGREEN MEDIUMPURPLE1 MEDIUMSPRINGGREEN SKYBLUE1 VIOLET WHITE YELLOW ( BURLYWOOD2 CADETBLUE CYAN DARKORANGE1 DEEPSKYBLUE1 FIREBRICK1 KHAKI1 LIGHTGOLDENROD4 LIGHTSALMON1 LIGHTSEAGREEN MEDIUMPURPLE1 MEDIUMSPRINGGREEN SKYBLUE1 VIOLET WHITE YELLOW ) NLAYERS : NLayers = 37 ( 37 ) LAYERS : Layers = 10|OBJECT 11|OBJECT 12|OBJECT 13|OBJECT 14|OBJECT 15|OBJECT 16|OBJECT 17|OBJECT 18|OBJECT 19|OBJECT 1|OBJECT 20|OBJECT 21|OBJECT 22|OBJECT 2|OBJECT 3|OBJECT 4|OBJECT 5|OBJECT 6|OBJECT 7|OBJECT 8|OBJECT 9|OBJECT BRCH-10|OBJECT BRCH-1|OBJECT BRCH-2|OBJECT BRCH-3|OBJECT BRCH-4|OBJECT BRCH-5|OBJECT BRCH-6|OBJECT BRCH-7|OBJECT BRCH-8|OBJECT BRCH-9|OBJECT DOWELS LWASHER M-50158|OBJECT OBJECT {SHRPSHIM$0$OBJECT} ( 10|OBJECT 11|OBJECT 12|OBJECT 13|OBJECT 14|OBJECT 15|OBJECT 16|OBJECT 17|OBJECT 18|OBJECT 19|OBJECT 1|OBJECT 20|OBJECT 21|OBJECT 22|OBJECT 2|OBJECT 3|OBJECT 4|OBJECT 5|OBJECT 6|OBJECT 7|OBJECT 8|OBJECT 9|OBJECT BRCH-10|OBJECT BRCH-1|OBJECT BRCH-2|OBJECT BRCH-3|OBJECT BRCH-4|OBJECT BRCH-5|OBJECT BRCH-6|OBJECT BRCH-7|OBJECT BRCH-8|OBJECT BRCH-9|OBJECT DOWELS LWASHER M-50158|OBJECT OBJECT {SHRPSHIM$0$OBJECT} ) diff --git a/tests/de/step_5/B5 b/tests/de/step_5/B5 index d238edcedb..9a886964c8 100644 --- a/tests/de/step_5/B5 +++ b/tests/de/step_5/B5 @@ -14,7 +14,7 @@ TOLERANCE : MaxTol = 9.800652784e-007 ( 9.956101111e-007 ) AvgTol = 1.0 LABELS : N0Labels = 49 ( 49 ) N1Labels = 207 ( 207 ) N2Labels = 0 ( 0 ) TotalLabels = 256 ( 256 ) NameLabels = 213 ( 213 ) ColorLabels = 80 ( 80 ) LayerLabels = 0 ( 0 ) PROPS : Centroid = 0 ( 0 ) Volume = 0 ( 0 ) Area = 0 ( 0 ) NCOLORS : NColors = 21 ( 21 ) -COLORS : Colors = BLUE1 DARKORANGE DARKSLATEGRAY1 DODGERBLUE2 GRAY13 GRAY18 GRAY27 GRAY30 GRAY31 GRAY4 GRAY65 GRAY8 GRAY85 GRAY94 GREEN LIGHTPINK2 MATRAGRAY RED RED RED4 WHITE ( BLUE1 DARKORANGE DARKSLATEGRAY1 DODGERBLUE2 GRAY13 GRAY18 GRAY27 GRAY30 GRAY31 GRAY4 GRAY65 GRAY8 GRAY85 GRAY94 GREEN LIGHTPINK2 MATRAGRAY RED RED RED4 WHITE ) +COLORS : Colors = BLUE DARKORANGE DARKSLATEGRAY1 DODGERBLUE2 GRAY13 GRAY18 GRAY27 GRAY30 GRAY31 GRAY4 GRAY65 GRAY8 GRAY85 GRAY94 GREEN LIGHTPINK2 MATRAGRAY RED RED RED4 WHITE ( BLUE DARKORANGE DARKSLATEGRAY1 DODGERBLUE2 GRAY13 GRAY18 GRAY27 GRAY30 GRAY31 GRAY4 GRAY65 GRAY8 GRAY85 GRAY94 GREEN LIGHTPINK2 MATRAGRAY RED RED RED4 WHITE ) NLAYERS : NLayers = 0 ( 0 ) LAYERS : Layers = ( ) diff --git a/tests/de/step_5/B7 b/tests/de/step_5/B7 index f134296e66..1be74ea66e 100644 --- a/tests/de/step_5/B7 +++ b/tests/de/step_5/B7 @@ -11,7 +11,7 @@ TOLERANCE : MaxTol = 2.825576197e-005 ( 2.825576197e-005 ) AvgTol = 6.5 LABELS : N0Labels = 9 ( 9 ) N1Labels = 13 ( 13 ) N2Labels = 0 ( 0 ) TotalLabels = 22 ( 22 ) NameLabels = 22 ( 22 ) ColorLabels = 5 ( 5 ) LayerLabels = 5 ( 5 ) PROPS : Centroid = 9 ( 9 ) Volume = 9 ( 9 ) Area = 9 ( 9 ) NCOLORS : NColors = 5 ( 5 ) -COLORS : Colors = BLUE1 DARKORANGE1 GREEN RED YELLOW2 ( BLUE1 DARKORANGE1 GREEN RED YELLOW2 ) +COLORS : Colors = BLUE DARKORANGE1 GREEN RED YELLOW2 ( BLUE DARKORANGE1 GREEN RED YELLOW2 ) NLAYERS : NLayers = 1 ( 1 ) LAYERS : Layers = 256 ( 256 ) diff --git a/tests/demo/draw/bug23745 b/tests/demo/draw/bug23745 index bec43d4565..807a23f976 100644 --- a/tests/demo/draw/bug23745 +++ b/tests/demo/draw/bug23745 @@ -11,7 +11,7 @@ vfont add [locate_data_file DejaVuSans.ttf] SansFont vclear vinit View1 vaxo -vdrawtext text0 "ANOTHERBUG" -pos 100 100 100 -color 1.0 0.0 0.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -font SansFont +vdrawtext text0 "ANOTHERBUG" -pos 100 100 100 -color RED -halign left -valign bottom -angle 0 -zoom 1 -height 50 -font SansFont vtrihedron trihedron set x 239 diff --git a/tests/tools/dfbrowser/A4 b/tests/tools/dfbrowser/A4 index 4733e9440a..a761268241 100644 --- a/tests/tools/dfbrowser/A4 +++ b/tests/tools/dfbrowser/A4 @@ -46,7 +46,7 @@ set test_failure 1 set test_driver "G" set test_driver_id "2a96b604-ec8b-11d0-bee7-080009dc3333" set test_transp 0.5 -set test_color 11 +set test_color AQUAMARINE4 set test_material 22 set test_positionX 100 set test_positionY 200 diff --git a/tests/v3d/edge/A10 b/tests/v3d/edge/A10 index b0b0178ec6..f42646f62d 100644 --- a/tests/v3d/edge/A10 +++ b/tests/v3d/edge/A10 @@ -11,7 +11,7 @@ proc check_highlighting { theEdgeIdx theCoords } { set nextColor [vreadpixel [lindex $theCoords [expr $aNext * 2] ] [lindex $theCoords [expr $aNext * 2 + 1] ] name] set nextNextColor [vreadpixel [lindex $theCoords [expr $aNextNext * 2] ] [lindex $theCoords [expr $aNextNext * 2 + 1] ] name] - if {$hiColor == "CYAN1 1" && $nextColor == "YELLOW 1" && $nextNextColor == "YELLOW 1"} { + if {$hiColor == "CYAN 1" && $nextColor == "YELLOW 1" && $nextNextColor == "YELLOW 1"} { return true } else { return false diff --git a/tests/v3d/face/F3 b/tests/v3d/face/F3 index 655c076021..16a5020d99 100644 --- a/tests/v3d/face/F3 +++ b/tests/v3d/face/F3 @@ -15,12 +15,12 @@ if { [vreadpixel 220 220 rgb name] != "TURQUOISE3" } { puts "Error: box b2 shoul vselfilter -type FACE vmoveto 0 0 vmoveto 220 220 -if { [vreadpixel 150 150 rgb name] != "CYAN1" } { puts "Error: face of box b1 should be highlighted" } +if { [vreadpixel 150 150 rgb name] != "CYAN" } { puts "Error: face of box b1 should be highlighted" } vselprops -pickStrategy topmost vmoveto 0 0 vmoveto 220 220 -if { [vreadpixel 150 150 rgb name] == "CYAN1" } { puts "Error: face of box b1 should NOT be highlighted" } +if { [vreadpixel 150 150 rgb name] == "CYAN" } { puts "Error: face of box b1 should NOT be highlighted" } vmoveto 150 150 -if { [vreadpixel 150 150 rgb name] != "CYAN1" } { puts "Error: face of box b1 should be highlighted" } +if { [vreadpixel 150 150 rgb name] != "CYAN" } { puts "Error: face of box b1 should be highlighted" } diff --git a/tests/v3d/glsl/clipping1 b/tests/v3d/glsl/clipping1 index 5ab1f1d23d..580d916fd5 100644 --- a/tests/v3d/glsl/clipping1 +++ b/tests/v3d/glsl/clipping1 @@ -22,7 +22,7 @@ box b5 0 0 0 30 10 70 box bb 10 -10 0 20 10 10 set aNbParts 6 -set aColors { RED YELLOW GREEN GRAY MAGENTA1 ORANGE } +set aColors { RED YELLOW GREEN GRAY MAGENTA ORANGE } compound b0 b1 b2 b3 b4 b5 cc @@ -34,7 +34,7 @@ vviewparams -scale 4.66737 -proj 0.465292 -0.577133 0.671134 -up -0.46873 0.4825 vpoint p0 0 0 0 vdisplay -dispMode 1 bb -vaspects -noupdate bb -setColor CYAN1 +vaspects -noupdate bb -setColor CYAN vzbufftrihedron puts "Display the geometry as dedicated objects" diff --git a/tests/v3d/glsl/culldist b/tests/v3d/glsl/culldist index 255fdf2372..90746dc97d 100644 --- a/tests/v3d/glsl/culldist +++ b/tests/v3d/glsl/culldist @@ -4,7 +4,7 @@ puts "Check distance culling" puts "========" set THE_NB_BOXES 5 -set THE_COLORS { RED GREEN BLUE1 YELLOW PURPLE1 } +set THE_COLORS { RED GREEN BLUE YELLOW PURPLE1 } set THE_PICK_PNTS1 { { 20 80 } { 60 110 } { 120 140 } { 200 180 } { 300 240 } } set THE_PICK_PNTS2 { { 110 140 } { 130 150 } { 160 170 } { 200 190 } { 240 210 } } diff --git a/tests/v3d/glsl/cullsize b/tests/v3d/glsl/cullsize index 28990ff9bd..6d74563cd3 100644 --- a/tests/v3d/glsl/cullsize +++ b/tests/v3d/glsl/cullsize @@ -4,7 +4,7 @@ puts "Check size culling" puts "========" set THE_NB_BOXES 5 -set THE_COLORS { RED GREEN BLUE1 YELLOW PURPLE1 } +set THE_COLORS { RED GREEN BLUE YELLOW PURPLE1 } set THE_PICK_PNTS1O { { 10 165 } { 100 200 } { 170 250 } { 250 250 } { 350 300 } } set THE_PICK_PNTS1P { { 40 170 } { 100 200 } { 170 250 } { 250 250 } { 380 350 } } set THE_PICK_PNTS2O { { 148 192 } { 175 200 } { 190 200 } { 200 220 } { 250 230 } } diff --git a/tests/v3d/glsl/interior1 b/tests/v3d/glsl/interior1 index eb95ada2a9..aeaad54b5a 100644 --- a/tests/v3d/glsl/interior1 +++ b/tests/v3d/glsl/interior1 @@ -32,8 +32,8 @@ vdrawtext t1 " s1: phong hollow-edges " -pos 2 0 0 -disptype SUBTITLE -color BLA vaspects s2 -setShadingModel GOURAUD -setInteriorStyle SOLID -setDrawEdges 1 -setEdgeColor YELLOW vdrawtext t2 " s2: gouraud solid-edges " -pos -1.3 -1.3 2.5 -halign CENTER -disptype SUBTITLE -color BLACK -subColor YELLOW -vaspects s3 -setShadingModel PHONG -setInteriorStyle SOLID -setDrawEdges 1 -edgeWidth 2 -setEdgeColor BLUE1 -vdrawtext t3 " s3: phong solid-edges " -pos 1.3 1.3 2.5 -halign CENTER -disptype SUBTITLE -color WHITE -subColor BLUE1 +vaspects s3 -setShadingModel PHONG -setInteriorStyle SOLID -setDrawEdges 1 -edgeWidth 2 -setEdgeColor BLUE +vdrawtext t3 " s3: phong solid-edges " -pos 1.3 1.3 2.5 -halign CENTER -disptype SUBTITLE -color WHITE -subColor BLUE vaspects s4 -setShadingModel GOURAUD -setInteriorStyle HIDDENLINE -setDrawEdges 1 -setEdgeColor RED vdrawtext t4 " s4: hiddenline-edges " -pos 1.3 -1.3 -1.3 -halign CENTER -disptype SUBTITLE -color BLACK -subColor RED diff --git a/tests/v3d/glsl/interior2 b/tests/v3d/glsl/interior2 index 1ca952e6f4..750bd362ee 100644 --- a/tests/v3d/glsl/interior2 +++ b/tests/v3d/glsl/interior2 @@ -9,7 +9,7 @@ vclear vclose ALL vinit View1 -width 768 -height 409 vzbufftrihedron -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL box b1 -2 0 2 1 0.2 1 box b2 2 0 2 1 0.2 1 box b3 0 0 0 1 0.2 1 @@ -24,8 +24,8 @@ vdrawtext t1 " b1: phong hollow-edges " -pos -2 0 2 -halign RIGHT -disptype SUBT vaspects b2 -setShadingModel GOURAUD -setInteriorStyle SOLID -setDrawEdges 1 -setEdgeColor YELLOW vdrawtext t2 " b2: gouraud solid-edges " -pos 2 0 2 -halign RIGHT -disptype SUBTITLE -color BLACK -subColor YELLOW -vaspects b3 -setShadingModel PHONG -setInteriorStyle SOLID -setDrawEdges 1 -edgeWidth 2 -setEdgeColor BLUE1 -vdrawtext t3 " b3: phong solid-edges " -pos 0 0 0 -halign RIGHT -disptype SUBTITLE -color WHITE -subColor BLUE1 +vaspects b3 -setShadingModel PHONG -setInteriorStyle SOLID -setDrawEdges 1 -edgeWidth 2 -setEdgeColor BLUE +vdrawtext t3 " b3: phong solid-edges " -pos 0 0 0 -halign RIGHT -disptype SUBTITLE -color WHITE -subColor BLUE vaspects b4 -setShadingModel GOURAUD -setInteriorStyle HIDDENLINE -setDrawEdges 1 -setEdgeColor RED vdrawtext t4 " b4: hiddenline-edges " -pos -2 0 -2 -halign RIGHT -disptype SUBTITLE -color BLACK -subColor RED diff --git a/tests/v3d/glsl/msaa b/tests/v3d/glsl/msaa index 76fe33952c..c69fdb2488 100644 --- a/tests/v3d/glsl/msaa +++ b/tests/v3d/glsl/msaa @@ -7,7 +7,7 @@ box b 2 3 1 vclear vclose ALL vinit View1 w=512 h=512 -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL vsetdispmode 0 vdisplay b vfit diff --git a/tests/v3d/glsl/outline1 b/tests/v3d/glsl/outline1 index cd2b2983bb..f025f32c41 100644 --- a/tests/v3d/glsl/outline1 +++ b/tests/v3d/glsl/outline1 @@ -9,7 +9,6 @@ pload MODELING VISUALIZATION vclear vinit View1 vbackground -color GAINSBORO -#vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL vaxo psphere s 1.0 @@ -18,7 +17,7 @@ box b 2 -2 -2 1 2 3 vdisplay -dispMode 1 b s vfit -vaspects b s -setDrawSilhouette 1 -setEdgeColor RED -setEdgeWidth 4 -setFaceBoundaryDraw 1 -setFaceBoundaryColor BLUE1 -setFaceBoundaryWidth 1 -setInteriorStyle HIDDENLINE +vaspects b s -setDrawSilhouette 1 -setEdgeColor RED -setEdgeWidth 4 -setFaceBoundaryDraw 1 -setFaceBoundaryColor BLUE -setFaceBoundaryWidth 1 -setInteriorStyle HIDDENLINE vdump $::imagedir/${::casename}_0.png vaspects b s -setDrawSilhouette 1 -setEdgeColor RED -setEdgeWidth 4 -setFaceBoundaryDraw 1 -setFaceBoundaryColor RED -setFaceBoundaryWidth 4 -setInteriorStyle HIDDENLINE diff --git a/tests/v3d/glsl/phong_pos2 b/tests/v3d/glsl/phong_pos2 index 4d1eae6c1b..963b79de8d 100644 --- a/tests/v3d/glsl/phong_pos2 +++ b/tests/v3d/glsl/phong_pos2 @@ -23,13 +23,13 @@ vfit set THE_LIGHTS { { -1 -1 -1 RED1 } { 1 -1 -1 YELLOW } - { -1 1 -1 BLUE1 } - { -1 -1 1 CYAN1 } + { -1 1 -1 BLUE } + { -1 -1 1 CYAN } { 1 1 -1 PURPLE } { 1 1 1 WHITE } { -1 1 1 HOTPINK } { 1 -1 1 GREEN } - { -4 -1 0 MAGENTA1 } + { -4 -1 0 MAGENTA } { 4 -1 0 MAGENTA3 } } vlight clear diff --git a/tests/v3d/glsl/phong_pos3 b/tests/v3d/glsl/phong_pos3 index ad80e5460a..80c9f9f736 100644 --- a/tests/v3d/glsl/phong_pos3 +++ b/tests/v3d/glsl/phong_pos3 @@ -16,13 +16,13 @@ vlight clear set THE_LIGHTS { { -1 -1 -1 RED1 } { 1 -1 -1 YELLOW } - { -1 1 -1 BLUE1 } - { -1 -1 1 CYAN1 } + { -1 1 -1 BLUE } + { -1 -1 1 CYAN } { 1 1 -1 PURPLE } { 1 1 1 WHITE } { -1 1 1 HOTPINK } { 1 -1 1 GREEN } - { 0 -1 0 MAGENTA1 } + { 0 -1 0 MAGENTA } { 0 1 0 MAGENTA3 } } diff --git a/tests/v3d/glsl/phong_pos4 b/tests/v3d/glsl/phong_pos4 index 6101ace5aa..69a3fd6405 100644 --- a/tests/v3d/glsl/phong_pos4 +++ b/tests/v3d/glsl/phong_pos4 @@ -16,7 +16,7 @@ vfront vfit # define lights -set THE_COLORS { RED1 YELLOW BLUE1 CYAN1 PURPLE WHITE HOTPINK GREEN MAGENTA1 MAGENTA3 } +set THE_COLORS { RED1 YELLOW BLUE CYAN PURPLE WHITE HOTPINK GREEN MAGENTA MAGENTA3 } vlight clear set aNbColors 10 set aLightIndex 0 diff --git a/tests/v3d/glsl/tiles b/tests/v3d/glsl/tiles index e084ce4350..fcd654a738 100644 --- a/tests/v3d/glsl/tiles +++ b/tests/v3d/glsl/tiles @@ -19,7 +19,7 @@ vclear vclose ALL vinit View1 vraytrace 0 -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL vsetdispmode 0 vdisplay -dispMode 1 b vfit diff --git a/tests/v3d/materials/bug24855 b/tests/v3d/materials/bug24855 index 141b3ea390..d5077e9ce3 100644 --- a/tests/v3d/materials/bug24855 +++ b/tests/v3d/materials/bug24855 @@ -9,7 +9,7 @@ set aShape [locate_data_file occ/Top.brep] vinit View1 w=768 h=768 vglinfo -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL # display shape vlight -change 0 -dir 0.577 -0.577 -0.577 diff --git a/tests/v3d/raytrace/bug24130 b/tests/v3d/raytrace/bug24130 index 52d715c81f..84dd56a6c0 100644 --- a/tests/v3d/raytrace/bug24130 +++ b/tests/v3d/raytrace/bug24130 @@ -12,7 +12,7 @@ vglinfo vvbo 0 vsetdispmode 1 -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL restore $aShape1 s1 restore $aShape2 s2 vdisplay s1 s2 diff --git a/tests/v3d/raytrace/bug24819 b/tests/v3d/raytrace/bug24819 index b496999fa7..748b469e16 100644 --- a/tests/v3d/raytrace/bug24819 +++ b/tests/v3d/raytrace/bug24819 @@ -10,7 +10,7 @@ vglinfo vvbo 0 vsetdispmode 1 -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL # boxes box b1 1 1 1 vdisplay b1 @@ -35,7 +35,7 @@ vdisplay p vmarkerstest mTest 7 -3 0 PointsOnSide=5 MarkerType=5 # 3d text -vdrawtext text0 3D_Text -pos 1 2 2 -color 1.0 0.0 0.0 -halign left -valign bottom -angle 0 -zoom 0 -height 20 -aspect regular -font SansFont +vdrawtext text0 3D_Text -pos 1 2 2 -color RED -halign left -valign bottom -angle 0 -zoom 0 -height 20 -aspect regular -font SansFont vlight -change 0 -dir 0.577 -0.577 -0.577 diff --git a/tests/v3d/raytrace/bug25201 b/tests/v3d/raytrace/bug25201 index 5ed06e6825..9782e88562 100644 --- a/tests/v3d/raytrace/bug25201 +++ b/tests/v3d/raytrace/bug25201 @@ -12,7 +12,7 @@ vglinfo vvbo 0 vsetdispmode 1 -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL vtextureenv on 4 restore $aShape1 s1 restore $aShape2 s2 diff --git a/tests/v3d/raytrace/bug26617 b/tests/v3d/raytrace/bug26617 index 89c7765bfd..c13b898217 100644 --- a/tests/v3d/raytrace/bug26617 +++ b/tests/v3d/raytrace/bug26617 @@ -17,7 +17,7 @@ vglinfo vvbo 0 vsetdispmode 1 -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL restore $aShape1 s1 restore $aShape2 s2 vdisplay s1 s2 diff --git a/tests/v3d/raytrace/refraction b/tests/v3d/raytrace/refraction index c0bfed68f4..8a4c7ace1c 100644 --- a/tests/v3d/raytrace/refraction +++ b/tests/v3d/raytrace/refraction @@ -6,7 +6,7 @@ vinit View1 vclear vrenderparams -rasterization vsetdispmode 1 -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL box wall1 1 8 8 box wall2 1 8 8 diff --git a/tests/v3d/raytrace/textures b/tests/v3d/raytrace/textures index 76eaae5859..35de06025d 100644 --- a/tests/v3d/raytrace/textures +++ b/tests/v3d/raytrace/textures @@ -6,7 +6,7 @@ vinit View1 vclear vrenderparams -rasterization vsetdispmode 1 -vbackground -gradient 0.705882 0.784314 1 0.705882 0.705882 0.705882 -gradientMode VERTICAL +vbackground -gradient B4C8FF B4B4B4 -gradientMode VERTICAL box wall1 1 8 8 box wall2 1 8 8 diff --git a/tests/v3d/transparency/blend b/tests/v3d/transparency/blend index ffb18bd181..70bb018ff5 100644 --- a/tests/v3d/transparency/blend +++ b/tests/v3d/transparency/blend @@ -8,7 +8,7 @@ set aShape2 [locate_data_file occ/Bottom.brep] vinit View1 vsetdispmode 1 -vbackground -gradient 0.705882 0.705882 0.705882 WHITE -gradientMode VERTICAL +vbackground -gradient B4B4B4 WHITE -gradientMode VERTICAL restore $aShape1 s1 restore $aShape2 s2 vdisplay s1 diff --git a/tests/v3d/viewcube/default b/tests/v3d/viewcube/default index b577a595be..1f0cd10192 100644 --- a/tests/v3d/viewcube/default +++ b/tests/v3d/viewcube/default @@ -13,7 +13,7 @@ vfit vviewcube vc -fixedAnimation 1 -duration 0 vmoveto 70 340 -if {[vreadpixel 70 340 name rgb] != "CYAN1"} { puts "Error: Highlighting of view cube Side is wrong." } +if {[vreadpixel 70 340 name rgb] != "CYAN"} { puts "Error: Highlighting of view cube Side is wrong." } vmoveto 0 0 vdump $imagedir/${casename}_axo.png @@ -25,12 +25,12 @@ 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] != "CYAN1"} { 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] != "CYAN1"} { 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." } vdump $imagedir/${casename}_corner.png diff --git a/tests/v3d/viewcube/style b/tests/v3d/viewcube/style index 958e1224b5..c205c6f07c 100644 --- a/tests/v3d/viewcube/style +++ b/tests/v3d/viewcube/style @@ -25,7 +25,7 @@ vclear # Color vrenderparams -rendScale 2 -vviewcube vc1 -boxColor 0.69 0.88 1 -textColor 0 0.4 0.54 +vviewcube vc1 -boxColor B0E0FF -textColor 00668A vdisplay vc1 -trihedron bottomLeft 100 100 # Transparency diff --git a/tests/xcaf/end b/tests/xcaf/end index e1f9f2ae87..c3f5dc48e1 100644 --- a/tests/xcaf/end +++ b/tests/xcaf/end @@ -66,20 +66,20 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } { ### colors' RGB set color1 "1 0 0" ;# RED set color2 "0 1 0" ;# GREEN - set color3 "0 0 1" ;# BLUE1 + set color3 "0 0 1" ;# BLUE set color4 "1 1 0" ;# YELLOW - set color1c "0 1 1" ;# CYAN1 - set color2c "1 0 1" ;# MAGENTA1 + set color1c "0 1 1" ;# CYAN + set color2c "1 0 1" ;# MAGENTA set color3c "1 1 1" ;# WHITE set color4c "0 0 0" ;# BLACK ### colors' name set color1name RED set color2name GREEN - set color3name BLUE1 + set color3name BLUE set color4name YELLOW - set color1cname CYAN1 - set color2cname MAGENTA1 + set color1cname CYAN + set color2cname MAGENTA set color3cname WHITE set color4cname BLACK @@ -254,20 +254,20 @@ if { [regexp "ASSEMBLY_C_L" $AddToDocument] } { ### colors' RGB set color1 "1 0 0" ;# RED set color2 "0 1 0" ;# GREEN - set color3 "0 0 1" ;# BLUE1 + set color3 "0 0 1" ;# BLUE set color4 "1 1 0" ;# YELLOW - set color1c "0 1 1" ;# CYAN1 - set color2c "1 0 1" ;# MAGENTA1 + set color1c "0 1 1" ;# CYAN + set color2c "1 0 1" ;# MAGENTA set color3c "1 1 1" ;# WHITE set color4c "0 0 0" ;# BLACK ### colors' name set color1name RED set color2name GREEN - set color3name BLUE1 + set color3name BLUE set color4name YELLOW - set color1cname CYAN1 - set color2cname MAGENTA1 + set color1cname CYAN + set color2cname MAGENTA set color3cname WHITE set color4cname BLACK ######################### COLORS VERIFYING ##############################