-// Copyright (C) 2011-2016 CEA/DEN, EDF R&D
+// Copyright (C) 2011-2022 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include "HOMARDGUI.h"
// SALOME Includes
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
+#include "OpUtil.hxx"
#include "SALOME_LifeCycleCORBA.hxx"
#include "SUIT_ResourceMgr.h"
#include "SalomeApp_Module.h"
#include "SALOMEconfig.h"
#include <SALOME_LifeCycleCORBA.hxx>
+#include <SALOME_NamingService_Abstract.hxx>
+#include <SALOME_KernelServices.hxx>
#include <utilities.h>
//=======================================================================
HOMARD::HOMARD_Gen_var HOMARDGUI::InitHOMARDGen(SalomeApp_Application* app)
{
- Engines::EngineComponent_var comp = app->lcc()->FindOrLoad_Component( "FactoryServer","HOMARD" );
+ Engines::EngineComponent_var comp;
+ comp = app->lcc()->FindOrLoad_Component( "FactoryServer","HOMARD" );
HOMARD::HOMARD_Gen_var clr = HOMARD::HOMARD_Gen::_narrow(comp);
ASSERT(!CORBA::is_nil(clr));
return clr;
//================================================
void HOMARDGUI::recupPreferences()
{
- MESSAGE("recupPreferences")
+ INFOS("recupPreferences")
//
// A. Declarations
//
// B. Les valeurs
// B.1. La langue
//
+ SUIT_ResourceMgr* resMgr0 = getApp()->resourceMgr();
+ QString lang = resMgr0->stringValue( resMgr0->langSection(), "language", "en" );
+ INFOS ("Récupération de lang = " << lang.toStdString().c_str() );
defaut_s = homardGen->GetLanguageShort();
+ INFOS ("Récupération de defaut_s = " << defaut_s.c_str() );
SUIT_ResourceMgr* resMgr = getApp()->resourceMgr();
_LanguageShort = resMgr->stringValue("language", "language", QString(defaut_s.c_str()) );
+ INFOS ("Récupération de LanguageShort = " << _LanguageShort.toStdString().c_str() );
//
// B.2. Les publications
bool publish_mesh ;
//
// C. Enregistrement dans l'objet general
//
- MESSAGE ("Enregistrement de LanguageShort = " << _LanguageShort.toStdString().c_str() );
- MESSAGE ("Enregistrement de PublisMeshIN = " << _PublisMeshIN<<", PublisMeshOUT = "<< _PublisMeshOUT);
- MESSAGE ("Enregistrement de YACSMaxIter = " << _YACSMaxIter<<", YACSMaxNode = "<< _YACSMaxNode<<", YACSMaxElem = "<< _YACSMaxElem);
- MESSAGE ("Enregistrement de YACSTypeTest = " << _YACSTypeTest);
+ INFOS ("Enregistrement de LanguageShort = " << _LanguageShort.toStdString().c_str() );
+ INFOS ("Enregistrement de PublisMeshIN = " << _PublisMeshIN<<", PublisMeshOUT = "<< _PublisMeshOUT);
+ INFOS ("Enregistrement de YACSMaxIter = " << _YACSMaxIter<<", YACSMaxNode = "<< _YACSMaxNode<<", YACSMaxElem = "<< _YACSMaxElem);
+ INFOS ("Enregistrement de YACSTypeTest = " << _YACSTypeTest);
//
homardGen->SetLanguageShort(_LanguageShort.toStdString().c_str());
homardGen->SetPublisMesh(_PublisMeshIN, _PublisMeshOUT);
{
try
{
- ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance();
- ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
- _orb = init( 0 , 0 );
+ _orb = KERNEL::GetRefToORB();
}
catch (...)
{