updated copyright message

[modules/geom.git] / src / MeasureGUI / MeasureGUI_CreateDimensionDlg.cxx

diff --git a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx b/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 13796c0..c57e52f
--- a/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -50,8 +50,14 @@
 #include <SUIT_Session.h>
 #include <SUIT_Desktop.h>
 
+#include <QButtonGroup>
+
 #include <Aspect_PolygonOffsetMode.hxx>
 
+#include <Basics_OCCTVersion.hxx>
+
+#include <QButtonGroup>
+
 //=================================================================================
 // function : Constructor
 // purpose  :
@@ -88,7 +94,7 @@ MeasureGUI_CreateDimensionDlg::MeasureGUI_CreateDimensionDlg( const GEOM::GeomOb
                            SLOT( OnStartSelection( const QList<TopAbs_ShapeEnum>& ) ) );
   connect( myDiameterArgs, SIGNAL( StartSelection( const QList<TopAbs_ShapeEnum>& ) ),
                            SLOT( OnStartSelection( const QList<TopAbs_ShapeEnum>& ) ) );
-  connect( myAngleArgs,    SIGNAL( StartSelection( const QList<TopAbs_ShapeEnum>& ) ), 
+  connect( myAngleArgs,    SIGNAL( StartSelection( const QList<TopAbs_ShapeEnum>& ) ),
                            SLOT( OnStartSelection( const QList<TopAbs_ShapeEnum>& ) ) );
 
   connect( myLengthArgs,   SIGNAL( StopSelection() ), SLOT( OnStopSelection() ) );
@@ -105,7 +111,7 @@ MeasureGUI_CreateDimensionDlg::MeasureGUI_CreateDimensionDlg( const GEOM::GeomOb
 
   // construct main layout
   QVBoxLayout* aCustomWidLayout = new QVBoxLayout( centralWidget() );
-  aCustomWidLayout->setMargin( 0 ); 
+  aCustomWidLayout->setMargin( 0 );
   aCustomWidLayout->setSpacing( 6 );
   aCustomWidLayout->addWidget( aGroupArgs );
 
@@ -151,7 +157,7 @@ MeasureGUI_CreateDimensionDlg::~MeasureGUI_CreateDimensionDlg()
 
 //=================================================================================
 // function : ActiveArgs
-// purpose  : 
+// purpose  :
 //=================================================================================
 MeasureGUI_CreateDimensionDlg::BaseSelectorPane* MeasureGUI_CreateDimensionDlg::ActiveArgs()
 {
@@ -167,7 +173,7 @@ MeasureGUI_CreateDimensionDlg::BaseSelectorPane* MeasureGUI_CreateDimensionDlg::
 
 //=================================================================================
 // function : GenerateName
-// purpose  : 
+// purpose  :
 //=================================================================================
 QString MeasureGUI_CreateDimensionDlg::GenerateName( const QString& thePrefix )
 {
@@ -209,7 +215,7 @@ QString MeasureGUI_CreateDimensionDlg::GenerateName( const QString& thePrefix )
 
 //=================================================================================
 // function : ConstructTypeChanged
-// purpose  : 
+// purpose  :
 //=================================================================================
 void MeasureGUI_CreateDimensionDlg::ConstructTypeChanged( int theType )
 {
@@ -236,7 +242,7 @@ void MeasureGUI_CreateDimensionDlg::ConstructTypeChanged( int theType )
 
 //=================================================================================
 // function : OnArgumentTabChanged
-// purpose  : 
+// purpose  :
 //=================================================================================
 void MeasureGUI_CreateDimensionDlg::OnArgumentTabChanged()
 {
@@ -304,9 +310,9 @@ void MeasureGUI_CreateDimensionDlg::SelectionIntoArgument()
     return;
   }
 
-  GEOM::GeomObjPtr aSelectedMain = 
-    !aSelected->IsMainShape() 
-      ? aSelected->GetMainShape() 
+  GEOM::GeomObjPtr aSelectedMain =
+    !aSelected->IsMainShape()
+      ? aSelected->GetMainShape()
       : GEOM::GeomObjPtr();
 
   if ( myParentObj != aSelected && myParentObj != aSelectedMain )
@@ -357,7 +363,7 @@ void MeasureGUI_CreateDimensionDlg::OnSelectionDone()
 
 //=================================================================================
 // function : ClickOnOk
-// purpose  : 
+// purpose  :
 //=================================================================================
 void MeasureGUI_CreateDimensionDlg::ClickOnOk()
 {
@@ -370,7 +376,7 @@ void MeasureGUI_CreateDimensionDlg::ClickOnOk()
 
 //=================================================================================
 // function : ClickOnApply
-// purpose  : 
+// purpose  :
 //=================================================================================
 bool MeasureGUI_CreateDimensionDlg::ClickOnApply()
 {
@@ -400,7 +406,7 @@ bool MeasureGUI_CreateDimensionDlg::ClickOnApply()
 
 //=================================================================================
 // function : StartLocalEditing
-// purpose  : 
+// purpose  :
 //=================================================================================
 void MeasureGUI_CreateDimensionDlg::StartLocalEditing()
 {
@@ -435,17 +441,23 @@ void MeasureGUI_CreateDimensionDlg::StartLocalEditing()
 
   aViewer3d->AddZLayer( myEditingLayer );
 
-  anAISContext->OpenLocalContext( Standard_False, Standard_False );
+#if OCC_VERSION_LARGE >= 0x070400ff
+  anAISContext->Load( myDimension, PrsDim_DimensionSelectionMode_All );
+  anAISContext->SetZLayer( myDimension, myEditingLayer );
+  anAISContext->Activate( myDimension, PrsDim_DimensionSelectionMode_Line );
+  anAISContext->Activate( myDimension, PrsDim_DimensionSelectionMode_Text );
+#else
   anAISContext->Load( myDimension, AIS_DSM_All );
   anAISContext->SetZLayer( myDimension, myEditingLayer );
   anAISContext->Activate( myDimension, AIS_DSM_Line );
   anAISContext->Activate( myDimension, AIS_DSM_Text );
-  anAISContext->Redisplay( myDimension );
+#endif
+  anAISContext->Redisplay( myDimension , Standard_True );
 }
 
 //=================================================================================
 // function : StopLocalEditing
-// purpose  : 
+// purpose  :
 //=================================================================================
 void MeasureGUI_CreateDimensionDlg::StopLocalEditing()
 {
@@ -460,14 +472,15 @@ void MeasureGUI_CreateDimensionDlg::StopLocalEditing()
   Handle(V3d_Viewer)             aViewer3d    = myEditingViewer->getViewer3d();
 
   aViewer3d->RemoveZLayer( myEditingLayer );
-  anAISContext->CloseLocalContext();
+  anAISContext->Deactivate();
+  anAISContext->Activate(0);
 
   myEditingViewer = NULL;
 }
 
 //=================================================================================
 // function : Init
-// purpose  : 
+// purpose  :
 //=================================================================================
 void MeasureGUI_CreateDimensionDlg::Init()
 {
@@ -484,7 +497,7 @@ void MeasureGUI_CreateDimensionDlg::Init()
 
 //=================================================================================
 // function : CreateDimensionPrs
-// purpose  : 
+// purpose  :
 //=================================================================================
 Handle(AIS_Dimension) MeasureGUI_CreateDimensionDlg::CreateDimension()
 {
@@ -495,12 +508,13 @@ Handle(AIS_Dimension) MeasureGUI_CreateDimensionDlg::CreateDimension()
 
   QColor  aQColor       = aResMgr->colorValue  ( "Geometry", "dimensions_color", QColor( 0, 255, 0 ) );
   int     aLineWidth    = aResMgr->integerValue( "Geometry", "dimensions_line_width", 1 );
-  double  aFontHeight   = aResMgr->doubleValue ( "Geometry", "dimensions_font_height", 10 );
+  QFont   aFont         = aResMgr->fontValue   ( "Geometry", "dimensions_font", QFont("Y14.5M-2009", 14) );
   double  anArrowLength = aResMgr->doubleValue ( "Geometry", "dimensions_arrow_length", 5 );
   double  aDefFlyout    = aResMgr->doubleValue ( "Geometry", "dimensions_default_flyout", 20 );
   bool    isUnitsShown  = aResMgr->booleanValue( "Geometry", "dimensions_show_units", false );
   QString aUnitsLength  = aResMgr->stringValue ( "Geometry", "dimensions_length_units", "m" );
   QString aUnitsAngle   = aResMgr->stringValue ( "Geometry", "dimensions_angle_units", "deg" );
+  bool    aUseText3d    = aResMgr->booleanValue( "Geometry", "dimensions_use_text3d", false );
 
   OCCViewer_ViewWindow* anActiveView = NULL;
 
@@ -610,10 +624,12 @@ Handle(AIS_Dimension) MeasureGUI_CreateDimensionDlg::CreateDimension()
 
   aStyle->SetCommonColor( aColor );
   aStyle->MakeUnitsDisplayed( (Standard_Boolean) isUnitsShown );
-  aStyle->MakeText3d( Standard_True );
+  aStyle->MakeText3d( aUseText3d );
   aStyle->MakeTextShaded( Standard_True );
-  aStyle->SetExtensionSize( aFontHeight * 0.5 );
-  aStyle->TextAspect()->SetHeight( aFontHeight );
+  int fsize = aFont.pixelSize() != -1 ? aFont.pixelSize() : aFont.pointSize();
+  aStyle->SetExtensionSize( fsize * 0.5 );
+  aStyle->TextAspect()->SetFont( aFont.family().toLatin1().data() );
+  aStyle->TextAspect()->SetHeight( fsize );
   aStyle->ArrowAspect()->SetLength( anArrowLength );
   aStyle->LineAspect()->SetWidth( aLineWidth );
 
@@ -623,12 +639,21 @@ Handle(AIS_Dimension) MeasureGUI_CreateDimensionDlg::CreateDimension()
     if ( aUnitsAngle == "deg" )
     {
       aDimensionIO->SetSpecialSymbol(0xB0);
+#if OCC_VERSION_LARGE >= 0x070400ff
+      aDimensionIO->SetDisplaySpecialSymbol( isUnitsShown ? PrsDim_DisplaySpecialSymbol_After :
+                                                            PrsDim_DisplaySpecialSymbol_No );
+#else
       aDimensionIO->SetDisplaySpecialSymbol( isUnitsShown ? AIS_DSS_After : AIS_DSS_No );
+#endif
       aStyle->MakeUnitsDisplayed(Standard_False);
     }
     else
     {
+#if OCC_VERSION_LARGE >= 0x070400ff
+      aDimensionIO->SetDisplaySpecialSymbol(PrsDim_DisplaySpecialSymbol_No);
+#else
       aDimensionIO->SetDisplaySpecialSymbol(AIS_DSS_No);
+#endif
       aStyle->MakeUnitsDisplayed( (Standard_Boolean) isUnitsShown );
     }
   }
@@ -647,7 +672,7 @@ Handle(AIS_Dimension) MeasureGUI_CreateDimensionDlg::CreateDimension()
 
 //=================================================================================
 // class    : AddDimensionToOwner
-// purpose  : 
+// purpose  :
 //=================================================================================
 bool MeasureGUI_CreateDimensionDlg::AddDimensionToOwner()
 {
@@ -926,7 +951,7 @@ void MeasureGUI_CreateDimensionDlg::BaseSelectorPane::SelectionIntoArguments( co
 
 //=================================================================================
 // function : BaseSelectorPane::GetSelection
-// purpose  : 
+// purpose  :
 //=================================================================================
 GEOM::GeomObjPtr MeasureGUI_CreateDimensionDlg::BaseSelectorPane::GetSelection( QLineEdit* theSelector ) const
 {