Error after Close Study with Change Clipping dialog box opened. Sometimes it either...

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_RenumberingDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
index 4dc3f240d1c25b56ee2e683819696c27bc3329ee..bee0c48e73092811c14ebd57cb48fcf9446f9df8 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
@@ -38,6 +38,7 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_MessageBox.h>
+#include <SUIT_OverrideCursor.h>
 
 #include <LightApp_Application.h>
 #include <LightApp_SelectionMgr.h>
@@ -54,6 +55,7 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QKeyEvent>
+#include <QButtonGroup>
 
 // IDL includes
 #include <SALOMEconfig.h>
@@ -91,14 +93,15 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg( SMESHGUI* theModule, const int
   SMESHGUI_RenumberingDlgLayout->setMargin(MARGIN);
 
   /***************************************************************/
-  QGroupBox* GroupConstructors = new QGroupBox(unit == 0 ? 
-                                              tr("SMESH_NODES") :
-                                              tr("SMESH_ELEMENTS"), 
-                                              this);
+  GroupConstructors = new QGroupBox(unit == 0 ? 
+                                   tr("SMESH_NODES") :
+                                   tr("SMESH_ELEMENTS"), 
+                                   this);
   myHelpFileName = unit == 0 ? 
     "renumbering_nodes_and_elements_page.html#renumbering_nodes_anchor" :
     "renumbering_nodes_and_elements_page.html#renumbering_elements_anchor";
 
+  QButtonGroup* ButtonGroup = new QButtonGroup(this);
   QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
   GroupConstructorsLayout->setSpacing(SPACING);
   GroupConstructorsLayout->setMargin(MARGIN);
@@ -108,7 +111,7 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg( SMESHGUI* theModule, const int
   Constructor1->setChecked(true);
 
   GroupConstructorsLayout->addWidget(Constructor1);
-  GroupConstructorsLayout->addStretch();
+  ButtonGroup->addButton(Constructor1, 0);
 
   /***************************************************************/
   GroupMesh = new QGroupBox(tr("SMESH_RENUMBERING"), this);
@@ -132,7 +135,7 @@ SMESHGUI_RenumberingDlg::SMESHGUI_RenumberingDlg( SMESHGUI* theModule, const int
   GroupButtonsLayout->setSpacing(SPACING);
   GroupButtonsLayout->setMargin(MARGIN);
 
-  buttonOk = new QPushButton(tr("SMESH_BUT_OK"), GroupButtons);
+  buttonOk = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE"), GroupButtons);
   buttonOk->setAutoDefault(true);
   buttonOk->setDefault(true);
   buttonApply = new QPushButton(tr("SMESH_BUT_APPLY"), GroupButtons);
@@ -224,7 +227,7 @@ void SMESHGUI_RenumberingDlg::ClickOnApply()
        if (isUnitsLabeled)  anActor->SetCellsLabeled(false);
       }
       
-      QApplication::setOverrideCursor(Qt::WaitCursor);
+      SUIT_OverrideCursor aWaitCursor;
       if (myUnit == 0) {
        aMeshEditor->RenumberNodes();
        if (isUnitsLabeled && anActor) anActor->SetPointsLabeled(true);
@@ -233,7 +236,6 @@ void SMESHGUI_RenumberingDlg::ClickOnApply()
        aMeshEditor->RenumberElements();
        if (isUnitsLabeled && anActor) anActor->SetCellsLabeled(true);
       }
-      QApplication::restoreOverrideCursor();
     }
     catch(...) {
     }