From: mpv <mikhail.ponikarov@opencascade.com>
Date: Thu, 10 Apr 2014 13:37:46 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.1~23^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1fc8dc0984e6bb92df544300fda9aa625ad5c05e;hp=-c;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom
---

1fc8dc0984e6bb92df544300fda9aa625ad5c05e
diff --combined src/XGUI/XGUI_Viewer.cpp
index ed02e33b1,6added867..0f6e40282
--- a/src/XGUI/XGUI_Viewer.cpp
+++ b/src/XGUI/XGUI_Viewer.cpp
@@@ -227,7 -227,7 +227,7 @@@ bool XGUI_Viewer::isTrihedronVisible() 
   \param on - new state
   */
  
- void XGUI_Viewer::setTrihedronShown(const bool on)
+ void XGUI_Viewer::setTrihedronShown(bool on)
  {
    if (myTrihedron.IsNull())
      return;
@@@ -324,7 -324,7 +324,7 @@@ bool XGUI_Viewer::computeTrihedronSize(
    if (aMaxSide < Precision::Confusion())
      return false;
  
 -  static float EPS = 5.0E-3;
 +  static float EPS = (float)5.0E-3;
    theSize = trihedron()->Size();
    //theNewSize = aMaxSide*aSizeInPercents / 100.0;