New method was not working when mesh was removed

diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx
index a45b96abf643367551b20be08bead4603a26131a..c9ac03e245d010e5cd22e5575b55bcbc90298b8b 100644 (file)
--- a/src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/src/SMESH_I/SMESH_2smeshpy.cxx
@@ -1092,6 +1092,14 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand )
       theCommand->RemoveArgs();
       id_mesh->second->Process( theCommand );
       id_mesh->second->AddProcessedCmd( theCommand );
+
+      // Changing command for compute adding a check on isDone and raising
+      // exception if not completed
+      _AString meshStr = theCommand->GetObject().ToCString();
+      _AString excStr = "\"Could not compute mesh: \"+";
+      excStr += meshStr + ".GetName()";
+      _AString compStr = theCommand->GetString()+"\nif not isDone:\n\traise Exception("+excStr+")";
+      theCommand->GetString() = compStr;
       return;
     }
   }

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index 8d380c6da5a8276ddf3c3c225d9db6c478243874..88a3a4b2d00cdb3a4d236f70695abcca4e1fbd14 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -2079,7 +2079,6 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
   // Update Python script
   TPythonDump(this) << "isDone = " << this << ".Compute( "
                     << theMesh << ", " << theShapeObject << ")";
-  TPythonDump(this) << "if not isDone: \n    raise Exception(\"Issue while computing Mesh\")";
 
   try {
     // get mesh servant