X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMESHGUI%2FSMESHGUI.cxx;h=5fb5edaa2352645f3338aef6350b438097e3b6e8;hb=04b5590d9c4ec2177ddc836cf2d4756ce37631d5;hp=df3f9c9122de0d0cd69a82f20d838f8a9b01c1f8;hpb=1856f1d72e94856031d2f0918738f3c583bd1419;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index df3f9c912..5fb5edaa2 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -267,214 +267,219 @@
     if( aSel )
       aSel->selectedObjects( selected );
 
-    if(selected.Extent()){
-      Handle(SALOME_InteractiveObject) anIObject = selected.First();
-      SMESH::SMESH_Mesh_var aMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(anIObject);
-      if ( !aMesh->_is_nil() ) {
-	QString aFilter, aTitle = QObject::tr("Export mesh");
-	QMap<QString, SMESH::MED_VERSION> aFilterMap;
-	QMap<QString, int> aFilterMapSTL;
-	switch ( theCommandID ) {
-	case 125:
-	case 122:
-          {
-	    if (aMesh->HasDuplicatedGroupNamesMED()) {
-              int aRet = SUIT_MessageBox::warning
-                (SMESHGUI::desktop(),
-                 QObject::tr("SMESH_WRN_WARNING"),
-                 QObject::tr("SMESH_EXPORT_MED_DUPLICATED_GRP").arg(anIObject->getName()),
-		 SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
-              if (aRet != SUIT_MessageBox::Yes)
-                return;
-            }
-            // PAL18696
-            QString v21 (aMesh->GetVersionString(SMESH::MED_V2_1, 2));
-            QString v22 (aMesh->GetVersionString(SMESH::MED_V2_2, 2));
-            aFilterMap.insert( QString("MED ") +  v21 + " (*.med)", SMESH::MED_V2_1 );
-            aFilterMap.insert( QString("MED ") +  v22 + " (*.med)", SMESH::MED_V2_2 );
-          }
-	  break;
-	case 124:
-	case 121:
-	  aFilter = QObject::tr("DAT files (*.dat)");
-	  break;
-	case 126:
-	case 123:
-          {
-            if (aMesh->NbPyramids()) {
-              int aRet = SUIT_MessageBox::warning
-                (SMESHGUI::desktop(),
-                 QObject::tr("SMESH_WRN_WARNING"),
-                 QObject::tr("SMESH_EXPORT_UNV").arg(anIObject->getName()),
-		 SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
-              if (aRet != SUIT_MessageBox::Yes)
-                return;
-            }
-            aFilter = QObject::tr("IDEAS files (*.unv)");
-          }
-	  break;
-	case 140:
-	case 141:
-          {
-	    // export STL
-	    /*
-	      there must be check on others mesh elements not equal triangles
-	    */
-	    if (aMesh->NbTriangles() < 1) {
-              SUIT_MessageBox::warning
-                (SMESHGUI::desktop(),
-                 QObject::tr("SMESH_WRN_WARNING"),
-                 QObject::tr("SMESH_EXPORT_STL1").arg(anIObject->getName()));
-	      return;
-            }
-	    if (!(aMesh->NbElements() - aMesh->NbTriangles())) {
-              int aRet = SUIT_MessageBox::warning
-                (SMESHGUI::desktop(),
-                 QObject::tr("SMESH_WRN_WARNING"),
-                 QObject::tr("SMESH_EXPORT_STL2").arg(anIObject->getName()),
-		 SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
-              if (aRet != SUIT_MessageBox::Yes)
-                return;
-            }
+    SMESH::SMESH_Mesh_var aMesh;
+    if(selected.Extent() == 1)
+      aMesh = SMESH::IObjectToInterface<SMESH::SMESH_Mesh>(selected.First());
+    if ( aMesh->_is_nil() ) {
+      SUIT_MessageBox::warning( SMESHGUI::desktop(),
+                                QObject::tr( "SMESH_WRN_WARNING" ),
+                                QObject::tr( "SMESH_BAD_MESH_SELECTION" ));
+      return;
+    }
 
-            aFilterMapSTL.insert( QObject::tr("STL ASCII  (*.stl)"), 1 ); // 1 - ASCII mode
-            aFilterMapSTL.insert( QObject::tr("STL Binary (*.stl)"), 0 ); // 0 - Binary mode
-          }
-	  break;
-	default:
-	  return;
-	}
+    Handle(SALOME_InteractiveObject) anIObject = selected.First();
+    QString aFilter, aTitle = QObject::tr("Export mesh");
+    QMap<QString, SMESH::MED_VERSION> aFilterMap;
+    QMap<QString, int> aFilterMapSTL;
+    switch ( theCommandID ) {
+    case 125:
+    case 122:
+      {
+        if (aMesh->HasDuplicatedGroupNamesMED()) {
+          int aRet = SUIT_MessageBox::warning
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_EXPORT_MED_DUPLICATED_GRP").arg(anIObject->getName()),
+             SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
+          if (aRet != SUIT_MessageBox::Yes)
+            return;
+        }
+        // PAL18696
+        QString v21 (aMesh->GetVersionString(SMESH::MED_V2_1, 2));
+        QString v22 (aMesh->GetVersionString(SMESH::MED_V2_2, 2));
+        aFilterMap.insert( QString("MED ") +  v21 + " (*.med)", SMESH::MED_V2_1 );
+        aFilterMap.insert( QString("MED ") +  v22 + " (*.med)", SMESH::MED_V2_2 );
+      }
+      break;
+    case 124:
+    case 121:
+      aFilter = QObject::tr("DAT files (*.dat)");
+      break;
+    case 126:
+    case 123:
+      {
+        if (aMesh->NbPyramids()) {
+          int aRet = SUIT_MessageBox::warning
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_EXPORT_UNV").arg(anIObject->getName()),
+             SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
+          if (aRet != SUIT_MessageBox::Yes)
+            return;
+        }
+        aFilter = QObject::tr("IDEAS files (*.unv)");
+      }
+      break;
+    case 140:
+    case 141:
+      {
+        // export STL
+        /*
+          there must be check on others mesh elements not equal triangles
+        */
+        if (aMesh->NbTriangles() < 1) {
+          SUIT_MessageBox::warning
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_EXPORT_STL1").arg(anIObject->getName()));
+          return;
+        }
+        if (!(aMesh->NbElements() - aMesh->NbTriangles())) {
+          int aRet = SUIT_MessageBox::warning
+            (SMESHGUI::desktop(),
+             QObject::tr("SMESH_WRN_WARNING"),
+             QObject::tr("SMESH_EXPORT_STL2").arg(anIObject->getName()),
+             SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
+          if (aRet != SUIT_MessageBox::Yes)
+            return;
+        }
 
-	QString aFilename;
-	SMESH::MED_VERSION aFormat;
-	// Init the parameter with the default value
-	bool aIsASCII_STL = true;
-	bool toCreateGroups = false;
-	SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-	if ( resMgr )
-	  toCreateGroups = resMgr->booleanValue( "SMESH", "auto_groups", false );
-
-	QString anInitialPath = "";
-	if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
-	  anInitialPath = QDir::currentPath();
-
-	if ( theCommandID != 122 && theCommandID != 125 && theCommandID != 140 && theCommandID != 141) {
-	  if ( anInitialPath.isEmpty() ) anInitialPath = SUIT_FileDlg::getLastVisitedPath();
-	  aFilename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), anInitialPath + QString("/") + anIObject->getName(),
-						aFilter, aTitle, false);
-	}
-	else if(theCommandID == 140 || theCommandID == 141) { // Export to STL
-	  QStringList filters;
-          QMap<QString, int>::const_iterator it = aFilterMapSTL.begin();
-          for ( ; it != aFilterMapSTL.end(); ++it )
-            filters.push_back( it.key() );
-
-          SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
-          fd->setWindowTitle( aTitle );
-          fd->setFilters( filters );
-          fd->selectFilter( QObject::tr("STL ASCII  (*.stl)") );
-	  if ( !anInitialPath.isEmpty() )
-	    fd->setDirectory( anInitialPath );
-	  fd->selectFile(anIObject->getName());
-          bool is_ok = false;
-          while (!is_ok) {
-	    if ( fd->exec() )
-	      aFilename = fd->selectedFile();
-            aIsASCII_STL = (aFilterMapSTL[fd->selectedFilter()]) == 1 ? true: false;
-            is_ok = true;
-	  }
-          delete fd;
-	}
-	else { // Export to MED
-          QStringList filters;
-          QString aDefaultFilter;
-          QMap<QString, SMESH::MED_VERSION>::const_iterator it = aFilterMap.begin();
-          for ( ; it != aFilterMap.end(); ++it ) {
-            filters.push_back( it.key() );
-            if (it.value() == SMESH::MED_V2_2)
-              aDefaultFilter = it.key();
-          }
+        aFilterMapSTL.insert( QObject::tr("STL ASCII  (*.stl)"), 1 ); // 1 - ASCII mode
+        aFilterMapSTL.insert( QObject::tr("STL Binary (*.stl)"), 0 ); // 0 - Binary mode
+      }
+      break;
+    default:
+      return;
+    }
 
-          //SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
-          SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg
-            ( SMESHGUI::desktop(), false, QObject::tr("SMESH_AUTO_GROUPS"), true, true );
-          fd->setWindowTitle( aTitle );
-          fd->setFilters( filters );
-          //fd->setSelectedFilter( QObject::tr("MED 2.2 (*.med)") );
-          fd->selectFilter(aDefaultFilter);
-          fd->SetChecked(toCreateGroups);
-	  if ( !anInitialPath.isEmpty() )
-	    fd->setDirectory( anInitialPath );
-	  fd->selectFile(anIObject->getName());
-          bool is_ok = false;
-          while (!is_ok) {
-	    if ( fd->exec() )
-	      aFilename = fd->selectedFile();
-            aFormat = aFilterMap[fd->selectedFilter()];
-            is_ok = true;
-            if ( !aFilename.isEmpty()
-                 && (aMesh->NbPolygons()>0 || aMesh->NbPolyhedrons()>0)
-                 && aFormat==SMESH::MED_V2_1) {
-              int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
-						  QObject::tr("SMESH_WRN_WARNING"),
-						  QObject::tr("SMESH_EXPORT_MED_V2_1").arg(anIObject->getName()),
-						  SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
-              if (aRet != SUIT_MessageBox::Yes) {
-                is_ok = false;
-              }
-            }
+    QString aFilename;
+    SMESH::MED_VERSION aFormat;
+    // Init the parameter with the default value
+    bool aIsASCII_STL = true;
+    bool toCreateGroups = false;
+    SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+    if ( resMgr )
+      toCreateGroups = resMgr->booleanValue( "SMESH", "auto_groups", false );
+
+    QString anInitialPath = "";
+    if ( SUIT_FileDlg::getLastVisitedPath().isEmpty() )
+      anInitialPath = QDir::currentPath();
+
+    if ( theCommandID != 122 && theCommandID != 125 && theCommandID != 140 && theCommandID != 141) {
+      if ( anInitialPath.isEmpty() ) anInitialPath = SUIT_FileDlg::getLastVisitedPath();
+      aFilename = SUIT_FileDlg::getFileName(SMESHGUI::desktop(), anInitialPath + QString("/") + anIObject->getName(),
+                                            aFilter, aTitle, false);
+    }
+    else if(theCommandID == 140 || theCommandID == 141) { // Export to STL
+      QStringList filters;
+      QMap<QString, int>::const_iterator it = aFilterMapSTL.begin();
+      for ( ; it != aFilterMapSTL.end(); ++it )
+        filters.push_back( it.key() );
+
+      SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
+      fd->setWindowTitle( aTitle );
+      fd->setFilters( filters );
+      fd->selectFilter( QObject::tr("STL ASCII  (*.stl)") );
+      if ( !anInitialPath.isEmpty() )
+        fd->setDirectory( anInitialPath );
+      fd->selectFile(anIObject->getName());
+      bool is_ok = false;
+      while (!is_ok) {
+        if ( fd->exec() )
+          aFilename = fd->selectedFile();
+        aIsASCII_STL = (aFilterMapSTL[fd->selectedFilter()]) == 1 ? true: false;
+        is_ok = true;
+      }
+      delete fd;
+    }
+    else { // Export to MED
+      QStringList filters;
+      QString aDefaultFilter;
+      QMap<QString, SMESH::MED_VERSION>::const_iterator it = aFilterMap.begin();
+      for ( ; it != aFilterMap.end(); ++it ) {
+        filters.push_back( it.key() );
+        if (it.value() == SMESH::MED_V2_2)
+          aDefaultFilter = it.key();
+      }
+
+      //SUIT_FileDlg* fd = new SUIT_FileDlg( SMESHGUI::desktop(), false, true, true );
+      SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg
+        ( SMESHGUI::desktop(), false, QObject::tr("SMESH_AUTO_GROUPS"), true, true );
+      fd->setWindowTitle( aTitle );
+      fd->setFilters( filters );
+      //fd->setSelectedFilter( QObject::tr("MED 2.2 (*.med)") );
+      fd->selectFilter(aDefaultFilter);
+      fd->SetChecked(toCreateGroups);
+      if ( !anInitialPath.isEmpty() )
+        fd->setDirectory( anInitialPath );
+      fd->selectFile(anIObject->getName());
+      bool is_ok = false;
+      while (!is_ok) {
+        if ( fd->exec() )
+          aFilename = fd->selectedFile();
+        aFormat = aFilterMap[fd->selectedFilter()];
+        is_ok = true;
+        if ( !aFilename.isEmpty()
+             && (aMesh->NbPolygons()>0 || aMesh->NbPolyhedrons()>0)
+             && aFormat==SMESH::MED_V2_1) {
+          int aRet = SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                              QObject::tr("SMESH_WRN_WARNING"),
+                                              QObject::tr("SMESH_EXPORT_MED_V2_1").arg(anIObject->getName()),
+                                              SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::Yes);
+          if (aRet != SUIT_MessageBox::Yes) {
+            is_ok = false;
           }
-          toCreateGroups = fd->IsChecked();
-          delete fd;
         }
-	if ( !aFilename.isEmpty() ) {
-	  // Check whether the file already exists and delete it if yes
-	  QFile aFile( aFilename );
-	  if ( aFile.exists() )
-	    aFile.remove();
-	  SUIT_OverrideCursor wc;
-
-	  try {
-	    bool Renumber = false;
-	    // PAL 14172  : Check of we have to renumber or not from the preferences before export
-	    if (resMgr)
-	      Renumber= resMgr->booleanValue("SMESH","renumbering");
-	    if (Renumber){
-	      SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
-	      aMeshEditor->RenumberNodes();
-	      aMeshEditor->RenumberElements();
-	      if ( SMESHGUI::automaticUpdate() )
-	        SMESH::UpdateView();
-	      }
-	    switch ( theCommandID ) {
-	    case 125:
-	    case 122:
-	      aMesh->ExportToMED( aFilename.toLatin1().data(), toCreateGroups, aFormat );
-	      break;
-	    case 124:
-	    case 121:
-	      aMesh->ExportDAT( aFilename.toLatin1().data() );
-	      break;
-	    case 126:
-	    case 123:
-	      aMesh->ExportUNV( aFilename.toLatin1().data() );
-	      break;
-	    case 140:
-	    case 141:
-	      aMesh->ExportSTL( aFilename.toLatin1().data(), aIsASCII_STL );
-	      break;
-	    default:
-	      break;
-	    }
-	  }
-	  catch (const SALOME::SALOME_Exception& S_ex){
-	    wc.suspend();
-	    SUIT_MessageBox::warning(SMESHGUI::desktop(),
-				     QObject::tr("SMESH_WRN_WARNING"),
-				     QObject::tr("SMESH_EXPORT_FAILED"));
-	    wc.resume();
-	  }
-	}
+      }
+      toCreateGroups = fd->IsChecked();
+      delete fd;
+    }
+    if ( !aFilename.isEmpty() ) {
+      // Check whether the file already exists and delete it if yes
+      QFile aFile( aFilename );
+      if ( aFile.exists() )
+        aFile.remove();
+      SUIT_OverrideCursor wc;
+
+      try {
+        bool Renumber = false;
+        // PAL 14172  : Check of we have to renumber or not from the preferences before export
+        if (resMgr)
+          Renumber= resMgr->booleanValue("SMESH","renumbering");
+        if (Renumber){
+          SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor();
+          aMeshEditor->RenumberNodes();
+          aMeshEditor->RenumberElements();
+          if ( SMESHGUI::automaticUpdate() )
+            SMESH::UpdateView();
+        }
+        switch ( theCommandID ) {
+        case 125:
+        case 122:
+          aMesh->ExportToMED( aFilename.toLatin1().data(), toCreateGroups, aFormat );
+          break;
+        case 124:
+        case 121:
+          aMesh->ExportDAT( aFilename.toLatin1().data() );
+          break;
+        case 126:
+        case 123:
+          aMesh->ExportUNV( aFilename.toLatin1().data() );
+          break;
+        case 140:
+        case 141:
+          aMesh->ExportSTL( aFilename.toLatin1().data(), aIsASCII_STL );
+          break;
+        default:
+          break;
+        }
+      }
+      catch (const SALOME::SALOME_Exception& S_ex){
+        wc.suspend();
+        SUIT_MessageBox::warning(SMESHGUI::desktop(),
+                                 QObject::tr("SMESH_WRN_WARNING"),
+                                 QObject::tr("SMESH_EXPORT_FAILED"));
+        wc.resume();
       }
     }
   }
@@ -891,18 +896,28 @@
     _PTR(AttributeIOR) anIOR;
 
     int objectCount = 0;
+    QString aNameList;
     QString aParentComponent = QString::null;
+    Handle(SALOME_InteractiveObject) anIO;
     for( SALOME_ListIteratorOfListIO anIt( selected ); anIt.More(); anIt.Next() )
     {
-      _PTR(SObject) aSO = aStudy->FindObjectID(anIt.Value()->getEntry());
+      anIO = anIt.Value();
+      QString cur = anIO->getComponentDataType();
+      _PTR(SObject) aSO = aStudy->FindObjectID(anIO->getEntry());
       if (aSO) {
-	// check if object is not reference
-	_PTR(SObject) refobj;
-	if ( !aSO->ReferencedObject( refobj ) )
-	  objectCount++;
+	// check if object is reference
+	_PTR(SObject) aRefSObj;
+	aNameList.append("\n    - ");
+	if ( aSO->ReferencedObject( aRefSObj ) ) {
+	  QString aRefName = QString::fromStdString ( aRefSObj->GetName() );
+	  aNameList.append( aRefName );
+	  cur = QString::fromStdString ( aRefSObj->GetFatherComponent()->ComponentDataType() );
+	}
+	else
+	  aNameList.append(anIO->getName());
+	objectCount++;
       }
 
-      QString cur = anIt.Value()->getComponentDataType();
       if( aParentComponent.isNull() )
         aParentComponent = cur;
       else if( !aParentComponent.isEmpty() && aParentComponent!=cur )
@@ -922,7 +937,7 @@
     if (SUIT_MessageBox::warning
 	(SMESHGUI::desktop(),
 	 QObject::tr("SMESH_WRN_WARNING"),
-	 QObject::tr("SMESH_REALLY_DELETE"),
+	 QObject::tr("SMESH_REALLY_DELETE").arg( objectCount ).arg( aNameList ),
 	 SUIT_MessageBox::Yes | SUIT_MessageBox::No,
 	 SUIT_MessageBox::Yes) != SUIT_MessageBox::Yes)
       return;
@@ -945,10 +960,10 @@
 	  if ( engineIOR() == anIOR->Value().c_str() )
 	    continue;
 	}
-
-	_PTR(SObject) refobj;
-	if ( aSO && aSO->ReferencedObject( refobj ) )
-	  continue; // skip references
+	//Check the referenced object
+	_PTR(SObject) aRefSObject;
+	if ( aSO && aSO->ReferencedObject( aRefSObject ) )
+	  aSO = aRefSObject; // Delete main Object instead of reference
 
         // put the whole hierarchy of sub-objects of the selected SO into a list and
         // then treat them all starting from the deepest objects (at list back)
@@ -2688,8 +2703,8 @@ void SMESHGUI::initialize( CAM_Application* app )
 
   createMenu( separator(), fileId );
 
-  int importId = createMenu( tr( "MEN_IMPORT" ), fileId, 11, 10 ),
-      exportId = createMenu( tr( "MEN_EXPORT" ), fileId, 12, 10 ),
+  int importId = createMenu( tr( "MEN_IMPORT" ), fileId, -1, 10 ),
+      exportId = createMenu( tr( "MEN_EXPORT" ), fileId, -1, 10 ),
       addId    = createMenu( tr( "MEN_ADD" ),    modifyId, 402 ),
       removeId = createMenu( tr( "MEN_REMOVE" ), modifyId, 403 ),
       renumId  = createMenu( tr( "MEN_RENUM" ),  modifyId, 404 ),
@@ -2913,6 +2928,8 @@ void SMESHGUI::initialize( CAM_Application* app )
   // popup for object browser
 
   createPopupItem( 150, OB, mesh, "&& selcount=1 && isImported" );      // FILE INFORMATION
+  createPopupItem( 703, OB, mesh, "&& isComputable");      // CREATE_SUBMESH
+  createPopupItem( 703, OB, subMesh, "&& isComputable" );  // CREATE_SUBMESH
   createPopupItem( 704, OB, mesh, "&& isComputable");      // EDIT_MESHSUBMESH
   createPopupItem( 704, OB, subMesh, "&& isComputable" );  // EDIT_MESHSUBMESH
   createPopupItem( 803, OB, group );                       // EDIT_GROUP