From: eap <eap@opencascade.com>
Date: Thu, 20 Feb 2014 08:55:58 +0000 (+0400)
Subject: Make meshes with different names if several GEOM objects selected
X-Git-Tag: V7_4_0a1~64
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=004510cb7d5c678ee8ab6740af9775b44eb8696a;p=modules%2Fsmesh.git

Make meshes with different names if several GEOM objects selected
---

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index f91dbca30..679348f2a 100644
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -1637,9 +1637,6 @@ bool SMESHGUI_MeshOp::createMesh( QString& theMess, QStringList& theEntryList )
 {
   theMess = "";
 
-  //QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom );
-  //QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom );
-
   QStringList aList;
   myDlg->selectedObject( SMESHGUI_MeshDlg::Geom, aList );
   if ( aList.isEmpty() )
@@ -1659,8 +1656,20 @@ bool SMESHGUI_MeshOp::createMesh( QString& theMess, QStringList& theEntryList )
     }
     return true;
   }
+  QString namePrefix;
+  if ( aList.count() > 1 )
+  {
+    namePrefix = myDlg->objectText( SMESHGUI_MeshDlg::Obj );
+    int i = namePrefix.length() - 1;
+    while ( i > 0 && namePrefix[i].isDigit() )
+      --i;
+    if ( i < namePrefix.length() - 1 )
+      namePrefix.chop( namePrefix.length() - 1 - i );
+    else
+      namePrefix += "_";
+  }
   QStringList::Iterator it = aList.begin();
-  for ( ; it!=aList.end(); it++)
+  for ( int i = 0; it!=aList.end(); it++, ++i )
   {
     QString aGeomEntry = *it;
     _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.toLatin1().data() );
@@ -1679,8 +1688,9 @@ bool SMESHGUI_MeshOp::createMesh( QString& theMess, QStringList& theEntryList )
       return false;
     _PTR(SObject) aMeshSO = SMESH::FindSObject( aMeshVar.in() );
     if ( aMeshSO ) {
-      SMESH::SetName( aMeshSO, myDlg->objectText( SMESHGUI_MeshDlg::Obj ) );
       theEntryList.append( aMeshSO->GetID().c_str() );
+      if ( i > 0 ) setDefaultName( namePrefix );
+      SMESH::SetName( aMeshSO, myDlg->objectText( SMESHGUI_MeshDlg::Obj ) );
     }
 
     for ( int aDim = SMESH::DIM_0D; aDim <= SMESH::DIM_3D; aDim++ ) {
@@ -1896,13 +1906,17 @@ void SMESHGUI_MeshOp::setCurrentHyp( const int theDim,
  * Generates and sets default mesh/submesh name(Mesh_1, Mesh_2, etc.)
  */
 //================================================================================
-void SMESHGUI_MeshOp::setDefaultName() const
+void SMESHGUI_MeshOp::setDefaultName( const QString& thePrefix ) const
 {
   QString aResName;
 
   _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
   int i = 1;
-  QString aPrefix = tr( myIsMesh ? "SMESH_OBJECT_MESH" : "SMESH_SUBMESH" ) + "_";
+
+  QString aPrefix = thePrefix;
+  if ( aPrefix.isEmpty() )
+    aPrefix = tr( myIsMesh ? "SMESH_OBJECT_MESH" : "SMESH_SUBMESH" ) + "_";
+
   _PTR(SObject) anObj;
   do
   {
diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.h b/src/SMESHGUI/SMESHGUI_MeshOp.h
index 90d49e276..783bb0831 100644
--- a/src/SMESHGUI/SMESHGUI_MeshOp.h
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.h
@@ -118,7 +118,7 @@ private:
   int                            currentHyp( const int, const int ) const;
   bool                           isAccessibleDim( const int ) const;
   void                           setCurrentHyp( const int, const int, const int );
-  void                           setDefaultName() const;
+  void                           setDefaultName( const QString& prefix="" ) const;
   SMESH::SMESH_Hypothesis_var    getAlgo( const int );
   void                           readMesh();
   QString                        name( _PTR(SObject) ) const;