activateModule/deactivateModule functions are made "bool".

[modules/smesh.git] / src / StdMeshersGUI / StdMeshersGUI_CreateHypothesisDlg.cxx

diff --git a/src/StdMeshersGUI/StdMeshersGUI_CreateHypothesisDlg.cxx b/src/StdMeshersGUI/StdMeshersGUI_CreateHypothesisDlg.cxx
index 90c3632f5e523404dfb4c32c7f20123e34763f6e..b68b6d24c1008f527892c4f11ec5139e8324a8eb 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_CreateHypothesisDlg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_CreateHypothesisDlg.cxx
@@ -35,13 +35,16 @@
 #include "SMESHGUI_HypothesesUtils.h"
 #include "SMESHGUI_Utils.h"
 
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
+#include "SUIT_Application.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_MessageBox.h"
+#include "SUIT_OverrideCursor.h"
 #include "utilities.h"
 
-#include "SALOMEGUI_QtCatchCorbaException.hxx"
-#include "QAD_MessageBox.h"
-#include "QAD_WaitCursor.h"
+#include "SalomeApp_Tools.h"
+#include "SalomeApp_Application.h"
+
+#include "OB_Browser.h"
 
 // QT Includes
 #include <qgroupbox.h>
@@ -51,6 +54,7 @@
 #include <qlayout.h>
 #include <qpixmap.h>
 #include <qspinbox.h>
+#include <qtextedit.h>
 
 using namespace std;
 
@@ -126,7 +130,7 @@ void StdMeshersGUI_CreateHypothesisDlg::CreateDlgLayout(const QString & theCapti
     QLabel * label = new QLabel( GroupC1, "TextLabel" );
     GroupC1Layout->addWidget( label, row, 0 );
     label->setText( param->Label() );
-    QWidget* aSpinWidget;
+    QWidget* aSpinWidget = 0;
     switch ( param->GetType() ) {
     case SMESHGUI_aParameter::DOUBLE: {
       SMESHGUI_SpinBox* spin = new SMESHGUI_SpinBox( GroupC1 );
@@ -139,13 +143,23 @@ void StdMeshersGUI_CreateHypothesisDlg::CreateDlgLayout(const QString & theCapti
       aSpinWidget = spin;
       break;
     }
+    case SMESHGUI_aParameter::TEXT: {
+      QTextEdit* edit = new QTextEdit( GroupC1 );
+      edit->setWordWrap( QTextEdit::NoWrap );
+      edit->setTextFormat( Qt::PlainText );
+      aSpinWidget = edit;
+      break;
+    }
     default:;
     }
-    GroupC1Layout->addWidget( aSpinWidget, row, 1 );
-    aSpinWidget->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
-    aSpinWidget->setMinimumSize( 150, 0 );
-    param->InitializeWidget( aSpinWidget );
-    mySpinList.push_back( aSpinWidget );
+
+    if ( aSpinWidget ) {
+      GroupC1Layout->addWidget( aSpinWidget, row, 1 );
+      aSpinWidget->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+      aSpinWidget->setMinimumSize( 150, 0 );
+      param->InitializeWidget( aSpinWidget );
+      mySpinList.push_back( aSpinWidget );
+    }
   }
   
   StdMeshersGUI_CreateHypothesisDlgLayout->addMultiCellWidget(GroupC1 , 1, 1, 0, 1 );
@@ -216,7 +230,7 @@ void StdMeshersGUI_CreateHypothesisDlg::Init()
   /* Move widget on the botton right corner of main widget */
   int x, y ;
   mySMESHGUI->DefineDlgPosition( this, x, y ) ;
-  this->move( x, y ) ; 
+  this->move( x, y ) ;
   this->show() ; /* displays Dialog */
 }
 
@@ -237,17 +251,17 @@ void StdMeshersGUI_CreateHypothesisDlg::ClickOnOk()
 //=================================================================================
 bool StdMeshersGUI_CreateHypothesisDlg::ClickOnApply()
 {
-  if ( !mySMESHGUI || mySMESHGUI->ActiveStudyLocked() )
+  if ( !mySMESHGUI || mySMESHGUI->isActiveStudyLocked() )
     return false;
 
   QString myHypName = LineEdit_NameHypothesis->text().stripWhiteSpace();
   if ( myHypName.isEmpty() ) {
-    QAD_MessageBox::warn1 (this, tr( "SMESH_WRN_WARNING" ),
+    SUIT_MessageBox::warn1 (this, tr( "SMESH_WRN_WARNING" ),
                            tr( "SMESH_WRN_EMPTY_NAME" ), tr( "SMESH_BUT_OK" ) );
     return false;
   }
 
-  QAD_WaitCursor wc;
+  SUIT_OverrideCursor wc;
 
   try {
     SMESH::SMESH_Hypothesis_var Hyp = SMESH::SMESH_Hypothesis::_narrow
@@ -267,16 +281,16 @@ bool StdMeshersGUI_CreateHypothesisDlg::ClickOnApply()
     //set new Attribute Comment for hypothesis which parameters were set
     QString aParams = "";
     StdMeshersGUI_Parameters::GetParameters( Hyp.in(), myParamList, aParams );
-    SALOMEDS::SObject_var SHyp = SMESH::FindSObject(Hyp.in());
-    if (!SHyp->_is_nil()) 
+    _PTR(SObject) SHyp = SMESH::FindSObject(Hyp.in());
+    if (SHyp)
       if (!aParams.isEmpty()) {
        SMESH::SetValue(SHyp, aParams);
-       mySMESHGUI->GetActiveStudy()->updateObjBrowser(true);
-      }    
+       mySMESHGUI->getApp()->objectBrowser()->updateTree();
+      }
   }
   catch (const SALOME::SALOME_Exception& S_ex) {
-    wc.stop();
-    QtCatchCorbaException(S_ex);
+    wc.suspend();
+    SalomeApp_Tools::QtCatchCorbaException(S_ex);
     return false;
   }
   return true;