Merge from V6_3_BR 06/06/2011

[modules/visu.git] / src / VISUGUI / VisuGUI_CacheDlg.cxx

diff --git a/src/VISUGUI/VisuGUI_CacheDlg.cxx b/src/VISUGUI/VisuGUI_CacheDlg.cxx
index 050ee390a1bcf3466cf741724f61b37ce4507f31..31b82df9fd29db3e3c243ccd9a6630b1ce0bb132 100644 (file)
--- a/src/VISUGUI/VisuGUI_CacheDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CacheDlg.cxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_CacheDlg.cxx
 //  Author : Oleg UVAROV
@@ -36,11 +37,10 @@
 #include "SUIT_ResourceMgr.h"
 
 #include "SalomeApp_Module.h"
+#include <SalomeApp_DoubleSpinBox.h>
 
 #include "LightApp_Application.h"
 
-#include "QtxDoubleSpinBox.h"
-
 #include <QButtonGroup>
 #include <QGroupBox>
 #include <QLabel>
@@ -52,7 +52,7 @@
 using namespace std;
 
 VisuGUI_CacheDlg::VisuGUI_CacheDlg( VISU::ColoredPrs3dCache_var theCache,
-                                   SalomeApp_Module* theModule )
+                                    SalomeApp_Module* theModule )
   : QDialog( VISU::GetDesktop( theModule ), Qt::WindowTitleHint | Qt::WindowSystemMenuHint ),
     myCache( theCache )
 {
@@ -72,11 +72,11 @@ VisuGUI_CacheDlg::VisuGUI_CacheDlg( VISU::ColoredPrs3dCache_var theCache,
   double anUsedMemory = myCache->GetMemorySize();
   double aLimitedMemoryMax = 
 #ifdef WNT
-         max
+          max
 #else
-         std::max
+          std::max
 #endif
-         (anUsedMemory + aFreeMemory, aLimitedMemory);
+          (anUsedMemory + aFreeMemory, aLimitedMemory);
 
   // Settings
   QButtonGroup* aMemoryGroup = new QButtonGroup(  this );
@@ -93,7 +93,8 @@ VisuGUI_CacheDlg::VisuGUI_CacheDlg( VISU::ColoredPrs3dCache_var theCache,
   myMimimalMemoryButton->setChecked( !isLimitedMemory );
   aGridLay->addWidget( myMimimalMemoryButton, 1, 0 );
 
-  myLimitedMemory = new QtxDoubleSpinBox( 1.0, aLimitedMemoryMax, 10.0, aGB );
+  myLimitedMemory = new SalomeApp_DoubleSpinBox( aGB );
+  VISU::initSpinBox( myLimitedMemory, 1.0, aLimitedMemoryMax, 10.0, "memory_precision" );
   myLimitedMemory->setSuffix( " Mb" );
   myLimitedMemory->setValue( aLimitedMemory );
   myLimitedMemory->setEnabled( isLimitedMemory );
@@ -202,7 +203,7 @@ void VisuGUI_CacheDlg::onHelp()
   LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
   if (app)
     app->onHelpContextModule(app->activeModule() ?
-                            app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName);
+                             app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName);
   else {
     SUIT_MessageBox::warning(0, tr("WRN_WARNING"),
                              tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").