-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 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
std::list<_PTR(SObject)> aSelectedSO;
for ( oit = objects.begin(); oit != objects.end(); ++oit )
{
- _PTR(SObject) so = study->FindObjectID( oit.key().toLatin1().data() );
- if ( !so )
+ _PTR(SObject) so = study->FindObjectID( oit.key().toUtf8().data() );
+ if ( !GeometryGUI::IsInGeomComponent( so ))
continue;
aSelectedSO.push_back(so);
CORBA::Object_var corbaObj_rem = GeometryGUI::ClientSObjectToObject( so );
// function : OnGUIEvent()
// purpose :
//=======================================================================
-bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
+bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/)
{
getGeometryGUI()->EmitSignalDeactivateDialog();
// function : OnGUIEvent()
// purpose :
//=======================================================================
-bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent, const QVariant& theParam )
+bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* /*parent*/, const QVariant& theParam )
{
getGeometryGUI()->EmitSignalDeactivateDialog();
continue; // invalid object
// ...
QString entry = anIObject->getEntry();
- _PTR(SObject) obj = aStudy->FindObjectID( entry.toLatin1().data() );
+ _PTR(SObject) obj = aStudy->FindObjectID( entry.toUtf8().data() );
// check parent component
QString parentComp = getParentComponent( obj );
if ( parentComp != geomComp ) {
if ( isComponentSelected ) {
// GEOM component is selected: delete all objects recursively
- _PTR(SObject) comp = aStudy->FindObjectID( geomComp.toLatin1().data() );
+ _PTR(SObject) comp = aStudy->FindObjectID( geomComp.toUtf8().data() );
if ( !comp )
return;
_PTR(ChildIterator) it ( aStudy->NewChildIterator( comp ) );
// ... and then delete all objects
QMap<QString, QString>::Iterator it;
for ( it = toBeDeleted.begin(); it != toBeDeleted.end(); ++it ) {
- _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toLatin1().data() ) );
+ _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toUtf8().data() ) );
// remove object from GEOM engine
removeObjectWithChildren( obj, views, &disp );
// remove objects from study
}
// ... and then delete all folders
for ( it = toBeDelFolders.begin(); it != toBeDelFolders.end(); ++it ) {
- _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toLatin1().data() ) );
+ _PTR(SObject) obj ( aStudy->FindObjectID( it.key().toUtf8().data() ) );
// remove object from GEOM engine
removeObjectWithChildren( obj, views, &disp );
// remove objects from study