-// Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2013-2021 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//=================================================================================
GEOM::GEOM_IOperations_ptr XAOPlugin_ImportDlg::createOperation()
{
- return getGeomEngine()->GetPluginOperations( getStudyId(), "XAOPluginEngine" );
+ return getGeomEngine()->GetPluginOperations( "XAOPluginEngine" );
}
//=================================================================================
// function : isValid
// purpose :
//=================================================================================
-bool XAOPlugin_ImportDlg::isValid(QString& msg)
+bool XAOPlugin_ImportDlg::isValid(QString& /*msg*/)
{
// check file name
if (ledFileName->text().isEmpty())
QStringList anEntryList;
anEntryList << addInStudy(m_mainShape, m_mainShape->GetName());
m_mainShape->UnRegister();
- for (int i = 0; i < subShapes->length(); i++)
+ for (CORBA::ULong i = 0; i < subShapes->length(); i++)
{
addInStudy(subShapes[i].in(), subShapes[i]->GetName());
subShapes[i]->UnRegister();
}
- for (int i = 0; i < groups->length(); i++)
+ for (CORBA::ULong i = 0; i < groups->length(); i++)
{
addInStudy(groups[i].in(), groups[i]->GetName());
groups[i]->UnRegister();
}
- for (int i = 0; i < fields->length(); i++)
+ for (CORBA::ULong i = 0; i < fields->length(); i++)
{
addFieldInStudy(fields[i].in(), m_mainShape);
}
if ( !aStudy || theField->_is_nil() )
return QString();
- SALOMEDS::Study_var aStudyDS = GeometryGUI::ClientStudyToStudy(aStudy);
-
SALOMEDS::SObject_var aSO =
- getGeomEngine()->AddInStudy(aStudyDS, theField, theField->GetName(), theFather);
+ getGeomEngine()->AddInStudy(theField, theField->GetName(), theFather);
theField->UnRegister();
QString anEntry;
// add steps
GEOM::ListOfLong_var steps = theField->GetSteps();
- for (int i = 0; i < steps->length(); ++i)
+ for (CORBA::ULong i = 0; i < steps->length(); ++i)
{
GEOM::GEOM_FieldStep_ptr step = theField->GetStep(steps[i]);
QString stepName = (tr("XAOPLUGIN_STEP") + " %1 %2").arg( step->GetID() ).arg( step->GetStamp() );
SALOMEDS::SObject_wrap aSOField =
- getGeomEngine()->AddInStudy( aStudyDS, step, stepName.toLatin1().constData(), theField );
+ getGeomEngine()->AddInStudy( step, stepName.toUtf8().constData(), theField );
step->UnRegister();
}
GEOM::GEOM_Object_var fatherObj;
if (object->GetType() != GEOM_IMPORT && m_mainShape != NULL)
{
- //GEOM::GEOM_IGroupOperations_var groupOper = getGeomEngine()->GetIGroupOperations(getStudyId());
+ //GEOM::GEOM_IGroupOperations_var groupOper = getGeomEngine()->GetIGroupOperations();
//fatherObj = groupOper->GetMainShape(object);
fatherObj = m_mainShape;
}