-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// GEOM GEOMGUI : GUI for Geometry component
// File : GEOMBase_Tools.cxx
// Author : Damien COQUERET, Open CASCADE S.A.S.
-//
+
#include "GEOMToolsGUI.h"
#include "GEOMToolsGUI_DeleteDlg.h"
#include <GeometryGUI.h>
+#include "GeometryGUI_Operations.h"
#include <GEOMBase.h>
#include <GEOM_Operation.h>
#include <GEOM_Displayer.h>
// OCCT Includes
#include <TCollection_AsciiString.hxx>
-using namespace std;
-
typedef QMap<QString, QString> FilterMap;
static QString lastUsedFilter;
{
//QStringList filters;
QString aBrepFilter;
- for ( FilterMap::const_iterator it = filterMap.begin(); it != filterMap.end(); ++it ) {
+ for (FilterMap::const_iterator it = filterMap.begin(); it != filterMap.end(); ++it) {
//filters.push_back( it.key() );
- if ( it.key().contains( "BREP", Qt::CaseInsensitive ) )
+ if (it.key().contains( "BREP", Qt::CaseInsensitive ))
aBrepFilter = it.key();
}
if ( !initial.isEmpty() )
fd->selectFile( initial );
-
+
if ( showCurrentDirInitially && SUIT_FileDlg::getLastVisitedPath().isEmpty() )
fd->setDirectory( QDir::currentPath() );
fd->setFilters( filters );
-
+
if ( !lastUsedFilter.isEmpty() && filterMap.contains( lastUsedFilter ) ) {
fd->selectFilter( lastUsedFilter );
}
}
}
filters.append( QObject::tr( "GEOM_ALL_IMPORT_FILES" ).arg( allFilters.join( " " ) ) );
-
+
SUIT_FileDlg fd( parent, true, true, true );
- fd.setFileMode( SUIT_FileDlg::ExistingFiles );
+ fd.setFileMode( SUIT_FileDlg::ExistingFiles );
if ( !caption.isEmpty() )
fd.setWindowTitle( caption );
if ( !initial.isEmpty() )
fd.selectFile( initial );
-
+
if ( showCurrentDirInitially && SUIT_FileDlg::getLastVisitedPath().isEmpty() )
fd.setDirectory( QDir::currentPath() );
-
+
fd.setFilters( filters );
-
+
if ( !lastUsedFilter.isEmpty() && filterMap.contains( lastUsedFilter ) )
fd.selectFilter( lastUsedFilter );
else if ( !aBrepFilter.isEmpty() )
// collect all GEOM objects being deleted
QMap<QString, GEOM::GEOM_Object_var> gobjects;
QMap<QString, QString>::ConstIterator oit;
- list<_PTR(SObject)> aSelectedSO;
+ std::list<_PTR(SObject)> aSelectedSO;
for ( oit = objects.begin(); oit != objects.end(); ++oit ) {
_PTR(SObject) so = study->FindObjectID( oit.key().toLatin1().data() );
if ( !so )
aSelectedSO.push_back(so);
CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject( so );
GEOM::GEOM_Object_var geomObj_rem = GEOM::GEOM_Object::_narrow( corbaObj_rem );
- if( CORBA::is_nil( geomObj_rem ) )
+ if( CORBA::is_nil( geomObj_rem ) )
continue;
gobjects.insert( oit.key(), geomObj_rem );
}
// Search References with other Modules
- list< _PTR(SObject) >::iterator itSO = aSelectedSO.begin();
+ std::list< _PTR(SObject) >::iterator itSO = aSelectedSO.begin();
for ( ; itSO != aSelectedSO.end(); ++itSO ) {
- std::vector<_PTR(SObject)> aReferences = study->FindDependances( *itSO );
+ std::vector<_PTR(SObject)> aReferences = study->FindDependances( *itSO );
int aRefLength = aReferences.size();
if (aRefLength) {
for (int i = 0; i < aRefLength; i++) {
_PTR(SObject) child( it->Value() );
CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject( child );
GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
- if( CORBA::is_nil( geomObj ) )
+ if( CORBA::is_nil( geomObj ) )
continue;
GEOM::ListOfGO_var list = geomObj->GetDependency();
- if( list->length() == 0 )
+ if( list->length() == 0 )
continue;
for( int i = 0; i < list->length(); i++ ) {
return false;
}
-
//=======================================================================
// function : GEOMToolsGUI()
// purpose : Constructor
{
}
-
//=======================================================================
// function : ~GEOMToolsGUI()
// purpose : Destructor
{
}
-
//=======================================================================
// function : OnGUIEvent()
// purpose :
{
getGeometryGUI()->EmitSignalDeactivateDialog();
- switch (theCommandID)
- {
- case 31: // COPY
- {
- OnEditCopy();
- break;
- }
- case 33: // DELETE
- {
- OnEditDelete();
- break;
- }
- case 111: // IMPORT BREP
- case 112: // IMPORT IGES
- case 113: // IMPORT STEP
- {
- Import();
- break;
- }
- case 121: // EXPORT BREP
- case 122: // EXPORT IGES
- case 123: // EXPORT STEP
- {
- Export();
- break;
- }
- case 2171: // POPUP VIEWER - SELECT ONLY - VERTEX
- {
- OnSelectOnly( GEOM_POINT );
- break;
- }
- case 2172: // POPUP VIEWER - SELECT ONLY - EDGE
- {
- OnSelectOnly( GEOM_EDGE );
- break;
- }
- case 2173: // POPUP VIEWER - SELECT ONLY - WIRE
- {
- OnSelectOnly( GEOM_WIRE );
- break;
- }
- case 2174: // POPUP VIEWER - SELECT ONLY - FACE
- {
- OnSelectOnly( GEOM_FACE );
- break;
- }
- case 2175: // POPUP VIEWER - SELECT ONLY - SHELL
- {
- OnSelectOnly( GEOM_SHELL );
- break;
- }
- case 2176: // POPUP VIEWER - SELECT ONLY - SOLID
- {
- OnSelectOnly( GEOM_SOLID );
- break;
- }
- case 2177: // POPUP VIEWER - SELECT ONLY - COMPOUND
- {
- OnSelectOnly( GEOM_COMPOUND );
- break;
- }
- case 2178: // POPUP VIEWER - SELECT ONLY - SELECT ALL
- {
- OnSelectOnly( GEOM_ALLOBJECTS );
- break;
- }
- case 411: // SETTINGS - ADD IN STUDY
- {
- // SAN -- TO BE REMOVED !!!
- break;
- }
- case 412: // SETTINGS - SHADING COLOR
- {
- OnSettingsColor();
- break;
- }
- case 804: // ADD IN STUDY - POPUP VIEWER
- {
- // SAN -- TO BE REMOVED !!!!
- break;
- }
- case 901: // RENAME
- {
- OnRename();
- break;
- }
- case 5103: // CHECK GEOMETRY
- {
- OnCheckGeometry();
- break;
- }
- case 8031: // DEFLECTION ANGLE - POPUP VIEWER
- {
- OnDeflection();
- break;
- }
- case 8032: // COLOR - POPUP VIEWER
- {
- OnColor();
- break;
- }
- case 8033: // TRANSPARENCY - POPUP VIEWER
- {
- OnTransparency();
- break;
- }
- case 8034: // ISOS - POPUP VIEWER
- {
- OnNbIsos();
- break;
- }
- case 8035: // AUTO COLOR - POPUP VIEWER
- {
- OnAutoColor();
- break;
- }
- case 8036: // DISABLE AUTO COLOR - POPUP VIEWER
- {
- OnDisableAutoColor();
- break;
- }
- case 8037: // SHOW CHILDREN - POPUP VIEWER
- case 8038: // HIDE CHILDREN - POPUP VIEWER
- {
- OnShowHideChildren( theCommandID == 8037 );
- break;
- }
- case 8039: // POINT MARKER
- {
- OnPointMarker();
- break;
- }
- case 9024 : // OPEN - OBJBROSER POPUP
- {
- OnOpen();
- break;
- }
- default:
- {
- SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
- break;
- }
- }
+ switch ( theCommandID ) {
+ case GEOMOp::OpDelete: // EDIT - DELETE
+ OnEditDelete();
+ break;
+ case GEOMOp::OpImport: // FILE - IMPORT
+ Import();
+ break;
+ case GEOMOp::OpExport: // FILE - EXPORT
+ Export();
+ break;
+ case GEOMOp::OpCheckGeom: // TOOLS - CHECK GEOMETRY
+ OnCheckGeometry();
+ break;
+ case GEOMOp::OpSelectVertex: // POPUP - SELECT ONLY - VERTEX
+ OnSelectOnly( GEOM_POINT );
+ break;
+ case GEOMOp::OpSelectEdge: // POPUP - SELECT ONLY - EDGE
+ OnSelectOnly( GEOM_EDGE );
+ break;
+ case GEOMOp::OpSelectWire: // POPUP - SELECT ONLY - WIRE
+ OnSelectOnly( GEOM_WIRE );
+ break;
+ case GEOMOp::OpSelectFace: // POPUP - SELECT ONLY - FACE
+ OnSelectOnly( GEOM_FACE );
+ break;
+ case GEOMOp::OpSelectShell: // POPUP - SELECT ONLY - SHELL
+ OnSelectOnly( GEOM_SHELL );
+ break;
+ case GEOMOp::OpSelectSolid: // POPUP - SELECT ONLY - SOLID
+ OnSelectOnly( GEOM_SOLID );
+ break;
+ case GEOMOp::OpSelectCompound: // POPUP - SELECT ONLY - COMPOUND
+ OnSelectOnly( GEOM_COMPOUND );
+ break;
+ case GEOMOp::OpSelectAll: // POPUP - SELECT ONLY - SELECT ALL
+ OnSelectOnly( GEOM_ALLOBJECTS );
+ break;
+ case GEOMOp::OpDeflection: // POPUP - DEFLECTION ANGLE
+ OnDeflection();
+ break;
+ case GEOMOp::OpColor: // POPUP - COLOR
+ OnColor();
+ break;
+ case GEOMOp::OpSetTexture: // POPUP - TEXTURE
+ OnTexture();
+ break;
+ case GEOMOp::OpTransparency: // POPUP - TRANSPARENCY
+ OnTransparency();
+ break;
+ case GEOMOp::OpIncrTransparency: // SHORTCUT - INCREASE TRANSPARENCY
+ OnChangeTransparency( true );
+ break;
+ case GEOMOp::OpDecrTransparency: // SHORTCUT - DECREASE TRANSPARENCY
+ OnChangeTransparency( false );
+ break;
+ case GEOMOp::OpIsos: // POPUP - ISOS
+ OnNbIsos();
+ break;
+ case GEOMOp::OpIncrNbIsos: // SHORTCUT - INCREASE NB ISOLINES
+ OnNbIsos( INCR );
+ break;
+ case GEOMOp::OpDecrNbIsos: // SHORTCUT - DECREASE NB ISOLINES
+ OnNbIsos( DECR );
+ break;
+ case GEOMOp::OpMaterialProperties: // POPUP - MATERIAL PROPERTIES
+ OnMaterialProperties();
+ break;
+ case GEOMOp::OpAutoColor: // POPUP - AUTO COLOR
+ OnAutoColor();
+ break;
+ case GEOMOp::OpNoAutoColor: // POPUP - DISABLE AUTO COLOR
+ OnDisableAutoColor();
+ break;
+ case GEOMOp::OpShowChildren: // POPUP - SHOW CHILDREN
+ case GEOMOp::OpHideChildren: // POPUP - HIDE CHILDREN
+ OnShowHideChildren( theCommandID == GEOMOp::OpShowChildren );
+ break;
+ case GEOMOp::OpPointMarker: // POPUP - POINT MARKER
+ OnPointMarker();
+ break;
+ case GEOMOp::OpUnpublishObject:// POPUP - UNPUBLISH
+ OnUnpublishObject();
+ break;
+ case GEOMOp::OpPublishObject:// GEOM ROOT OBJECT - POPUP - PUBLISH
+ OnPublishObject();
+ break;
+ case GEOMOp::OpEdgeWidth:
+ OnEdgeWidth();
+ break;
+ case GEOMOp::OpIsosWidth:
+ OnIsosWidth();
+ break;
+ case GEOMOp::OpBringToFront:
+ OnBringToFront();
+ break;
+ case GEOMOp::OpClsBringToFront:
+ OnClsBringToFront();
+ break;
+ default:
+ SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
+ break;
+ }
return true;
}
-
//===============================================================================
// function : OnEditDelete()
// purpose :
return;
_PTR(Study) aStudy = appStudy->studyDS();
-
+
// check if study is locked
if ( _PTR(AttributeStudyProperties)( aStudy->GetProperties() )->IsLocked() ) {
SUIT_MessageBox::warning( app->desktop(),
tr("WRN_STUDY_LOCKED") );
return; // study is locked
}
-
+
// get GEOM component
CORBA::String_var geomIOR = app->orb()->object_to_string( GeometryGUI::GetGeomGen() );
QString geomComp = getParentComponent( aStudy->FindObjectIOR( geomIOR.in() ) );
QMap<QString,QString> toBeDeleted;
QMap<QString,QString> allDeleted;
bool isComponentSelected = false;
+
for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
Handle(SALOME_InteractiveObject) anIObject = It.Value();
if ( !anIObject->hasEntry() )
///////////////////////////////////////////////////////
// if GEOM component is selected, so skip other checks
- if ( isComponentSelected ) continue;
+ if ( isComponentSelected ) continue;
///////////////////////////////////////////////////////
-
+
// check if object is reference
_PTR(SObject) refobj;
if ( obj && obj->ReferencedObject( refobj ) ) {
allDeleted.insert( child->GetID().c_str(), aName );
}
}
-
+
// is there is anything to delete?
if ( !isComponentSelected && allDeleted.count() <= 0 )
return; // nothing to delete
GEOMToolsGUI_DeleteDlg dlg( app->desktop(), allDeleted, isComponentSelected );
if ( !dlg.exec() )
return; // operation is cancelled by user
-
+
// get currently opened views
QList<SALOME_View*> views;
SALOME_View* view;
if ( view )
views.append( view );
}
-
+
_PTR(StudyBuilder) aStudyBuilder (aStudy->NewBuilder());
GEOM_Displayer* disp = new GEOM_Displayer( appStudy );
-
+
if ( isComponentSelected ) {
// GEOM component is selected: delete all objects recursively
_PTR(SObject) comp = aStudy->FindObjectID( geomComp.toLatin1().data() );
aStudyBuilder->RemoveObjectWithChildren( obj );
}
}
-
+
selected.Clear();
aSelMgr->setSelectedObjects( selected );
getGeometryGUI()->updateObjBrowser();
app->updateActions(); //SRN: To update a Save button in the toolbar
}
-
-//==============================================================================
-// function : OnEditCopy()
-// purpose :
-//==============================================================================
-void GEOMToolsGUI::OnEditCopy()
-{
-/*
- SALOME_Selection* Sel = SALOME_Selection::Selection(QAD_Application::getDesktop()->getActiveStudy()->getSelection() );
- GEOM::string_array_var listIOR = new GEOM::string_array;
-
- const SALOME_ListIO& List = Sel->StoredIObjects();
-
- myGeomBase->ConvertListOfIOInListOfIOR(List, listIOR);
-
- Sel->ClearIObjects();
-
- SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
- int aStudyID = aStudy->StudyId();
-
- for (unsigned int ind = 0; ind < listIOR->length();ind++) {
- GEOM::GEOM_Object_var aShapeInit = myGeom->GetIORFromString(listIOR[ind]);
- try {
- GEOM::GEOM_IInsertOperations_var IOp = myGeom->GetIInsertOperations(aStudyID);
- GEOM::GEOM_Object_var result = IOp->MakeCopy(aShapeInit);
- myGeomBase->Display(result);
- }
- catch (const SALOME::SALOME_Exception& S_ex) {
- QtCatchCorbaException(S_ex);
- }
- }
-
- QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_READY"));
-*/
-}
-
//=====================================================================================
// function : Import
-// purpose : BRep, Iges, Step
+// purpose : BRep, Iges, Step, ...
//=====================================================================================
bool GEOMToolsGUI::Import()
{
QList< GEOM::GEOM_Object_var > objsForDisplay;
-
+ QStringList anEntryList;
+
// iterate through all selected files
SUIT_MessageBox::StandardButton igesAnswer = SUIT_MessageBox::NoButton;
// file type is not defined, try to detect
QString ext = QFileInfo( fileName ).suffix().toUpper();
QRegExp re( "\\*\\.(\\w+)" );
- for ( FilterMap::const_iterator it = aMap.begin();
+ for ( FilterMap::const_iterator it = aMap.begin();
it != aMap.end() && aCurrentType.isEmpty(); ++it ) {
int pos = 0;
while ( re.indexIn( it.key(), pos ) >= 0 ) {
CORBA::String_var fileN = fileName.toLatin1().constData();
CORBA::String_var fileT = aCurrentType.toLatin1().constData();
+ // jfa 21.08.2012 for mantis issue 21511 (STEP file units)
+ CORBA::String_var aUnits = aInsOp->ReadValue(fileN, fileT, "LEN_UNITS");
+ TCollection_AsciiString aUnitsStr (aUnits.in());
+ bool needConvert = true;
+ if (aUnitsStr.IsEmpty() || aUnitsStr == "UNIT_M")
+ needConvert = false;
+
+ if (needConvert) {
+ if (igesAnswer == SUIT_MessageBox::NoToAll) {
+ // converting for all files is already approved
+ fileT = (aCurrentType + "_SCALE").toLatin1().constData();
+ }
+ else if (igesAnswer != SUIT_MessageBox::YesToAll) {
+ SUIT_MessageBox::StandardButtons btns = SUIT_MessageBox::Yes | SUIT_MessageBox::No;
+ if (i < fileNames.count() - 1) btns = btns | SUIT_MessageBox::YesToAll | SUIT_MessageBox::NoToAll;
+ igesAnswer = SUIT_MessageBox::question(app->desktop(),
+ "Question",//tr("WRN_WARNING"),
+ tr("GEOM_SCALE_DIMENSIONS"),
+ btns | SUIT_MessageBox::Cancel,
+ SUIT_MessageBox::No);
+ switch (igesAnswer) {
+ case SUIT_MessageBox::Cancel:
+ return false; // cancel (break) import operation
+ case SUIT_MessageBox::Yes:
+ case SUIT_MessageBox::YesToAll:
+ break; // scaling is confirmed
+ case SUIT_MessageBox::No:
+ case SUIT_MessageBox::NoAll:
+ fileT = (aCurrentType + "_SCALE").toLatin1().constData();
+ default:
+ break; // scaling is rejected
+ } // switch ( igesAnswer )
+ } // if ( igeAnswer != NoToAll )
+ } // if ( needConvert )
+
+ /*
// skl 29.05.2009
if ( aCurrentType == "IGES" ) {
- GEOM::GEOM_Object_var anObj = aInsOp->Import( fileN, "IGES_UNIT" );
+ GEOM::GEOM_Object_var anObj = aInsOp->ImportFile( fileN, "IGES_UNIT" );
bool needConvert = false;
TCollection_AsciiString aUnitName = aInsOp->GetErrorCode();
if ( aUnitName.SubString( 1, 4 ) == "UNIT" )
} // if ( needConvert )
} // if ( aCurrentType == "IGES" )
else if ( aCurrentType == "ACIS" ) {
+ */
+
+ if ( aCurrentType == "ACIS" ) {
if ( acisAnswer != SUIT_MessageBox::YesToAll && acisAnswer != SUIT_MessageBox::NoToAll ) {
SUIT_MessageBox::StandardButtons btns = SUIT_MessageBox::Yes | SUIT_MessageBox::No;
if ( i < fileNames.count()-1 ) btns = btns | SUIT_MessageBox::YesToAll | SUIT_MessageBox::NoToAll;
return false; // cancel (break) import operation
} // if ( acisAnswer != YesToAll && acisAnswer != NoToAll )
} // else if ( aCurrentType == "ACIS" )
-
- GEOM::GEOM_Object_var anObj = aInsOp->Import( fileN, fileT );
+
+ // IMPORT
+ GEOM::GEOM_Object_var anObj = aInsOp->ImportFile( fileN, fileT );
if ( !anObj->_is_nil() && aInsOp->IsDone() ) {
- QString aPublishObjName =
+ QString aPublishObjName =
GEOMBase::GetDefaultName( SUIT_Tools::file( fileName, /*withExten=*/true ) );
-
+
SALOMEDS::Study_var aDSStudy = GeometryGUI::ClientStudyToStudy( aStudy );
- GeometryGUI::GetGeomGen()->PublishInStudy( aDSStudy,
- SALOMEDS::SObject::_nil(),
- anObj,
- aPublishObjName.toLatin1().constData() );
-
+ SALOMEDS::SObject_var aSO =
+ GeometryGUI::GetGeomGen()->PublishInStudy( aDSStudy,
+ SALOMEDS::SObject::_nil(),
+ anObj,
+ aPublishObjName.toLatin1().constData() );
+ if ( ( !aSO->_is_nil() ) )
+ anEntryList.append( aSO->GetID() );
+
objsForDisplay.append( anObj );
-
+
if ( aCurrentType == "ACIS" ) {
if ( acisAnswer == SUIT_MessageBox::Yes || acisAnswer == SUIT_MessageBox::YesToAll )
GeometryGUI::GetGeomGen()->PublishNamedShapesInStudy( aDSStudy, anObj );
// update object browser
getGeometryGUI()->updateObjBrowser( true );
+ // browse published objects
+ app->browseObjects( anEntryList );
+
// display imported model (if only one file is selected)
if ( objsForDisplay.count() == 1 )
GEOM_Displayer( stud ).Display( objsForDisplay[0].in() );
return objsForDisplay.count() > 0;
}
-
//=====================================================================================
// function : Export
// purpose : BRep, Iges, Step
bool appropriateObj = false;
SALOME_ListIteratorOfListIO It( selectedObjects );
- for(;It.More();It.Next()) {
+ for (; It.More(); It.Next()) {
Handle(SALOME_InteractiveObject) IObject = It.Value();
- Standard_Boolean found;
- GEOM::GEOM_Object_var anObj = GEOMBase::ConvertIOinGEOMObject(IObject, found);
+ GEOM::GEOM_Object_var anObj = GEOMBase::ConvertIOinGEOMObject( IObject );
- if ( !found || anObj->_is_nil() )
+ if ( anObj->_is_nil() )
continue;
QString fileType;
anOp->start();
-
aInsOp->Export( anObj, file.toStdString().c_str(), fileType.toLatin1().constData() );
- if ( aInsOp->IsDone() )
+ if (aInsOp->IsDone())
anOp->commit();
- else
- {
- anOp->abort();
- wc.suspend();
- SUIT_MessageBox::critical( app->desktop(),
- QObject::tr( "GEOM_ERROR" ),
- QObject::tr("GEOM_PRP_ABORT") + "\n" + QString( aInsOp->GetErrorCode() ) );
- return false;
- }
+ else {
+ anOp->abort();
+ wc.suspend();
+ SUIT_MessageBox::critical(app->desktop(),
+ QObject::tr("GEOM_ERROR"),
+ QObject::tr("GEOM_PRP_ABORT") + "\n" + QObject::tr(aInsOp->GetErrorCode()));
+ return false;
+ }
}
catch (const SALOME::SALOME_Exception& S_ex) {
//QtCatchCorbaException(S_ex);
//=====================================================================================
// function : RemoveObjectWithChildren
-// purpose : to be used by OnEditDelete() method
+// purpose : used by OnEditDelete() method
//=====================================================================================
void GEOMToolsGUI::removeObjectWithChildren(_PTR(SObject) obj,
_PTR(Study) aStudy,
if (obj->FindAttribute(anAttr, "AttributeIOR")) {
_PTR(AttributeIOR) anIOR (anAttr);
+ SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( SUIT_Session::session()->activeApplication()->activeStudy() );
+
// Delete shape in Client
const TCollection_AsciiString ASCIor ((char*)anIOR->Value().c_str());
getGeometryGUI()->GetShapeReader().RemoveShapeFromBuffer(ASCIor);
CORBA::Object_var corbaObj = GeometryGUI::ClientSObjectToObject(obj);
GEOM::GEOM_Object_var geomObj = GEOM::GEOM_Object::_narrow( corbaObj );
if (!CORBA::is_nil(geomObj)) {
+
+ //Remove visual properties of the object
+ appStudy->removeObjectFromAll(obj->GetID().c_str());
+
// Erase graphical object
QListIterator<SALOME_View*> it( views );
while ( it.hasNext() )
if ( SALOME_View* view = it.next() )
disp->Erase(geomObj, true, view);
-
+
// Remove object from Engine
// We can't directly remove object from engine. All we can do is to unpublish the object
// from the study. Another client could be using the object.
