X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXAOPlugin%2FXAOPlugin_ImportDlg.cxx;h=a04b6d675f703ae38e9903e9c671165338fc3ed0;hb=25a3dc91508bb59688142bc616b10facc61dfc3d;hp=990386361f24655743a7def9f5cf964fcf7d30e7;hpb=ff7fc4d6c2f5e6de741fd7f0b9ebf01de04d0e10;p=modules%2Fgeom.git

diff --git a/src/XAOPlugin/XAOPlugin_ImportDlg.cxx b/src/XAOPlugin/XAOPlugin_ImportDlg.cxx
index 990386361..a04b6d675 100644
--- a/src/XAOPlugin/XAOPlugin_ImportDlg.cxx
+++ b/src/XAOPlugin/XAOPlugin_ImportDlg.cxx
@@ -1,4 +1,4 @@
-// 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
@@ -235,14 +235,14 @@ void XAOPlugin_ImportDlg::enterEvent(QEvent*)
 //=================================================================================
 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())
@@ -280,15 +280,18 @@ bool XAOPlugin_ImportDlg::execute()
   {
     QStringList anEntryList;
     anEntryList << addInStudy(m_mainShape, m_mainShape->GetName());
-    for (int i = 0; i < subShapes->length(); i++)
+    m_mainShape->UnRegister();
+    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);
     }
@@ -312,10 +315,9 @@ QString XAOPlugin_ImportDlg::addFieldInStudy( GEOM::GEOM_Field_ptr theField, GEO
   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;
   if ( !aSO->_is_nil() ) {
@@ -325,12 +327,13 @@ QString XAOPlugin_ImportDlg::addFieldInStudy( GEOM::GEOM_Field_ptr theField, GEO
 
   // 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();
   }
 
   aSO->UnRegister();
@@ -343,7 +346,7 @@ GEOM::GEOM_Object_ptr XAOPlugin_ImportDlg::getFather(GEOM::GEOM_Object_ptr objec
   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;
   }