-// Copyright (C) 2011-2013 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
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// File : HOMARDGUI.cxx
-// Author : Paul RASCLE, EDF
+// Author : Gerald NICOLAS, EDF
// Module : HOMARD
-using namespace std;
#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 "OB_Browser.h"
#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
#include "SalomeApp_Application.h"
#include "SalomeApp_DataModel.h"
#include "SalomeApp_Module.h"
#include "SALOMEconfig.h"
#include <SALOME_LifeCycleCORBA.hxx>
+#include <SALOME_NamingService_Abstract.hxx>
+#include <SALOME_KernelServices.hxx>
#include <utilities.h>
#include "MonCreateCase.h"
#include "MonCreateIteration.h"
#include "MonPursueIteration.h"
-#include "MonEditFile.h"
+#include "MonCreateYACS.h"
+#include "MonEditBoundaryCAO.h"
+#include "MonEditBoundaryAn.h"
+#include "MonEditBoundaryDi.h"
#include "MonEditCase.h"
-#include "MonEditIteration.h"
#include "MonEditHypothesis.h"
+#include "MonEditIteration.h"
+#include "MonEditYACS.h"
#include "MonEditZone.h"
-#include "MonEditBoundaryAn.h"
-#include "MonEditBoundaryDi.h"
#include "MonMeshInfo.h"
-#include "MonCreateYACS.h"
#include "MonIterInfo.h"
+#include "MonEditFile.h"
#include "HomardQtCommun.h"
// BOOST Includes
#include "SALOMEDS_Study.hxx"
#include "HOMARDGUI_Utils.h"
+using namespace std;
+
static CORBA::ORB_var _orb;
//=======================================================================
SalomeApp_Module( "HOMARD" ) // default name
{
}
-
-
//=======================================================================
// function : ~HOMARDGUI()
// purpose : Destructor
//=======================================================================
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;
anId = 0;
createActions();
createMenus();
+ recupPreferences();
}
//================================================
createHOMARDAction( 1102, "PURSUE_ITERATION", "iter_poursuite.png" );
createHOMARDAction( 1103, "NEW_ITERATION", "iter_next.png" );
createHOMARDAction( 1111, "COMPUTE", "mesh_compute.png" );
+ createHOMARDAction( 1112, "COMPUTE_PUBLISH", "mesh_compute.png" );
createHOMARDAction( 1121, "MESH_INFO", "advanced_mesh_info.png" );
+ createHOMARDAction( 1131, "MESH_PUBLICATION", "mesh_tree_mesh.png" );
//
createHOMARDAction( 1201, "EDIT", "loop.png" );
createHOMARDAction( 1211, "DELETE", "delete.png" );
//================================================
// function : createPreferences
-// No preferences for Homard
-// Just a test
//================================================
-void HOMARDGUI::createPreferences(){
- QString toto = tr( "PREF_GROUP_GENERAL" );
- int tabId = addPreference( tr( "PREF_GROUP_GENERAL" ) );
- int genGroup = addPreference( tr( "PREF_TAB_SETTINGS" ), tabId );
- addPreference( tr( "PREF_TEST" ), genGroup, LightApp_Preferences::Color, "Homard", "shading_color" );
+void HOMARDGUI::createPreferences()
+{
+ MESSAGE("createPreferences");
+
+ int Onglet, Bloc, Pref ;
+ // 1. Generalites
+ Onglet = addPreference( tr( "PREF_TAB_GENERAL" ) );
+// Onglet = addPreference( tr( "PREF_TAB_SETTINGS" ) ) ;
+
+ Bloc = addPreference( tr( "PREF_PUBLICATION" ), Onglet );
+ setPreferenceProperty( Bloc, "columns", 1 );
+
+ Pref = addPreference( tr( "PREF_PUBLICATION_MAILLAGE_IN" ), Bloc, LightApp_Preferences::Bool, "HOMARD", "publish_mesh_in" );
+
+ Pref = addPreference( tr( "PREF_PUBLICATION_MAILLAGE_OUT" ), Bloc, LightApp_Preferences::Bool, "HOMARD", "publish_mesh_out" );
+
+ // 2. YACS
+ Onglet = addPreference( tr( "PREF_YACS" ) ) ;
+
+ Bloc = addPreference( tr( "PREF_YACS_MAX" ), Onglet );
+ setPreferenceProperty( Bloc, "columns", 1 );
+
+ Pref = addPreference( tr( "PREF_YACS_MAX_ITER" ), Bloc, LightApp_Preferences::IntSpin, "HOMARD", "yacs_max_iter" );
+ setPreferenceProperty( Pref, "min", 0 );
+ setPreferenceProperty( Pref, "max", 100000000 );
+ setPreferenceProperty( Pref, "step", 1 );
+
+ Pref = addPreference( tr( "PREF_YACS_MAX_NODE" ), Bloc, LightApp_Preferences::IntSpin, "HOMARD", "yacs_max_node" );
+ setPreferenceProperty( Pref, "min", 0 );
+ setPreferenceProperty( Pref, "max", 100000000 );
+ setPreferenceProperty( Pref, "step", 1000 );
+
+ Pref = addPreference( tr( "PREF_YACS_MAX_ELEM" ), Bloc, LightApp_Preferences::IntSpin, "HOMARD", "yacs_max_elem" );
+ setPreferenceProperty( Pref, "min", 0 );
+ setPreferenceProperty( Pref, "max", 100000000 );
+ setPreferenceProperty( Pref, "step", 1000 );
+
+ Bloc = addPreference( tr( "PREF_YACS_CONVERGENCE" ), Onglet );
+ setPreferenceProperty( Bloc, "columns", 1 );
+
+ Pref = addPreference( tr( "PREF_YACS_TYPE_TEST" ), Bloc, LightApp_Preferences::Selector, "HOMARD", "yacs_type_test" );
+ QStringList aListOfTypeTest;
+ aListOfTypeTest << "None";
+ aListOfTypeTest << "VTest > VRef";
+ aListOfTypeTest << "VTest < VRef";
+ setPreferenceProperty( Pref, "strings", aListOfTypeTest );
}
//================================================
// function : createMenus
-// Verifier l'avant dernier nombre passe en parametre
//================================================
-void HOMARDGUI::createMenus(){
- MESSAGE("createMenus")
+void HOMARDGUI::createMenus()
+{
+ MESSAGE("createMenus");
//
int HOMARD_Id = createMenu( tr( "HOM_MEN_HOMARD" ), -1, 5, 10 );
createMenu( 1101, HOMARD_Id, -1 ); //Create_Case
createMenu( 1102, HOMARD_Id, -1 ); //Pursue_Iteration
+ createMenu( separator(), HOMARD_Id,-1);
createMenu( 1103, HOMARD_Id, -1 ); //Create_Iteration
- createMenu( 1111, HOMARD_Id, -1 ); //COMPUTE
+ createMenu( 1111, HOMARD_Id, -1 ); //Compute
+ createMenu( 1112, HOMARD_Id, -1 ); //Compute and publish
//
HOMARD_Id = createMenu( tr( "HOM_MEN_MODIFICATION" ), -1, 5, 10 );
createMenu( 1201, HOMARD_Id, -1 ); //Edit
//
HOMARD_Id = createMenu( tr( "HOM_MEN_INFORMATION" ), -1, 5, 10 );
createMenu( 1301, HOMARD_Id, -1 ); //Information sur un maillage
+ createMenu( 1131, HOMARD_Id, -1 ); //Mesh publication
createMenu( separator(), HOMARD_Id,-1);
createMenu( 1302, HOMARD_Id, -1 ); //EditAsciiFile pour le fichier listeStd ou bilan
createMenu( separator(), HOMARD_Id,-1);
createMenu( separator(), HOMARD_Id,-1);
//
HOMARD_Id = createMenu( tr( "HOM_MEN_YACS" ), -1, 5, 10 );
- createMenu( 1401, HOMARD_Id, -1 ); // Création d'un schéma YACS
+ createMenu( 1401, HOMARD_Id, -1 ); // Création d'un schéma YACS
createMenu( separator(), HOMARD_Id,-1);
+}
+
+//================================================
+// function : recupPreferences
+// Pour chaque valeur, le defaut est la valeur definie dans HOMARD_Gen
+// . Si la recuperation dans config/salome s'est bien passee a la creation de HOMARD_Gen,
+// ces valeurs sont les valeurs definies.
+// . Si cela ne s'est pas bien passe, ce sont les valeurs par defaut de HOMARD_Gen
+//================================================
+void HOMARDGUI::recupPreferences()
+{
+ INFOS("recupPreferences")
+//
+// A. Declarations
+//
+ SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( application() );
+ HOMARD::HOMARD_Gen_var homardGen = HOMARDGUI::InitHOMARDGen(app);
+ int defaut_i ;
+ std::string defaut_s ;
+ QString QString_v ;
//
-/*// La langue des preferences
+// 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();
- QString langue = resMgr->stringValue("language", "language", "en");
- MESSAGE("langue " << langue.toStdString().c_str() );*/
+ _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 ;
+//
+ _PublisMeshIN = homardGen->GetPublisMeshIN();
+ if ( _PublisMeshIN == 1 ) { publish_mesh = true ; }
+ else { publish_mesh = false ; }
+ publish_mesh = resMgr->booleanValue("HOMARD", "publish_mesh_in", publish_mesh );
+ if ( publish_mesh ) { _PublisMeshIN = 1 ; }
+ else { _PublisMeshIN = 0 ; }
+//
+ _PublisMeshOUT = homardGen->GetPublisMeshOUT();
+ if ( _PublisMeshOUT == 1 ) { publish_mesh = true ; }
+ else { publish_mesh = false ; }
+ publish_mesh = resMgr->booleanValue("HOMARD", "publish_mesh_out", publish_mesh );
+ if ( publish_mesh ) { _PublisMeshOUT = 1 ; }
+ else { _PublisMeshOUT = 0 ; }
+//
+// B.3. Les maximum pour YACS
+//
+ defaut_i = homardGen->GetYACSMaxIter();
+ _YACSMaxIter = resMgr->integerValue("HOMARD", "yacs_max_iter", defaut_i );
+//
+ defaut_i = homardGen->GetYACSMaxNode();
+ _YACSMaxNode = resMgr->integerValue("HOMARD", "yacs_max_node", defaut_i );
+//
+ defaut_i = homardGen->GetYACSMaxElem();
+ _YACSMaxElem = resMgr->integerValue("HOMARD", "yacs_max_elem", defaut_i );
+//
+// B.4. La convergence pour YACS
+//
+ defaut_i = homardGen->GetYACSConvergenceType();
+ if ( defaut_i == 1 ) { QString_v = tr("VTest > VRef") ; }
+ else if ( defaut_i == 2 ) { QString_v = tr("VTest < VRef") ; }
+ else { QString_v = tr("None") ; }
+ QString_v = resMgr->stringValue ( "HOMARD", "yacs_type_test", QString_v );
+ if ( ( QString_v == "VTest > VRef" ) || ( QString_v == "VTest > VRef" ) ) { _YACSTypeTest = 1 ; }
+ else if ( ( QString_v == "VTest < VRef" ) || ( QString_v == "VTest < VRef" ) ) { _YACSTypeTest = 2 ; }
+ else { _YACSTypeTest = 0 ; }
+//
+// C. Enregistrement dans l'objet general
+//
+ 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);
+ homardGen->SetYACSMaximum(_YACSMaxIter, _YACSMaxNode, _YACSMaxElem);
+//
+ homardGen->SetYACSConvergenceType(_YACSTypeTest);
}
//================================================
void HOMARDGUI::OnGUIEvent()
//================================================
{
- MESSAGE("OnGUIEvent()")
+ MESSAGE("OnGUIEvent()");
setOrb();
const QObject* obj = sender();
- if ( !obj || !obj->inherits( "QAction" ) )
- return;
+ if ( !obj || !obj->inherits( "QAction" ) ) { return; }
int id = actionId((QAction*)obj);
- bool ret;
- if ( id != -1 )
- ret = OnGUIEvent( id );
- MESSAGE("************** End of OnGUIEvent()");
+ if ( id != -1 ) { bool ret = OnGUIEvent( id ); }
+ MESSAGE("Fin de OnGUIEvent()");
}
//=======================================================================
bool HOMARDGUI::OnGUIEvent (int theCommandID)
{
MESSAGE("OnGUIEvent avec theCommandID = "<<theCommandID);
+// A. Controles
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( application() );
if ( !app ) return false;
SalomeApp_Study* stud = dynamic_cast<SalomeApp_Study*> ( app->activeStudy() );
- if ( !stud ) {
+ if ( !stud )
+ {
MESSAGE ( "FAILED to cast active study to SalomeApp_Study" );
return false;
}
SUIT_Desktop* parent = application()->desktop();
+
HOMARD::HOMARD_Gen_var homardGen = HOMARDGUI::InitHOMARDGen(app);
if (!CORBA::is_nil(homardGen))
- {
- // Set current study
- SalomeApp_Study* aSAStudy =dynamic_cast<SalomeApp_Study*>(app->activeStudy());
- _PTR(Study) aStudy = aSAStudy->studyDS();
- SALOMEDS::Study_ptr aStudyDS;
- if (aStudy)
- aStudyDS = _CAST(Study,aStudy)->GetStudy();
- homardGen->SetCurrentStudy(aStudyDS);
- }
- getApp()->updateObjectBrowser();
+ homardGen->UpdateStudy();
+ getApp()->updateObjectBrowser();
+// B. Choix selon les commandes
SCRUTE(theCommandID);
switch (theCommandID)
{
case 1101: // Creation d un Cas
{
MESSAGE("command " << theCommandID << " activated");
- MonCreateCase *aDlg = new MonCreateCase( parent, true,
+ MonCreateCase *aDlg = new MonCreateCase( true,
HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ;
aDlg->show();
break;
case 1102: // Poursuite d une iteration
{
MESSAGE("command " << theCommandID << " activated");
- MonPursueIteration *aDlg = new MonPursueIteration( parent, true,
+ MonPursueIteration *aDlg = new MonPursueIteration( true,
HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ;
aDlg->show();
break;
case 1103: // Creation d une Iteration
{
- MESSAGE("command " << theCommandID << " activated");
- QString IterParentName=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("IterationHomard"), 0);
- MESSAGE("IterParentName " << IterParentName.toStdString().c_str() << " choisi dans arbre");
+ MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
MonCreateIteration *IterDlg = new MonCreateIteration( parent, true,
- HOMARD::HOMARD_Gen::_duplicate(homardGen), IterParentName ) ;
+ HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
IterDlg->show();
break;
}
- case 1111: // Compute une Iteration
+ case 1111: // Compute une iteration
{
- MESSAGE("command " << theCommandID << " activated");
- QString monIter=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("IterationHomard"), 1);
- if (monIter == QString("")) break;
- try
+ MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
+ try { homardGen->Compute(_ObjectName.toStdString().c_str(), 0, 1, -1, 1); }
+ catch( SALOME::SALOME_Exception& S_ex )
{
- homardGen->Compute(monIter.toStdString().c_str(), 0, 1, -1, 2);
+ QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
+ QObject::tr(CORBA::string_dup(S_ex.details.text)) );
+ getApp()->updateObjectBrowser();
+ return false;
}
+ break;
+ }
+
+ case 1112: // Compute une iteration et publication
+ {
+ MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
+ try { homardGen->Compute(_ObjectName.toStdString().c_str(), 0, 1, -1, 2); }
catch( SALOME::SALOME_Exception& S_ex )
{
QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
case 1121: // Information sur le maillage de l'iteration
{
- MESSAGE("command " << theCommandID << " activated");
- QString IterName=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("IterationHomard"), 0);
- MESSAGE("IterName " << IterName.toStdString().c_str() << " choisi dans arbre");
- MonIterInfo *IterDlg = new MonIterInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), IterName ) ;
+ MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
+ MonIterInfo *IterDlg = new MonIterInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
IterDlg->show();
break;
}
+ case 1131: // Publication du maillage de l'iteration
+ {
+ MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
+ homardGen->PublishMeshIterInSmesh(_ObjectName.toStdString().c_str());
+ break;
+ }
+
+ case 1132: // Publication du maillage de l'iteration a partir du fichier
+ {
+ MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
+ homardGen->PublishResultInSmesh(_ObjectName.toStdString().c_str(), 1);
+ break;
+ }
+
case 1201: // Edition d'un objet
{
MESSAGE("command " << theCommandID << " activated");
_PTR(SObject) obj = chercheMonObjet();
if (obj)
{
- // Edition d'un cas
- if (HOMARD_UTILS::isCase(obj))
+ // Edition d'une frontiere CAO
+ if (HOMARD_UTILS::isBoundaryCAO(obj))
{
- MonEditCase *aDlg = new MonEditCase(parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
+ MonEditBoundaryCAO *aDlg = new MonEditBoundaryCAO(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
aDlg->show();
}
- // Edition d'une iteration
- else if (HOMARD_UTILS::isIter(obj))
+ // Edition d'une frontiere discrete
+ else if (HOMARD_UTILS::isBoundaryDi(obj))
{
- MonEditIteration *aDlg = new MonEditIteration(parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+ MonEditBoundaryDi *aDlg = new MonEditBoundaryDi(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+ aDlg->show();
+ }
+ // Edition d'une frontiere analytique
+ else if (HOMARD_UTILS::isBoundaryAn(obj))
+ {
+ MonEditBoundaryAn *aDlg = new MonEditBoundaryAn(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+ aDlg->show();
+ }
+ // Edition d'un cas
+ else if (HOMARD_UTILS::isCase(obj))
+ {
+ MonEditCase *aDlg = new MonEditCase(true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
aDlg->show();
}
// Edition d'une hypothese
MonEditHypothesis *aDlg = new MonEditHypothesis(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName, QString(""), QString("")) ;
aDlg->show();
}
- // Edition d'une zone
- else if (HOMARD_UTILS::isZone(obj))
+ // Edition d'une iteration
+ else if (HOMARD_UTILS::isIter(obj))
{
- MonEditZone *aDlg = new MonEditZone(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+ MonEditIteration *aDlg = new MonEditIteration(parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
aDlg->show();
}
- // Edition d'une frontiere discrete
- else if (HOMARD_UTILS::isBoundaryDi(obj))
+ // Edition d'un schema YACS
+ else if (HOMARD_UTILS::isYACS(obj))
{
- MESSAGE(".. Lancement de MonEditBoundaryDi" );
- MonEditBoundaryDi *aDlg = new MonEditBoundaryDi(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
- aDlg->show();
+ MESSAGE("appel de MonEditYACS");
+ MonEditYACS *aDlg = new MonEditYACS(true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName) ;
+ aDlg->show();
}
- // Edition d'une frontiere analytique
- else if (HOMARD_UTILS::isBoundaryAn(obj))
+ // Edition d'une zone
+ else if (HOMARD_UTILS::isZone(obj))
{
- MESSAGE(".. Lancement de MonEditBoundaryAn" );
- MonEditBoundaryAn *aDlg = new MonEditBoundaryAn(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
- aDlg->show();
+ MonEditZone *aDlg = new MonEditZone(0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+ aDlg->show();
}
}
break;
_PTR(SObject) obj = chercheMonObjet();
if (obj)
{
- // Suppression d'un cas
- if (HOMARD_UTILS::isCase(obj))
+ // Suppression d'une frontiere
+ if ( HOMARD_UTILS::isBoundaryCAO(obj) || HOMARD_UTILS::isBoundaryDi(obj) || HOMARD_UTILS::isBoundaryAn(obj) )
{
try
- { homardGen->DeleteCase(_ObjectName.toStdString().c_str(), 1); }
+ { homardGen->DeleteBoundary(_ObjectName.toStdString().c_str()); }
catch( SALOME::SALOME_Exception& S_ex )
{
QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
return false;
}
}
- // Suppression d'une iteration
- else if (HOMARD_UTILS::isIter(obj))
+ // Suppression d'un cas
+ else if (HOMARD_UTILS::isCase(obj))
{
try
- { homardGen->DeleteIteration(_ObjectName.toStdString().c_str(), 1); }
+ { homardGen->DeleteCase(_ObjectName.toStdString().c_str(), 1); }
catch( SALOME::SALOME_Exception& S_ex )
{
QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
return false;
}
}
- // Suppression d'une zone
- else if (HOMARD_UTILS::isZone(obj))
+ // Suppression d'une iteration
+ else if (HOMARD_UTILS::isIter(obj))
{
try
- { homardGen->DeleteZone(_ObjectName.toStdString().c_str()); }
+ { homardGen->DeleteIteration(_ObjectName.toStdString().c_str(), 1); }
catch( SALOME::SALOME_Exception& S_ex )
{
QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
return false;
}
}
- // Suppression d'une frontiere
- else if ( HOMARD_UTILS::isBoundaryDi(obj) or HOMARD_UTILS::isBoundaryAn(obj) )
+ // Suppression d'un schema YACS
+ else if (HOMARD_UTILS::isYACS(obj))
{
try
- { homardGen->DeleteBoundary(_ObjectName.toStdString().c_str()); }
+ { homardGen->DeleteYACS(_ObjectName.toStdString().c_str(), 1); }
+ catch( SALOME::SALOME_Exception& S_ex )
+ {
+ QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
+ QObject::tr(CORBA::string_dup(S_ex.details.text)) );
+ getApp()->updateObjectBrowser();
+ return false;
+ }
+ }
+ // Suppression d'une zone
+ else if (HOMARD_UTILS::isZone(obj))
+ {
+ try
+ { homardGen->DeleteZone(_ObjectName.toStdString().c_str()); }
catch( SALOME::SALOME_Exception& S_ex )
{
QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
case 1301: // Information sur un maillage
{
- MESSAGE("etape 1301")
+ MESSAGE("etape 1301");
MESSAGE("command " << theCommandID << " activated");
MonMeshInfo *aDlg = new MonMeshInfo( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ;
aDlg->show();
break;
}
- case 1302: // Affichage du fichier mess
+ case 1302: // Affichage de fichier texte
{
MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
_PTR(SObject) obj = chercheMonObjet();
- if ((obj) and ((HOMARD_UTILS::isFilelog(obj) or HOMARD_UTILS::isFileSummary(obj))))
+ if ( (obj) && ( HOMARD_UTILS::isFileType(obj,QString("log")) || HOMARD_UTILS::isFileType(obj,QString("Summary")) || HOMARD_UTILS::isFileType(obj,QString("xml")) ) )
{
- MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
+ MonEditFile *aDlg = new MonEditFile( 0, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName, 0 ) ;
if ( aDlg->_codret == 0 ) { aDlg->show(); }
}
break;
}
- case 1401: // Création d'un schéma YACS
+ case 1401: // Création d'un schema YACS
{
- MESSAGE("etape 1401")
- MESSAGE("command " << theCommandID << " activated");
- QString Name=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("CasHomard"), 1);
- MESSAGE("Name " << Name.toStdString().c_str() << " choisi dans arbre");
- MonCreateYACS *aDlg = new MonCreateYACS( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), Name ) ;
+ MESSAGE("etape 1401");
+ MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
+ MonCreateYACS *aDlg = new MonCreateYACS( true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
aDlg->show();
break;
}
- case 1402: // Ecriture d'un schéma YACS
+ case 1402: // Ecriture d'un schéma YACS
{
- MESSAGE("etape 1402")
- MESSAGE("command " << theCommandID << " activated");
- QString Name=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("YACSHomard"), 1);
- MESSAGE("YACSHomard " << Name.toStdString().c_str() << " choisi dans arbre");
- MonCreateYACS *aDlg = new MonCreateYACS( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), Name ) ;
- aDlg->show();
+ MESSAGE("etape 1402");
+ MESSAGE("command " << theCommandID << " activated avec objet " << _ObjectName.toStdString().c_str() );
+ try { homardGen->YACSWrite(_ObjectName.toStdString().c_str()); }
+ catch( SALOME::SALOME_Exception& S_ex )
+ {
+ QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
+ QObject::tr(CORBA::string_dup(S_ex.details.text)) );
+ getApp()->updateObjectBrowser();
+ return false;
+ }
break;
}
{
theMap.clear();
theMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea );
+#ifndef DISABLE_PYCONSOLE
theMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );
+#endif
}
//=============================================================================
{
try
{
- ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance();
- ASSERT(SINGLETON_<ORB_INIT>::IsAlreadyExisting());
- _orb = init( 0 , 0 );
+ _orb = KERNEL::GetRefToORB();
}
catch (...)
{
bool DeleteObject = false ;
bool EditObject = false ;
//
- if ( HOMARD_UTILS::isBoundaryAn(obj) )
+ if ( HOMARD_UTILS::isBoundaryCAO(obj) )
+ {
+ EditObject = true ;
+ DeleteObject = true ;
+ }
+ else if ( HOMARD_UTILS::isBoundaryAn(obj) )
{
EditObject = true ;
DeleteObject = true ;
{
pix = resMgr->loadPixmap( "HOMARD", "iter_next.png" );
menu->addAction(QIcon(pix), tr(QString("HOM_MEN_NEW_ITERATION").toLatin1().data()), this, SLOT(NextIter()));
- QPixmap pix2 = resMgr->loadPixmap( "HOMARD", "mesh_compute.png" );
- menu->addAction(QIcon(pix2), tr(QString("HOM_MEN_COMPUTE").toLatin1().data()), this, SLOT(LanceCalcul()));
- pix2 = resMgr->loadPixmap( "HOMARD", "advanced_mesh_info.png" );
- menu->addAction(QIcon(pix2), tr(QString("HOM_MEN_MESH_INFO").toLatin1().data()), this, SLOT(IterInfo()));
+ pix = resMgr->loadPixmap( "HOMARD", "mesh_compute.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_COMPUTE").toLatin1().data()), this, SLOT(LanceCalcul0()));
+ pix = resMgr->loadPixmap( "HOMARD", "mesh_compute.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_COMPUTE_PUBLISH").toLatin1().data()), this, SLOT(LanceCalcul1()));
+ pix = resMgr->loadPixmap( "HOMARD", "advanced_mesh_info.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_MESH_INFO").toLatin1().data()), this, SLOT(IterInfo()));
+ pix = resMgr->loadPixmap( "HOMARD", "mesh_tree_mesh.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_MESH_PUBLICATION").toLatin1().data()), this, SLOT(MeshPublish0()));
EditObject = true ;
DeleteObject = true ;
}
else if ( HOMARD_UTILS::isYACS(obj) )
{
- pix = resMgr->loadPixmap( "HOMARD", "save.png" );
- menu->addAction(QIcon(pix), tr(QString("HOM_MEN_YACS").toLatin1().data()), this, SLOT(YACSWrite()));
+ pix = resMgr->loadPixmap( "HOMARD", "write.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_WRITE").toLatin1().data()), this, SLOT(YACSWrite()));
EditObject = true ;
DeleteObject = true ;
}
EditObject = true ;
DeleteObject = true ;
}
- else if ( HOMARD_UTILS::isFilelog(obj) or HOMARD_UTILS::isFileSummary(obj) )
+ else if ( HOMARD_UTILS::isFileType(obj,QString("log")) || HOMARD_UTILS::isFileType(obj,QString("Summary")) || HOMARD_UTILS::isFileType(obj,QString("xml")) )
{
pix = resMgr->loadPixmap( "HOMARD", "texte.png" );
menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_MESS_FILE").toLatin1().data()), this, SLOT(EditAsciiFile()));
}
+ else if ( HOMARD_UTILS::isFileType(obj,QString("Mesh")) )
+ {
+ pix = resMgr->loadPixmap( "HOMARD", "mesh_tree_mesh.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_MESH_PUBLICATION").toLatin1().data()), this, SLOT(MeshPublish1()));
+ }
// Ajout d'un menu d'edition pour les objets qui le proposent
if ( EditObject )
{
this->OnGUIEvent(1103);
}
-void HOMARDGUI::LanceCalcul()
+void HOMARDGUI::LanceCalcul0()
{
this->OnGUIEvent(1111);
}
+void HOMARDGUI::LanceCalcul1()
+{
+ this->OnGUIEvent(1112);
+}
+
void HOMARDGUI::IterInfo()
{
this->OnGUIEvent(1121);
}
+void HOMARDGUI::MeshPublish0()
+{
+ this->OnGUIEvent(1131);
+}
+
+void HOMARDGUI::MeshPublish1()
+{
+ this->OnGUIEvent(1132);
+}
+
void HOMARDGUI::Edit()
{
this->OnGUIEvent(1201);
this->OnGUIEvent(1211);
}
-// void HOMARDGUI::EditAsciiFile()
-// {
-// this->OnGUIEvent(1301);
-// }
-
void HOMARDGUI::EditAsciiFile()
{
this->OnGUIEvent(1302);
