Empty list of objects to delete (bug 19263) fix

[modules/geom.git] / src / GEOMToolsGUI / GEOMToolsGUI.cxx

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
index 83718a6791e75e4887ffc09cfce6a3f8c25d503e..51d5758316ed0192436232edee3411ada51fef7e 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
@@ -24,6 +24,7 @@
 //
 
 #include "GEOMToolsGUI.h"
+#include "GEOMToolsGUI_DeleteDlg.h"
 
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
@@ -67,14 +68,19 @@ typedef QMap<QString, QString> FilterMap;
 static QString getFileName( QWidget*           parent,
                            const QString&     initial,
                            const FilterMap&   filterMap,
+                            const QStringList& filters,
                            const QString&     caption,
                            bool               open,
                            QString&           format )
 {
   static QString lastUsedFilter;
-  QStringList filters;
-  for ( FilterMap::const_iterator it = filterMap.begin(); it != filterMap.end(); ++it )
-    filters.push_back( it.key() );
+  //QStringList filters;
+  QString aBrepFilter;
+  for ( FilterMap::const_iterator it = filterMap.begin(); it != filterMap.end(); ++it ) {
+    //filters.push_back( it.key() );
+    if ( it.key().contains( "BREP", Qt::CaseInsensitive ) )
+      aBrepFilter = it.key();
+  }
 
   SUIT_FileDlg* fd = new SUIT_FileDlg( parent, open, true, true );
   if ( !caption.isEmpty() )
@@ -83,15 +89,22 @@ static QString getFileName( QWidget*           parent,
   if ( !initial.isEmpty() )
     fd->selectFile( initial );
 
-  if ( !lastUsedFilter.isEmpty() && filterMap.contains( lastUsedFilter ) )
+  fd->setFilters( filters );
+  
+  if ( !lastUsedFilter.isEmpty() && filterMap.contains( lastUsedFilter ) ) {
     fd->selectFilter( lastUsedFilter );
+  }
+  else if ( !aBrepFilter.isEmpty() ) {
+    fd->selectFilter( aBrepFilter );
+  }
 
-  fd->setFilters( filters );
+  QString filename;
+  if ( fd->exec() == QDialog::Accepted ) {
+    filename = fd->selectedFile();
+    format = filterMap[fd->selectedFilter()];
+    lastUsedFilter = fd->selectedFilter();
+  }
 
-  fd->exec();
-  QString filename = fd->selectedFile();
-  format = filterMap[fd->selectedFilter()];
-  lastUsedFilter = fd->selectedFilter();
   delete fd;
   qApp->processEvents();
   return filename;
@@ -230,6 +243,16 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
        OnNbIsos();
        break;
       }
+    case 8035: // AUTO COLOR - POPUP VIEWER
+      {
+       OnAutoColor();
+       break;
+      }
+    case 8036: // DISABLE AUTO COLOR - POPUP VIEWER
+      {
+       OnDisableAutoColor();
+       break;
+      }
     case 9024 : // OPEN - OBJBROSER POPUP
       {
        OnOpen();
@@ -275,7 +298,7 @@ void GEOMToolsGUI::OnEditDelete()
        // VSR 17/11/04: check if all objects selected belong to GEOM component --> start
        // modifications of ASV 01.06.05
        QString parentComp = getParentComponent( aStudy, selected );
-  CORBA::String_var geomIOR = app->orb()->object_to_string( GeometryGUI::GetGeomGen() );
+       CORBA::String_var geomIOR = app->orb()->object_to_string( GeometryGUI::GetGeomGen() );
        QString geomComp = getParentComponent( aStudy->FindObjectIOR( geomIOR.in() ) );
 
        if ( parentComp != geomComp )  {
@@ -287,11 +310,27 @@ void GEOMToolsGUI::OnEditDelete()
        }
        // VSR 17/11/04: check if all objects selected belong to GEOM component <-- finish
 
-       if ( SUIT_MessageBox::warning( app->desktop(),
-                                      QObject::tr( "GEOM_WRN_WARNING" ),
-                                      QObject::tr( "GEOM_REALLY_DELETE" ),
-                                      QObject::tr( "GEOM_BUT_YES" ),
-                                      QObject::tr( "GEOM_BUT_NO" ), 1 ) != 0 )
+       QStringList aNameList;
+       for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
+         Handle(SALOME_InteractiveObject) anIObject = It.Value();
+         QString aName = anIObject->getName();
+         if ( aName != "" && aName[ 0 ] != '*' ) {
+           aNameList.append( aName );
+         
+           _PTR(SObject) obj ( aStudy->FindObjectID( anIObject->getEntry() ) );
+           _PTR(ChildIterator) it ( aStudy->NewChildIterator( obj ) );
+           for ( it->InitEx( true ); it->More(); it->Next() ) {
+             _PTR(SObject) child( it->Value() );
+             QString aName = child->GetName().c_str();
+             if ( aName != "" && aName[ 0 ] != '*' ) {
+               aNameList.append( aName );
+             }
+           }
+         }
+       }
+
+       GEOMToolsGUI_DeleteDlg dlg( app->desktop(), aNameList );
+       if ( !dlg.exec() )
          return;
 
        //      QAD_Operation* op = new SALOMEGUI_ImportOperation(.....);
@@ -347,7 +386,7 @@ void GEOMToolsGUI::OnEditDelete()
           RemoveObjectWithChildren(obj, aStudy, views, disp);
 
          // Remove objects from Study
-         aStudyBuilder->RemoveObject( obj );
+         aStudyBuilder->RemoveObjectWithChildren( obj );
 
          //deleted = true;
        } // MAIN LOOP of selected
@@ -449,17 +488,23 @@ bool GEOMToolsGUI::Import()
 
   // Obtain a list of available import formats
   FilterMap aMap;
+  QStringList filters;
   GEOM::string_array_var aFormats, aPatterns;
   aInsOp->ImportTranslators( aFormats, aPatterns );
 
-  for ( int i = 0, n = aFormats->length(); i < n; i++ )
+  for ( int i = 0, n = aFormats->length(); i < n; i++ ) {
     aMap.insert( (char*)aPatterns[i], (char*)aFormats[i] );
+    filters.push_back( (char*)aPatterns[i] );
+  }
 
   QString fileType;
 
-  QString fileName = getFileName(app->desktop(), "", aMap,
+  QString fileName = getFileName(app->desktop(), "", aMap, filters,
                                  tr("GEOM_MEN_IMPORT"), true, fileType);
 
+  if (fileName.isEmpty())
+    return false;
+
   if (fileType.isEmpty() )
     {
       // Trying to detect file type
@@ -470,7 +515,7 @@ bool GEOMToolsGUI::Import()
        fileType = aPossibleType;
     }
 
-  if (fileName.isEmpty() || fileType.isEmpty())
+  if (fileType.isEmpty())
     return false;
 
   GEOM_Operation* anOp = new GEOM_Operation (app, aInsOp.in());
@@ -481,8 +526,8 @@ bool GEOMToolsGUI::Import()
 
     anOp->start();
 
-    CORBA::String_var fileN = fileName.toLatin1().data();
-    CORBA::String_var fileT = fileType.toLatin1().data();
+    CORBA::String_var fileN = CORBA::string_dup(fileName.toLatin1().data());
+    CORBA::String_var fileT = CORBA::string_dup(fileType.toLatin1().data());
     anObj = aInsOp->Import(fileN, fileT);
 
     if ( !anObj->_is_nil() && aInsOp->IsDone() ) {
@@ -554,10 +599,13 @@ bool GEOMToolsGUI::Export()
 
   // Obtain a list of available export formats
   FilterMap aMap;
+  QStringList filters;
   GEOM::string_array_var aFormats, aPatterns;
   aInsOp->ExportTranslators( aFormats, aPatterns );
-  for ( int i = 0, n = aFormats->length(); i < n; i++ )
+  for ( int i = 0, n = aFormats->length(); i < n; i++ ) {
     aMap.insert( (char*)aPatterns[i], (char*)aFormats[i] );
+    filters.push_back( (char*)aPatterns[i] );
+  }
 
   // Get selected objects
   LightApp_SelectionMgr* sm = app->selectionMgr();
@@ -577,7 +625,7 @@ bool GEOMToolsGUI::Export()
       continue;
 
     QString fileType;
-    QString file = getFileName(app->desktop(), QString( IObject->getName() ), aMap,
+    QString file = getFileName(app->desktop(), QString( IObject->getName() ), aMap, filters,
                               tr("GEOM_MEN_EXPORT"), false, fileType);
 
     // User has pressed "Cancel" --> stop the operation