0026587: Infinite calculations of BRepOffset_MakeOffset

src/AIS/AIS_AngleDimension.cxx

@@ -597,14 +597,9 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*
 
   Quantity_Length anArrowLength = aDimensionAspect->ArrowAspect()->Length();
 
-  TCollection_ExtendedString aLabelString = GetTextLabel();
+  // prepare label string and compute its geometrical width
-
+  Standard_Real aLabelWidth;
-  // Text sizes
+  TCollection_ExtendedString aLabelString = GetValueString (aLabelWidth);
-  Standard_Real aLabelWidth = 0.0;
-  Standard_Real aLabelHeight = 0.0;
-  Standard_Real aSymbolWidth = 0.0;
-  Standard_Real aSymbolHeight = 0.0;
-  getLabelSizes (aLabelString, aLabelWidth, aLabelHeight, aSymbolWidth, aSymbolHeight);
 
   // add margins to label width
   if (aDimensionAspect->IsText3d())
@@ -1164,15 +1159,8 @@ const gp_Pnt AIS_AngleDimension::GetTextPosition() const
   Handle(Prs3d_DimensionAspect) aDimensionAspect = myDrawer->DimensionAspect();
 
   // Prepare label string and compute its geometrical width
-  TCollection_ExtendedString aLabelString = GetTextLabel();
+  Standard_Real aLabelWidth;
-
+  TCollection_ExtendedString aLabelString = GetValueString (aLabelWidth);
-  // Text sizes
-  Standard_Real aLabelWidth = 0.0;
-  Standard_Real aLabelHeight = 0.0;
-  Standard_Real aSymbolWidth = 0.0;
-  Standard_Real aSymbolHeight = 0.0;
-  getLabelSizes (aLabelString, aLabelWidth, aLabelHeight, aSymbolWidth, aSymbolHeight);
-
 
   gp_Pnt aFirstAttach = myCenterPoint.Translated (gp_Vec(myCenterPoint, myFirstPoint).Normalized() * GetFlyout());
   gp_Pnt aSecondAttach = myCenterPoint.Translated (gp_Vec(myCenterPoint, mySecondPoint).Normalized() * GetFlyout());
@@ -1351,15 +1339,8 @@ void AIS_AngleDimension::FitTextAlignment (const Prs3d_DimensionTextHorizontalPo
   Quantity_Length anArrowLength = aDimensionAspect->ArrowAspect()->Length();
 
   // Prepare label string and compute its geometrical width
-  TCollection_ExtendedString aLabelString = GetTextLabel();
+  Standard_Real aLabelWidth;
-
+  TCollection_ExtendedString aLabelString = GetValueString (aLabelWidth);
-  // Text sizes
-  Standard_Real aLabelWidth = 0.0;
-  Standard_Real aLabelHeight = 0.0;
-  Standard_Real aSymbolWidth = 0.0;
-  Standard_Real aSymbolHeight = 0.0;
-  getLabelSizes (aLabelString, aLabelWidth, aLabelHeight, aSymbolWidth, aSymbolHeight);
-
 
   // add margins to label width
   if (aDimensionAspect->IsText3d())

src/AIS/AIS_DiameterDimension.cxx

@@ -35,11 +35,10 @@ namespace
 //function : Constructor
 //purpose  : 
 //=======================================================================
-AIS_DiameterDimension::AIS_DiameterDimension (const gp_Circ& theCircle,
+AIS_DiameterDimension::AIS_DiameterDimension (const gp_Circ& theCircle)
-                                              const Standard_Real theParameter)
 : AIS_Dimension (AIS_KOD_DIAMETER)
 {
-  SetMeasuredGeometry (theCircle, theParameter);
+  SetMeasuredGeometry (theCircle);
   SetSpecialSymbol (THE_DIAMETER_SYMBOL);
   SetDisplaySpecialSymbol (AIS_DSS_Before);
   SetFlyout (0.0);
@@ -106,8 +105,7 @@ gp_Pnt AIS_DiameterDimension::AnchorPoint()
 //function : SetMeasuredGeometry
 //purpose  : 
 //=======================================================================
-void AIS_DiameterDimension::SetMeasuredGeometry (const gp_Circ& theCircle,
+void AIS_DiameterDimension::SetMeasuredGeometry (const gp_Circ& theCircle)
-                                                 const Standard_Real theParameter)
 {
   myCircle          = theCircle;
   myGeometryType    = GeometryType_Edge;
@@ -122,7 +120,7 @@ void AIS_DiameterDimension::SetMeasuredGeometry (const gp_Circ& theCircle,
   else if (!myIsPlaneCustom)
   {
     ComputePlane();
-    myAnchorPoint = ElCLib::Value (theParameter, myCircle);
+    myAnchorPoint = ElCLib::Value (0.0, myCircle);
   }
 
   SetToUpdate();
@@ -294,7 +292,7 @@ void AIS_DiameterDimension::Compute (const Handle(PrsMgr_PresentationManager3d)&
   gp_Pnt aSecondPnt (gp::Origin());
   ComputeSidePoints (myCircle, aFirstPnt, aSecondPnt);
 
-  DrawLinearDimension (thePresentation, theMode, aFirstPnt, aSecondPnt, Standard_False, myToDrawDimensionLine);
+  DrawLinearDimension (thePresentation, theMode, aFirstPnt, aSecondPnt);
 }
 
 //=======================================================================

src/AIS/AIS_DiameterDimension.hxx

@@ -59,9 +59,7 @@ public:
 
   //! Construct diameter dimension for the circle.
   //! @param theCircle [in] the circle to measure.
-  //! @param theParameter [in] the value of parameter for parametric representation of the input circle
+  Standard_EXPORT AIS_DiameterDimension (const gp_Circ& theCircle);
-  //! that defines the point where the dimension is to be attached.
-  Standard_EXPORT AIS_DiameterDimension (const gp_Circ& theCircle, const Standard_Real theParameter = 0.0);
 
   //! Construct diameter dimension for the circle and orient it correspondingly
   //! to the passed plane.
@@ -108,9 +106,7 @@ public:
   //! The dimension will become invalid if the diameter of the circle
   //! is less than Precision::Confusion().
   //! @param theCircle [in] the circle to measure.
-  //! @param theParameter [in] the value of parameter for parametric representation of the input circle
+  Standard_EXPORT void SetMeasuredGeometry (const gp_Circ& theCircle);
-  //! that defines the point where the dimension is to be attached.
-  Standard_EXPORT void SetMeasuredGeometry (const gp_Circ& theCircle, const Standard_Real theParameter = 0);
 
   //! Measure diameter on the passed shape, if applicable.
   //! The dimension will become invalid if the passed shape is not

src/AIS/AIS_Dimension.cxx

@@ -25,7 +25,6 @@
 #include <ElCLib.hxx>
 #include <Font_BRepFont.hxx>
 #include <Font_BRepTextBuilder.hxx>
-#include <Font_FTFont.hxx>
 #include <GC_MakeCircle.hxx>
 #include <Geom_Line.hxx>
 #include <GeomAdaptor_Curve.hxx>
@@ -84,7 +83,7 @@ namespace
 
   // default text margin and resolution
   static const Standard_Real THE_3D_TEXT_MARGIN    = 0.1;
-  static const unsigned int  THE_FONT_RESOLUTION = 72;
+  static const unsigned int  THE_2D_TEXT_RESOLUTION = 72;
 
   // default selection priorities
   static const Standard_Integer THE_NEUTRAL_SEL_PRIORITY = 5;
@@ -98,104 +97,37 @@ namespace
 AIS_Dimension::AIS_Dimension (const AIS_KindOfDimension theType)
 : AIS_InteractiveObject  (),
   mySelToleranceForText2d(0.0),
-  myTypeOfLabel          (TOL_Computed),
+  myCustomValue          (0.0),
-  myLabel                (""),
+  myIsValueCustom        (Standard_False),
   myIsTextPositionFixed  (Standard_False), 
   mySpecialSymbol        (' '),
   myDisplaySpecialSymbol (AIS_DSS_No),
-  myToDrawDimensionLine  (Standard_True),
   myGeometryType         (GeometryType_UndefShapes),
   myIsPlaneCustom        (Standard_False),
   myFlyout               (0.0),
-  myIsTextAligned        (Standard_False),
-  myTextDir              (1.0, 0.0, 0.0),
-  myLeaderSegmentLength  (0.0),
   myIsGeometryValid      (Standard_False),
   myKindOfDimension      (theType)
 {
 }
 
-//=======================================================================
-//function : GetValue
-//purpose  : 
-//=======================================================================
-Standard_Real AIS_Dimension::GetValue() const
-{
-  switch (myTypeOfLabel)
-  {
-    case TOL_Computed:
-    {
-      return ComputeValue();
-    }
-    case TOL_Value:
-      {
-        return myCustomValue;
-      }
-    case TOL_Text:
-    default:
-      return 0.0;
-  }
-}
-
 //=======================================================================
 //function : SetCustomValue
 //purpose  : 
 //=======================================================================
 void AIS_Dimension::SetCustomValue (const Standard_Real theValue)
 {
-  if (myTypeOfLabel == TOL_Value && GetValue() == theValue)
+  if (myIsValueCustom && myCustomValue == theValue)
   {
     return;
   }
 
-  myTypeOfLabel = TOL_Value;
+  myIsValueCustom = Standard_True;
 
   myCustomValue = theValue;
 
   SetToUpdate();
 }
 
-//=======================================================================
-//function : SetTextLabel
-//purpose  : 
-//=======================================================================
-void AIS_Dimension::SetTextLabel (const TCollection_ExtendedString& theValue)
-{
-  myTypeOfLabel = TOL_Text;
-  myLabel = theValue;
-}
-
-//=======================================================================
-//function : GetTextLabel
-//purpose  : 
-//=======================================================================
-TCollection_ExtendedString AIS_Dimension::GetTextLabel() const
-{
-  if (myTypeOfLabel == TOL_Text)
-  {
-    return myLabel;
-  }
-  else
-  {
-    TCollection_ExtendedString aString;
-
-    // Format value string using "sprintf"
-    TCollection_AsciiString aFormatStr = myDrawer->DimensionAspect()->ValueStringFormat();
-
-    char aFmtBuffer[256];
-    sprintf (aFmtBuffer, aFormatStr.ToCString(), ValueToDisplayUnits());
-    aString = TCollection_ExtendedString (aFmtBuffer);
-
-    // Add units to values string
-    if (myDrawer->DimensionAspect()->IsUnitsDisplayed())
-    {
-      aString += " ";
-      aString += TCollection_ExtendedString (GetDisplayUnits());
-    }
-    return aString;
-  }
-}
-
 //=======================================================================
 //function : GetPlane
 //purpose  : 
@@ -311,75 +243,6 @@ void AIS_Dimension::SetFlyout (const Standard_Real theFlyout)
   SetToUpdate();
 }
 
-//=======================================================================
-//function : ToDrawDimensionLine
-//purpose  : 
-//=======================================================================
-const Standard_Boolean AIS_Dimension::ToDrawDimensionLine() const
-{
-  return myToDrawDimensionLine;
-}
-
-//=======================================================================
-//function : SetToDrawDimensionLine
-//purpose  : 
-//=======================================================================
-void AIS_Dimension::SetToDrawDimensionLine (const Standard_Boolean theToDraw)
-{
-  myToDrawDimensionLine = theToDraw;
-}
-
-//=======================================================================
-//function : SetToAlignText
-//purpose  : 
-//=======================================================================
-void AIS_Dimension::SetToAlignText (const Standard_Boolean theToAlign,
-                                    const gp_Dir& theAlignmentDir)
-{
-  myIsTextAligned = theToAlign;
-  myTextDir = theAlignmentDir;
-  if (theToAlign && !myTextDir.IsNormal (myPlane.Axis().Direction(), Precision::Angular()))
-  {
-    myIsTextAligned = Standard_False;
-  }
-}
-
-//=======================================================================
-//function : IsTextAligned
-//purpose  : 
-//=======================================================================
-const Standard_Boolean AIS_Dimension::IsTextAligned() const
-{
-  return myIsTextAligned;
-}
-
-//=======================================================================
-//function : TextAlignmentDir
-//purpose  : 
-//=======================================================================
-const gp_Dir& AIS_Dimension::TextAlignmentDir() const
-{
-  return myTextDir;
-}
-
-//=======================================================================
-//function : SetLeaderSegment
-//purpose  : 
-//=======================================================================
-void AIS_Dimension::SetLeaderSegment (const Standard_Real theLength)
-{
-  myLeaderSegmentLength = theLength;
-}
-
-//=======================================================================
-//function : UnsetLeaderSegment
-//purpose  : 
-//=======================================================================
-void AIS_Dimension::UnsetLeaderSegment()
-{
-  myLeaderSegmentLength = 0.0;
-}
-
 //=======================================================================
 //function : GetDisplayUnits
 //purpose  :
@@ -410,61 +273,72 @@ Standard_Real AIS_Dimension::ValueToDisplayUnits() const
 }
 
 //=======================================================================
-// function : getLabelSizes
+//function : GetValueString
 //purpose  : 
 //=======================================================================
-void  AIS_Dimension::getLabelSizes (const TCollection_ExtendedString& theLabel,
+TCollection_ExtendedString AIS_Dimension::GetValueString (Standard_Real& theWidth) const
-                                    Standard_Real& theWidth,
-                                    Standard_Real& theHeight,
-                                    Standard_Real& theSymbolWidth,
-                                    Standard_Real& theSymbolHeight) const
 {
-  Handle(Prs3d_DimensionAspect) anAspect    = myDrawer->DimensionAspect();
+  // format value string using "sprintf"
-  Handle(Prs3d_TextAspect)      aTextAspect = myDrawer->DimensionAspect()->TextAspect();
+  TCollection_AsciiString aFormatStr = myDrawer->DimensionAspect()->ValueStringFormat();
-  Standard_Real                 aFontHeight = aTextAspect->Height();
 
-  Quantity_Color aColor;
+  char aFmtBuffer[256];
-  Standard_CString aFontName;
+  sprintf (aFmtBuffer, aFormatStr.ToCString(), ValueToDisplayUnits());
-  Standard_Real anExpFactor, aSpace;
+  TCollection_ExtendedString aValueStr = TCollection_ExtendedString (aFmtBuffer);
-  aTextAspect->Aspect()->Values (aColor, aFontName, anExpFactor, aSpace);
 
-  NCollection_String aText ((Standard_Utf16Char*) theLabel.ToExtString());
+  // add units to values string
-  NCollection_String aSymbol;
+  if (myDrawer->DimensionAspect()->IsUnitsDisplayed())
-  if (DisplaySpecialSymbol() != AIS_DSS_No)
   {
-    aSymbol.FromUnicode ((Standard_Utf16Char*) TCollection_ExtendedString (mySpecialSymbol).ToExtString());
+    aValueStr += " ";
+    aValueStr += TCollection_ExtendedString (GetDisplayUnits());
   }
 
-  Font_FTFont::Rect aTextBox;
+  switch (myDisplaySpecialSymbol)
-  Font_FTFont::Rect aSymbolBox;
+  {
+    case AIS_DSS_Before : aValueStr.Insert (1, mySpecialSymbol); break;
+    case AIS_DSS_After  : aValueStr.Insert (aValueStr.Length() + 1, mySpecialSymbol); break;
+    case AIS_DSS_No     : break;
+  }
 
-  if (!anAspect->IsText3d())
+  // Get text style parameters
+  Quantity_Color aColor; 
+  Standard_CString aFontName;
+  Standard_Real aFactor;
+  Standard_Real aSpace;
+  myDrawer->DimensionAspect()->TextAspect()->Aspect()->Values (aColor, aFontName, aFactor, aSpace);
+  Font_FontAspect aFontAspect = myDrawer->DimensionAspect()->TextAspect()->Aspect()->GetTextFontAspect();
+  Standard_Real   aFontHeight = myDrawer->DimensionAspect()->TextAspect()->Height();
+
+  NCollection_Utf8String anUTFString = (Standard_Utf16Char* )aValueStr.ToExtString();
+
+  theWidth = 0.0;
+
+  if (myDrawer->DimensionAspect()->IsText3d())
   {
-    Font_FTFont aFont;
+    // text width produced by BRepFont
-    aFont.Init (aFontName,
+    Font_BRepFont aFont (aFontName, aFontAspect, aFontHeight);
-                aTextAspect->Aspect()->GetTextFontAspect(),
+
-                static_cast<Standard_Integer> (aFontHeight),
+    for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
-                THE_FONT_RESOLUTION);
-    aTextBox = aFont.BoundingBox (aText, Graphic3d_HTA_LEFT, Graphic3d_VTA_TOP);
-    if (!aSymbol.IsEmpty())
     {
-      aSymbolBox = aFont.BoundingBox (aSymbol, Graphic3d_HTA_LEFT, Graphic3d_VTA_TOP);
+      Standard_Utf32Char aCurrChar = *anIter;
+      Standard_Utf32Char aNextChar = *(++anIter);
+      theWidth += aFont.AdvanceX (aCurrChar, aNextChar);
     }
   }
   else
   {
-    Font_BRepFont aFont (aFontName, aTextAspect->Aspect()->GetTextFontAspect(), aFontHeight);
+    // Text width for 1:1 scale 2D case
-    aTextBox = aFont.BoundingBox (aText);
+    Handle(Font_FTFont) aFont = new Font_FTFont();
-    if (!aSymbol.IsEmpty())
+    aFont->Init (aFontName, aFontAspect, (const unsigned int)aFontHeight, THE_2D_TEXT_RESOLUTION);
+
+    for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
     {
-      aSymbolBox = aFont.BoundingBox (aSymbol);
+      Standard_Utf32Char aCurrChar = *anIter;
+      Standard_Utf32Char aNextChar = *(++anIter);
+      theWidth += (Standard_Real) aFont->AdvanceX (aCurrChar, aNextChar);
     }
   }
 
-  theWidth        = aTextBox.Width();
+  return aValueStr;
-  theHeight       = aTextBox.Height();
-  theSymbolWidth  = aSymbolBox.Width();
-  theSymbolHeight = aSymbolBox.Height();
 }
 
 //=======================================================================
@@ -535,188 +409,97 @@ void AIS_Dimension::DrawText (const Handle(Prs3d_Presentation)& thePresentation,
                               const TCollection_ExtendedString& theText,
                               const Standard_Integer theLabelPosition)
 {
-  // Prepare font
-  const Handle(Prs3d_TextAspect)& aTextAspect = myDrawer->DimensionAspect()->TextAspect();
-  Handle(Graphic3d_AspectText3d) anAspectText3d = aTextAspect->Aspect();
-  Quantity_Color aColor;
-  Standard_CString aFontName;
-  Standard_Real anExpFactor, aSpace;
-  anAspectText3d->Values (aColor, aFontName, anExpFactor, aSpace);
-  Font_FontAspect aFontAspect = anAspectText3d->GetTextFontAspect();
-  const Standard_Real aFontHeight = aTextAspect->Height();
-
-  Standard_Real aWidth  = 0.0;
-  Standard_Real aHeight = 0.0;
-  Standard_Real aSymbolWidth = 0.0;
-  Standard_Real aSymbolHeight = 0.0;
-  getLabelSizes (theText, aWidth, aHeight, aSymbolWidth, aSymbolHeight);
-
-  // Compute label offsets
-  Standard_Real aMarginSize    = aFontHeight * THE_3D_TEXT_MARGIN;
-  Standard_Real aCenterHOffset = 0.0;
-  Standard_Real aCenterVOffset = 0.0;
-  Standard_Real aSymbolVOffset = 0.0; //< Offset of symbol relative to the main text
-  Standard_Real aSymbolHOffset = 0.0;
-  Standard_Real aShapeHOffset = 0.0;
-  Standard_Real aShapeVOffset = 0.0;
-  Standard_Real aFlippingVOffset = 0.0;
-  Standard_Integer aVLabelPos = theLabelPosition & LabelPosition_VMask;
-  Standard_Integer aHLabelPos = theLabelPosition & LabelPosition_HMask;
-
   if (myDrawer->DimensionAspect()->IsText3d())
   {
-    // Creating TopoDS_Shape for text
+    // getting font parameters
+    Quantity_Color aColor;
+    Standard_CString aFontName;
+    Standard_Real anExpansionFactor;
+    Standard_Real aSpace;
+    myDrawer->DimensionAspect()->TextAspect()->Aspect()->Values (aColor, aFontName, anExpansionFactor, aSpace);
+    Font_FontAspect aFontAspect = myDrawer->DimensionAspect()->TextAspect()->Aspect()->GetTextFontAspect();
+    Standard_Real aFontHeight = myDrawer->DimensionAspect()->TextAspect()->Height();
+
+    // creating TopoDS_Shape for text
     Font_BRepFont aFont (aFontName, aFontAspect, aFontHeight);
     NCollection_Utf8String anUTFString = (Standard_Utf16Char* )theText.ToExtString();
 
-    const Standard_Real aHeightOfLine = aFont.LineSpacing();
     Font_BRepTextBuilder aBuilder;
     TopoDS_Shape aTextShape = aBuilder.Perform (aFont, anUTFString);
 
-    // Add special symbol
+    // compute text width with kerning
-    TopoDS_Shape aSymbolShape;
+    Standard_Real aTextWidth  = 0.0;
-    if (myDisplaySpecialSymbol != AIS_DSS_No)
+    Standard_Real aTextHeight = aFont.Ascender() + aFont.Descender();
+
+    for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; )
     {
-      NCollection_Utf8String anUTFSymbol = (Standard_Utf16Char* )TCollection_ExtendedString (mySpecialSymbol).ToExtString();
+      Standard_Utf32Char aCurrChar = *anIter;
-      aSymbolShape = aBuilder.Perform (aFont, anUTFSymbol);
+      Standard_Utf32Char aNextChar = *(++anIter);
+      aTextWidth += aFont.AdvanceX (aCurrChar, aNextChar);
     }
 
-    // Formating text position in XOY plane
+    // formating text position in XOY plane
+    Standard_Integer aHLabelPos = theLabelPosition & LabelPosition_HMask;
+    Standard_Integer aVLabelPos = theLabelPosition & LabelPosition_VMask;
+
+    gp_Dir aTextDir (aHLabelPos == LabelPosition_Left ? -theTextDir : theTextDir);
+
+    // compute label offsets
+    Standard_Real aMarginSize    = aFontHeight * THE_3D_TEXT_MARGIN;
+    Standard_Real aCenterHOffset = 0.0;
+    Standard_Real aCenterVOffset = 0.0;
     switch (aHLabelPos)
     {
       case LabelPosition_HCenter : aCenterHOffset =  0.0; break;
-      case LabelPosition_Right   : aCenterHOffset =  (aWidth + aSymbolWidth) / 2.0 + aMarginSize; break;
+      case LabelPosition_Right   : aCenterHOffset =  aTextWidth / 2.0 + aMarginSize; break;
-      case LabelPosition_Left    : aCenterHOffset = -(aWidth + aSymbolWidth) / 2.0 - aMarginSize; break;
+      case LabelPosition_Left    : aCenterHOffset = -aTextWidth / 2.0 - aMarginSize; break;
+    }
+    switch (aVLabelPos)
+    {
+      case LabelPosition_VCenter : aCenterVOffset =  0.0; break;
+      case LabelPosition_Above   : aCenterVOffset =  aTextHeight / 2.0 + aMarginSize; break;
+      case LabelPosition_Below   : aCenterVOffset = -aTextHeight / 2.0 - aMarginSize; break;
     }
 
-    // Correct text direction
+    // compute shape offset transformation
-    gp_Dir aTextDir = (aHLabelPos == LabelPosition_Left ? -theTextDir : theTextDir);
+    Standard_Real aShapeHOffset = aCenterHOffset - aTextWidth / 2.0;
+    Standard_Real aShapeVOffset = aCenterVOffset - aTextHeight / 2.0;
 
-    // Transform text to myWorkingPlane coordinate system
+    // center shape in its bounding box (suppress border spacing added by FT_Font)
+    Bnd_Box aShapeBnd;
+    BRepBndLib::AddClose (aTextShape, aShapeBnd);
+
+    Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax;
+    aShapeBnd.Get (aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);
+
+    Standard_Real aXalign = aTextWidth  * 0.5 - (aXmax + aXmin) * 0.5;
+    Standard_Real aYalign = aTextHeight * 0.5 - (aYmax + aYmin) * 0.5;
+    aShapeHOffset += aXalign;
+    aShapeVOffset += aYalign;
+
+    gp_Trsf anOffsetTrsf;
+    anOffsetTrsf.SetTranslation (gp::Origin(), gp_Pnt (aShapeHOffset, aShapeVOffset, 0.0));
+    aTextShape.Move (anOffsetTrsf);
+
+    // transform text to myWorkingPlane coordinate system
     gp_Ax3 aTextCoordSystem (theTextPos, GetPlane().Axis().Direction(), aTextDir);
     gp_Trsf aTextPlaneTrsf;
     aTextPlaneTrsf.SetTransformation (aTextCoordSystem, gp_Ax3 (gp::XOY()));
-
-    // ALIGNMENT: Vertical
-
-    switch (aVLabelPos)
-    {
-      case LabelPosition_FirstLine:
-      {
-        if (myTypeOfLabel == TOL_Text && aHeight > aHeightOfLine)
-        {
-          aCenterVOffset = aSymbolHeight - aHeight / 2.0 - aMarginSize;
-          aSymbolVOffset = aHeight / 2.0 - aSymbolHeight / 2.0;
-          aFlippingVOffset = aHeight / 2.0 - aSymbolHeight + aMarginSize;
-        }
-        break;
-      }
-      case LabelPosition_LastLine:
-      {
-        if (myTypeOfLabel == TOL_Text && aHeight > aHeightOfLine)
-        {
-          aCenterVOffset = aHeight / 2.0 + aMarginSize - aSymbolHeight;
-          aSymbolVOffset = aHeight / 2.0 - aHeightOfLine / 2.0 - aMarginSize;
-          aFlippingVOffset = -aHeight / 2.0 + aSymbolHeight - aMarginSize;
-
-        }
-        break;
-      }
-      case LabelPosition_VCenter:
-      {
-        if (myTypeOfLabel == TOL_Text && aHeight > aHeightOfLine)
-        {
-          aSymbolVOffset = aCenterVOffset + (aHeight - aHeightOfLine) / 2.0 - aMarginSize;
-        }
-      }
-      break;
-      case LabelPosition_Above:
-      {
-        aCenterVOffset = aHeight / 2.0 + aMarginSize;
-        if (myTypeOfLabel == TOL_Text)
-        {
-          aSymbolVOffset = aCenterVOffset / 2.0;
-        }
-        break;
-      }
-      case LabelPosition_Below:
-      {
-        aCenterVOffset = - aHeight / 2.0 - aMarginSize;
-        if (myTypeOfLabel == TOL_Text)
-        {
-          aSymbolVOffset = aCenterVOffset / 2.0;
-        }
-        break;
-      }
-    }
-
-    // ALIGNMENT: Horisontal
-
-    // Center shape in its bounding box (suppress border spacing added by FT_Font)
-    Bnd_Box aShapeBnd;
-    BRepBndLib::AddClose (aTextShape, aShapeBnd);
-    Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax;
-    aShapeBnd.Get (aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);
-    Standard_Real aXalign = aWidth  * 0.5 - (aXmax + aXmin) * 0.5;
-    Standard_Real aYalign = aHeight * 0.5 - (aYmax + aYmin) * 0.5;
-
-    // Compute where to place main part of label (without special symbol) relative to the input text position
-    aShapeHOffset = aCenterHOffset - aWidth / 2.0 + aXalign;
-    aShapeVOffset += aCenterVOffset - aHeight / 2.0 + aYalign;
-
-    gp_Trsf anOffsetTrsf;
-    if (!aSymbolShape.IsNull())
-    {
-      Bnd_Box aSymbolBnd;
-      BRepBndLib::AddClose (aSymbolShape, aSymbolBnd);
-      aSymbolBnd.Get (aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);
-      aXalign = aSymbolWidth * 0.5 - (aXmax + aXmin) * 0.5;
-
-      aSymbolHOffset = aCenterHOffset + aXalign;
-      aSymbolVOffset += aYalign - aHeight / 2.0;
-
-      switch (myDisplaySpecialSymbol)
-      {
-        case AIS_DSS_After:
-        {
-          aSymbolHOffset += aWidth * 0.5;
-          aShapeHOffset -= aSymbolWidth * 0.5;
-          break;
-        }
-        case AIS_DSS_Before:
-        {
-          aSymbolHOffset -= (aWidth + aSymbolWidth) * 0.5;
-          aShapeHOffset += aSymbolWidth * 0.5;
-          break;
-        }
-        case AIS_DSS_No:
-        default:
-        {
-          break;
-        }
-      }
-
-      // Modify transformation for a special symbol relative! to the main text
-      anOffsetTrsf.SetTranslation (gp::Origin(), gp_Pnt (aSymbolHOffset, aSymbolVOffset, 0.0));
-      aSymbolShape.Move (anOffsetTrsf);
-      aSymbolShape.Move (aTextPlaneTrsf);
-    }
-
-    anOffsetTrsf.SetTranslation (gp::Origin(), gp_Pnt (aShapeHOffset, aShapeVOffset, 0.0));
-    aTextShape.Move (anOffsetTrsf);
     aTextShape.Move (aTextPlaneTrsf);
 
-    // Compute anchor point for flipping options
+    // set text flipping anchors
+    gp_Trsf aCenterOffsetTrsf;
+    gp_Pnt aCenterOffset (aCenterHOffset, aCenterVOffset, 0.0);
+    aCenterOffsetTrsf.SetTranslation (gp::Origin(), aCenterOffset);
 
-    gp_Trsf aFlippingTrsf;
+    gp_Pnt aCenterOfLabel (gp::Origin());
-    aFlippingTrsf.SetTranslation (gp::Origin(), gp_Pnt(aCenterHOffset, aCenterVOffset + aFlippingVOffset, 0.0));
+    aCenterOfLabel.Transform (aCenterOffsetTrsf);
-    gp_Pnt aFlippingPoint = gp::Origin();
+    aCenterOfLabel.Transform (aTextPlaneTrsf);
-    aFlippingPoint.Transform (aFlippingTrsf);
+
-    aFlippingPoint.Transform (aTextPlaneTrsf);
+    gp_Ax2 aFlippingAxes (aCenterOfLabel, GetPlane().Axis().Direction(), aTextDir);
-    gp_Ax2 aFlippingAxes (aFlippingPoint, GetPlane().Axis().Direction(), aTextDir);
     Prs3d_Root::CurrentGroup (thePresentation)->SetFlippingOptions (Standard_True, aFlippingAxes);
 
-    // Draw text
+    // draw text
     if (myDrawer->DimensionAspect()->IsTextShaded())
     {
       // Setting text shading and color parameters
@@ -728,92 +511,33 @@ void AIS_Dimension::DrawText (const Handle(Prs3d_Presentation)& thePresentation,
       myDrawer->ShadingAspect()->Aspect()->SetBackInteriorColor (aColor);
       myDrawer->ShadingAspect()->SetMaterial (aShadeMat);
 
+      // drawing text
       StdPrs_ShadedShape::Add (thePresentation, aTextShape, myDrawer);
-      StdPrs_ShadedShape::Add (thePresentation, aSymbolShape, myDrawer);
     }
     else
     {
-      // Setting color for text
+      // setting color for text
       myDrawer->FreeBoundaryAspect()->Aspect()->SetColor (aColor);
-
+      // drawing text
       StdPrs_WFShape::Add (thePresentation, aTextShape, myDrawer);
-      StdPrs_WFShape::Add (thePresentation, aSymbolShape, myDrawer);
     }
-
     Prs3d_Root::CurrentGroup (thePresentation)->SetFlippingOptions (Standard_False, gp_Ax2());
 
-    gp_Trsf aCenterOffsetTrsf;
-    gp_Pnt aCenterOfLabel (gp::Origin());
-    gp_Pnt aCenterOffset (aCenterHOffset, aCenterVOffset, 0.0);
-    aCenterOffsetTrsf.SetTranslation (gp::Origin(), aCenterOffset);
-    aCenterOfLabel.Transform (aCenterOffsetTrsf);
-    aCenterOfLabel.Transform (aTextPlaneTrsf);
-
-
     mySelectionGeom.TextPos    = aCenterOfLabel;
     mySelectionGeom.TextDir    = aTextDir;
-    mySelectionGeom.TextWidth  = (aWidth + aSymbolWidth) + aMarginSize * 2.0;
+    mySelectionGeom.TextWidth  = aTextWidth + aMarginSize * 2.0;
-    mySelectionGeom.TextHeight = aHeight;
+    mySelectionGeom.TextHeight = aTextHeight;
 
     return;
   }
 
-  // 2D text
+  // generate primitives for 2D text
-
   myDrawer->DimensionAspect()->TextAspect()->Aspect()->SetDisplayType (Aspect_TODT_DIMENSION);
 
-  gp_Pnt aTextPos = theTextPos;
+  Prs3d_Text::Draw (thePresentation,
-
+                    myDrawer->DimensionAspect()->TextAspect(),
-  Font_FTFont aFont;
+                    theText,
-  aFont.Init (aFontName,
+                    theTextPos);
-              anAspectText3d->GetTextFontAspect(),
-              static_cast<Standard_Integer>(aFontHeight),
-              THE_FONT_RESOLUTION);
-  const Standard_Real aHeightOfLine = aFont.LineSpacing();
-
-  switch (aVLabelPos)
-  {
-    case LabelPosition_FirstLine: break;
-    case LabelPosition_LastLine : break;
-    case LabelPosition_VCenter  : break;
-    case LabelPosition_Above:
-    {
-      if (myTypeOfLabel == TOL_Text && aHeight > aHeightOfLine)
-      {
-        aSymbolVOffset = -aHeight / 2;
-      }
-      break;
-    }
-    case LabelPosition_Below:
-    {
-      if (myTypeOfLabel == TOL_Text && aHeight > aHeightOfLine)
-      {
-        aSymbolVOffset = aHeight / 2;
-      }
-      break;
-    }
-  }
-
-  // NOTE: for 2d text that is always parallel to view plane,
-  //       multiline text alignment with special symbol does not applied.
-  TCollection_ExtendedString aText = theText;
-  switch (myDisplaySpecialSymbol)
-  {
-    case AIS_DSS_Before:
-    {
-      aText.Insert (1, mySpecialSymbol);
-      break;
-    }
-    case AIS_DSS_After:
-    {
-      aText += mySpecialSymbol;
-      break;
-    }
-    case AIS_DSS_No: break;
-  }
-
-  
-  Prs3d_Text::Draw (thePresentation, aTextAspect, aText, aTextPos);
 
   mySelectionGeom.TextPos    = theTextPos;
   mySelectionGeom.TextDir    = theTextDir;
@@ -838,33 +562,11 @@ void AIS_Dimension::DrawExtension (const Handle(Prs3d_Presentation)& thePresenta
   gp_Lin anExtensionLine (theExtensionStart, theExtensionDir);
 
   Standard_Boolean hasLabel = theLabelString.Length() > 0;
-
-  gp_Dir aTextDir = myIsTextAligned
-    ? (myTextDir * theExtensionDir < 0 ? -myTextDir : myTextDir)
-    : theExtensionDir;
-
-  // Compute graphical primitives and sensitives for extension line
-  gp_Pnt anExtStart = theExtensionStart;
-  gp_Pnt   anExtEnd = !hasLabel || !(theLabelPosition & LabelPosition_Above || theLabelPosition & LabelPosition_Below)
-    ? ElCLib::Value (theExtensionSize, anExtensionLine)
-    : ElCLib::Value (theExtensionSize + theLabelWidth, anExtensionLine);
-
-  gp_Pnt aSegmentPoint;
-
   if (hasLabel && (theMode == ComputeMode_All || theMode == ComputeMode_Text))
   {
     // compute text primitives; get its model width
     gp_Pnt aTextPos = ElCLib::Value (theExtensionSize, anExtensionLine);
-
+    gp_Dir aTextDir = theExtensionDir;
-    if (hasLabel && myLeaderSegmentLength > 0 && myIsTextAligned)
-    {
-      gp_Lin aSegmentLine (anExtEnd, aTextDir);
-      Standard_Real aSegmentLength = !(theLabelPosition & LabelPosition_Above || theLabelPosition & LabelPosition_Below)
-        ? myLeaderSegmentLength : theLabelWidth + myLeaderSegmentLength;
-      aSegmentPoint = ElCLib::Value (aSegmentLength, aSegmentLine);
-      aTextPos = !(theLabelPosition & LabelPosition_Above || theLabelPosition & LabelPosition_Below)
-        ? aSegmentPoint : ElCLib::Value (myLeaderSegmentLength, aSegmentLine);
-    }
 
     DrawText (thePresentation,
               aTextPos,
@@ -878,30 +580,25 @@ void AIS_Dimension::DrawExtension (const Handle(Prs3d_Presentation)& thePresenta
     return;
   }
 
-  // Add graphical primitives
+  Standard_Boolean isShortLine =  !myDrawer->DimensionAspect()->IsText3d()
-  Handle(Graphic3d_ArrayOfSegments) anExtPrimitive = new Graphic3d_ArrayOfSegments ((hasLabel && myLeaderSegmentLength > 0 && myIsTextAligned) ? 4 : 2);
+                               || theLabelPosition & LabelPosition_VCenter;
+
+  // compute graphical primitives and sensitives for extension line
+  gp_Pnt anExtStart = theExtensionStart;
+  gp_Pnt anExtEnd   = !hasLabel || isShortLine
+    ? ElCLib::Value (theExtensionSize, anExtensionLine)
+    : ElCLib::Value (theExtensionSize + theLabelWidth, anExtensionLine);
+
+  // add graphical primitives
+  Handle(Graphic3d_ArrayOfSegments) anExtPrimitive = new Graphic3d_ArrayOfSegments (2);
   anExtPrimitive->AddVertex (anExtStart);
   anExtPrimitive->AddVertex (anExtEnd);
 
-  // Add selection primitives
+  // add selection primitives
   SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
   aSensitiveCurve.Append (anExtStart);
   aSensitiveCurve.Append (anExtEnd);
 
-  // Draw segment
-  if (hasLabel && myLeaderSegmentLength > 0 && myIsTextAligned)
-  {
-    anExtPrimitive->AddVertex (anExtEnd);
-    anExtPrimitive->AddVertex (aSegmentPoint);
-
-    // Add selection primitives
-    SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
-    aSensitiveCurve.Append (anExtEnd);
-    aSensitiveCurve.Append (aSegmentPoint);
-  }
-
-
-
   if (!myDrawer->DimensionAspect()->IsText3d() && theMode == ComputeMode_All)
   {
     Prs3d_Root::CurrentGroup (thePresentation)->SetStencilTestOptions (Standard_True);
@@ -923,8 +620,7 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
                                          const Standard_Integer theMode,
                                          const gp_Pnt& theFirstPoint,
                                          const gp_Pnt& theSecondPoint,
-                                         const Standard_Boolean theIsOneSide,
+                                         const Standard_Boolean theIsOneSide)
-                                         const Standard_Boolean theToDrawDimensionLine)
 {
   // do not build any dimension for equal points
   if (theFirstPoint.IsEqual (theSecondPoint, Precision::Confusion()))
@@ -937,14 +633,9 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
   // For extensions we need to know arrow size, text size and extension size: get it from aspect
   Quantity_Length anArrowLength   = aDimensionAspect->ArrowAspect()->Length();
   Standard_Real   anExtensionSize = aDimensionAspect->ExtensionSize();
-
+  // prepare label string and compute its geometrical width
-  // Prepare label string and compute its geometrical sizes
+  Standard_Real aLabelWidth;
-  Standard_Real aLabelWidth, aLabelHeight;
+  TCollection_ExtendedString aLabelString = GetValueString (aLabelWidth);
-  Standard_Real aSymbolWidth, aSymbolHeight;
-  TCollection_ExtendedString aLabel = GetTextLabel();
-  getLabelSizes (aLabel, aLabelWidth, aLabelHeight, aSymbolWidth, aSymbolHeight);
-  aLabelHeight += aSymbolHeight;
-  aLabelWidth += aSymbolWidth;
 
   // add margins to cut dimension lines for 3d text
   if (aDimensionAspect->IsText3d())
@@ -1027,11 +718,7 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
 
       gp_Pnt aTextPos = IsTextPositionCustom() ? myFixedTextPosition
                                               : (aCenterLineBegin.XYZ() + aCenterLineEnd.XYZ()) * 0.5;
-
+      gp_Dir aTextDir = aDimensionLine.Direction();
-      // Choose a text direction
-      gp_Dir aTextDir = myIsTextAligned
-        ? myTextDir
-        : aDimensionLine.Direction();
 
       // add text primitives
       if (theMode == ComputeMode_All || theMode == ComputeMode_Text)
@@ -1039,18 +726,15 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
         DrawText (thePresentation,
                   aTextPos,
                   aTextDir,
-                  aLabel,
+                  aLabelString,
                   aLabelPosition);
       }
 
       // add dimension line primitives
       if (theMode == ComputeMode_All || theMode == ComputeMode_Line)
       {
-        // Line break is made only for 3d text (for 2d text it is managed with stensil test)
+        Standard_Boolean isLineBreak = aDimensionAspect->TextVerticalPosition() == Prs3d_DTVP_Center
-        // and for special alignment for multi-line text
+                                    && aDimensionAspect->IsText3d();
-        Standard_Boolean isLineBreak = aDimensionAspect->IsText3d() &&
-         (aDimensionAspect->TextVerticalPosition() == Prs3d_DTVP_Center || (myTypeOfLabel == TOL_Text &&
-           (aDimensionAspect->TextVerticalPosition() == Prs3d_DTVP_FirstLine || aDimensionAspect->TextVerticalPosition() == Prs3d_DTVP_LastLine) ) );
 
         Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments (isLineBreak ? 4 : 2);
 
@@ -1087,13 +771,10 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
 
         // set text label justification
         Graphic3d_VerticalTextAlignment aTextJustificaton = Graphic3d_VTA_BOTTOM;
-
         switch (aLabelPosition & LabelPosition_VMask)
         {
           case LabelPosition_Above   :
-          case LabelPosition_LastLine  :
           case LabelPosition_VCenter : aTextJustificaton = Graphic3d_VTA_BOTTOM; break;
-          case LabelPosition_FirstLine :
           case LabelPosition_Below   : aTextJustificaton = Graphic3d_VTA_TOP;    break;
         }
         aDimensionAspect->TextAspect()->SetVerticalJustification (aTextJustificaton);
@@ -1155,15 +836,13 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
                        ? aFirstArrowEnd
                        : aFirstArrowBegin,
                      aFirstExtensionDir,
-                     aLabel,
+                     aLabelString,
                      aLabelWidth,
                      theMode,
                      aLabelPosition);
 
       // add dimension line primitives
       if (theMode == ComputeMode_All || theMode == ComputeMode_Line)
-      {
-        if (theToDrawDimensionLine || !isArrowsExternal || abs(myFlyout) > Precision::Confusion() )
       {
         // add central dimension line
         Prs3d_Root::NewGroup (thePresentation);
@@ -1180,13 +859,12 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
         SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
         aSensitiveCurve.Append (aCenterLineBegin);
         aSensitiveCurve.Append (aCenterLineEnd);
-        }
 
         // add arrows to presentation
         Prs3d_Root::NewGroup (thePresentation);
 
         DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
-        if (!theIsOneSide && (theToDrawDimensionLine || (!isArrowsExternal && !theToDrawDimensionLine)))
+        if (!theIsOneSide)
         {
           DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
         }
@@ -1199,13 +877,10 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
         // add extension lines for external arrows
         Prs3d_Root::NewGroup (thePresentation);
 
-        if (theToDrawDimensionLine)
-        {
         DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
                        aSecondArrowEnd, aSecondExtensionDir,
                        THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
       }
-      }
 
       break;
     }
@@ -1224,13 +899,11 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
                        ? aSecondArrowEnd
                        : aSecondArrowBegin,
                      aSecondExtensionDir,
-                     aLabel, aLabelWidth,
+                     aLabelString, aLabelWidth,
                      theMode,
                      aLabelPosition);
 
       if (theMode == ComputeMode_All || theMode == ComputeMode_Line)
-      {
-        if (theToDrawDimensionLine || !isArrowsExternal || abs(myFlyout) > Precision::Confusion())
       {
         // add central dimension line
         Prs3d_Root::NewGroup (thePresentation);
@@ -1246,13 +919,12 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
         SelectionGeometry::Curve& aSensitiveCurve = mySelectionGeom.NewCurve();
         aSensitiveCurve.Append (aCenterLineBegin);
         aSensitiveCurve.Append (aCenterLineEnd);
-        }
 
         // add arrows to presentation
         Prs3d_Root::NewGroup (thePresentation);
 
         DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir);
-        if (!theIsOneSide && (theToDrawDimensionLine || (!theToDrawDimensionLine && !isArrowsExternal)))
+        if (!theIsOneSide)
         {
           DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir);
         }
@@ -1265,13 +937,10 @@ void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePr
         // add extension lines for external arrows
         Prs3d_Root::NewGroup (thePresentation);
 
-        if (theToDrawDimensionLine)
-        {
         DrawExtension (thePresentation, aDimensionAspect->ArrowTailSize(),
                        aFirstArrowEnd, aFirstExtensionDir,
                        THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None);
       }
-      }
 
       break;
     }
@@ -1914,15 +1583,8 @@ void AIS_Dimension::FitTextAlignmentForLinear (const gp_Pnt& theFirstPoint,
   Quantity_Length anArrowLength = aDimensionAspect->ArrowAspect()->Length();
 
   // prepare label string and compute its geometrical width
-  TCollection_ExtendedString aLabelString = GetTextLabel();
+  Standard_Real aLabelWidth;
-
+  TCollection_ExtendedString aLabelString = GetValueString (aLabelWidth);
-  // Text sizes
-  Standard_Real aLabelWidth = 0.0;
-  Standard_Real aLabelHeight = 0.0;
-  Standard_Real aSymbolWidth = 0.0;
-  Standard_Real aSymbolHeight = 0.0;
-  getLabelSizes (aLabelString, aLabelWidth, aLabelHeight, aSymbolWidth, aSymbolHeight);
-
 
   // Add margins to cut dimension lines for 3d text
   if (aDimensionAspect->IsText3d())
@@ -1956,7 +1618,7 @@ void AIS_Dimension::FitTextAlignmentForLinear (const gp_Pnt& theFirstPoint,
   switch (theHorizontalTextPos)
   {
     case Prs3d_DTHP_Left  : theLabelPosition |= LabelPosition_Left; break;
-    case Prs3d_DTHP_Right : theLabelPosition |= theIsOneSide ? LabelPosition_Left : LabelPosition_Right; break;
+    case Prs3d_DTHP_Right : theLabelPosition |= LabelPosition_Right; break;
     case Prs3d_DTHP_Center: theLabelPosition |= LabelPosition_HCenter; break;
     case Prs3d_DTHP_Fit:
     {
@@ -1973,9 +1635,7 @@ void AIS_Dimension::FitTextAlignmentForLinear (const gp_Pnt& theFirstPoint,
   switch (aDimensionAspect->TextVerticalPosition())
   {
     case Prs3d_DTVP_Above  : theLabelPosition |= LabelPosition_Above; break;
-    case Prs3d_DTVP_FirstLine : theLabelPosition |= LabelPosition_FirstLine; break;
     case Prs3d_DTVP_Below  : theLabelPosition |= LabelPosition_Below; break;
-    case Prs3d_DTVP_LastLine : theLabelPosition |= LabelPosition_LastLine; break;
     case Prs3d_DTVP_Center : theLabelPosition |= LabelPosition_VCenter; break;
   }
 }

src/AIS/AIS_Dimension.hxx

@@ -196,12 +196,10 @@ protected:
     LabelPosition_HCenter = 0x04,
     LabelPosition_HMask   = LabelPosition_Left | LabelPosition_Right | LabelPosition_HCenter,
 
-    LabelPosition_Above     = 0x0010,
+    LabelPosition_Above   = 0x10,
-    LabelPosition_FirstLine = 0x0020,
+    LabelPosition_Below   = 0x20,
-    LabelPosition_Below     = 0x0040,
+    LabelPosition_VCenter = 0x40,
-    LabelPosition_LastLine  = 0x0080,
+    LabelPosition_VMask   = LabelPosition_Above | LabelPosition_Below | LabelPosition_VCenter
-    LabelPosition_VCenter   = 0x0100,
-    LabelPosition_VMask     = LabelPosition_Above | LabelPosition_Below | LabelPosition_VCenter | LabelPosition_FirstLine | LabelPosition_LastLine
   };
 
 public:
@@ -227,7 +225,10 @@ public:
   //! compute it on its own in model space coordinates.
   //! @return the dimension value (in model units) which is used
   //! during display of the presentation.
-  Standard_EXPORT Standard_Real GetValue() const;
+  Standard_Real GetValue() const
+  {
+    return myIsValueCustom ? myCustomValue : ComputeValue();
+  }
 
   //! Sets user-defined dimension value.
   //! The user-defined dimension value is specified in model space,
@@ -235,14 +236,6 @@ public:
   //! @param theValue [in] the user-defined value to display.
   Standard_EXPORT void SetCustomValue (const Standard_Real theValue);
 
-  //! Sets multiline text for dimension label.
-  //! @param theValue [in] multiline string of Unicode symbols.
-  //! Can be used along with spectial symbol (like radius and diameter symbol)
-  Standard_EXPORT void SetTextLabel (const TCollection_ExtendedString& theValue);
-
-  //! @return the text for text label.
-  Standard_EXPORT TCollection_ExtendedString GetTextLabel() const;
-
   //! Get the dimension plane in which the 2D dimension presentation is computed.
   //! By default, if plane is not defined by user, it is computed automatically
   //! after dimension geometry is computed.
@@ -383,26 +376,6 @@ public:
     return myIsGeometryValid && CheckPlane (GetPlane());
   }
 
-  //! @return state that shows if the radius inner segment
-  //! is to be displayed.
-  Standard_EXPORT const Standard_Boolean ToDrawDimensionLine() const;
-
-  //! Sets the flag that defines whether the dimenion line segment is displayed
-  //! @warning Dimension line won't be displayed only if arrows and label are moved
-  //! outside on dimension line extensions
-  Standard_EXPORT void SetToDrawDimensionLine (const Standard_Boolean theToDrawInnerSegment);
-
-  Standard_EXPORT void SetToAlignText (const Standard_Boolean theToAlign,
-                                       const gp_Dir& theAlignmentDir = gp_Dir (1.0, 0.0, 0.0));
-
-  Standard_EXPORT const Standard_Boolean IsTextAligned() const;
-
-  Standard_EXPORT const gp_Dir& TextAlignmentDir() const;
-
-  Standard_EXPORT void SetLeaderSegment (const Standard_Real theLength);
-
-  Standard_EXPORT void UnsetLeaderSegment();
-
 public:
 
   DEFINE_STANDARD_RTTI(AIS_Dimension, AIS_InteractiveObject)
@@ -411,9 +384,10 @@ protected:
 
   Standard_EXPORT Standard_Real ValueToDisplayUnits() const;
 
-  Standard_EXPORT void getLabelSizes (const TCollection_ExtendedString& theLabel,
+  //! Get formatted value string and its model space width.
-                                      Standard_Real& theWidth, Standard_Real& theHeight,
+  //! @param theWidth [out] the model space with of the string.
-                                      Standard_Real& theSymbolWidth, Standard_Real& theSymbolHeight) const;
+  //! @return formatted dimension value string.
+  Standard_EXPORT TCollection_ExtendedString GetValueString (Standard_Real& theWidth) const;
 
   //! Performs drawing of 2d or 3d arrows on the working plane
   //! @param theLocation [in] the location of the arrow tip.
@@ -461,15 +435,11 @@ protected:
   //! @param theFirstPoint [in] the first attach point of linear dimension.
   //! @param theSecondPoint [in] the second attach point of linear dimension.
   //! @param theIsOneSide [in] specifies whether the dimension has only one flyout line.
-  //! @param theToDrawDimensionLine [in] specifies whether the dimension line is to be displayed.
-  //! @warning Dimension line won't be displayed only if arrows and label are moved
-  //! outside on dimension line extensions
   Standard_EXPORT void DrawLinearDimension (const Handle(Prs3d_Presentation)& thePresentation,
                                             const Standard_Integer theMode,
                                             const gp_Pnt& theFirstPoint,
                                             const gp_Pnt& theSecondPoint,
-                                            const Standard_Boolean theIsOneSide = Standard_False,
+                                            const Standard_Boolean theIsOneSide = Standard_False);
-                                            const Standard_Boolean theToDrawDimensionLine = Standard_True);
 
   //! Compute selection sensitives for linear dimension flyout lines (length, diameter, radius).
   //! Please note that this method uses base dimension properties: working plane and flyout length.
@@ -681,21 +651,10 @@ protected: //! @name Selection geometry
 
   Standard_Real mySelToleranceForText2d; //!< Sensitive point tolerance for 2d text selection.
 
-protected:
+protected: //! @name Value properties
-
-  enum TypeOfLabel
-  {
-    TOL_Computed = 0, //< is default
-    TOL_Value    = 1,
-    TOL_Text 
-  };
-
-protected: //! @name Label properties
-
-  TypeOfLabel myTypeOfLabel;
 
   Standard_Real    myCustomValue;   //!< Value of the dimension (computed or user-defined).
-  TCollection_ExtendedString myLabel;        //!< Label text. Sets the user defined multiline text
+  Standard_Boolean myIsValueCustom; //!< Is user-defined value.
 
 protected: //! @name Fixed text position properties
 
@@ -707,15 +666,6 @@ protected: //! @name Units properties
   Standard_ExtCharacter    mySpecialSymbol;        //!< Special symbol.
   AIS_DisplaySpecialSymbol myDisplaySpecialSymbol; //!< Special symbol display options.
 
-protected:
-
-  //! Shows if the dimension line is to be drawn
-  //! It is used only if the text is placed on the one of the dimension line extensions.
-  //! By default it is TRUE
-  //! @warning Dimension line won't be displayed only if arrows and label are moved
-  //! outside on dimension line extensions
-  Standard_Boolean myToDrawDimensionLine;
-
 protected: //! @name Geometrical properties
 
   GeometryType myGeometryType;  //!< defines type of shapes on which the dimension is to be built. 
@@ -723,14 +673,6 @@ protected: //! @name Geometrical properties
   gp_Pln           myPlane;           //!< Plane where dimension will be built (computed or user defined).
   Standard_Boolean myIsPlaneCustom;   //!< Is plane defined by user (otherwise it will be computed automatically).
   Standard_Real    myFlyout;          //!< Flyout distance.
-  
-  //! Shows if the text label is aligned to user-defined direction myTextDir
-  //! Otherwise it is alligned to the dimension line extension direction
-  //! @warning Only for text placed outside of the dimension line
-  Standard_Boolean myIsTextAligned;       
-  gp_Dir           myTextDir;             //!< Alignment direction for the text
-  Standard_Real    myLeaderSegmentLength; //!< Length of leader line segment aligned with text to myTextDir direction
-  
   Standard_Boolean myIsGeometryValid; //!< Is dimension geometry properly defined.
 
 private:

src/AIS/AIS_RadiusDimension.cxx

@@ -31,25 +31,15 @@ namespace
 //function : Constructor
 //purpose  : 
 //=======================================================================
-void AIS_RadiusDimension::init()
+AIS_RadiusDimension::AIS_RadiusDimension (const gp_Circ& theCircle)
+: AIS_Dimension (AIS_KOD_RADIUS)
 {
+  SetMeasuredGeometry (theCircle);
   SetSpecialSymbol (THE_RADIUS_SYMBOL);
   SetDisplaySpecialSymbol (AIS_DSS_Before);
   SetFlyout (0.0);
 }
 
-//=======================================================================
-//function : Constructor
-//purpose  : 
-//=======================================================================
-AIS_RadiusDimension::AIS_RadiusDimension (const gp_Circ& theCircle,
-                                          const Standard_Real theParameter)
-: AIS_Dimension (AIS_KOD_RADIUS)
-{
-  init();
-  SetMeasuredGeometry (theCircle, theParameter);
-}
-
 //=======================================================================
 //function : Constructor
 //purpose  : 
@@ -58,8 +48,10 @@ AIS_RadiusDimension::AIS_RadiusDimension (const gp_Circ& theCircle,
                                           const gp_Pnt& theAttachPoint)
 : AIS_Dimension (AIS_KOD_RADIUS)
 {
-  init();
   SetMeasuredGeometry (theCircle, theAttachPoint);
+  SetSpecialSymbol (THE_RADIUS_SYMBOL);
+  SetDisplaySpecialSymbol (AIS_DSS_Before);
+  SetFlyout (0.0);
 }
 
 //=======================================================================
@@ -69,21 +61,22 @@ AIS_RadiusDimension::AIS_RadiusDimension (const gp_Circ& theCircle,
 AIS_RadiusDimension::AIS_RadiusDimension (const TopoDS_Shape& theShape)
 : AIS_Dimension (AIS_KOD_RADIUS)
 {
-  init();
   SetMeasuredGeometry (theShape);
+  SetSpecialSymbol (THE_RADIUS_SYMBOL);
+  SetDisplaySpecialSymbol (AIS_DSS_Before);
+  SetFlyout (0.0);
 }
 
 //=======================================================================
 //function : SetMeasuredGeometry
 //purpose  : 
 //=======================================================================
-void AIS_RadiusDimension::SetMeasuredGeometry (const gp_Circ& theCircle,
+void AIS_RadiusDimension::SetMeasuredGeometry (const gp_Circ& theCircle)
-                                               const Standard_Real theParameter)
 {
   myCircle          = theCircle;
   myGeometryType    = GeometryType_Edge;
   myShape           = BRepLib_MakeEdge (theCircle);
-  myAnchorPoint     = ElCLib::Value (theParameter, myCircle);
+  myAnchorPoint     = ElCLib::Value (0, myCircle);
   myIsGeometryValid = IsValidCircle (myCircle);
 
   if (myIsGeometryValid)
@@ -135,33 +128,6 @@ void AIS_RadiusDimension::SetMeasuredGeometry (const TopoDS_Shape& theShape)
   SetToUpdate();
 }
 
-//=======================================================================
-//function : Circle
-//purpose  : 
-//=======================================================================
-const gp_Circ& AIS_RadiusDimension::Circle() const
-{
-  return myCircle;
-}
-
-//=======================================================================
-//function : AnchorPoint
-//purpose  : 
-//=======================================================================
-const gp_Pnt& AIS_RadiusDimension::AnchorPoint() const
-{
-  return myAnchorPoint;
-}
-
-//=======================================================================
-//function : Shape
-//purpose  : 
-//=======================================================================
-const TopoDS_Shape& AIS_RadiusDimension::Shape() const
-{
-  return myShape;
-}
-
 //=======================================================================
 //function : CheckPlane
 //purpose  : 
@@ -262,7 +228,7 @@ void AIS_RadiusDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /
     return;
   }
 
-  DrawLinearDimension (thePresentation, theMode, myAnchorPoint, myCircle.Location(), Standard_True, myToDrawDimensionLine);
+  DrawLinearDimension (thePresentation, theMode, myAnchorPoint, myCircle.Location(), Standard_True);
 }
 
 //=======================================================================

src/AIS/AIS_RadiusDimension.hxx

@@ -39,21 +39,13 @@ DEFINE_STANDARD_HANDLE (AIS_RadiusDimension,AIS_Dimension)
 //! In case if the dimension is built on the arbitrary shape,
 //! it can be considered as invalid if the shape does not contain
 //! circle geometry.
-//! Use IsValid() method to check that created dimension is valid.
 class AIS_RadiusDimension : public AIS_Dimension
 {
-protected:
-  
-  //! Setting of default construction parameters
-  void init();
-
 public:
 
   //! Create radius dimension for the circle geometry.
   //! @param theCircle [in] the circle to measure.
-  //! @param theParameter [in] the value of parameter for parametric representation of the input circle
+  Standard_EXPORT AIS_RadiusDimension (const gp_Circ& theCircle);
-  //! that defines the point where the dimension is to be attached.
-  Standard_EXPORT AIS_RadiusDimension (const gp_Circ& theCircle, const Standard_Real theParameter = 0);
 
   //! Create radius dimension for the circle geometry and define its
   //! orientation by location of the first point on that circle.
@@ -70,13 +62,22 @@ public:
 public:
 
   //! @return measured geometry circle.
-  Standard_EXPORT const gp_Circ& Circle() const;
+  const gp_Circ& Circle() const
+  {
+    return myCircle;
+  }
 
   //! @return anchor point on circle for radius dimension.
-  Standard_EXPORT const gp_Pnt& AnchorPoint() const;
+  const gp_Pnt& AnchorPoint() const
+  {
+    return myAnchorPoint;
+  }
 
   //! @return the measured shape.
-  Standard_EXPORT const TopoDS_Shape& Shape() const;
+  const TopoDS_Shape& Shape() const
+  {
+    return myShape;
+  }
 
 public:
 
@@ -84,9 +85,7 @@ public:
   //! The dimension will become invalid if the radius of the circle
   //! is less than Precision::Confusion().
   //! @param theCircle [in] the circle to measure.
-  //! @param theParameter [in] the value of parameter for parametric representation of the input circle
+  Standard_EXPORT void SetMeasuredGeometry (const gp_Circ& theCircle);
-  //! that defines the point where the dimension is to be attached.
-  Standard_EXPORT void SetMeasuredGeometry (const gp_Circ& theCircle, const Standard_Real theParameter = 0);
 
   //! Measure radius of the circle and orient the dimension so
   //! the dimension lines attaches to anchor point on the circle.
@@ -123,16 +122,16 @@ public:
 
 protected:
 
-  Standard_EXPORT virtual void ComputePlane() Standard_OVERRIDE;
+  Standard_EXPORT virtual void ComputePlane();
 
   //! Checks if anchor point and the center of the circle are on the plane.
-  Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const Standard_OVERRIDE;
+  Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const;
 
-  Standard_EXPORT virtual Standard_Real ComputeValue() const Standard_OVERRIDE;
+  Standard_EXPORT virtual Standard_Real ComputeValue() const;
 
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
                                         const Handle(Prs3d_Presentation)& thePresentation,
-                                        const Standard_Integer theMode = 0) Standard_OVERRIDE;
+                                        const Standard_Integer theMode = 0);
 
 protected:
 

src/Font/Font_BRepFont.cxx

@@ -464,38 +464,3 @@ Standard_Boolean Font_BRepFont::renderGlyph (const Standard_Utf32Char theChar,
   myCache.Bind (theChar, theShape);
   return !theShape.IsNull();
 }
-
-
-// =======================================================================
-// function : BoundingBox
-// purpose  :
-// =======================================================================
-Font_FTFont::Rect Font_BRepFont::BoundingBox (const NCollection_String& theString,
-                                              const Graphic3d_HorizontalTextAlignment theHAlign,
-                                              const Graphic3d_VerticalTextAlignment   theVAlign)
-{
-  Rect aBox;
-  aBox.Left   = 0.0f;
-  aBox.Right  = 0.0f;
-  aBox.Bottom = 0.0f;
-  aBox.Top    = static_cast<float> (Ascender());
-
-  // Initialize text formatter
-  Font_TextFormatter aFormatter;
-  aFormatter.Reset();
-  aFormatter.SetupAlignment (theHAlign, theVAlign);
-  aFormatter.Append (theString, *(reinterpret_cast<Font_FTFont*> (this)));
-  aFormatter.Format();
-
-  // Get bounding box
-  aFormatter.BndBox (aBox);
-
-  // Apply BRepFont scale to box limits
-  Standard_Real aScaleUnits = Scale();
-  aBox.Left = aBox.Left * aScaleUnits;
-  aBox.Top = aBox.Top * aScaleUnits;
-  aBox.Right = aBox.Right * aScaleUnits;
-  aBox.Bottom = aBox.Bottom * aScaleUnits;
-
-  return aBox;
-}

src/Font/Font_BRepFont.hxx

@@ -96,12 +96,6 @@ public:
   //! Notice that altering this flag clears currently accumulated cache!
   Standard_EXPORT void SetCompositeCurveMode (const Standard_Boolean theToConcatenate);
 
-  //! Compute bounding rectangle of resultant BRep text shape from input string
-  //! @return bounding rectangle
-  Standard_EXPORT Font_FTFont::Rect BoundingBox (const NCollection_String& theString,
-                                                 const Graphic3d_HorizontalTextAlignment theHAlign = Graphic3d_HTA_LEFT,
-                                                 const Graphic3d_VerticalTextAlignment   theVAlign = Graphic3d_VTA_BOTTOM);
-
 public:
 
   //! @return vertical distance from the horizontal baseline to the highest character coordinate.
@@ -170,8 +164,6 @@ public:
     return myMutex;
   }
 
-
-
 protected:
 
   //! Render single glyph as TopoDS_Shape. This method does not lock the mutex.

src/Prs3d/Prs3d_DimensionTextVerticalPosition.hxx

@@ -25,9 +25,7 @@
 enum Prs3d_DimensionTextVerticalPosition
 {
 Prs3d_DTVP_Above,
-Prs3d_DTVP_FirstLine,
 Prs3d_DTVP_Below,
-Prs3d_DTVP_LastLine,
 Prs3d_DTVP_Center
 };
 

src/ViewerTest/ViewerTest_RelationCommands.cxx

@@ -38,7 +38,6 @@
 #include <Draw_Appli.hxx>
 #include <Draw_Window.hxx>
 #include <DBRep.hxx>
-#include <ElCLib.hxx>
 #include <ElSLib.hxx>
 #include <Font_FontMgr.hxx>
 #include <GC_MakePlane.hxx>
@@ -170,21 +169,16 @@ static Standard_Boolean Get3DPointAtMousePosition (const gp_Pnt& theFirstPoint,
 //           length, angle, radius and diameter dimension.
 //
 //draw args: -text [3d|2d] [wf|sh|wireframe|shading] [Size]
-//           -label [left|right|hcenter|hfit] [top|bottom|vcenter|firstline|lastline|vfit]
+//           -label [left|right|hcenter|hfit] [top|bottom|vcenter|vfit]
 //           -arrow [external|internal|fit] [Length(int)]
 //           -arrowangle ArrowAngle(degrees)
 //           -plane xoy|yoz|zox
 //           -flyout FloatValue -extension FloatValue
 //           -value CustomNumberValue
-//           -valuetext CustomText
 //           -dispunits DisplayUnitsString
 //           -modelunits ModelUnitsString
-//           -showunits (DEFAULT)
+//           -showunits
 //           -hideunits
-//           -drawdimline (DEFAULT)
-//           -hidedimline
-//           -aligntext DirX DirY DirZ
-//           -segment Length
 //
 // Warning! flyout is not an aspect value, it is for dimension parameter
 // likewise text position, but text position override other paramaters.
@@ -197,8 +191,6 @@ static int ParseDimensionParams (Standard_Integer  theArgNum,
                                  Standard_Boolean& theIsCustomPlane, gp_Pln& thePlane,
                                  NCollection_DataMap<TCollection_AsciiString, Standard_Real>& theRealParams,
                                  NCollection_DataMap<TCollection_AsciiString, TCollection_AsciiString>& theStringParams,
-                                 NCollection_DataMap<TCollection_AsciiString, Standard_Boolean>& theBooleanParams,
-                                 Standard_Boolean& theIsTextAligned, gp_Dir& theTextDir,
                                  NCollection_List<Handle(AIS_InteractiveObject)>* theShapeList = NULL)
 {
   theRealParams.Clear();
@@ -217,7 +209,7 @@ static int ParseDimensionParams (Standard_Integer  theArgNum,
       continue;
     }
 
-    // BOOLEAN flags
+    // Boolean flags
     if (aParam.IsEqual ("-showunits"))
     {
       theAspect->MakeUnitsDisplayed (Standard_True);
@@ -229,25 +221,14 @@ static int ParseDimensionParams (Standard_Integer  theArgNum,
       continue;
     }
 
-    if (aParam.IsEqual ("-drawdimline"))
+    // Before all non-boolean flags parsing check if a flag have at least one value.
-    {
-      theBooleanParams.Bind ("drawdimline", Standard_True);
-      continue;
-    }
-    else if (aParam.IsEqual ("-hidedimline"))
-    {
-      theBooleanParams.Bind ("drawdimline", Standard_False);
-      continue;
-    }
-
-    // Before all NON-BOOLEAN flags parsing check if a flag have at least one value.
     if (anIt + 1 >= theArgNum)
     {
       std::cerr << "Error: "<< aParam <<" flag should have value.\n";
       return 1;
     }
 
-    // NON-BOOLEAN flags
+    // Non-boolean flags
     if (aParam.IsEqual ("-shape")
      || aParam.IsEqual ("-shapes"))
     {
@@ -342,8 +323,6 @@ static int ParseDimensionParams (Standard_Integer  theArgNum,
         else if (aParamValue == "above")   { theAspect->SetTextVerticalPosition   (Prs3d_DTVP_Above); }
         else if (aParamValue == "below")   { theAspect->SetTextVerticalPosition   (Prs3d_DTVP_Below); }
         else if (aParamValue == "vcenter") { theAspect->SetTextVerticalPosition   (Prs3d_DTVP_Center);}
-        else if (aParamValue == "firstline") { theAspect->SetTextVerticalPosition   (Prs3d_DTVP_FirstLine); }
-        else if (aParamValue == "lastline")  { theAspect->SetTextVerticalPosition   (Prs3d_DTVP_LastLine);  }
         else
         {
           std::cerr << "Error: invalid label position: '" << aParamValue << "'.\n";
@@ -366,7 +345,7 @@ static int ParseDimensionParams (Standard_Integer  theArgNum,
       TCollection_AsciiString aValue (theArgVec[++anIt]);
       if (!aValue.IsRealValue())
       {
-        std::cerr << "Error: arrow length should be float degree value.\n";
+        std::cerr << "Error: arrow lenght should be float degree value.\n";
         return 1;
       }
       theAspect->ArrowAspect()->SetLength (Draw::Atof (aValue.ToCString()));
@@ -420,20 +399,6 @@ static int ParseDimensionParams (Standard_Integer  theArgNum,
         return 1;
       }
     }
-    else if (aParam.IsEqual ("-aligntext"))
-    {
-      theIsTextAligned = Standard_True;
-      TCollection_AsciiString aParam1 (theArgVec[++anIt]);
-      TCollection_AsciiString aParam2 (theArgVec[++anIt]);
-      TCollection_AsciiString aParam3 (theArgVec[++anIt]);
-      if (!aParam1.IsRealValue() || !aParam2.IsRealValue() || !aParam3.IsRealValue())
-      {
-        std::cerr << "Error: direction coordinate should be real value.\n";
-        return 1;
-      }
-      theTextDir.SetCoord (aParam1.RealValue(), aParam2.RealValue(), aParam3.RealValue());
-    }
-    // REAL parameters
     else if (aParam.IsEqual ("-flyout"))
     {
       TCollection_AsciiString aParam (theArgVec[++anIt]);
@@ -448,43 +413,13 @@ static int ParseDimensionParams (Standard_Integer  theArgNum,
     else if (aParam.IsEqual ("-value"))
     {
       TCollection_AsciiString aParam (theArgVec[++anIt]);
-
-      // Custom real value
       if (!aParam.IsRealValue())
       {
-        std::cerr << "Error: custom value should be real value.\n";
+        std::cerr << "Error: dimension value for dimension should be real value.\n";
         return 1;
       }
+
       theRealParams.Bind ("value", Draw::Atof (aParam.ToCString()));
-
-    }
-    else if (aParam.IsEqual ("-circleparam"))
-    {
-      TCollection_AsciiString aParam (theArgVec[++anIt]);
-      if (!aParam.IsRealValue())
-      {
-        std::cerr << "Error: circle parameter should be real value.\n";
-        return 1;
-      }
-
-      theRealParams.Bind ("circleparam", aParam.RealValue());
-    }
-    else if (aParam.IsEqual ("-segment"))
-    {
-       TCollection_AsciiString aParam (theArgVec[++anIt]);
-      if (!aParam.IsRealValue() || aParam.RealValue() < 0.0)
-      {
-        std::cerr << "Error: segment length should be positive real value.\n";
-        return 1;
-      }
-
-      theRealParams.Bind ("segment", aParam.RealValue());
-    }
-    // STRING parameters
-    else if (aParam.IsEqual ("-valuetext"))
-    {
-      TCollection_AsciiString aParam (theArgVec[++anIt]);
-      theStringParams.Bind ("valuetext", aParam);
     }
     else if (aParam.IsEqual ("-modelunits"))
     {
@@ -514,8 +449,7 @@ static int ParseDimensionParams (Standard_Integer  theArgNum,
 //=======================================================================
 static void SetDimensionParams (const Handle(AIS_Dimension)& theDim,
                                 const NCollection_DataMap<TCollection_AsciiString, Standard_Real>& theRealParams,
-                                const NCollection_DataMap<TCollection_AsciiString, TCollection_AsciiString>& theStringParams,
+                                const NCollection_DataMap<TCollection_AsciiString, TCollection_AsciiString>& theStringParams)
-                                const NCollection_DataMap<TCollection_AsciiString, Standard_Boolean>& theBooleanParams)
 {
   if (theRealParams.IsBound ("flyout"))
   {
@@ -526,10 +460,6 @@ static void SetDimensionParams (const Handle(AIS_Dimension)& theDim,
   {
     theDim->SetCustomValue (theRealParams.Find ("value"));
   }
-  else if (theStringParams.IsBound ("valuetext"))
-  {
-    theDim->SetTextLabel (theStringParams.Find ("valuetext"));
-  }
 
   if (theStringParams.IsBound ("modelunits"))
   {
@@ -540,16 +470,6 @@ static void SetDimensionParams (const Handle(AIS_Dimension)& theDim,
   {
     theDim->SetDisplayUnits (theStringParams.Find ("dispunits"));
   }
-
-  if (theBooleanParams.IsBound ("drawdimline"))
-  {
-    theDim->SetToDrawDimensionLine (theBooleanParams.Find ("drawdimline"));
-  }
-
-  if (theRealParams.IsBound ("segment"))
-  {
-    theDim->SetLeaderSegment (theRealParams.Find ("segment"));
-  }
 }
 
 //=======================================================================
@@ -574,12 +494,9 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
   Handle(Prs3d_DimensionAspect) anAspect = new Prs3d_DimensionAspect;
   Standard_Boolean isPlaneCustom = Standard_False;
   gp_Pln aWorkingPlane;
-  Standard_Boolean isTextAligned = Standard_False;
-  gp_Dir aTextDir (1.0, 0.0, 0.0);
 
   NCollection_DataMap<TCollection_AsciiString, Standard_Real> aRealParams;
   NCollection_DataMap<TCollection_AsciiString, TCollection_AsciiString> aStringParams;
-  NCollection_DataMap<TCollection_AsciiString, Standard_Boolean> aBoolParams;
 
   TCollection_AsciiString aDimType(theArgs[2]);
   aDimType.LowerCase();
@@ -609,7 +526,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
 
   if (ParseDimensionParams (theArgsNb, theArgs, 3,
                             anAspect,isPlaneCustom,aWorkingPlane,
-                            aRealParams, aStringParams, aBoolParams, isTextAligned, aTextDir, &aShapes))
+                            aRealParams, aStringParams, &aShapes))
   {
     return 1;
   }
@@ -750,15 +667,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
         {
           Handle(AIS_Circle) aShape = Handle(AIS_Circle)::DownCast (aShapes.First());
           gp_Circ aCircle = aShape->Circle()->Circ();
-          Standard_Real aParam = 0;
+          aDim = new AIS_RadiusDimension (aCircle);
-
-          // Check if circle parameter is set
-          if (aRealParams.IsBound ("circleparam"))
-          {
-            aParam = aRealParams.Find ("circleparam");
-          }
-
-          aDim = new AIS_RadiusDimension (aCircle, aParam);
         }
         else
         {
@@ -787,16 +696,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
         {
           Handle(AIS_Circle) aShape = Handle(AIS_Circle)::DownCast (aShapes.First());
           gp_Circ aCircle = aShape->Circle()->Circ();
-
+          aDim = new AIS_DiameterDimension (aCircle);
-          Standard_Real aParam = 0;
-
-          // Check if circle parameter is set
-          if (aRealParams.IsBound ("circleparam"))
-          {
-            aParam = aRealParams.Find ("circleparam");
-          }
-
-          aDim = new AIS_DiameterDimension (aCircle, aParam);
         }
         else
         {
@@ -824,11 +724,6 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
     }
   }
 
-  if (isTextAligned)
-  {
-    aDim->SetToAlignText (isTextAligned, aTextDir);
-  }
-
   // Check dimension geometry
   if (!aDim->IsValid())
   {
@@ -839,7 +734,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
 
   aDim->SetDimensionAspect (anAspect);
 
-  SetDimensionParams (aDim, aRealParams, aStringParams, aBoolParams);
+  SetDimensionParams (aDim, aRealParams, aStringParams);
 
   VDisplayAISObject (aName,aDim);
 
@@ -2651,13 +2546,10 @@ static int VDimParam (Draw_Interpretor& theDi, Standard_Integer theArgNum, const
   TCollection_AsciiString aName (theArgVec[1]);
   gp_Pln aWorkingPlane;
   Standard_Boolean isCustomPlane = Standard_False;
-  Standard_Boolean isTextAligned = Standard_False;
-  gp_Dir aTextDir (1.0, 0.0, 0.0);
   Standard_Boolean toUpdate = Standard_True;
 
   NCollection_DataMap<TCollection_AsciiString, Standard_Real> aRealParams;
   NCollection_DataMap<TCollection_AsciiString, TCollection_AsciiString> aStringParams;
-  NCollection_DataMap<TCollection_AsciiString, Standard_Boolean> aBoolParams;
 
   if (!GetMapOfAIS().IsBound2 (aName))
   {
@@ -2668,7 +2560,7 @@ static int VDimParam (Draw_Interpretor& theDi, Standard_Integer theArgNum, const
   Handle(AIS_InteractiveObject) anObject = Handle(AIS_InteractiveObject)::DownCast(GetMapOfAIS().Find2 (aName));
   if (anObject->Type() != AIS_KOI_Dimension)
   {
-    theDi << theArgVec[0] << "error: no dimension with the name: " << aName.ToCString() << ".\n";
+    theDi << theArgVec[0] << "error: no dimension with this name.\n";
     return 1;
   }
 
@@ -2677,7 +2569,7 @@ static int VDimParam (Draw_Interpretor& theDi, Standard_Integer theArgNum, const
 
   if (ParseDimensionParams (theArgNum, theArgVec, 2, anAspect,
                             isCustomPlane, aWorkingPlane,
-                            aRealParams, aStringParams, aBoolParams, isTextAligned, aTextDir))
+                            aRealParams, aStringParams))
   {
     return 1;
   }
@@ -2687,12 +2579,7 @@ static int VDimParam (Draw_Interpretor& theDi, Standard_Integer theArgNum, const
     aDim->SetCustomPlane (aWorkingPlane);
   }
 
-  if (isTextAligned)
+  SetDimensionParams (aDim, aRealParams, aStringParams);
-  {
-    aDim->SetToAlignText (isTextAligned, aTextDir);
-  }
-
-  SetDimensionParams (aDim, aRealParams, aStringParams, aBoolParams);
 
   if (!aDim->IsValid())
   {
@@ -2887,20 +2774,16 @@ void ViewerTest::RelationCommands(Draw_Interpretor& theCommands)
       "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 above|below|vcenter|vfit]\n"
+      "[-label left|right|hcenter|hfit top|bottom|vcenter|vfit]\n"
       "[-arrow external|internal|fit]\n"
       "[{-arrowlength|-arlen} RealArrowLength]\n"
       "[{-arrowangle|-arangle} ArrowAngle(degrees)]\n"
       "[-plane xoy|yoz|zox]\n"
       "[-flyout FloatValue -extension FloatValue]\n"
-      "[-value CustomNumberValue] OR [-valuetext CustomMultilineLabel]\n"
+      "[-value CustomNumberValue]\n"
       "[-dispunits DisplayUnitsString]\n"
       "[-modelunits ModelUnitsString]\n"
       "[-showunits | -hideunits]\n"
-      "[-drawdimline] <- dimension line is displayed by default\n"
-      "[-hidedimline]/n"
-      "[-aligntext DirX DirY DirZ]\n"
-      "[-segment Length\n"
       " -Builds angle, length, radius and diameter dimensions.\n"
       " -See also: vdimparam, vmovedim.\n",
       __FILE__,VDimBuilder,group);
@@ -2919,11 +2802,6 @@ void ViewerTest::RelationCommands(Draw_Interpretor& theCommands)
     "[-dispunits DisplayUnitsString]\n"
     "[-modelunits ModelUnitsString]\n"
     "[-showunits | -hideunits]\n"
-    "[-drawdimline] <- dimension line is displayed by default\n"
-    "[-hidedimline]/n"
-    "[-aligntext DirX DirY DirZ]\n"
-    "[-segment Length\n"
-    " -Builds angle, length, radius and diameter dimensions.\n"
     " -Sets parameters for angle, length, radius and diameter dimensions.\n"
     " -See also: vmovedim, vdimension.\n",
     __FILE__,VDimParam,group);

tests/bugs/modalg_6/bug26587

@@ -0,0 +1,24 @@
+puts "========"
+puts "OCC26587"
+puts "========"
+puts ""
+#######################################################
+#  Infinite calculations of BRepOffset_MakeOffset
+#######################################################
+
+smallview
+
+restore [locate_data_file bug26587_plate.brep] plate
+
+offsetparameter 1e-7 p i
+offsetload plate 50
+
+decho off
+
+offsetperform r
+
+decho on
+
+fit
+
+set only_screen_axo 1

tests/bugs/vis/bug26507_1

@@ -1,28 +0,0 @@
-puts "================================================================"
-puts "CR26507"
-puts "Visualization - Improved presentations of dimensions"
-puts "================================================================"
-puts ""
-puts "Radius dimension line not continued to the center of a circle"
-
-#set anImage1 $imagedir/${casename}_1.png
-
-vinit Viewer1/View
-vright
-
-vpoint aCircleP1 0 0 60
-vpoint aCircleP2 60 0 0
-vpoint aCircleP3 120 0 60
-vcircle aCircle aCircleP1 aCircleP2 aCircleP3 0
-
-#Check all text and arrow positions
-vdimension aDim1 -radius -shapes aCircle -text 3d -plane zox -label hfit -arrow external -hidedimline
-vdimension aDim2 -radius -shapes aCircle -circleparam 20 -text 3d -plane zox -label right -arrow external -hidedimline
-vdimension aDim3 -radius -shapes aCircle -circleparam 40 -text 3d -plane zox -label hfit -arrow internal -hidedimline
-
-vdimension aDim4 -radius -shapes aCircle -circleparam 60 -text 2d -flyout -30 -plane zox -label right -arrow external -hidedimline
-vdimparam aDim4 -text 20
-vfit
-
-#finalize and dump
-set only_screen 1

tests/bugs/vis/bug26507_2

@@ -1,34 +0,0 @@
-puts "================================================================"
-puts "CR26507"
-puts "Visualization - Improved presentations of dimensions"
-puts "================================================================"
-puts ""
-puts "User-defined orientation of text label"
-puts "Line segment aligned with text"
-
-#set anImage1 $imagedir/${casename}_1.png
-
-vinit Viewer1/View
-vbottom
-
-vpoint lengthP1 0 0 0
-vpoint lengthP2 50 100 0
-vpoint lengthP3 -50 100 0
-vpoint lengthP4 0 200 0
-# Text in center - custom aligment does not taken into account
-vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 -text 3d -aligntext 1.0 0.0 0.0 -flyout -10
-
-# Text on the right side - it is aligned
-vdimension dim2 -length -plane xoy -shapes lengthP1 lengthP3 -text 3d -aligntext 1.0 0.0 0.0 -segment 0 -label right
-
-# Text on the left side - it is aligned
-vdimension dim3 -length -plane xoy -shapes lengthP2 lengthP3 -text 3d -flyout -10 -aligntext 1.0 0.0 0.0 -segment 5 -label left
-
-# Text on the left side - it is aligned
-vdimension dim4 -length -plane xoy -shapes lengthP2 lengthP4 -text 3d -flyout -10 -aligntext 1.0 0.0 0.0 -segment 25 -label right
-
-# Text on the left side - it is aligned
-vdimension dim5 -length -plane xoy -shapes lengthP4 lengthP3 -text 3d -flyout -10 -aligntext 1.0 0.0 0.0 -label left above -segment 10 
-vfit
-#finalize and dump
-set only_screen 1

tests/bugs/vis/bug26507_3

@@ -1,28 +0,0 @@
-puts "================================================================"
-puts "CR26507"
-puts "Visualization - Improved presentations of dimensions"
-puts "================================================================"
-puts ""
-puts "Multi-line custom text label"
-
-#set anImage1 $imagedir/${casename}_1.png
-
-vinit Viewer1/View
-vbottom
-
-vpoint lengthP1 0 0 0
-vpoint lengthP2 50 100 0
-vpoint lengthP3 -50 100 0
-# Text in center - custom aligment does not taken into account
-vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 -valuetext "+2.0\n-3.0\nThickness" -text 2d -aligntext 1.0 0.0 0.0 -segment 15 -flyout -10 -label left firstline
-
-# Text on the right side - it is aligned
-vdimension dim2 -length -plane xoy -shapes lengthP1 lengthP3 -valuetext "+3.0\n-15.0\nThickness" -text 2d -aligntext 1.0 0.0 0.0 -segment 15 -label right
-
-# Text on the left side - it is aligned
-vdimension dim3 -length -plane xoy -shapes lengthP2 lengthP3 -text 2d -valuetext "+3.0\n-15.0" -flyout -10 -aligntext 1.0 0.0 0.0 -segment 10
-
-
-vfit
-#finalize and dump
-set only_screen 1

tests/bugs/vis/bug26507_4

@@ -1,32 +0,0 @@
-puts "================================================================"
-puts "CR26507"
-puts "Visualization - Improved presentations of dimensions"
-puts "================================================================"
-puts ""
-puts "Radius dimension with multiline custom text"
-
-#set anImage1 $imagedir/${casename}_1.png
-
-vinit Viewer1/View
-vright
-
-vpoint aCircleP1 0 0 60
-vpoint aCircleP2 60 0 0
-vpoint aCircleP3 120 0 60
-vcircle aCircle aCircleP1 aCircleP2 aCircleP3 0
-
-#Check all text and arrow positions
-vdimension aDim1 -radius -shapes aCircle -circleparam 10 -text 3d -label right -arrow external -hidedimline -valuetext "+2.0\n -3.0\nThickness" -aligntext 1.0 0.0 0.0 -segment 15 -label left firstline
-vdimension aDim2 -diameter -shapes aCircle -circleparam 5 -text 3d -label left -arrow external -hidedimline -valuetext "+4.0\n -6.0" -aligntext 1.0 0.0 0.0 -segment 15 -label left firstline
-vdimension aDim3 -radius -shapes aCircle -circleparam 20 -text 3d -plane zox -label right -arrow external -hidedimline
-vdimension aDim4 -radius -shapes aCircle -circleparam 30 -text 3d -plane zox -label vcenter -arrow internal -hidedimline
-
-vdimension aDim5 -radius -shapes aCircle -circleparam 40 -text 2d -label right -arrow external -hidedimline -valuetext "+2.0\n -3.0\nThickness" -aligntext 1.0 0.0 0.0 -segment 15 -label left firstline
-
-vdimparam aDim1 -text 6
-vdimparam aDim3 -text 6
-
-vfit
-
-#finalize and dump
-set only_screen 1

tests/bugs/vis/bug26507_5

@@ -1,34 +0,0 @@
-puts "================================================================"
-puts "CR26507"
-puts "Visualization - Improved presentations of dimensions"
-puts "================================================================"
-puts ""
-puts "User-defined orientation of text label"
-puts "Line segment aligned with text"
-
-#set anImage1 $imagedir/${casename}_1.png
-
-vinit Viewer1/View
-vbottom
-
-vpoint lengthP1 0 0 0
-vpoint lengthP2 100 0 0
-vpoint lengthP3 100 100 0
-vpoint lengthP4 0 100 0
-# Text in center - custom aligment does not taken into account
-#vdimension dim1 -length -plane xoy -shapes lengthP1 lengthP2 -text 3d -aligntext 1.0 0.0 0.0 -flyout -10
-
-# Text on the right side - it is aligned
-vdimension dim2 -length -plane xoy -shapes lengthP1 lengthP3 -text 3d -aligntext 1.0 0.0 0.0 -segment 0 -label right
-
-# Text on the left side - it is aligned
-vdimension dim3 -length -plane xoy -shapes lengthP2 lengthP3 -text 3d -flyout -10 -aligntext 1.0 0.0 0.0 -segment 5 -label left
-
-# Text on the left side - it is aligned
-vdimension dim4 -length -plane xoy -shapes lengthP4 lengthP1 -text 3d -valuetext "0.6\n1.58\nTHICKNESS" -flyout -10 -aligntext 1.0 0.0 0.0 -segment 10 -label right vcenter
-
-# Text on the left side - it is aligned
-vdimension dim5 -length -plane xoy -shapes lengthP4 lengthP3 -text 3d -flyout -10 -aligntext 1.0 0.0 0.0 -label left above -segment 10 
-vfit
-#finalize and dump
-set only_screen 1

tests/bugs/vis/bug26507_6

@@ -1,27 +0,0 @@
-puts "================================================================"
-puts "CR26507"
-puts "Visualization - Improved presentations of dimensions"
-puts "================================================================"
-puts ""
-puts "Radius dimension vertical alignment with multiline custom text"
-
-#set anImage1 $imagedir/${casename}_1.png
-
-vinit Viewer1/View
-vright
-
-vpoint aCircleP1 0 0 100
-vpoint aCircleP2 100 0 0
-vpoint aCircleP3 200 0 100
-vcircle aCircle aCircleP1 aCircleP2 aCircleP3 0
-
-#Check all text and arrow positions
-vdimension aDim1 -radius -shapes aCircle -circleparam 10 -text 3d -label right -arrow external -hidedimline -valuetext "+2.0\n -3.0\nThickness" -aligntext 1.0 0.0 0.0 -segment 15 -label left firstline
-vdimension aDim2 -radius -shapes aCircle -circleparam 20 -text 3d -label right -arrow external -hidedimline -valuetext "Thickness\n+3.0\n -4.0" -aligntext 1.0 0.0 0.0 -segment 15 -label left lastline
-vdimension aDim3 -radius -shapes aCircle -circleparam 30 -text 3d -label right -arrow external -hidedimline -valuetext "+4.0\n -5.0\nThickness" -aligntext 1.0 0.0 0.0 -flyout -70 -segment 15 -label left vcenter
-vdimension aDim4 -radius -shapes aCircle -circleparam 15 -text 3d -label right -arrow external -hidedimline -valuetext "+0.5\n -0.5" -aligntext 1.0 0.0 0.0 -segment 15 -label left lastline
-
-vfit
-
-#finalize and dump
-set only_screen 1