Merge branch 'master' of newgeom:newgeom

diff --combined src/XGUI/XGUI_Viewer.cpp
index ed02e33b1ff2161568636af0b9008d353c3d23d3,6added867d745cb571e124b72d7c6b6dda85b06f..0f6e40282c133495240260c2f86dae78ac075b07
--- 1/src/XGUI/XGUI_Viewer.cpp
--- 2/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;