From: ouv <ouv@opencascade.com>
Date: Tue, 12 Oct 2010 09:38:01 +0000 (+0000)
Subject: Additional fix for issue 0020874 : [CEA] Graduated axes in GEOM
X-Git-Tag: V5_1_5rc1~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=80b8df44809d1ef9d49b3d63a9aed887e558c405;p=modules%2Fgui.git

Additional fix for issue 0020874 : [CEA] Graduated axes in GEOM
---

diff --git a/doc/salome/gui/images/geomview-alt.png b/doc/salome/gui/images/geomview-alt.png
index e7e1ef677..b76055e50 100755
Binary files a/doc/salome/gui/images/geomview-alt.png and b/doc/salome/gui/images/geomview-alt.png differ
diff --git a/doc/salome/gui/images/occviewer_toolbar.png b/doc/salome/gui/images/occviewer_toolbar.png
index 3e87ca31b..23b236990 100644
Binary files a/doc/salome/gui/images/occviewer_toolbar.png and b/doc/salome/gui/images/occviewer_toolbar.png differ
diff --git a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
index 198b0f57a..9ecc2a6af 100644
--- a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
@@ -261,6 +261,11 @@ void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView )
       if( OCCViewer_AxisWidget* anAxisWidget = dynamic_cast<OCCViewer_AxisWidget*>( myAxes[ i ] ) )
         anAxisWidget->GetData( anAxisData[i] );
 
+    // A gap used offset of axis names' offset
+    // (this hard-coded value will be removed when the
+    // font support will be introduced in OCC-6.4)
+    int aGap = 20;
+
     theView->GraduatedTrihedronDisplay(
       anAxisData[0].Name.toLatin1().constData(),
       anAxisData[1].Name.toLatin1().constData(),
@@ -272,15 +277,16 @@ void OCCViewer_CubeAxesDlg::ApplyData( const Handle(V3d_View)& theView )
       anAxisData[1].DrawValues,
       anAxisData[2].DrawValues,
       Standard_True, // draw grid
+      Standard_False, // draw axes
       anAxisData[0].NbValues - 1,
       anAxisData[1].NbValues - 1,
       anAxisData[2].NbValues - 1,
       anAxisData[0].Offset,
       anAxisData[1].Offset,
       anAxisData[2].Offset,
-      anAxisData[0].Offset + 20, // tmp
-      anAxisData[1].Offset + 20, // tmp
-      anAxisData[2].Offset + 20, // tmp
+      anAxisData[0].Offset + aGap, // see above
+      anAxisData[1].Offset + aGap, // see above
+      anAxisData[2].Offset + aGap, // see above
       anAxisData[0].DrawTickmarks,
       anAxisData[1].DrawTickmarks,
       anAxisData[2].DrawTickmarks,