X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI.cxx;h=15c9c94cd0a115e8c17fa15033683bc03df3553e;hp=b3b02de46f9f2364c40cae539f77ae851c25942f;hb=4fe88e90a7950c1374379297242d9ad57126084f;hpb=8db6ce0cb05ae8e6fcab7347209a7db5f8c58099

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index b3b02de46..15c9c94cd 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -184,7 +184,6 @@ namespace{
     if(!filename.isEmpty()) {
       SUIT_OverrideCursor wc;
       _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
-      theComponentMesh->SetCurrentStudy( _CAST(Study,aStudy)->GetStudy() );
 
       try {
 	SMESH::mesh_array_var aMeshes = new SMESH::mesh_array;
@@ -1063,10 +1062,6 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
   if( !mgr )
     return false;
 
-  if (CORBA::is_nil(GetSMESHGen()->GetCurrentStudy())) {
-    GetSMESHGen()->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy());
-  }
-
   SUIT_ViewWindow* view = application()->desktop()->activeWindow();
   SVTK_ViewWindow* vtkwnd = dynamic_cast<SVTK_ViewWindow*>( view );
 
@@ -1284,7 +1279,7 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
 	SMESH::SMESH_Mesh_var aMesh;
 	SMESH::SMESH_subMesh_var aSubMesh;
 	Handle(SALOME_InteractiveObject) IObject = selected.First();
-	if (IObject->hasEntry()){
+	if (IObject->hasEntry()) {
 	  _PTR(SObject) aMeshSObj = aStudy->FindObjectID(IObject->getEntry());
 	  GEOM::GEOM_Object_var aShapeObject = SMESH::GetShapeOnMeshOrSubMesh( aMeshSObj );
 	  if ( aShapeObject->_is_nil() ) {
@@ -1292,69 +1287,50 @@ bool SMESHGUI::OnGUIEvent( int theCommandID )
 	    break;
 	  }
 	  if( aMeshSObj ) {
-	    SMESH::SMESH_Mesh_var aMesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>(aMeshSObj);
-	    SMESH::SMESH_subMesh_var aSubMesh = SMESH::SObjectToInterface<SMESH::SMESH_subMesh>(aMeshSObj);
-
-	    if (!aMesh->_is_nil()){
-	      GEOM::GEOM_Object_var refShapeObject = SMESH::GetShapeOnMeshOrSubMesh(aMeshSObj);
-	      if (!refShapeObject->_is_nil()) {
-		if(!GetSMESHGen()->IsReadyToCompute(aMesh,refShapeObject)){
-		  SUIT_MessageBox::warn1(desktop(),
-					tr("SMESH_WRN_WARNING"),
-					tr("SMESH_WRN_MISSING_PARAMETERS"),
-					tr("SMESH_BUT_OK"));
-		  break;
-		}
-		try{
-		  if (GetSMESHGen()->Compute(aMesh,refShapeObject))
-                    SMESH::ModifiedMesh(aMeshSObj,true);
-		  // TO Do : change icon of all submeshes
-                  else
-                    SUIT_MessageBox::warn1(desktop(),
-                                          tr("SMESH_WRN_WARNING"),
-                                          tr("SMESH_WRN_COMPUTE_FAILED"),
-                                          tr("SMESH_BUT_OK"));
-		}
-		catch(const SALOME::SALOME_Exception & S_ex){
-		  SalomeApp_Tools::QtCatchCorbaException(S_ex);
-		}
-	      }
-	    }else if(!aSubMesh->_is_nil()){
+	    aMesh = SMESH::SObjectToInterface<SMESH::SMESH_Mesh>(aMeshSObj);
+	    aSubMesh = SMESH::SObjectToInterface<SMESH::SMESH_subMesh>(aMeshSObj);
+            if ( !aSubMesh->_is_nil() )
 	      aMesh = aSubMesh->GetFather();
-	      GEOM::GEOM_Object_var refShapeObject = SMESH::GetShapeOnMeshOrSubMesh(aMeshSObj);
-	      if(!refShapeObject->_is_nil()){
-		bool compute = GetSMESHGen()->IsReadyToCompute(aMesh,refShapeObject);
-		if(!compute){
-		  SUIT_MessageBox::warn1(desktop(),
-					tr("SMESH_WRN_WARNING"),
-					tr("SMESH_WRN_MISSING_PARAMETERS"),
-					tr("SMESH_BUT_OK"));
-		  break;
-		}
-		try{
-		  if ( GetSMESHGen()->Compute(aMesh,refShapeObject) )
-                    SMESH::ModifiedMesh(aMeshSObj,true);
-		  // TO Do : change icon of all submeshes
-                  else
-                    SUIT_MessageBox::warn1(desktop(),
-                                          tr("SMESH_WRN_WARNING"),
-                                          tr("SMESH_WRN_COMPUTE_FAILED"),
-                                          tr("SMESH_BUT_OK"));
-		}catch(const SALOME::SALOME_Exception & S_ex){
-		  SalomeApp_Tools::QtCatchCorbaException(S_ex);
-		}
-	      }
-	    }
+
+	    if (!aMesh->_is_nil()) {
+//               if(!GetSMESHGen()->IsReadyToCompute(aMesh,aShapeObject)) {
+//                 SUIT_MessageBox::warn1(desktop(),
+//                                        tr("SMESH_WRN_WARNING"),
+//                                        tr("SMESH_WRN_MISSING_PARAMETERS"),
+//                                        tr("SMESH_BUT_OK"));
+//                 break;
+//               }
+              SMESH::algo_error_array_var errors = GetSMESHGen()->GetAlgoState(aMesh,aShapeObject);
+              if ( errors->length() > 0 ) {
+                SUIT_MessageBox::warn1(desktop(),
+                                       tr("SMESH_WRN_WARNING"),
+                                       SMESH::GetMessageOnAlgoStateErrors( errors.in() ),
+                                       tr("SMESH_BUT_OK"));
+                break;
+              }
+              try{
+                if (GetSMESHGen()->Compute(aMesh,aShapeObject))
+                  SMESH::ModifiedMesh(aMeshSObj,true);
+                else
+                  SUIT_MessageBox::warn1(desktop(),
+                                         tr("SMESH_WRN_WARNING"),
+                                         tr("SMESH_WRN_COMPUTE_FAILED"),
+                                         tr("SMESH_BUT_OK"));
+              }
+              catch(const SALOME::SALOME_Exception & S_ex){
+                SalomeApp_Tools::QtCatchCorbaException(S_ex);
+              }
+            }
 	  }
 	}
-	CORBA::Long anId = aStudy->StudyId();
-	TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,IObject->getEntry());
-	if ( automaticUpdate() && aVisualObj){
-	  aVisualObj->Update();
-	  SMESH_Actor* anActor = SMESH::FindActorByEntry(IObject->getEntry());
-	  if(!anActor){
-	    anActor = SMESH::CreateActor(aStudy,IObject->getEntry());
-	    if(anActor){
+        CORBA::Long anId = aStudy->StudyId();
+        TVisualObjPtr aVisualObj = SMESH::GetVisualObj(anId,IObject->getEntry());
+        if ( automaticUpdate() && aVisualObj){
+          aVisualObj->Update();
+          SMESH_Actor* anActor = SMESH::FindActorByEntry(IObject->getEntry());
+          if(!anActor){
+            anActor = SMESH::CreateActor(aStudy,IObject->getEntry());
+            if(anActor){
 	      SMESH::DisplayActor(view,anActor); //apo
 	      SMESH::FitAll();
 	    }
@@ -2826,11 +2802,16 @@ void SMESHGUI::OnGUIEvent()
 
 SMESH::SMESH_Gen_var SMESHGUI::GetSMESHGen()
 {
+  _PTR(Study) aStudy = SMESH::GetActiveStudyDocument(); //Document OCAF de l'etude active
   if ( CORBA::is_nil( myComponentSMESH ) )
     {
       SMESHGUI aGUI; //SRN BugID: IPAL9186: Create an instance of SMESHGUI to initialize myComponentSMESH
+      if ( aStudy )
+        aGUI.myComponentSMESH->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy());
       return aGUI.myComponentSMESH;
     }
+  if ( aStudy )
+    myComponentSMESH->SetCurrentStudy(_CAST(Study,aStudy)->GetStudy());
   return myComponentSMESH;
 }
 
@@ -3121,6 +3102,6 @@ LightApp_Operation* SMESHGUI::createOperation( const int id ) const
 LightApp_Displayer* SMESHGUI::displayer()
 {
   if( !myDisplayer )
-    myDisplayer = new SMESHGUI_Displayer( dynamic_cast<SalomeApp_Study*>( getApp()->activeStudy() ) );
+    myDisplayer = new SMESHGUI_Displayer( getApp() );
   return myDisplayer;
 }