X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI.cxx;h=93322c3e76b3255dd93e481f1e3bd45ddf2d953b;hb=c9c6669fab21f2a0d544d79e60ceb119800b4cb5;hp=36a65f6f07c182dc52cc9b0b2843929e75c24d4e;hpb=220083d44c2de174a49cc9e6b214a8b6df2db284;p=modules%2Fsmesh.git

diff --git a/src/StdMeshersGUI/StdMeshersGUI.cxx b/src/StdMeshersGUI/StdMeshersGUI.cxx
index 36a65f6f0..93322c3e7 100644
--- a/src/StdMeshersGUI/StdMeshersGUI.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI.cxx
@@ -37,8 +37,8 @@
 #include "StdMeshersGUI_Parameters.h"
 #include "StdMeshersGUI_CreateStdHypothesisDlg.h"
 
-#include "QAD_Desktop.h"
-#include "QAD_ResourceMgr.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_ResourceMgr.h"
 
 #include <qobject.h>
 
@@ -98,7 +98,7 @@ void StdMeshersGUI_HypothesisCreator::CreateHypothesis
   {
     if ( StdMeshersGUI_Parameters::HasParameters( myHypType ))
     // Show Dialog for hypothesis creation
-      StdMeshersGUI_CreateStdHypothesisDlg *aDlg =
+      //StdMeshersGUI_CreateStdHypothesisDlg *aDlg =
         new StdMeshersGUI_CreateStdHypothesisDlg(myHypType, parent, "");
     else
       SMESH::CreateHypothesis(myHypType, aHypName, isAlgo); // without GUI
@@ -115,36 +115,35 @@ void StdMeshersGUI_HypothesisCreator::EditHypothesis
 {
   MESSAGE("StdMeshersGUI_HypothesisCreator::EditHypothesis");
 
-  SALOMEDS::Study::ListOfSObject_var listSOmesh =
-    SMESH::GetMeshesUsingAlgoOrHypothesis(theHyp);
-  
+  SMESH::SObjectList listSOmesh = SMESH::GetMeshesUsingAlgoOrHypothesis(theHyp);
+
   list<SMESHGUI_aParameterPtr> paramList;
   StdMeshersGUI_Parameters::GetParameters( theHyp, paramList );
 
   bool modified = false;
-  if ( SMESHGUI_aParameterDlg::Parameters( paramList, QObject::tr("SMESH_VALUE")) )
+  if ( SMESHGUI_aParameterDlg::Parameters( SMESHGUI::GetSMESHGUI(), paramList, QObject::tr("SMESH_VALUE")) )
     modified = StdMeshersGUI_Parameters::SetParameters( theHyp, paramList );
 
   if ( modified ) {
     //set new Attribute Comment for hypothesis which parameters were modified
     QString aParams = "";
     StdMeshersGUI_Parameters::GetParameters( theHyp, paramList, aParams );
-    SALOMEDS::SObject_var SHyp = SMESH::FindSObject(theHyp);
-    if (!SHyp->_is_nil()) 
+    _PTR(SObject) SHyp = SMESH::FindSObject(theHyp);
+    if (SHyp)
       if (!aParams.isEmpty()) {
 	SMESH::SetValue(SHyp, aParams);
 	//mySMESHGUI->GetActiveStudy()->updateObjBrowser(true);
       }    
-	
-    if ( listSOmesh->length() > 0 ) {
-      SALOMEDS::SObject_var submSO = listSOmesh[0];
+
+    if ( listSOmesh.size() > 0 ) {
+      _PTR(SObject) submSO = listSOmesh[0];
       SMESH::SMESH_Mesh_var aMesh =
         SMESH::SObjectToInterface<SMESH::SMESH_Mesh>(submSO);
       SMESH::SMESH_subMesh_var aSubMesh =
         SMESH::SObjectToInterface<SMESH::SMESH_subMesh>(submSO);
       if ( !aSubMesh->_is_nil() )
         aMesh = aSubMesh->GetFather();
-      SALOMEDS::SObject_var meshSO = SMESH::FindSObject( aMesh );
+      _PTR(SObject) meshSO = SMESH::FindSObject( aMesh );
       SMESH::ModifiedMesh( meshSO, false);
     }
   }