ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-09 18:03:08 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix messages and indentation

Browse Source
This commit is contained in:
eap 2022-01-26 13:38:57 +03:00
parent 526e921765
commit 9db5f5f59c
3 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/SMESHGUI/SMESHGUI.cxx
View File

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

8
src/SMESHGUI/SMESH_msg_en.ts
View File

@ -3296,6 +3296,10 @@ Use Display Entity menu command to show them.
<source>STB_COMPUTE</source> <source>STB_COMPUTE</source>
<translation>Compute</translation> <translation>Compute</translation>
</message> </message>
<message>
<source>STB_RE_COMPUTE</source>
<translation>Clear + Compute</translation>
</message>
<message> <message>
<source>STB_COMPUTE_SUBMESH</source> <source>STB_COMPUTE_SUBMESH</source>
<translation>Compute Sub-mesh</translation> <translation>Compute Sub-mesh</translation>
@ -3996,6 +4000,10 @@ Use Display Entity menu command to show them.
<source>TOP_COMPUTE</source> <source>TOP_COMPUTE</source>
<translation>Compute</translation> <translation>Compute</translation>
</message> </message>
<message>
<source>TOP_RE_COMPUTE</source>
<translation>Clear + Compute</translation>
</message>
<message> <message>
<source>TOP_COMPUTE_SUBMESH</source> <source>TOP_COMPUTE_SUBMESH</source>
<translation>Compute Sub-mesh</translation> <translation>Compute Sub-mesh</translation>

8
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -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 SMESH_Gen_i::publish(CORBA::Object_ptr theIOR,
SALOMEDS::SObject_ptr theFatherObject, SALOMEDS::SObject_ptr theFatherObject,
const int theTag, const int theTag,
const char* thePixMap, const char* thePixMap,
const bool theSelectable) const bool theSelectable)
{ {
SALOMEDS::Study_var theStudy = getStudyServant(); SALOMEDS::Study_var theStudy = getStudyServant();
SALOMEDS::SObject_wrap SO = ObjectToSObject( theIOR ); SALOMEDS::SObject_wrap SO = ObjectToSObject( theIOR );