-// GEOM GEOMGUI : GUI for Geometry component
+// GEOM GEOMGUI : GUI for Geometry component
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+// File : GEOMBase_Tools.cxx
+// Author : Damien COQUERET, Open CASCADE S.A.S.
//
-//
-// File : GEOMBase_Tools.cxx
-// Author : Damien COQUERET
-// Module : GEOM
-// $Header$
#include "GEOMToolsGUI.h"
+#include "GEOMToolsGUI_DeleteDlg.h"
-#include "GeometryGUI.h"
-#include "GEOM_Actor.h"
-#include "GEOMBase.h"
-#include "GEOM_Operation.h"
-#include "GEOM_Displayer.h"
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+#include <GEOM_Operation.h>
+#include <GEOM_Displayer.h>
#include <SUIT_Session.h>
-#include <SUIT_Application.h>
#include <SUIT_OverrideCursor.h>
#include <SUIT_MessageBox.h>
#include <SUIT_Tools.h>
#include <SUIT_FileDlg.h>
#include <SUIT_Desktop.h>
#include <SUIT_ViewModel.h>
+#include <SUIT_ViewManager.h>
#include <SalomeApp_Application.h>
#include <SalomeApp_Study.h>
#include <LightApp_SelectionMgr.h>
#include <GEOMImpl_Types.hxx>
+#include <SALOME_ListIO.hxx>
#include <SALOME_ListIteratorOfListIO.hxx>
#include <SALOME_Prs.h>
-#include "utilities.h"
-
// QT Includes
-#include <qapplication.h>
-#include <qmap.h>
+#include <QApplication>
+#include <QMap>
// OCCT Includes
#include <TCollection_AsciiString.hxx>
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() )
- fd->setCaption( caption );
+ fd->setWindowTitle( caption );
if ( !initial.isEmpty() )
- fd->setSelection( initial );
-
- if ( !lastUsedFilter.isEmpty() && filterMap.contains( lastUsedFilter ) )
- fd->setSelectedFilter( lastUsedFilter );
+ fd->selectFile( initial );
fd->setFilters( filters );
+
+ if ( !lastUsedFilter.isEmpty() && filterMap.contains( lastUsedFilter ) ) {
+ fd->selectFilter( lastUsedFilter );
+ }
+ else if ( !aBrepFilter.isEmpty() ) {
+ fd->selectFilter( aBrepFilter );
+ }
+
+ 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;
OnSettingsColor();
break;
}
- case 413: // SETTINGS - ISOS
- {
- OnSettingsIsos();
- break;
- }
- case 414: // SETTINGS : STEP VALUE FOR SPIN BOXES
- {
- OnSettingsStep();
- break;
- }
case 804: // ADD IN STUDY - POPUP VIEWER
{
// SAN -- TO BE REMOVED !!!!
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();
bool aLocked = (_PTR(AttributeStudyProperties)(aStudy->GetProperties()))->IsLocked();
if ( aLocked ) {
- SUIT_MessageBox::warn1 ( app->desktop(),
- QObject::tr("WRN_WARNING"),
- QObject::tr("WRN_STUDY_LOCKED"),
- QObject::tr("BUT_OK") );
+ SUIT_MessageBox::warning ( app->desktop(),
+ QObject::tr("WRN_WARNING"),
+ QObject::tr("WRN_STUDY_LOCKED"),
+ QObject::tr("BUT_OK") );
return;
}
// 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 ) {
- SUIT_MessageBox::warn1 ( app->desktop(),
- QObject::tr("ERR_ERROR"),
- QObject::tr("NON_GEOM_OBJECTS_SELECTED").arg( getGeometryGUI()->moduleName() ),
- QObject::tr("BUT_OK") );
+ SUIT_MessageBox::warning ( app->desktop(),
+ QObject::tr("ERR_ERROR"),
+ QObject::tr("NON_GEOM_OBJECTS_SELECTED").arg( getGeometryGUI()->moduleName() ),
+ QObject::tr("BUT_OK") );
return;
}
// VSR 17/11/04: check if all objects selected belong to GEOM component <-- finish
- if ( SUIT_MessageBox::warn2( app->desktop(),
- QObject::tr( "GEOM_WRN_WARNING" ),
- QObject::tr( "GEOM_REALLY_DELETE" ),
- QObject::tr( "GEOM_BUT_YES" ),
- QObject::tr( "GEOM_BUT_NO" ), 1, 0, 0 ) != 1 )
+ 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(.....);
// op->start();
// prepare list of SALOME_Views
- QPtrList<SALOME_View> views;
+ QList<SALOME_View*> views;
SALOME_View* view;
// fill the list
ViewManagerList vmans = app->viewManagers();
SUIT_ViewManager* vman;
- for ( vman = vmans.first(); vman; vman = vmans.next() ) {
+ QListIterator<SUIT_ViewManager*> it( vmans );
+ while ( it.hasNext() && (vman = it.next()) ) {
SUIT_ViewModel* vmod = vman->getViewModel();
view = dynamic_cast<SALOME_View*> ( vmod ); // must work for OCC and VTK views
if ( view )
RemoveObjectWithChildren(obj, aStudy, views, disp);
// Remove objects from Study
- aStudyBuilder->RemoveObject( obj );
+ aStudyBuilder->RemoveObjectWithChildren( obj );
//deleted = true;
} // MAIN LOOP of selected
bool aLocked = (_PTR(AttributeStudyProperties)(aStudy->GetProperties()))->IsLocked();
if ( aLocked ) {
- SUIT_MessageBox::warn1 ( app->desktop(),
- QObject::tr("WRN_WARNING"),
- QObject::tr("WRN_STUDY_LOCKED"),
- QObject::tr("BUT_OK") );
+ SUIT_MessageBox::warning ( app->desktop(),
+ QObject::tr("WRN_WARNING"),
+ QObject::tr("WRN_STUDY_LOCKED"),
+ QObject::tr("BUT_OK") );
return false;
}
GEOM::GEOM_Gen_var eng = GeometryGUI::GetGeomGen();
if ( CORBA::is_nil( eng ) ) {
- SUIT_MessageBox::error1( app->desktop(),
- QObject::tr("WRN_WARNING"),
- QObject::tr( "GEOM Engine is not started" ),
- QObject::tr("BUT_OK") );
+ SUIT_MessageBox::critical( app->desktop(),
+ QObject::tr("WRN_WARNING"),
+ QObject::tr( "GEOM Engine is not started" ),
+ QObject::tr("BUT_OK") );
return false;
}
// 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
QFileInfo aFileInfo( fileName );
- QString aPossibleType = (aFileInfo.extension(false)).upper() ;
+ QString aPossibleType = (aFileInfo.suffix()).toUpper() ;
if ( (aMap.values()).contains(aPossibleType) )
fileType = aPossibleType;
}
- if (fileName.isEmpty() || fileType.isEmpty())
+ if (fileType.isEmpty())
return false;
GEOM_Operation* anOp = new GEOM_Operation (app, aInsOp.in());
anOp->start();
- CORBA::String_var fileN = fileName.latin1();
- CORBA::String_var fileT = fileType.latin1();
+ 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() ) {
GeometryGUI::GetGeomGen()->PublishInStudy(aDSStudy,
SALOMEDS::SObject::_nil(),
anObj,
- aPublishObjName);
+ aPublishObjName.toStdString().c_str());
GEOM_Displayer( stud ).Display( anObj.in() );
else {
anOp->abort();
wc.suspend();
- SUIT_MessageBox::error1( app->desktop(),
- QObject::tr( "GEOM_ERROR" ),
- QObject::tr("GEOM_PRP_ABORT") + "\n" + QString( aInsOp->GetErrorCode() ),
- QObject::tr("BUT_OK") );
+ SUIT_MessageBox::critical( app->desktop(),
+ QObject::tr( "GEOM_ERROR" ),
+ QObject::tr("GEOM_PRP_ABORT") + "\n" + QString( aInsOp->GetErrorCode() ),
+ QObject::tr("BUT_OK") );
}
}
catch( const SALOME::SALOME_Exception& S_ex ) {
GEOM::GEOM_Gen_var eng = GeometryGUI::GetGeomGen();
if ( CORBA::is_nil( eng ) ) {
- SUIT_MessageBox::error1( app->desktop(),
- QObject::tr("WRN_WARNING"),
- QObject::tr( "GEOM Engine is not started" ),
- QObject::tr("BUT_OK") );
+ SUIT_MessageBox::critical( app->desktop(),
+ QObject::tr("WRN_WARNING"),
+ QObject::tr( "GEOM Engine is not started" ),
+ QObject::tr("BUT_OK") );
return false;
}
// 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();
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
anOp->start();
- aInsOp->Export( anObj, file, fileType.latin1() );
+ aInsOp->Export( anObj, file.toStdString().c_str(), fileType.toLatin1().constData() );
if ( aInsOp->IsDone() )
anOp->commit();
{
anOp->abort();
wc.suspend();
- SUIT_MessageBox::error1( app->desktop(),
- QObject::tr( "GEOM_ERROR" ),
- QObject::tr("GEOM_PRP_ABORT") + "\n" + QString( aInsOp->GetErrorCode() ),
- QObject::tr("BUT_OK") );
+ SUIT_MessageBox::critical( app->desktop(),
+ QObject::tr( "GEOM_ERROR" ),
+ QObject::tr("GEOM_PRP_ABORT") + "\n" + QString( aInsOp->GetErrorCode() ),
+ QObject::tr("BUT_OK") );
return false;
}
}
//=====================================================================================
void GEOMToolsGUI::RemoveObjectWithChildren(_PTR(SObject) obj,
_PTR(Study) aStudy,
- QPtrList<SALOME_View> views,
+ QList<SALOME_View*> views,
GEOM_Displayer* disp)
{
// iterate through all children of obj
GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
if (!CORBA::is_nil(geomObj)) {
// Erase graphical object
- SALOME_View* view = views.first();
- for (; view; view = views.next()) {
- disp->Erase(geomObj, true, view);
- }
-
+ QListIterator<SALOME_View*> it( views );
+ while ( it.hasNext() )
+ if ( SALOME_View* view = it.next() )
+ disp->Erase(geomObj, true, view);
+
// Remove object from Engine
GeometryGUI::GetGeomGen()->RemoveObject( geomObj );
}
SalomeApp_Application* app =
dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
- SUIT_MessageBox::warn1 ( app->desktop(),
- QObject::tr("WRN_WARNING"),
- QObject::tr("DEP_OBJECT"),
- QObject::tr("BUT_OK") );
+ SUIT_MessageBox::warning ( app->desktop(),
+ QObject::tr("WRN_WARNING"),
+ QObject::tr("DEP_OBJECT"),
+ QObject::tr("BUT_OK") );
return true;
}
}
//=====================================================================================
extern "C"
{
-GEOMTOOLSGUI_EXPORT
+#ifdef WIN32
+ __declspec( dllexport )
+#endif
GEOMGUI* GetLibGUI( GeometryGUI* parent )
{
return new GEOMToolsGUI( parent );
