Fix messages and indentation

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 6cf1f382341ca76351cab7f61b137bd9225f0c4e..0c2778ad5ba3d82f47ccbfc1bff115cc6f2b538f 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -2084,20 +2084,20 @@ void SMESHGUI::OnEditDelete()
         SMESH::RemoveHypothesisOrAlgorithmOnMesh(IObject);
         aStudyBuilder->RemoveObjectWithChildren( SO );
       }
-      else {// default action: remove SObject from the study           
-               // Find Sub-Meshes and Group and delete corresopning visual objects and actors
-               _PTR(ChildIterator) it1 = aStudy->NewChildIterator(SO);
-               for (it1->InitEx(false); it1->More(); it1->Next()) {
-                 _PTR(SObject) SObj = it1->Value();
-                 if (!SObj) continue;
-                 if (SObj->FindAttribute(anAttr, "AttributeIOR")) {
-                       SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(SMESH::SObjectToObject(SObj));
-                       SMESH::SMESH_subMesh_var   aSubMesh = SMESH::SMESH_subMesh::_narrow(SMESH::SObjectToObject(SObj));
-                       if (!aGroup->_is_nil() || !aSubMesh->_is_nil()) {
-                         SMESH::RemoveVisualObjectWithActors(SObj->GetID().c_str(), true);
-                       }
-                 }
-               }
+      else {// default action: remove SObject from the study
+        // Find Sub-Meshes and Group and delete corresopning visual objects and actors
+        _PTR(ChildIterator) it1 = aStudy->NewChildIterator(SO);
+        for (it1->InitEx(false); it1->More(); it1->Next()) {
+          _PTR(SObject) SObj = it1->Value();
+          if (!SObj) continue;
+          if (SObj->FindAttribute(anAttr, "AttributeIOR")) {
+            SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(SMESH::SObjectToObject(SObj));
+            SMESH::SMESH_subMesh_var   aSubMesh = SMESH::SMESH_subMesh::_narrow(SMESH::SObjectToObject(SObj));
+            if (!aGroup->_is_nil() || !aSubMesh->_is_nil()) {
+              SMESH::RemoveVisualObjectWithActors(SObj->GetID().c_str(), true);
+            }
+          }
+        }
         // san - it's no use opening a transaction here until UNDO/REDO is provided in SMESH
         //SUIT_Operation *op = new SALOMEGUI_ImportOperation(myActiveStudy);
         //op->start();

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index 827d8ab82ff9362fe70c5d3548c8bdb854ce1bfb..871b155b0fa2ef69b1a2cd48dcaee84954318134 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -3296,6 +3296,10 @@ Use Display Entity menu command to show them.
         <source>STB_COMPUTE</source>
         <translation>Compute</translation>
     </message>
+    <message>
+        <source>STB_RE_COMPUTE</source>
+        <translation>Clear + Compute</translation>
+    </message>
     <message>
         <source>STB_COMPUTE_SUBMESH</source>
         <translation>Compute Sub-mesh</translation>
@@ -3996,6 +4000,10 @@ Use Display Entity menu command to show them.
         <source>TOP_COMPUTE</source>
         <translation>Compute</translation>
     </message>
+    <message>
+        <source>TOP_RE_COMPUTE</source>
+        <translation>Clear + Compute</translation>
+    </message>
     <message>
         <source>TOP_COMPUTE_SUBMESH</source>
         <translation>Compute Sub-mesh</translation>

diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx
index e4e3f5e8595156f0a0439f9ba70e497731fc8300..413ef37f93b64b5ff6eeff5587f5b47a507f477a 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/src/SMESH_I/SMESH_Gen_i_1.cxx
@@ -282,10 +282,10 @@ GEOM::GEOM_Object_ptr SMESH_Gen_i::GetGeomObjectByEntry( const std::string& entr
 //=======================================================================
 
 SALOMEDS::SObject_ptr SMESH_Gen_i::publish(CORBA::Object_ptr     theIOR,
-                                     SALOMEDS::SObject_ptr theFatherObject,
-                                     const int             theTag,
-                                     const char*           thePixMap,
-                                     const bool            theSelectable)
+                                           SALOMEDS::SObject_ptr theFatherObject,
+                                           const int             theTag,
+                                           const char*           thePixMap,
+                                           const bool            theSelectable)
 {
   SALOMEDS::Study_var theStudy = getStudyServant();
   SALOMEDS::SObject_wrap SO = ObjectToSObject( theIOR );