From 284c9238642cfd4ec4d8d46cad15849f0ded29d9 Mon Sep 17 00:00:00 2001
From: san <san@opencascade.com>
Date: Mon, 20 Jun 2016 19:17:56 +0300
Subject: [PATCH] 0027624: ViewerTest - vdrawtext command ignores text display
 options

vdrawtext command was corrected to set the specified text display type
regardless of other options.
---
 src/ViewerTest/ViewerTest_ObjectCommands.cxx |  4 ++--
 tests/bugs/vis/bug27624                      | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 tests/bugs/vis/bug27624

diff --git a/src/ViewerTest/ViewerTest_ObjectCommands.cxx b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
index dfe1ff9a34..a3cefaf089 100644
--- a/src/ViewerTest/ViewerTest_ObjectCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ObjectCommands.cxx
@@ -2842,10 +2842,11 @@ static int VDrawText (Draw_Interpretor& theDI,
     aTextPrs->SetOrientation3D (gp_Ax2 (aPos, aNormal, aDirection));
   }
 
+  aTextPrs->SetDisplayType (aDisplayType);
+
   if (aTrsfPersFlags != Graphic3d_TMF_None)
   {
     aTextPrs->SetTransformPersistence (aTrsfPersFlags, aTPPosition);
-    aTextPrs->SetDisplayType (aDisplayType);
     aTextPrs->SetZLayer(Graphic3d_ZLayerId_TopOSD);
     if (aTextPrs->Position().Z() != 0)
     {
@@ -2855,7 +2856,6 @@ static int VDrawText (Draw_Interpretor& theDI,
   else if (aTrsfPersFlags != aTextPrs->TransformPersistence().Flags)
   {
     aTextPrs->SetTransformPersistence (aTrsfPersFlags);
-    aTextPrs->SetDisplayType (Aspect_TODT_NORMAL);
   }
   ViewerTest::Display (aName, aTextPrs, Standard_False);
   return 0;
diff --git a/tests/bugs/vis/bug27624 b/tests/bugs/vis/bug27624
new file mode 100644
index 0000000000..b8fc4c6b17
--- /dev/null
+++ b/tests/bugs/vis/bug27624
@@ -0,0 +1,14 @@
+puts "========"
+puts "CR27624"
+puts "========"
+puts ""
+##################################################################
+puts "Draw Harness, ViewerTest - vdrawtext command ignores text display options"
+##################################################################
+
+vfont add [locate_data_file DejaVuSans.ttf] SansFont
+
+vinit
+vdrawtext t1 "Subtitle" -height 20 -font SansFont -color 0 1 0 -disptype subtitle -subcolor 0.3 0.3 0.3
+vfit
+vdump $imagedir/${casename}.png