Salome HOME
projects
/
modules
/
homard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated copyright comment
[modules/homard.git]
/
src
/
HOMARD_I
/
HOMARD_Gen_i.cxx
diff --git
a/src/HOMARD_I/HOMARD_Gen_i.cxx
b/src/HOMARD_I/HOMARD_Gen_i.cxx
index a42a858c60a4f2e5fd5a1a5c7ea0e08e019614e3..4eee809efb1abf8aef71c841fe0e2b3e8fb45792 100644
(file)
--- a/
src/HOMARD_I/HOMARD_Gen_i.cxx
+++ b/
src/HOMARD_I/HOMARD_Gen_i.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2011-202
0 CEA/DEN, EDF R&D
+// Copyright (C) 2011-202
4 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-43,8
+43,6
@@
#include "SALOME_LifeCycleCORBA.hxx"
#include "SALOMEconfig.h"
#include <SMESH_Gen_i.hxx>
#include "SALOME_LifeCycleCORBA.hxx"
#include "SALOMEconfig.h"
#include <SMESH_Gen_i.hxx>
-#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
-#include CORBA_CLIENT_HEADER(SMESH_Gen)
#include <cmath>
#include <stdlib.h>
#include <cmath>
#include <stdlib.h>
@@
-92,17
+90,15
@@
HOMARD_Gen_i::HOMARD_Gen_i( CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
PortableServer::ObjectId * contId,
const char *instanceName,
PortableServer::POA_ptr poa,
PortableServer::ObjectId * contId,
const char *instanceName,
- const char *interfaceName) :
-Engines_Component_i(orb, poa, contId, instanceName, interfaceName)
+ const char *interfaceName,
+ bool checkNS) :
+Engines_Component_i(orb, poa, contId, instanceName, interfaceName, false, checkNS)
{
MESSAGE("constructor de HOMARD_Gen_i");
_thisObj = this;
_id = _poa->activate_object(_thisObj);
myHomard = new ::HOMARD_Gen;
{
MESSAGE("constructor de HOMARD_Gen_i");
_thisObj = this;
_id = _poa->activate_object(_thisObj);
myHomard = new ::HOMARD_Gen;
- _NS = SINGLETON_<SALOME_NamingService>::Instance();
- ASSERT(SINGLETON_<SALOME_NamingService>::IsAlreadyExisting());
- _NS->init_orb(_orb);
_tag_gene = 0 ;
_tag_boun = 0 ;
_tag_gene = 0 ;
_tag_boun = 0 ;
@@
-143,9
+139,7
@@
void HOMARD_Gen_i::UpdateStudy()
homardFather = myBuilder->NewComponent(ComponentDataType());
SALOMEDS::GenericAttribute_var anAttr = myBuilder->FindOrCreateAttribute(homardFather,"AttributeName");
SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
homardFather = myBuilder->NewComponent(ComponentDataType());
SALOMEDS::GenericAttribute_var anAttr = myBuilder->FindOrCreateAttribute(homardFather,"AttributeName");
SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
- CORBA::Object_var objVarN = _NS->Resolve("/Kernel/ModulCatalog");
- SALOME_ModuleCatalog::ModuleCatalog_var Catalogue =
- SALOME_ModuleCatalog::ModuleCatalog::_narrow(objVarN);
+ SALOME_ModuleCatalog::ModuleCatalog_var Catalogue = this->getModuleCatalog();
SALOME_ModuleCatalog::Acomponent_var Comp = Catalogue->GetComponent(ComponentDataType());
if (!Comp->_is_nil())
{
SALOME_ModuleCatalog::Acomponent_var Comp = Catalogue->GetComponent(ComponentDataType());
if (!Comp->_is_nil())
{
@@
-4000,8
+3994,9
@@
void HOMARD_Gen_i::PublishResultInSmesh(const char* NomFich, CORBA::Long Option)
// On enregistre le fichier
MESSAGE( "Enregistrement du fichier");
// On enregistre le fichier
MESSAGE( "Enregistrement du fichier");
- SALOME_LifeCycleCORBA* myLCC = new SALOME_LifeCycleCORBA(_NS);
- SMESH::SMESH_Gen_var aSmeshEngine = SMESH::SMESH_Gen::_narrow(myLCC->FindOrLoad_Component("FactoryServer","SMESH"));
+ //
+ SMESH::SMESH_Gen_var aSmeshEngine = this->retrieveSMESHInst();
+ //
ASSERT(!CORBA::is_nil(aSmeshEngine));
aSmeshEngine->UpdateStudy();
SMESH::DriverMED_ReadStatus theStatus;
ASSERT(!CORBA::is_nil(aSmeshEngine));
aSmeshEngine->UpdateStudy();
SMESH::DriverMED_ReadStatus theStatus;