From 6fb1a930e242aef0b08e8ad7bb397b844e32bb6b Mon Sep 17 00:00:00 2001 From: isk Date: Thu, 27 Aug 2015 14:30:44 +0300 Subject: [PATCH] 0024387: Tests - use system-independent fonts in test cases Add a new parameter "-font FontName" to the command "vdimension". Tuning of test-cases --- .../ViewerTest_RelationCommands.cxx | 13 ++++ tests/3rdparty/export/A2 | 18 +++--- tests/3rdparty/export/A3 | 18 +++--- tests/3rdparty/export/A4 | 18 +++--- tests/3rdparty/export/A5 | 18 +++--- tests/3rdparty/export/A6 | 18 +++--- tests/3rdparty/export/A7 | 18 +++--- tests/3rdparty/fonts/A2 | 62 ++++++++++--------- tests/3rdparty/fonts/A3 | 4 +- tests/3rdparty/fonts/A4 | 4 +- tests/3rdparty/fonts/A5 | 20 +++--- tests/3rdparty/fonts/A6 | 20 +++--- tests/3rdparty/fonts/A7 | 18 +++--- tests/3rdparty/fonts/A8 | 61 ++++++++++++++++++ tests/3rdparty/fonts/B1 | 4 +- tests/3rdparty/fonts/B2 | 4 +- tests/3rdparty/fonts/B3 | 4 +- tests/bugs/vis/bug21091_4 | 22 ++++--- tests/bugs/vis/bug21091_5 | 22 ++++--- tests/bugs/vis/bug21091_6 | 22 ++++--- tests/bugs/vis/bug21091_7 | 18 +++--- tests/bugs/vis/bug21091_8 | 22 ++++--- tests/bugs/vis/bug21091_9 | 18 +++--- tests/bugs/vis/bug22796_1 | 4 +- tests/bugs/vis/bug22796_3 | 4 +- tests/bugs/vis/bug22879 | 16 ++--- tests/bugs/vis/bug23652 | 6 +- tests/bugs/vis/bug23654_MarkersRecompute | 4 +- tests/bugs/vis/bug24131_markers | 4 +- tests/bugs/vis/bug24133_1 | 4 +- tests/bugs/vis/bug24133_2 | 6 +- tests/bugs/vis/bug24133_3 | 10 +-- tests/bugs/vis/bug24133_4 | 6 +- tests/bugs/vis/bug24288_1 | 4 +- tests/bugs/vis/bug24288_2 | 4 +- tests/bugs/vis/bug24288_3 | 4 +- tests/bugs/vis/bug24293 | 5 +- tests/bugs/vis/bug24351_1 | 12 ++-- tests/bugs/vis/bug24351_2 | 12 ++-- tests/bugs/vis/bug24351_3 | 12 ++-- tests/bugs/vis/bug24351_4 | 12 ++-- tests/bugs/vis/bug24374 | 4 +- tests/bugs/vis/bug24389 | 24 +++---- tests/bugs/vis/bug24412_1 | 4 +- tests/bugs/vis/bug24412_2 | 4 +- tests/bugs/vis/bug24555 | 6 +- tests/bugs/vis/bug24837_2 | 10 +-- tests/bugs/vis/bug25121 | 18 +++--- tests/bugs/vis/bug25369 | 4 +- tests/bugs/vis/bug25403 | 6 +- tests/bugs/vis/bug25732_1 | 14 ++--- tests/bugs/vis/bug25732_2 | 4 +- tests/bugs/vis/bug25783_1 | 12 ++-- tests/bugs/vis/bug25783_2 | 12 ++-- tests/bugs/vis/bug26035_1 | 4 +- tests/bugs/vis/bug26035_2 | 4 +- tests/bugs/vis/bug26035_3 | 4 +- tests/bugs/vis/bug26035_4 | 4 +- tests/bugs/vis/bug26035_5 | 4 +- tests/bugs/vis/bug26035_6 | 4 +- tests/bugs/vis/bug26149 | 12 ++-- tests/demo/draw/bug23745 | 4 +- tests/v3d/raytrace/bug24819 | 8 ++- 63 files changed, 469 insertions(+), 276 deletions(-) create mode 100644 tests/3rdparty/fonts/A8 diff --git a/src/ViewerTest/ViewerTest_RelationCommands.cxx b/src/ViewerTest/ViewerTest_RelationCommands.cxx index 8c191afac8..8569d07233 100644 --- a/src/ViewerTest/ViewerTest_RelationCommands.cxx +++ b/src/ViewerTest/ViewerTest_RelationCommands.cxx @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -297,6 +298,16 @@ static int ParseDimensionParams (Standard_Integer theArgNum, } while (anIt + 1 < theArgNum && theArgVec[anIt + 1][0] != '-'); } + else if (aParam.IsEqual ("-font")) + { + if (anIt + 1 >= theArgNum) + { + std::cout << "Error: wrong number of values for parameter '" << aParam.ToCString() << "'.\n"; + return 1; + } + + theAspect->TextAspect()->SetFont (theArgVec[++anIt]); + } else if (aParam.IsEqual ("-label")) { do @@ -2762,6 +2773,7 @@ void ViewerTest::RelationCommands(Draw_Interpretor& theCommands) theCommands.Add("vdimension", "vdimension name {-angle|-length|-radius|-diameter} -shapes shape1 [shape2 [shape3]]\n" "[-text 3d|2d wf|sh|wireframe|shading IntegerSize]\n" + "[-font FontName]\n" "[-label left|right|hcenter|hfit top|bottom|vcenter|vfit]\n" "[-arrow external|internal|fit]\n" "[{-arrowlength|-arlen} RealArrowLength]\n" @@ -2779,6 +2791,7 @@ void ViewerTest::RelationCommands(Draw_Interpretor& theCommands) theCommands.Add("vdimparam", "vdimparam name" "[-text 3d|2d wf|sh|wireframe|shading IntegerSize]\n" + "[-font FontName]\n" "[-label left|right|hcenter|hfit top|bottom|vcenter|vfit]\n" "[-arrow external|internal|fit]\n" "[{-arrowlength|-arlen} RealArrowLength]\n" diff --git a/tests/3rdparty/export/A2 b/tests/3rdparty/export/A2 index dd9b730b74..cc2e8bca9a 100755 --- a/tests/3rdparty/export/A2 +++ b/tests/3rdparty/export/A2 @@ -4,32 +4,34 @@ puts "OCC21450" puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 diff --git a/tests/3rdparty/export/A3 b/tests/3rdparty/export/A3 index b4ebcc72ab..75eba9c51c 100644 --- a/tests/3rdparty/export/A3 +++ b/tests/3rdparty/export/A3 @@ -4,32 +4,34 @@ puts "OCC21450" puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 diff --git a/tests/3rdparty/export/A4 b/tests/3rdparty/export/A4 index c2f4127893..59ef56fcff 100644 --- a/tests/3rdparty/export/A4 +++ b/tests/3rdparty/export/A4 @@ -4,32 +4,34 @@ puts "OCC21450" puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 diff --git a/tests/3rdparty/export/A5 b/tests/3rdparty/export/A5 index bbe906a859..1da0e2e166 100644 --- a/tests/3rdparty/export/A5 +++ b/tests/3rdparty/export/A5 @@ -4,32 +4,34 @@ puts "OCC21450" puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 diff --git a/tests/3rdparty/export/A6 b/tests/3rdparty/export/A6 index 11b8f15126..7101bc8e60 100644 --- a/tests/3rdparty/export/A6 +++ b/tests/3rdparty/export/A6 @@ -4,32 +4,34 @@ puts "OCC21450" puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 diff --git a/tests/3rdparty/export/A7 b/tests/3rdparty/export/A7 index ba4e59f6b0..82698837ed 100644 --- a/tests/3rdparty/export/A7 +++ b/tests/3rdparty/export/A7 @@ -4,32 +4,34 @@ puts "OCC21450" puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 diff --git a/tests/3rdparty/fonts/A2 b/tests/3rdparty/fonts/A2 index 16dbbb7e34..02eb060b80 100755 --- a/tests/3rdparty/fonts/A2 +++ b/tests/3rdparty/fonts/A2 @@ -36,56 +36,60 @@ puts "" # If in list of textfont, not find font with necessary Name, will be used default font "Courier" # +vfont add [locate_data_file DejaVuSansMono.ttf] MonoFont +vfont add [locate_data_file DejaVuSans.ttf] SansFont +vfont add [locate_data_file DejaVuSerif.ttf] SerifFont + 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 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 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 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 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 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 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 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 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 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 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 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 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 1.0 0.0 0.0 -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 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 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 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 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 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 Arbat -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 Elephant -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 RockWell -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 1.0 0.0 1.0 -halign left -valign bottom -angle 010 -zoom 0 -height 15 -aspect regular -font SansFont +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 SerifFont +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 SerifFont +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 MonoFont +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 MonoFont diff --git a/tests/3rdparty/fonts/A3 b/tests/3rdparty/fonts/A3 index f5edea08c4..e8b94fb1e6 100644 --- a/tests/3rdparty/fonts/A3 +++ b/tests/3rdparty/fonts/A3 @@ -4,6 +4,8 @@ puts "Test case performs rendering of single huge text label" puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vtrihedron trihedr set aFileHandle [open [locate_data_file screw.step] r] @@ -15,6 +17,6 @@ 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 Times-Roman +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 vfps diff --git a/tests/3rdparty/fonts/A4 b/tests/3rdparty/fonts/A4 index ccca866956..5fa562daa0 100644 --- a/tests/3rdparty/fonts/A4 +++ b/tests/3rdparty/fonts/A4 @@ -4,6 +4,8 @@ puts "Test case performs rendering of big number of small text labels" puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vtrihedron trihedr set aFileHandle [open [locate_data_file screw.step] r] @@ -18,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 Times-Roman + 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 set aLineId [expr $aLineId + 1] } diff --git a/tests/3rdparty/fonts/A5 b/tests/3rdparty/fonts/A5 index d6c0e740b8..870b2af8fb 100644 --- a/tests/3rdparty/fonts/A5 +++ b/tests/3rdparty/fonts/A5 @@ -4,34 +4,36 @@ puts "Test case prints 3D labels with different text alignment styles" puts "============" puts "" +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 Times-Roman +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 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 Times-Roman +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 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 Times-Roman +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 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 Times-Roman +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 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 Times-Roman +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 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 Times-Roman +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 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 Times-Roman +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 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 Times-Roman +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 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 Times-Roman +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 vfit diff --git a/tests/3rdparty/fonts/A6 b/tests/3rdparty/fonts/A6 index a58130a122..2ff79e0a47 100644 --- a/tests/3rdparty/fonts/A6 +++ b/tests/3rdparty/fonts/A6 @@ -4,34 +4,36 @@ puts "Test case prints 3D labels with different text alignment styles and extra puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + 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 Arial +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 SansFont 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 Arial +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 SansFont 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 Arial +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 SansFont 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 Arial +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 SansFont 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 Arial +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 SansFont 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 Arial +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 SansFont 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 Arial +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 SansFont 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 Arial +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 SansFont 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 Arial +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 SansFont vfit diff --git a/tests/3rdparty/fonts/A7 b/tests/3rdparty/fonts/A7 index 03689bb5b9..fe65864536 100644 --- a/tests/3rdparty/fonts/A7 +++ b/tests/3rdparty/fonts/A7 @@ -4,21 +4,23 @@ puts "Test case prints overlay labels with different subtitle styles" puts "============" puts "" -vdrawtext t1 "Overlay Test Blend" -2d -perspos -1 1 -pos 100 -50 0 -height 16 -font Times-Roman -color 1 1 0 -disptype blend -subcolor 0 0 1 +vfont add [locate_data_file DejaVuSans.ttf] SansFont -vdrawtext t2 "Overlay Test Decal" -2d -perspos -1 1 -pos 100 -100 0 -height 16 -font Times-Roman -color 1 1 0 -disptype decal -subcolor 0 0 1 +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 t3 "Overlay Test Subtitle" -2d -perspos -1 1 -pos 100 -150 0 -height 16 -font Times-Roman -color 1 1 0 -disptype subtitle -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 t4 "Overlay Test Normal" -2d -perspos -1 1 -pos 100 -200 0 -height 16 -font Times-Roman -color 0 1 1 -disptype normal -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 t5 " Overlay Test Normal \n Second line" -2d -perspos -1 1 -pos 100 -250 0 -height 16 -font Times-Roman -color 0 1 1 -disptype normal -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 t6 " Overlay Test Subtitle\n Second line" -2d -perspos -1 1 -pos 100 -300 0 -height 16 -font Times-Roman -color 1 1 0 -disptype subtitle -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 0 1 1 -disptype normal -subcolor 0 0 1 -vdrawtext t7 " Overlay Test Decal \n Second line" -2d -perspos -1 1 -pos 100 -350 0 -height 16 -font Times-Roman -color 1 1 0 -disptype decal -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 t8 " Overlay Test Blend \n Second line" -2d -perspos -1 1 -pos 100 -400 0 -height 16 -font Times-Roman -color 1 1 0 -disptype blend -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 box b 1 2 3 vsetdispmode 1 diff --git a/tests/3rdparty/fonts/A8 b/tests/3rdparty/fonts/A8 new file mode 100644 index 0000000000..b1f7a33001 --- /dev/null +++ b/tests/3rdparty/fonts/A8 @@ -0,0 +1,61 @@ +puts "============" +puts "OCC24387" +puts "============" +puts "" +################################################# +# Draw the text with different fonts. +################################################# + +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 + +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 + +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 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 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 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 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 + +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 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 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 Arbat +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 Elephant +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 RockWell +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 diff --git a/tests/3rdparty/fonts/B1 b/tests/3rdparty/fonts/B1 index c9981463f4..1a1c37bb3b 100644 --- a/tests/3rdparty/fonts/B1 +++ b/tests/3rdparty/fonts/B1 @@ -5,8 +5,10 @@ puts "" pload MODELING pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + set THE_TEXT "The quick brown fox\njumps over the lazy dog!" -set THE_FONT_NAME Times-Roman +set THE_FONT_NAME SansFont set THE_FONT_SIZES {12 18 24} vsetdispmode 1 diff --git a/tests/3rdparty/fonts/B2 b/tests/3rdparty/fonts/B2 index 6119e6d3bb..c5a932ca33 100644 --- a/tests/3rdparty/fonts/B2 +++ b/tests/3rdparty/fonts/B2 @@ -5,8 +5,10 @@ puts "" pload MODELING pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + set THE_TEXT "The quick brown fox\njumps over the lazy dog!" -set THE_FONT_NAME Times-Roman +set THE_FONT_NAME SansFont set THE_FONT_SIZES {12 18 24} vsetdispmode 1 diff --git a/tests/3rdparty/fonts/B3 b/tests/3rdparty/fonts/B3 index ab9fc61851..57d031357d 100644 --- a/tests/3rdparty/fonts/B3 +++ b/tests/3rdparty/fonts/B3 @@ -5,7 +5,9 @@ puts "" pload MODELING pload VISUALIZATION -set THE_FONT_NAME Times-Roman +vfont add [locate_data_file DejaVuSans.ttf] SansFont + +set THE_FONT_NAME SansFont set THE_FONT_SIZE 24 set THE_TEXT { `1234567890-= diff --git a/tests/bugs/vis/bug21091_4 b/tests/bugs/vis/bug21091_4 index 1c5fb2525d..60bfdb3a5e 100755 --- a/tests/bugs/vis/bug21091_4 +++ b/tests/bugs/vis/bug21091_4 @@ -7,33 +7,35 @@ puts "" #vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format #Testing export to PDF format +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 @@ -46,9 +48,9 @@ set aFile ${imagedir}/${test_image}.pdf vexport ${aFile} PDF if { [string compare $tcl_platform(platform) "windows"] != 0 } { - set refsize 10091 + set refsize 10107 } else { - set refsize 10115 + set refsize 10131 } if { [file exists ${aFile}] } { diff --git a/tests/bugs/vis/bug21091_5 b/tests/bugs/vis/bug21091_5 index c58b2cef03..34c992d17e 100755 --- a/tests/bugs/vis/bug21091_5 +++ b/tests/bugs/vis/bug21091_5 @@ -7,33 +7,35 @@ puts "" #vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format #Testing export to PS format +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 @@ -46,9 +48,9 @@ set aFile ${imagedir}/${test_image}.ps vexport ${aFile} PS if { [string compare $tcl_platform(platform) "windows"] != 0 } { - set refsize 10370 + set refsize 10386 } else { - set refsize 10394 + set refsize 10410 } if { [file exists ${aFile}] } { diff --git a/tests/bugs/vis/bug21091_6 b/tests/bugs/vis/bug21091_6 index 5ae77c9914..19148e31ba 100755 --- a/tests/bugs/vis/bug21091_6 +++ b/tests/bugs/vis/bug21091_6 @@ -7,33 +7,35 @@ puts "" #vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format #Testing export to EPS format +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 box a 110 110 110 200 200 200 @@ -45,9 +47,9 @@ set aFile ${imagedir}/${test_image}.eps vexport ${aFile} EPS if { [string compare $tcl_platform(platform) "windows"] != 0 } { - set refsize 10314 + set refsize 10330 } else { - set refsize 10338 + set refsize 10354 } if { [file exists ${aFile}] } { diff --git a/tests/bugs/vis/bug21091_7 b/tests/bugs/vis/bug21091_7 index 8c6f0d427d..212864edbe 100755 --- a/tests/bugs/vis/bug21091_7 +++ b/tests/bugs/vis/bug21091_7 @@ -7,35 +7,37 @@ puts "" #vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format #Testing export to TEX format +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit set only_screen 1 vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 diff --git a/tests/bugs/vis/bug21091_8 b/tests/bugs/vis/bug21091_8 index 58051f2df0..e719264be7 100755 --- a/tests/bugs/vis/bug21091_8 +++ b/tests/bugs/vis/bug21091_8 @@ -7,33 +7,35 @@ puts "" #vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format #Testing export to SVG format +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 @@ -46,9 +48,9 @@ set aFile ${imagedir}/${test_image}.svg vexport ${aFile} SVG if { [string compare $tcl_platform(platform) "windows"] != 0 } { - set refsize 14191 + set refsize 14207 } else { - set refsize 14075 + set refsize 14091 } if { [file exists ${aFile}] } { diff --git a/tests/bugs/vis/bug21091_9 b/tests/bugs/vis/bug21091_9 index 27b7dd45e6..952eec0aa0 100755 --- a/tests/bugs/vis/bug21091_9 +++ b/tests/bugs/vis/bug21091_9 @@ -7,33 +7,35 @@ puts "" #vexport full_file_path {PS | EPS | TEX | PDF | SVG | PGF } : exports the view to a vector file of a given format #Testing export to PGF format +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vtrihedron trihedron vpoint p1 -300 -300 -300 -vdrawtext OC0 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 OC0 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 SansFont vpoint p2 -300 -300 -100 -vdrawtext OC1 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 OC1 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 SansFont vpoint p3 -100 -100 -300 -vdrawtext OC2 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 OC2 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 SansFont vpoint p4 -100 -100 -100 -vdrawtext OC3 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 OC3 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 SansFont vpoint p5 -300 -100 -300 -vdrawtext OC4 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 OC4 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 SansFont vpoint p6 -100 -300 -300 -vdrawtext OC5 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 OC5 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 SansFont vpoint p7 -300 -100 -100 -vdrawtext OC6 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 OC6 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 SansFont vpoint p8 -100 -300 -100 -vdrawtext OC7 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 OC7 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 SansFont vaxis ax1 100 100 100 100 100 0 diff --git a/tests/bugs/vis/bug22796_1 b/tests/bugs/vis/bug22796_1 index 48a0a7a365..ebb220659e 100755 --- a/tests/bugs/vis/bug22796_1 +++ b/tests/bugs/vis/bug22796_1 @@ -6,10 +6,12 @@ puts "" # Possibility to display multi-line text in 3D ####################################################################### +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 +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 set only_screen 1 diff --git a/tests/bugs/vis/bug22796_3 b/tests/bugs/vis/bug22796_3 index c3a91c573b..cbac1fd28e 100755 --- a/tests/bugs/vis/bug22796_3 +++ b/tests/bugs/vis/bug22796_3 @@ -6,10 +6,12 @@ puts "" # Possibility to display multi-line text in 3D ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + set BugNumber OCC22796 vinit -vdrawtext text0 "TestString\nHello,\tWorld!" -pos 0 0 0 -color 1.0 1.0 1.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular +vdrawtext text0 "TestString\nHello,\tWorld!" -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 vexport $imagedir/${test_image}.pdf PDF set only_screen 1 diff --git a/tests/bugs/vis/bug22879 b/tests/bugs/vis/bug22879 index 429a660d73..76254ac824 100755 --- a/tests/bugs/vis/bug22879 +++ b/tests/bugs/vis/bug22879 @@ -6,17 +6,19 @@ puts "" # Possible bug in Opengl_togl_begin_layer_mode.cxx ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + set BugNumber OCC22879 vinit -vdrawtext t1 "Text Height=14" -2d -perspos -1 1 -pos 10 -10 0 -height 14 -color 1 1 1 -vdrawtext t2 "Text Height=25" -2d -perspos -1 1 -pos 10 -40 0 -height 25 -color 1 1 1 -vdrawtext t3 "Arial" -2d -perspos -1 1 -pos 10 -60 0 -height 18 -font Arial -color 1 0 0 -vdrawtext t4 "Times New Roman" -2d -perspos -1 1 -pos 10 -80 0 -height 18 -font Times-Roman -color 0 0 1 -vdrawtext t5 "Subtitle" -2d -perspos -1 1 -pos 10 -110 0 -height 20 -font Arial -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 Arial -color 0 0 1 -disptype decal -subcolor 1 0 0 -vdrawtext t7 "Blend" -2d -perspos -1 1 -pos 10 -170 0 -height 20 -font Arial -color 1 0 0 -disptype blend +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 box b 50 -700 450 50 50 50 vdisplay b vsetdispmode 1 diff --git a/tests/bugs/vis/bug23652 b/tests/bugs/vis/bug23652 index 90334fe7f5..7d512ac8f5 100755 --- a/tests/bugs/vis/bug23652 +++ b/tests/bugs/vis/bug23652 @@ -6,10 +6,12 @@ puts "========" # Non zoomable text with alignment slides away when zooming view ############################################################################### +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 -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 +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 set scale 3.1783114563761763 set proj_X 0.57735025882720947 diff --git a/tests/bugs/vis/bug23654_MarkersRecompute b/tests/bugs/vis/bug23654_MarkersRecompute index 911328a27e..67f4d717c3 100644 --- a/tests/bugs/vis/bug23654_MarkersRecompute +++ b/tests/bugs/vis/bug23654_MarkersRecompute @@ -39,11 +39,13 @@ vdisplay b vfit verase b +vfont add [locate_data_file DejaVuSans.ttf] SansFont + 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 Arial + 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 SansFont if { $aMarkerType == 13 } { vmarkerstest m${aMarkerType}_${aCol} $aCol $aRow 0 PointsOnSide=1 FileName=$aCustom1 set aCol [expr $aCol - 1] diff --git a/tests/bugs/vis/bug24131_markers b/tests/bugs/vis/bug24131_markers index 5de3465242..0701fb5b4d 100644 --- a/tests/bugs/vis/bug24131_markers +++ b/tests/bugs/vis/bug24131_markers @@ -26,6 +26,8 @@ set aCustom1 [locate_data_file images/marker_box1.png] set aCustom2 [locate_data_file images/marker_box2.png] set aCustom3 [locate_data_file images/marker_dot.png] +vfont add [locate_data_file DejaVuSans.ttf] SansFont + # draw box in advance which should fit all our markers box b -8 -8 0 16 16 2 puts "hI" @@ -47,7 +49,7 @@ for { set aMode 0 } { $aMode <= 1 } { incr aMode } { 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 Arial + 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 SansFont if { $aMarkerType == 13 } { vmarkerstest m${aMarkerType}_${aCol} $aCol $aRow 0 PointsOnSide=1 FileName=$aCustom1 set aCol [expr $aCol - 1] diff --git a/tests/bugs/vis/bug24133_1 b/tests/bugs/vis/bug24133_1 index 194fef79d4..66b4aa8485 100644 --- a/tests/bugs/vis/bug24133_1 +++ b/tests/bugs/vis/bug24133_1 @@ -8,10 +8,12 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vpoint lengthP1 0 0 0 vpoint lengthP2 50 50 50 -vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 +vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 -font SansFont vfit vmoveto 82 254 diff --git a/tests/bugs/vis/bug24133_2 b/tests/bugs/vis/bug24133_2 index 2f1c53eeb6..88c909e539 100644 --- a/tests/bugs/vis/bug24133_2 +++ b/tests/bugs/vis/bug24133_2 @@ -8,11 +8,13 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vpoint angleP1 0 0 0 vpoint angleP2 50 50 50 vpoint angleP3 50 50 100 -vdimension dim1 -angle -shapes angleP1 angleP2 angleP3 +vdimension dim1 -angle -shapes angleP1 angleP2 angleP3 -font SansFont vfit vmoveto 249 206 @@ -26,7 +28,7 @@ if { $stat != 1 } { } vinit Viewer2/View2 vdisplay angleP1 angleP2 angleP3 -vdimension dim2 -angle -text 3d -shapes angleP1 angleP2 angleP3 +vdimension dim2 -angle -text 3d -shapes angleP1 angleP2 angleP3 -font SansFont vfit vmoveto 263 251 diff --git a/tests/bugs/vis/bug24133_3 b/tests/bugs/vis/bug24133_3 index 50eb3c0155..0d4acd1397 100644 --- a/tests/bugs/vis/bug24133_3 +++ b/tests/bugs/vis/bug24133_3 @@ -8,13 +8,15 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vpoint radP1 0 0 0 vpoint radP2 50 50 0 vpoint radP3 100 0 0 vcircle circle radP1 radP2 radP3 0 verase radP1 radP2 radP3 -vdimension dim1 -radius -shapes circle +vdimension dim1 -radius -shapes circle -font SansFont vfit vmoveto 123 158 @@ -29,12 +31,12 @@ if { $stat != 1 } { vinit Viewer2/View2 vdisplay circle -vdimension dim2 -radius -text 3d -shapes circle +vdimension dim2 -radius -text 3d -shapes circle -font SansFont vfit vmoveto 191 196 -set x_coord 129 -set y_coord 172 +set x_coord 112 +set y_coord 151 checkcolor $x_coord $y_coord 0 1 1 diff --git a/tests/bugs/vis/bug24133_4 b/tests/bugs/vis/bug24133_4 index 7e5039e44e..ab4d64e1fb 100644 --- a/tests/bugs/vis/bug24133_4 +++ b/tests/bugs/vis/bug24133_4 @@ -8,13 +8,15 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vpoint diamP1 0 0 0 vpoint diamP2 50 50 0 vpoint diamP3 100 0 0 vcircle circle diamP1 diamP2 diamP3 0 verase diamP1 diamP2 diamP3 -vdimension dim1 -diameter -shapes circle +vdimension dim1 -diameter -shapes circle -font SansFont vfit vmoveto 208 205 @@ -29,7 +31,7 @@ if { $stat != 1 } { vinit Viewer2/View2 vdisplay circle -vdimension dim2 -diameter -text 3d -shapes circle +vdimension dim2 -diameter -text 3d -shapes circle -font SansFont vfit vmoveto 208 205 diff --git a/tests/bugs/vis/bug24288_1 b/tests/bugs/vis/bug24288_1 index f5b3ee9b33..51081e5271 100644 --- a/tests/bugs/vis/bug24288_1 +++ b/tests/bugs/vis/bug24288_1 @@ -8,6 +8,8 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + set m_pi 3,14 set m_pi2 1,57 vinit @@ -17,7 +19,7 @@ vpoint radP3 100 0 0 vcircle circle radP1 radP2 radP3 0 vrotate 0 -$m_pi2 0 verase radP1 radP2 radP3 -vdimension dim -radius -text 3d -shapes circle +vdimension dim -radius -text 3d -shapes circle -font SansFont vfit vmoveto 110 111 diff --git a/tests/bugs/vis/bug24288_2 b/tests/bugs/vis/bug24288_2 index d90905cc13..e89554cad3 100644 --- a/tests/bugs/vis/bug24288_2 +++ b/tests/bugs/vis/bug24288_2 @@ -8,6 +8,8 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + set m_pi 3,14 set m_pi2 1,57 vinit @@ -17,7 +19,7 @@ vpoint radP3 100 0 0 vcircle circle radP1 radP2 radP3 0 vrotate 0 -$m_pi2 0 verase radP1 radP2 radP3 -vdimension dim -radius -text 3d -shapes circle +vdimension dim -radius -text 3d -shapes circle -font SansFont vfit vmoveto 110 111 diff --git a/tests/bugs/vis/bug24288_3 b/tests/bugs/vis/bug24288_3 index fe85221922..c2704d0563 100644 --- a/tests/bugs/vis/bug24288_3 +++ b/tests/bugs/vis/bug24288_3 @@ -8,6 +8,8 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + set m_pi 3,14 set m_pi2 1,57 vinit @@ -17,7 +19,7 @@ vpoint radP3 100 0 0 vcircle circle radP1 radP2 radP3 0 vrotate 0 -$m_pi2 0 verase radP1 radP2 radP3 -vdimension dim -radius -text 3d -shapes circle +vdimension dim -radius -text 3d -shapes circle -font SansFont vfit vmoveto 110 111 diff --git a/tests/bugs/vis/bug24293 b/tests/bugs/vis/bug24293 index 88d0b0d762..1bb125534c 100644 --- a/tests/bugs/vis/bug24293 +++ b/tests/bugs/vis/bug24293 @@ -5,10 +5,13 @@ puts "" ####################################################################### # Dimension flyout lines don't belong to the dimension sensitive entity. ####################################################################### + +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit View1 vpoint lengthP1 0 0 0 vpoint lengthP2 10 10 10 -vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 +vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 -font SansFont vfit vmoveto 202 191 diff --git a/tests/bugs/vis/bug24351_1 b/tests/bugs/vis/bug24351_1 index e929520e2d..933431b60d 100644 --- a/tests/bugs/vis/bug24351_1 +++ b/tests/bugs/vis/bug24351_1 @@ -7,6 +7,8 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vright @@ -30,16 +32,16 @@ vpoint arrow_p7 0 0 50 vpoint arrow_p8 10 0 50 # test forced internal arrow orientation -vdimension arrow_d1 -length -shapes arrow_p1 arrow_p2 -text 3d -plane zox -label hfit -flyout 10.0 -arrow internal +vdimension arrow_d1 -length -shapes arrow_p1 arrow_p2 -text 3d -plane zox -label hfit -flyout 10.0 -arrow internal -font SansFont # test forced external arrow orientation -vdimension arrow_d2 -length -shapes arrow_p3 arrow_p4 -text 3d -plane zox -label hfit -flyout 10.0 -arrow external +vdimension arrow_d2 -length -shapes arrow_p3 arrow_p4 -text 3d -plane zox -label hfit -flyout 10.0 -arrow external -font SansFont # test that auto-fit for arrow places them externally for small geometry -vdimension arrow_d3 -length -shapes arrow_p5 arrow_p6 -text 3d -plane zox -label hcenter -flyout 10.0 -arrow fit +vdimension arrow_d3 -length -shapes arrow_p5 arrow_p6 -text 3d -plane zox -label hcenter -flyout 10.0 -arrow fit -font SansFont # test that auto-fit for text places the label externally for small geometry -vdimension arrow_d4 -length -shapes arrow_p7 arrow_p8 -text 3d -plane zox -label hfit -flyout 10.0 -arrow fit +vdimension arrow_d4 -length -shapes arrow_p7 arrow_p8 -text 3d -plane zox -label hfit -flyout 10.0 -arrow fit -font SansFont vfit @@ -62,7 +64,7 @@ for {set r 0} {$r < 3} {incr r} { set dimension d_$idx - vdimension $dimension -length -shapes $point1 $point2 -text 3d -plane zox -label [lindex $hpos $c] [lindex $vpos $r] -arrow external -flyout 10.0 + vdimension $dimension -length -shapes $point1 $point2 -text 3d -plane zox -label [lindex $hpos $c] [lindex $vpos $r] -arrow external -flyout 10.0 -font SansFont vdisplay $dimension incr idx diff --git a/tests/bugs/vis/bug24351_2 b/tests/bugs/vis/bug24351_2 index 064aef678b..aa58735f60 100644 --- a/tests/bugs/vis/bug24351_2 +++ b/tests/bugs/vis/bug24351_2 @@ -7,6 +7,8 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vright @@ -22,28 +24,28 @@ vpoint circle1_p1 0 0 30 vpoint circle1_p2 30 0 0 vpoint circle1_p3 60 0 30 vcircle circle1 circle1_p1 circle1_p2 circle1_p3 0 -vdimension diam1 -diameter -shapes circle1 -text 3d -plane zox -label hfit -flyout 0 -arrow internal +vdimension diam1 -diameter -shapes circle1 -text 3d -plane zox -label hfit -flyout 0 -arrow internal -font SansFont # test forced external arrow orientation vpoint circle2_p1 100 0 30 vpoint circle2_p2 130 0 0 vpoint circle2_p3 160 0 30 vcircle circle2 circle2_p1 circle2_p2 circle2_p3 0 -vdimension diam2 -diameter -shapes circle2 -text 3d -plane zox -label hfit -flyout 0 -arrow external +vdimension diam2 -diameter -shapes circle2 -text 3d -plane zox -label hfit -flyout 0 -arrow external -font SansFont # test that auto-fit for arrow places them externally for small geometry vpoint circle3_p1 0 0 102 vpoint circle3_p2 22 0 80 vpoint circle3_p3 44 0 102 vcircle circle3 circle3_p1 circle3_p2 circle3_p3 0 -vdimension diam3 -diameter -shapes circle3 -text 3d -plane zox -label hcenter -flyout 0 -label hfit -arrow fit +vdimension diam3 -diameter -shapes circle3 -text 3d -plane zox -label hcenter -flyout 0 -label hfit -arrow fit -font SansFont # test that auto-fit for text places the label externally for small geometry vpoint circle4_p1 100 0 92 vpoint circle4_p2 112 0 80 vpoint circle4_p3 124 0 92 vcircle circle4 circle4_p1 circle4_p2 circle4_p3 0 -vdimension diam4 -diameter -shapes circle4 -text 3d -plane zox -label hfit -flyout 0 -label hfit -arrow fit +vdimension diam4 -diameter -shapes circle4 -text 3d -plane zox -label hfit -flyout 0 -label hfit -arrow fit -font SansFont vfit @@ -70,7 +72,7 @@ for {set r 0} {$r < 3} {incr r} { set dimension d_$idx - vdimension $dimension -diameter -shapes $circle -text 3d -plane zox -label [lindex $hpos $c] [lindex $vpos $r] -arrow external -flyout 0.0 + vdimension $dimension -diameter -shapes $circle -text 3d -plane zox -label [lindex $hpos $c] [lindex $vpos $r] -arrow external -flyout 0.0 -font SansFont vdisplay $dimension incr idx diff --git a/tests/bugs/vis/bug24351_3 b/tests/bugs/vis/bug24351_3 index 62ad32bdfb..b9bbcbce27 100644 --- a/tests/bugs/vis/bug24351_3 +++ b/tests/bugs/vis/bug24351_3 @@ -7,6 +7,8 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vright @@ -22,28 +24,28 @@ vpoint circle1_p1 0 0 30 vpoint circle1_p2 30 0 0 vpoint circle1_p3 60 0 30 vcircle circle1 circle1_p1 circle1_p2 circle1_p3 0 -vdimension rad1 -radius -shapes circle1 -text 3d -plane zox -label hfit -flyout 0 -arrow internal +vdimension rad1 -radius -shapes circle1 -text 3d -plane zox -label hfit -flyout 0 -arrow internal -font SansFont # test forced external arrow orientation vpoint circle2_p1 100 0 35 vpoint circle2_p2 135 0 0 vpoint circle2_p3 170 0 35 vcircle circle2 circle2_p1 circle2_p2 circle2_p3 0 -vdimension rad2 -radius -shapes circle2 -text 3d -plane zox -label hfit -flyout 0 -arrow external +vdimension rad2 -radius -shapes circle2 -text 3d -plane zox -label hfit -flyout 0 -arrow external -font SansFont # test that auto-fit for arrow places them externally for small geometry vpoint circle3_p1 0 0 113 vpoint circle3_p2 33 0 80 vpoint circle3_p3 66 0 113 vcircle circle3 circle3_p1 circle3_p2 circle3_p3 0 -vdimension rad3 -radius -shapes circle3 -text 3d -plane zox -label hcenter -flyout 0 -arrow fit +vdimension rad3 -radius -shapes circle3 -text 3d -plane zox -label hcenter -flyout 0 -arrow fit -font SansFont # test that auto-fit for text places the label externally for small geometry vpoint circle4_p1 120 0 95 vpoint circle4_p2 135 0 80 vpoint circle4_p3 150 0 95 vcircle circle4 circle4_p1 circle4_p2 circle4_p3 0 -vdimension rad4 -radius -shapes circle4 -text 3d -plane zox -label hfit -flyout 0 -arrow fit +vdimension rad4 -radius -shapes circle4 -text 3d -plane zox -label hfit -flyout 0 -arrow fit -font SansFont vfit # ------------------------------------------------ @@ -69,7 +71,7 @@ for {set r 0} {$r < 3} {incr r} { set dimension r_$idx - vdimension $dimension -radius -shapes $circle -text 3d -plane zox -label [lindex $hpos $c] [lindex $vpos $r] -arrow external -flyout 0.0 + vdimension $dimension -radius -shapes $circle -text 3d -plane zox -label [lindex $hpos $c] [lindex $vpos $r] -arrow external -flyout 0.0 -font SansFont vdisplay $dimension incr idx diff --git a/tests/bugs/vis/bug24351_4 b/tests/bugs/vis/bug24351_4 index c837332ac1..c5fbde222a 100644 --- a/tests/bugs/vis/bug24351_4 +++ b/tests/bugs/vis/bug24351_4 @@ -7,6 +7,8 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vright @@ -21,25 +23,25 @@ set vpos "above vcenter below" vpoint angle1_p1 0 0 40 vpoint angle1_p2 0 0 0 vpoint angle1_p3 40 0 0 -vdimension ang1 -angle -shapes angle1_p1 angle1_p2 angle1_p3 -text 3d -plane zox -label hfit -flyout 40.0 -arrow internal +vdimension ang1 -angle -shapes angle1_p1 angle1_p2 angle1_p3 -text 3d -plane zox -label hfit -flyout 40.0 -arrow internal -font SansFont # test forced external arrow orientation vpoint angle2_p1 80 0 40 vpoint angle2_p2 80 0 0 vpoint angle2_p3 120 0 0 -vdimension ang2 -angle -shapes angle2_p1 angle2_p2 angle2_p3 -text 3d -plane zox -label hfit -flyout 40.0 -arrow external +vdimension ang2 -angle -shapes angle2_p1 angle2_p2 angle2_p3 -text 3d -plane zox -label hfit -flyout 40.0 -arrow external -font SansFont # test that auto-fit for arrow places them externally for small geometry vpoint angle3_p1 0 0 100 vpoint angle3_p2 0 0 80 vpoint angle3_p3 20 0 80 -vdimension ang3 -angle -shapes angle3_p1 angle3_p2 angle3_p3 -text 3d -plane zox -label hcenter -flyout 20.0 -arrow fit +vdimension ang3 -angle -shapes angle3_p1 angle3_p2 angle3_p3 -text 3d -plane zox -label hcenter -flyout 20.0 -arrow fit -font SansFont # test that auto-fit for text places the label externally for small geometry vpoint angle4_p1 85 0 100 vpoint angle4_p2 85 0 85 vpoint angle4_p3 100 0 85 -vdimension ang4 -angle -shapes angle4_p1 angle4_p2 angle4_p3 -text 3d -plane zox -label hfit -flyout 15.0 -arrow fit +vdimension ang4 -angle -shapes angle4_p1 angle4_p2 angle4_p3 -text 3d -plane zox -label hfit -flyout 15.0 -arrow fit -font SansFont vdisplay ang1 ang2 ang3 ang4 vfit @@ -65,7 +67,7 @@ for {set r 0} {$r < 3} {incr r} { set dimension r_$idx - vdimension $dimension -angle -shapes $point1 $point2 $point3 -text 3d -plane zox -label [lindex $hpos $c] [lindex $vpos $r] -arrow external -flyout 40.0 + vdimension $dimension -angle -shapes $point1 $point2 $point3 -text 3d -plane zox -label [lindex $hpos $c] [lindex $vpos $r] -arrow external -flyout 40.0 -font SansFont vdisplay $dimension incr idx diff --git a/tests/bugs/vis/bug24374 b/tests/bugs/vis/bug24374 index 746a6e8902..adaf07f5b4 100644 --- a/tests/bugs/vis/bug24374 +++ b/tests/bugs/vis/bug24374 @@ -5,11 +5,13 @@ puts "" ####################################################################### # Flipping affects highlight presentation of dimension ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + box b 100 100 100 explode b e vdisplay b vdisplay b_9 -vdimension dim1 -length -shapes b_9 -text 3d -plane zox +vdimension dim1 -length -shapes b_9 -text 3d -plane zox -font SansFont vselmode b 2 1 vselmode dim1 2 1 vfit diff --git a/tests/bugs/vis/bug24389 b/tests/bugs/vis/bug24389 index c6be927cb7..91979decf8 100644 --- a/tests/bugs/vis/bug24389 +++ b/tests/bugs/vis/bug24389 @@ -6,6 +6,8 @@ puts "" # Invalid hilight of AIS dimension line in local selection ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + # ----------------------------------------------# # Check highlight of length dimension elements # # ----------------------------------------------# @@ -23,14 +25,14 @@ vpoint len_p1 0 0 0 vpoint len_p2 40 0 0 verase len_p1 len_p2 -vdimension len1 -length -text 3d -plane xoy -flyout 20 -arrow external -label left -shapes len_p1 len_p2 -vdimension len2 -length -text 3d -plane xoy -flyout -20 -arrow external -label right -shapes len_p1 len_p2 +vdimension len1 -length -text 3d -plane xoy -flyout 20 -arrow external -label left -shapes len_p1 len_p2 -font SansFont +vdimension len2 -length -text 3d -plane xoy -flyout -20 -arrow external -label right -shapes len_p1 len_p2 -font SansFont vpoint len_p3 0 20 0 vpoint len_p4 40 20 0 verase len_p3 len_p4 -vdimension len3 -length -text 3d -plane xoy -flyout 20 -arrow internal -label hcenter -shapes len_p3 len_p4 +vdimension len3 -length -text 3d -plane xoy -flyout 20 -arrow internal -label hcenter -shapes len_p3 len_p4 -font SansFont # diameter @@ -39,21 +41,21 @@ vpoint diam_p2 120 0 0 vpoint diam_p3 105 -15 0 verase diam_p1 diam_p2 diam_p3 vcircle diam_c1 diam_p1 diam_p2 diam_p3 0 -vdimension diam1 -diameter -text 3d -plane xoy -arrow external -label left -shapes diam_c1 +vdimension diam1 -diameter -text 3d -plane xoy -arrow external -label left -shapes diam_c1 -font SansFont vpoint diam_p4 90 40 0 vpoint diam_p5 120 40 0 vpoint diam_p6 105 25 0 verase diam_p4 diam_p5 diam_p6 vcircle diam_c2 diam_p4 diam_p5 diam_p6 0 -vdimension diam2 -diameter -text 3d -plane xoy -arrow external -label right -shapes diam_c2 +vdimension diam2 -diameter -text 3d -plane xoy -arrow external -label right -shapes diam_c2 -font SansFont vpoint diam_p7 80 -40 0 vpoint diam_p8 120 -40 0 vpoint diam_p9 100 -60 0 verase diam_p7 diam_p8 diam_p9 vcircle diam_c3 diam_p7 diam_p8 diam_p9 0 -vdimension diam3 -diameter -text 3d -plane xoy -arrow external -label hcenter -flyout 30 -shapes diam_c3 +vdimension diam3 -diameter -text 3d -plane xoy -arrow external -label hcenter -flyout 30 -shapes diam_c3 -font SansFont # radius @@ -62,14 +64,14 @@ vpoint rad_p2 180 -45 0 vpoint rad_p3 220 -5 0 verase rad_p1 rad_p2 rad_p3 vcircle rad_c1 rad_p1 rad_p2 rad_p3 0 -vdimension rad1 -radius -text 3d -plane xoy -arrow internal -label hcenter -flyout 0 -shapes rad_c1 +vdimension rad1 -radius -text 3d -plane xoy -arrow internal -label hcenter -flyout 0 -shapes rad_c1 -font SansFont vpoint rad_p4 180 -70 0 vpoint rad_p5 160 -90 0 vpoint rad_p6 140 -70 0 verase rad_p4 rad_p5 rad_p6 vcircle rad_c2 rad_p4 rad_p5 rad_p6 0 -vdimension rad2 -radius -text 3d -plane xoy -arrow external -label left -shapes rad_c2 +vdimension rad2 -radius -text 3d -plane xoy -arrow external -label left -shapes rad_c2 -font SansFont # angles @@ -77,19 +79,19 @@ vpoint ang_p1 0 -50 0 vpoint ang_p2 25 -75 0 vpoint ang_p3 0 -100 0 verase ang_p1 ang_p2 ang_p3 -vdimension ang1 -angle -text 3d -plane xoy -arrow internal -label hcenter -flyout 35 -shapes ang_p1 ang_p2 ang_p3 +vdimension ang1 -angle -text 3d -plane xoy -arrow internal -label hcenter -flyout 35 -shapes ang_p1 ang_p2 ang_p3 -font SansFont vpoint ang_p4 0 -120 0 vpoint ang_p5 30 -80 0 vpoint ang_p6 30 -120 0 verase ang_p4 ang_p5 ang_p6 -vdimension ang2 -angle -text 3d -plane xoy -arrow external -label left -flyout 55 -shapes ang_p4 ang_p5 ang_p6 +vdimension ang2 -angle -text 3d -plane xoy -arrow external -label left -flyout 55 -shapes ang_p4 ang_p5 ang_p6 -font SansFont vpoint ang_p8 55 -120 0 vpoint ang_p9 55 -80 0 vpoint ang_p10 95 -120 0 verase ang_p8 ang_p9 ang_p10 -vdimension ang3 -angle -text 3d -plane xoy -arrow external -label right -flyout 55 -shapes ang_p8 ang_p9 ang_p10 +vdimension ang3 -angle -text 3d -plane xoy -arrow external -label right -flyout 55 -shapes ang_p8 ang_p9 ang_p10 -font SansFont vpoint fit1 -75 0 0 vpoint fit2 235 0 0 diff --git a/tests/bugs/vis/bug24412_1 b/tests/bugs/vis/bug24412_1 index e86773ad6e..19c4a9e34d 100644 --- a/tests/bugs/vis/bug24412_1 +++ b/tests/bugs/vis/bug24412_1 @@ -8,6 +8,8 @@ puts "" ####################################################################### pload ALL +vfont add [locate_data_file DejaVuSans.ttf] SansFont + set anImage1 $imagedir/${casename}_1.png set anImage2 $imagedir/${casename}_2.png @@ -17,7 +19,7 @@ vpoint circ_p2 30 10 0 vpoint circ_p3 60 10 30 vcircle circ circ_p1 circ_p2 circ_p3 0 vdisplay circ -vdimension diam -diameter -shapes circ +vdimension diam -diameter -shapes circ -font SansFont # Change text position vmovedim diam 15 15 15 vfit diff --git a/tests/bugs/vis/bug24412_2 b/tests/bugs/vis/bug24412_2 index 9f6c5f1bf9..da6239d428 100644 --- a/tests/bugs/vis/bug24412_2 +++ b/tests/bugs/vis/bug24412_2 @@ -8,6 +8,8 @@ puts "" ####################################################################### pload ALL +vfont add [locate_data_file DejaVuSans.ttf] SansFont + set anImage1 $imagedir/${casename}_1.png set anImage2 $imagedir/${casename}_2.png @@ -15,7 +17,7 @@ vinit Viewer1/View1 vpoint ang_p1 0 0 30 vpoint ang_p2 30 0 0 vpoint ang_p3 60 0 30 -vdimension ang -angle -shapes ang_p1 ang_p2 ang_p3 +vdimension ang -angle -shapes ang_p1 ang_p2 ang_p3 -font SansFont vmovedim ang 5 0 5 vfit diff --git a/tests/bugs/vis/bug24555 b/tests/bugs/vis/bug24555 index a9e9ee1843..9f3988a391 100755 --- a/tests/bugs/vis/bug24555 +++ b/tests/bugs/vis/bug24555 @@ -6,12 +6,14 @@ puts "" # Visualization - the same text is rendered with shift at second time ####################################################################### +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 Arial +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 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 Arial +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 set x 346 set y 190 diff --git a/tests/bugs/vis/bug24837_2 b/tests/bugs/vis/bug24837_2 index 37de7ea9a7..1646095b95 100644 --- a/tests/bugs/vis/bug24837_2 +++ b/tests/bugs/vis/bug24837_2 @@ -6,6 +6,8 @@ puts "" # Visualization - revise design and implementation of connected Interactive Objects ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + pload MODELING VISUALIZATION box o1 -10 -10 -5 1 1 10 box o2 10 10 -5 1 1 10 @@ -18,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 Arial -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 Arial -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 Arial -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 Arial +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 vsetdispmode 1 set anImage ${imagedir}/${casename}_2_1.png vdump ${anImage} diff --git a/tests/bugs/vis/bug25121 b/tests/bugs/vis/bug25121 index f530021918..72ed259214 100644 --- a/tests/bugs/vis/bug25121 +++ b/tests/bugs/vis/bug25121 @@ -6,6 +6,8 @@ puts "" # Visualization, OpenGl_Text - correct scaling factor for fixed-size text at 3D point ####################################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit box b -5 -5 0 10 10 1 @@ -13,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 Courier -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 Courier -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 Courier -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 Courier -vdrawtext t1 "000 2D" -2d -perspos -1 1 -pos 100 -200 0 -height 16 -font Courier -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 Courier -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 Courier -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 Courier -color 1 1 1 -disptype normal -subcolor 0 0 1 +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 set only_screen 1 diff --git a/tests/bugs/vis/bug25369 b/tests/bugs/vis/bug25369 index 05652652b7..97003d9ae2 100644 --- a/tests/bugs/vis/bug25369 +++ b/tests/bugs/vis/bug25369 @@ -6,6 +6,8 @@ puts "" # Visualization, Image_AlienPixMap - handle UTF-8 names in image read/save operations on Windows ################################################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + box b 1 2 3 vinit View1 vclear @@ -14,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 Times +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 vdump $::imagedir/$s vtexture b $::imagedir/$s diff --git a/tests/bugs/vis/bug25403 b/tests/bugs/vis/bug25403 index 77524bd06c..f750ebdefd 100644 --- a/tests/bugs/vis/bug25403 +++ b/tests/bugs/vis/bug25403 @@ -7,12 +7,14 @@ puts "" ####################################################################### pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit vpoint angleP1 0 0 0 vpoint angleP2 50 50 50 vpoint angleP3 50 50 100 -vdimension dim1 -angle -value 300 -modelunits deg -shapes angleP1 angleP2 angleP3 -vdimension dim2 -length -value 10 -modelunits mm -showunits -plane yoz -shapes angleP1 angleP3 +vdimension dim1 -angle -value 300 -modelunits deg -shapes angleP1 angleP2 angleP3 -font SansFont +vdimension dim2 -length -value 10 -modelunits mm -showunits -plane yoz -shapes angleP1 angleP3 -font SansFont vfit set only_screen 1 diff --git a/tests/bugs/vis/bug25732_1 b/tests/bugs/vis/bug25732_1 index f007e5ec5f..14273fd7b3 100644 --- a/tests/bugs/vis/bug25732_1 +++ b/tests/bugs/vis/bug25732_1 @@ -6,6 +6,8 @@ puts "" # Visualization, TKOpenGl - back face culling should not affect textured font rendering ######################################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + box b -100 0 -200 50 100 200 vinit View1 @@ -16,16 +18,10 @@ 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 Arial +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 -set env(os_type) $tcl_platform(platform) -if { [string compare ${env(os_type)} "windows"] != 0 } { - set x_coord 259 - set y_coord 279 -} else { - set x_coord 255 - set y_coord 277 -} +set x_coord 255 +set y_coord 277 set bug_info [vreadpixel ${x_coord} ${y_coord} rgb name] if {$bug_info != "RED"} { diff --git a/tests/bugs/vis/bug25732_2 b/tests/bugs/vis/bug25732_2 index ad577cea89..7890200113 100644 --- a/tests/bugs/vis/bug25732_2 +++ b/tests/bugs/vis/bug25732_2 @@ -6,6 +6,8 @@ puts "" # Visualization, TKOpenGl - back face culling should not affect textured font rendering ######################################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + box b 1 2 3 explode b F @@ -15,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 +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 set bug_info [vreadpixel 260 137 rgb name] if {$bug_info != "RED"} { diff --git a/tests/bugs/vis/bug25783_1 b/tests/bugs/vis/bug25783_1 index 48bbb9cc03..4f9623a8bb 100644 --- a/tests/bugs/vis/bug25783_1 +++ b/tests/bugs/vis/bug25783_1 @@ -4,36 +4,38 @@ puts "Draw 2D objects." puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit View1 vclear vaxo # display polyline in overlay -text2brep tcc "Center" -font Times-Roman -height 30 +text2brep tcc "Center" -font SansFont -height 30 vdisplay tcc -2d -osd polyline lcc -50 -50 0 -50 50 0 50 50 0 50 0 0 0 -50 0 -50 -50 0 vdisplay lcc -2d -overlay # display polyline in overlay in the bottom left corner of the view -text2brep tbl "Bottom-Left" -font Times-Roman -height 30 +text2brep tbl "Bottom-Left" -font SansFont -height 30 vdisplay tbl -2d -trsfPersPos -1 -1 5 -osd polyline lbl 0 0 0 0 100 0 100 100 0 100 50 0 50 0 0 0 0 0 vdisplay lbl -2d -trsfPersPos -1 -1 3 -overlay # display polyline in overlay in the top left corner of the view -text2brep ttl "Top-Left" -font Times-Roman -height 30 -pos -27 0 0 +text2brep ttl "Top-Left" -font SansFont -height 30 -pos -27 0 0 vdisplay ttl -2d -trsfPersPos -1 1 30 -osd polyline ltl 0 -100 0 0 0 0 100 0 0 100 -50 0 50 -100 0 0 -100 0 vdisplay ltl -2d -trsfPersPos -1 1 3 -overlay # display polyline in overlay in the top right corner of the view -text2brep ttr "Top-Right" -font Times-Roman -height 30 -pos -100 0 0 +text2brep ttr "Top-Right" -font SansFont -height 30 -pos -100 0 0 vdisplay ttr -2d -trsfPersPos 1 1 30 -osd polyline ltr -100 -100 0 -100 0 0 0 0 0 0 -50 0 -50 -100 0 -100 -100 0 vdisplay ltr -2d -trsfPersPos 1 1 3 -overlay # display polyline in overlay in the bottom right corner of the view -text2brep tbr "Bottom-Right" -font Times-Roman -height 30 -pos -165 0 0 +text2brep tbr "Bottom-Right" -font SansFont -height 30 -pos -165 0 0 vdisplay tbr -2d -trsfPersPos 1 -1 5 -osd polyline lbr -100 0 0 -100 100 0 0 100 0 0 50 0 -50 0 0 -100 0 0 vdisplay lbr -2d -trsfPersPos 1 -1 3 -overlay diff --git a/tests/bugs/vis/bug25783_2 b/tests/bugs/vis/bug25783_2 index fd8b27cbe0..cd5a448b4c 100644 --- a/tests/bugs/vis/bug25783_2 +++ b/tests/bugs/vis/bug25783_2 @@ -4,36 +4,38 @@ puts "Draw 2d objects in top-down mode." puts "============" puts "" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit View1 vclear vaxo # display polyline in overlay -text2brep tcc "Center" -font Times-Roman -height 30 +text2brep tcc "Center" -font SansFont -height 30 vdisplay tcc -2dTopDown -osd polyline lcc -50 -50 0 -50 50 0 50 50 0 50 0 0 0 -50 0 -50 -50 0 vdisplay lcc -2dTopDown -overlay # display polyline in overlay in the top left corner of the view -text2brep ttl "Top-Left" -font Times-Roman -height 30 +text2brep ttl "Top-Left" -font SansFont -height 30 vdisplay ttl -2dTopDown -trsfPersPos -1 -1 5 -osd polyline ltl 0 0 0 0 100 0 100 100 0 100 50 0 50 0 0 0 0 0 vdisplay ltl -2dTopDown -trsfPersPos -1 -1 3 -overlay # display polyline in overlay in the bottom left corner of the view -text2brep tbl "Bottom-Left" -font Times-Roman -height 30 -pos -27 0 0 +text2brep tbl "Bottom-Left" -font SansFont -height 30 -pos -27 0 0 vdisplay tbl -2dTopDown -trsfPersPos -1 1 30 -osd polyline lbl 0 -100 0 0 0 0 100 0 0 100 -50 0 50 -100 0 0 -100 0 vdisplay lbl -2dTopDown -trsfPersPos -1 1 3 -overlay # display polyline in overlay in the bottom right corner of the view -text2brep tbr Bottom-Right -font Times-Roman -height 30 -pos -145 0 0 +text2brep tbr Bottom-Right -font SansFont -height 30 -pos -145 0 0 vdisplay tbr -2dTopDown -trsfPersPos 1 1 30 -osd polyline lbr -100 -100 0 -100 0 0 0 0 0 0 -50 0 -50 -100 0 -100 -100 0 vdisplay lbr -2dTopDown -trsfPersPos 1 1 3 -overlay # display polyline in overlay in the top right corner of the view -text2brep ttr "Top-Right" -font Times-Roman -height 30 -pos -130 0 0 +text2brep ttr "Top-Right" -font SansFont -height 30 -pos -130 0 0 vdisplay ttr -2dTopDown -trsfPersPos 1 -1 5 -osd polyline ltr -100 0 0 -100 100 0 0 100 0 0 50 0 -50 0 0 -100 0 0 vdisplay ltr -2dTopDown -trsfPersPos 1 -1 3 -overlay diff --git a/tests/bugs/vis/bug26035_1 b/tests/bugs/vis/bug26035_1 index be4116d498..026c1e00de 100644 --- a/tests/bugs/vis/bug26035_1 +++ b/tests/bugs/vis/bug26035_1 @@ -6,6 +6,8 @@ puts "" # Dimension drawing between two vertices ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit View1 vclear vaxo @@ -21,7 +23,7 @@ set z2 10 vertex v1 $x1 $y1 $z1 vertex v2 $x2 $y2 $z2 -vdimension len -length -shapes v1 v2 -plane yoz +vdimension len -length -shapes v1 v2 -plane yoz -font SansFont vfit diff --git a/tests/bugs/vis/bug26035_2 b/tests/bugs/vis/bug26035_2 index 8b91728c31..81b35bb603 100644 --- a/tests/bugs/vis/bug26035_2 +++ b/tests/bugs/vis/bug26035_2 @@ -6,6 +6,8 @@ puts "" # Exception when trying to draw dimension between face and point ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit View1 vclear vaxo @@ -16,7 +18,7 @@ vdisplay b_1 vpoint p 10 0 0 -catch {vdimension len -length -shapes b_1 p -plane zox} +catch {vdimension len -length -shapes b_1 p -plane zox -font SansFont} vfit diff --git a/tests/bugs/vis/bug26035_3 b/tests/bugs/vis/bug26035_3 index f365e4a597..700ea04a78 100644 --- a/tests/bugs/vis/bug26035_3 +++ b/tests/bugs/vis/bug26035_3 @@ -6,6 +6,8 @@ puts "" # Drawing dimension between edge and vertex ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit View1 vclear vaxo @@ -18,7 +20,7 @@ vdisplay e vertex v3 10 0 10 vdisplay v3 -vdimension len -length -shapes e v3 -plane yoz +vdimension len -length -shapes e v3 -plane yoz -font SansFont vfit diff --git a/tests/bugs/vis/bug26035_4 b/tests/bugs/vis/bug26035_4 index 5abba54a51..a5457283ab 100644 --- a/tests/bugs/vis/bug26035_4 +++ b/tests/bugs/vis/bug26035_4 @@ -6,6 +6,8 @@ puts "" # Drawing dimension between vertex and edge ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit View1 vclear vaxo @@ -18,7 +20,7 @@ vdisplay e vertex v3 10 0 10 vdisplay v3 -vdimension len -length -shapes v3 e -plane yoz +vdimension len -length -shapes v3 e -plane yoz -font SansFont vfit diff --git a/tests/bugs/vis/bug26035_5 b/tests/bugs/vis/bug26035_5 index 81bf689c6b..be26bf3a54 100644 --- a/tests/bugs/vis/bug26035_5 +++ b/tests/bugs/vis/bug26035_5 @@ -6,6 +6,8 @@ puts "" # Drawing dimension between edge and point ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit View1 vclear vaxo @@ -17,7 +19,7 @@ vdisplay e vpoint p 10 0 10 -vdimension len -length -shapes e p -plane yoz +vdimension len -length -shapes e p -plane yoz -font SansFont vfit diff --git a/tests/bugs/vis/bug26035_6 b/tests/bugs/vis/bug26035_6 index f3ece6d96a..b1c73b5104 100644 --- a/tests/bugs/vis/bug26035_6 +++ b/tests/bugs/vis/bug26035_6 @@ -6,6 +6,8 @@ puts "" # Drawing dimension between point and edge ####################################################################### +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit View1 vclear vaxo @@ -17,7 +19,7 @@ vdisplay e vpoint p 10 0 10 -vdimension len -length -shapes p e -plane yoz +vdimension len -length -shapes p e -plane yoz -font SansFont vfit diff --git a/tests/bugs/vis/bug26149 b/tests/bugs/vis/bug26149 index 48be5ee792..19e096e85c 100644 --- a/tests/bugs/vis/bug26149 +++ b/tests/bugs/vis/bug26149 @@ -3,32 +3,34 @@ puts "0026149: Visualization - depth buffer should not be written within Z-layer puts "Check that objects drawn in Graphic3d_ZLayerId_BotOSD layer do not overlap objects in Graphic3d_ZLayerId_Default layer." puts "===========" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + pload MODELING VISUALIZATION vinit View1 vclear vaxo -text2brep tcc "Center" -font Times-Roman -height 30 +text2brep tcc "Center" -font SansFont -height 30 vdisplay tcc -2d -underlay polyline lcc -50 -50 0 -50 50 0 50 50 0 50 0 0 0 -50 0 -50 -50 0 vdisplay lcc -2d -underlay -text2brep tbl "Bottom-Left" -font Times-Roman -height 30 +text2brep tbl "Bottom-Left" -font SansFont -height 30 vdisplay tbl -2d -trsfPersPos -1 -1 5 -underlay polyline lbl 0 0 0 0 100 0 100 100 0 100 50 0 50 0 0 0 0 0 vdisplay lbl -2d -trsfPersPos -1 -1 3 -underlay -text2brep ttl "Top-Left" -font Times-Roman -height 30 -pos -27 0 0 +text2brep ttl "Top-Left" -font SansFont -height 30 -pos -27 0 0 vdisplay ttl -2d -trsfPersPos -1 1 30 -underlay polyline ltl 0 -100 0 0 0 0 100 0 0 100 -50 0 50 -100 0 0 -100 0 vdisplay ltl -2d -trsfPersPos -1 1 3 -underlay -text2brep ttr "Top-Right" -font Times-Roman -height 30 -pos -100 0 0 +text2brep ttr "Top-Right" -font SansFont -height 30 -pos -100 0 0 vdisplay ttr -2d -trsfPersPos 1 1 30 -underlay polyline ltr -100 -100 0 -100 0 0 0 0 0 0 -50 0 -50 -100 0 -100 -100 0 vdisplay ltr -2d -trsfPersPos 1 1 3 -underlay -text2brep tbr "Bottom-Right" -font Times-Roman -height 30 -pos -165 0 0 +text2brep tbr "Bottom-Right" -font SansFont -height 30 -pos -165 0 0 vdisplay tbr -2d -trsfPersPos 1 -1 5 -underlay polyline lbr -100 0 0 -100 100 0 0 100 0 0 50 0 -50 0 0 -100 0 0 vdisplay lbr -2d -trsfPersPos 1 -1 3 -underlay diff --git a/tests/demo/draw/bug23745 b/tests/demo/draw/bug23745 index 985c980d98..3390d9e338 100644 --- a/tests/demo/draw/bug23745 +++ b/tests/demo/draw/bug23745 @@ -9,8 +9,10 @@ puts "" pload QAcommands pload VISUALIZATION +vfont add [locate_data_file DejaVuSans.ttf] SansFont + vinit -vdrawtext text0 "ANOTHERBUG" -pos 100 100 100 -color 1.0 0.0 0.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect regular +vdrawtext text0 "ANOTHERBUG" -pos 100 100 100 -color 1.0 0.0 0.0 -halign left -valign bottom -angle 0 -zoom 1 -height 50 -aspect SansFont vtrihedron trihedron set x 239 diff --git a/tests/v3d/raytrace/bug24819 b/tests/v3d/raytrace/bug24819 index 8be8c3e84f..a6524bb942 100644 --- a/tests/v3d/raytrace/bug24819 +++ b/tests/v3d/raytrace/bug24819 @@ -2,6 +2,8 @@ puts "========" puts "OCC24819: TKOpenGl - extend the ray-tracing core by visualization of lines, text and point sprites" puts "========" +vfont add [locate_data_file DejaVuSans.ttf] SansFont + # setup 3D viewer content vinit name=View1 w=512 h=512 vglinfo @@ -21,11 +23,11 @@ vsetmaterial b2 Pewter vsettransparency b2 0.8 # brep text -text2brep t "text" -font "Arial" -height 8 +text2brep t "text" -font "SansFont" -height 8 vdisplay t # overlay objects -vdrawtext t1 "Overlay text!" -2d -perspos -1 1 -pos 200 -440 0 -height 40 +vdrawtext t1 "Overlay text!" -2d -perspos -1 1 -pos 200 -440 0 -height 40 -font SansFont # markers vpoint p 1 1 1 @@ -33,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 +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 vlight change 0 pos -1 1 1 -- 2.20.1