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 e7e1ef67701a8c4d4876349109d7124ecd611113..b76055e50de84accd66a294f5b00f1ea436ab0a9 100755 (executable)
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 3e87ca31b20b181e19ee259b842f29a0542527b3..23b236990676eba7f87592c4608cb482e2cd8855 100644 (file)
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 198b0f57ab2f77cad046d1d59df29d0d38681805..9ecc2a6af9d1d5f311ced313ab0c0fd707eb4df5 100644 (file)
--- 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,