Fix for Bug IPAL8945

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

diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
index 73ce4a538986bf1a736c127162c71748f6d0c551..34d170b91a3ed5ac73e19d431a23fc2e11158397 100644 (file)
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
@@ -27,8 +27,9 @@
 //  $Header$
 
 #include "VisuGUI_IsoSurfacesDlg.h"
+
 #include "VisuGUI.h"
-//#include "VisuGUI_Selection.h"
+#include "VisuGUI_Tools.h"
 
 #include "SalomeApp_Application.h"
 
@@ -56,14 +57,14 @@ VisuGUI_IsoSurfPane::VisuGUI_IsoSurfPane (QWidget* parent)
   TopGroupLayout->setSpacing( 6 );
   TopGroupLayout->setMargin( 11 );
 
-  QLabel* LabelNbr = new QLabel( tr( "Number of surfaces:" ), TopGroup, "LabelNbr" );
+  QLabel* LabelNbr = new QLabel (tr("NB_SURFACES"), TopGroup, "LabelNbr");
   TopGroupLayout->addWidget( LabelNbr, 0, 0 );
   NbrIso = new QSpinBox( 1, 100, 1, TopGroup, "NbrIso" );
   NbrIso->setValue( 1 );
   TopGroupLayout->addWidget( NbrIso, 0, 1 );
 
-  QLabel* LabelMin = new QLabel( tr( "Minimum value:" ), TopGroup, "LabelMin" );
-  TopGroupLayout->addWidget( LabelMin, 1, 0 );
+  QLabel* LabelMin = new QLabel (tr("MIN_VALUE"), TopGroup, "LabelMin");
+  TopGroupLayout->addWidget(LabelMin, 1, 0);
   //MinIso = new QtxDblSpinBox( -DBL_MAX, DBL_MAX, 0.1, TopGroup );
   MinIso = new QLineEdit( TopGroup );
   MinIso->setValidator( new QDoubleValidator(TopGroup) );
@@ -72,7 +73,7 @@ VisuGUI_IsoSurfPane::VisuGUI_IsoSurfPane (QWidget* parent)
   LabelMin->setBuddy(MinIso);
   TopGroupLayout->addWidget( MinIso, 1, 1 );
 
-  QLabel* LabelMax = new QLabel( tr( "Maximum value:" ), TopGroup, "LabelMax" );
+  QLabel* LabelMax = new QLabel (tr("MAX_VALUE"), TopGroup, "LabelMax");
   TopGroupLayout->addWidget( LabelMax, 2, 0 );
   //MaxIso = new QtxSpinBoxDbl( -DBL_MAX, DBL_MAX, 0.1, TopGroup );
   MaxIso = new QLineEdit( TopGroup );
@@ -138,16 +139,16 @@ bool VisuGUI_IsoSurfPane::check()
 {
   if (MinIso->text().toDouble() >= MaxIso->text().toDouble()) {
     MESSAGE(tr("MSG_MINMAX_VALUES"));
-    SUIT_MessageBox::warn1( this,tr("VISU_WARNING"),
+    SUIT_MessageBox::warn1( this,tr("WRN_VISU"),
                            tr("MSG_MINMAX_VALUES"),
-                           tr("VISU_BUT_OK"));
+                           tr("BUT_OK"));
     return false;
   } // else if (/* CBUpdate->isChecked() && CBLog->isChecked() && */
 //           (MinIso->text().toDouble() <=0 || MaxIso->text().toDouble() <=0) ) {
 //     SUIT_MessageBox::warn1( this,
-//                        tr("VISU_WARNING"),
+//                        tr("WRN_VISU"),
 //                        tr("WRN_LOGARITHMIC_RANGE_ISOSURF"),
-//                        tr("VISU_BUT_OK"));
+//                        tr("BUT_OK"));
 //     return false;
 //   }
   return true;
@@ -160,11 +161,11 @@ bool VisuGUI_IsoSurfPane::check()
 /*!
   Constructor
 */
-VisuGUI_IsoSurfacesDlg::VisuGUI_IsoSurfacesDlg (QWidget* parent)
-     : QDialog(parent, "VisuGUI_IsoSurfacesDlg", true,
+VisuGUI_IsoSurfacesDlg::VisuGUI_IsoSurfacesDlg (SalomeApp_Module* theModule)
+     : QDialog(VISU::GetDesktop(theModule), "VisuGUI_IsoSurfacesDlg", true,
                WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
 {
-  setCaption( tr( "Iso Surfaces Definition" ) );
+  setCaption(tr("DEFINE_ISOSURFACES"));
   setSizeGripEnabled( TRUE );
 
   QVBoxLayout* TopLayout = new QVBoxLayout(this);
@@ -211,5 +212,14 @@ VisuGUI_IsoSurfacesDlg::VisuGUI_IsoSurfacesDlg (QWidget* parent)
 void VisuGUI_IsoSurfacesDlg::accept()
 {
   if (myIsoPane->check() && myScalarPane->check())
-    QDialog::accept();
+    {
+      myScalarPane->deletePreview();
+      QDialog::accept();
+    }
+}
+
+void VisuGUI_IsoSurfacesDlg::reject()
+{
+  myScalarPane->deletePreview();
+  QDialog::reject();
 }