From: akl <akl@opencascade.com>
Date: Fri, 18 Apr 2014 08:47:37 +0000 (+0400)
Subject: INT PAL 0052384: TC7.4.0:Angle between two edges: 1) using single angle value from... 
X-Git-Tag: V7_4_0rc1~16
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4d92b761b3f13b9502c50064c2c4c1a71a8c66e5;p=modules%2Fgeom.git

INT PAL 0052384: TC7.4.0:Angle between two edges: 1) using single angle value from the built presentation in viewer and dialog; 2) switch angle units depending on preferences.
---

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index 797c629ff..6ab8140a0 100644
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -4605,9 +4605,13 @@ Please, select face, shell or solid and try again</translation>
         <translation>Objects And Results</translation>
     </message>
     <message>
-        <source>GEOM_MEASURE_ANGLE_IS</source>
+        <source>GEOM_MEASURE_ANGLE_DEG</source>
         <translation>Angle in degrees :</translation>
     </message>
+    <message>
+        <source>GEOM_MEASURE_ANGLE_RAD</source>
+        <translation>Angle in radians :</translation>
+    </message>
     <message>
         <source>GEOM_LINE_INTERSECTION</source>
         <translation>Point On Lines Intersection</translation>
diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts
index 25f857109..fd3458859 100644
--- a/src/GEOMGUI/GEOM_msg_fr.ts
+++ b/src/GEOMGUI/GEOM_msg_fr.ts
@@ -4593,9 +4593,13 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
         <translation>Objets et résultats</translation>
     </message>
     <message>
-        <source>GEOM_MEASURE_ANGLE_IS</source>
+        <source>GEOM_MEASURE_ANGLE_DEG</source>
         <translation>Angle en degrés :</translation>
     </message>
+    <message>
+        <source>GEOM_MEASURE_ANGLE_RAD</source>
+        <translation type="unfinished">Angle in radians :</translation>
+    </message>
     <message>
         <source>GEOM_LINE_INTERSECTION</source>
         <translation>Point à l&apos;Intersection de deux lignes</translation>
diff --git a/src/GEOMGUI/GEOM_msg_ja.ts b/src/GEOMGUI/GEOM_msg_ja.ts
index 7837cffaf..d445fab84 100644
--- a/src/GEOMGUI/GEOM_msg_ja.ts
+++ b/src/GEOMGUI/GEOM_msg_ja.ts
@@ -4588,9 +4588,13 @@
       <translation>オブジェクトと結果</translation>
     </message>
     <message>
-      <source>GEOM_MEASURE_ANGLE_IS</source>
+      <source>GEOM_MEASURE_ANGLE_DEG</source>
       <translation>角度(degree):</translation>
     </message>
+    <message>
+        <source>GEOM_MEASURE_ANGLE_RAD</source>
+        <translation type="unfinished">Angle in radians :</translation>
+    </message>
     <message>
       <source>GEOM_LINE_INTERSECTION</source>
       <translation>線の交点</translation>
diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
index 8a7407a29..ccce76eb6 100644
--- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
@@ -57,6 +57,9 @@
 #include <AIS.hxx>
 #include <AIS_Drawer.hxx>
 #include <Prs3d_LineAspect.hxx> 
+#include <IntTools_EdgeEdge.hxx>
+#include <IntTools_SequenceOfCommonPrts.hxx>
+#include <IntTools_CommonPrt.hxx>
 
 // QT Includes
 #include <qlineedit.h>
@@ -97,7 +100,7 @@ MeasureGUI_AngleDlg::MeasureGUI_AngleDlg (GeometryGUI* GUI, QWidget* parent)
   myGrp->GroupBox1->setTitle(tr("GEOM_MEASURE_ANGLE_OBJ"));
   myGrp->TextLabel1->setText(tr("GEOM_OBJECT_I").arg("1"));
   myGrp->TextLabel2->setText(tr("GEOM_OBJECT_I").arg("2"));
-  myGrp->TextLabel3->setText(tr("GEOM_MEASURE_ANGLE_IS"));
+  myGrp->TextLabel3->setText(tr(aResMgr->stringValue ( "Geometry", "dimensions_angle_units", "deg" ) == "deg" ? "GEOM_MEASURE_ANGLE_DEG" : "GEOM_MEASURE_ANGLE_RAD"));
   myGrp->LineEdit3->setReadOnly(true);
   myGrp->PushButton1->setIcon(image1);
   myGrp->PushButton2->setIcon(image1);
@@ -197,9 +200,8 @@ void MeasureGUI_AngleDlg::processObject()
 
   double anAngle = 0.;
   if (getParameters(anAngle)) {
-    SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-    int aPrecision = resMgr->integerValue( "Geometry", "angle_precision", 6 );
-    myGrp->LineEdit3->setText(DlgRef::PrintDoubleValue(anAngle, aPrecision));
+    // To avoid the using different angle values in viewer and dialog,
+    // the value from presentation is used in both cases (see buildPrs())
     redisplayPreview();
   }
   else {
@@ -352,6 +354,7 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
 
         SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
         int w = resMgr->integerValue( "Geometry", "measures_line_width", 1 );
+        QString aUnitsAngle = resMgr->stringValue ( "Geometry", "dimensions_angle_units", "deg" );
 
         aDimensionStyle->LineAspect()->SetWidth( w );
         aDimensionStyle->SetTextHorizontalPosition( Prs3d_DTHP_Center );
@@ -360,6 +363,9 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
         aDimensionStyle->MakeArrows3d( Standard_True );
 
         anIO->SetDimensionAspect( aDimensionStyle );
+        anIO->SetDisplayUnits( aUnitsAngle.toLatin1().data() );
+        if (aUnitsAngle == "rad")
+          anIO->SetDisplaySpecialSymbol(AIS_DSS_No);
 
         SOCC_Prs* aPrs =
           dynamic_cast<SOCC_Prs*>(((SOCC_Viewer*)(vw->getViewManager()->getViewModel()))->CreatePrs(0));
@@ -367,6 +373,18 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
         if (aPrs)
           aPrs->AddObject(anIO);
 
+        // set angle value into dialog
+        double anAngle = anIO->GetValue();
+        QString anAngleLabel = "GEOM_MEASURE_ANGLE_RAD";
+        if (aUnitsAngle == "deg") {
+          // using degrees instead of radians
+          anAngle *= 180. / M_PI;
+          anAngleLabel = "GEOM_MEASURE_ANGLE_DEG";
+        }
+        myGrp->TextLabel3->setText(tr(anAngleLabel.toLatin1().data()));
+        int aPrecision = resMgr->integerValue( "Geometry", "angle_precision", 6 );
+        myGrp->LineEdit3->setText(DlgRef::PrintDoubleValue(anAngle, aPrecision));
+
         return aPrs;
       }
     }