From 3d2da7c28f913e2839466428ab6b7bc8708b721c Mon Sep 17 00:00:00 2001 From: rnv Date: Mon, 25 Nov 2013 08:43:52 +0000 Subject: [PATCH] Porting to the new version of the OCCT. --- src/EntityGUI/EntityGUI_3DSketcherDlg.cxx | 9 ++++++++- src/MeasureGUI/MeasureGUI_AngleDlg.cxx | 5 ++++- src/MeasureGUI/MeasureGUI_DistanceDlg.cxx | 5 ++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx index 343ee0939..64e1e5e12 100755 --- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx @@ -1669,7 +1669,10 @@ Handle(AIS_LengthDimension) EntityGUI_3DSketcherDlg::createAISLengthDimension(do aDimensionStyle->ArrowAspect()->SetLength( theLength / 20.0 ); aDimensionStyle->LineAspect()->SetWidth( w ); - aDimensionStyle->SetHorizontalTextAlignment( Prs3d_HTA_Center ); + aDimensionStyle->MakeText3d( Standard_False ); + aDimensionStyle->SetTextHorizontalPosition( Prs3d_DTHP_Center ); + aDimensionStyle->SetTextVerticalPosition( Prs3d_DTVP_Center ); + aDimensionStyle->MakeArrows3d( Standard_True ); anIO->SetFlyout( 0.0 ); anIO->SetDimensionAspect( aDimensionStyle ); @@ -1733,6 +1736,10 @@ Handle(AIS_AngleDimension) EntityGUI_3DSketcherDlg::createAISAngleDimension(doub aDimensionStyle->ArrowAspect()->SetLength( (theAngle * M_PI / 180.0) * (aLength / 20.0) ); aDimensionStyle->LineAspect()->SetWidth( w ); + aDimensionStyle->SetTextHorizontalPosition( Prs3d_DTHP_Center ); + aDimensionStyle->SetTextVerticalPosition( Prs3d_DTVP_Center ); + aDimensionStyle->MakeText3d( Standard_False ); + aDimensionStyle->MakeArrows3d( Standard_True ); anIO->SetDimensionAspect( aDimensionStyle ); diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx index 574b53c19..afb373a9d 100644 --- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx @@ -380,7 +380,10 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs() int w = resMgr->integerValue( "Geometry", "measures_line_width", 1 ); aDimensionStyle->LineAspect()->SetWidth( w ); - aDimensionStyle->SetHorizontalTextAlignment( Prs3d_HTA_Center ); + aDimensionStyle->SetTextHorizontalPosition( Prs3d_DTHP_Center ); + aDimensionStyle->SetTextVerticalPosition( Prs3d_DTVP_Center ); + aDimensionStyle->MakeText3d( Standard_False ); + aDimensionStyle->MakeArrows3d( Standard_True ); anIO->SetDimensionAspect( aDimensionStyle ); diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx index af2085805..d9adbc4b7 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx @@ -388,7 +388,10 @@ SALOME_Prs* MeasureGUI_DistanceDlg::buildPrs() aDimensionStyle->ArrowAspect()->SetLength( aDist / 20.0 ); aDimensionStyle->LineAspect()->SetWidth( w ); - aDimensionStyle->SetHorizontalTextAlignment( Prs3d_HTA_Center ); + aDimensionStyle->SetTextHorizontalPosition( Prs3d_DTHP_Center ); + aDimensionStyle->SetTextVerticalPosition( Prs3d_DTVP_Center ); + aDimensionStyle->MakeText3d( Standard_False ); + aDimensionStyle->MakeArrows3d( Standard_True ); anIO->SetFlyout( 0.0 ); anIO->SetDimensionAspect( aDimensionStyle ); -- 2.39.2