#include "MonCreateCase.h"
#include "MonCreateIteration.h"
#include "MonPursueIteration.h"
-#include "MonEditFile.h"
+#include "MonCreateYACS.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
createHOMARDAction( 1111, "COMPUTE", "mesh_compute.png" );
createHOMARDAction( 1121, "MESH_INFO", "advanced_mesh_info.png" );
//
- createHOMARDAction( 1201, "EDIT", "whatis.png" );
+ createHOMARDAction( 1201, "EDIT", "loop.png" );
createHOMARDAction( 1211, "DELETE", "delete.png" );
//
createHOMARDAction( 1301, "MESH_INFO", "advanced_mesh_info.png" );
createHOMARDAction( 1302, "EDIT_MESS_FILE", "texte.png" );
//
- createHOMARDAction( 1401, "YACS", "yacs.png" );
+ createHOMARDAction( 1401, "YACS", "table_view.png" );
//
}
//================================================
// function : createMenus
-// Verifier l'avant dernier nombre passe en parametre
//================================================
void HOMARDGUI::createMenus(){
MESSAGE("createMenus")
createMenu( 1401, HOMARD_Id, -1 ); // Création d'un schéma YACS
createMenu( separator(), HOMARD_Id,-1);
//
-/*// La langue des preferences
+// La langue des preferences
SUIT_ResourceMgr* resMgr = getApp()->resourceMgr();
- QString langue = resMgr->stringValue("language", "language", "en");
- MESSAGE("langue " << langue.toStdString().c_str() );*/
+ _LanguageShort = resMgr->stringValue("language", "language", "en");
+ MESSAGE("_LanguageShort " << _LanguageShort.toStdString().c_str() );
+//
+ SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( application() );
+ HOMARD::HOMARD_Gen_var homardGen = HOMARDGUI::InitHOMARDGen(app);
+ homardGen->SetLanguageShort(_LanguageShort.toStdString().c_str());
}
//================================================
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;
if (monIter == QString("")) break;
try
{
- homardGen->Compute(monIter.toStdString().c_str(), 0, 1, -1, 2);
+ homardGen->Compute(monIter.toStdString().c_str(), 0, 1, -1, 1);
}
catch( SALOME::SALOME_Exception& S_ex )
{
_PTR(SObject) obj = chercheMonObjet();
if (obj)
{
- // Edition d'un cas
- if (HOMARD_UTILS::isCase(obj))
+ // Edition d'une frontiere discrete
+ if (HOMARD_UTILS::isBoundaryDi(obj))
{
- MonEditCase *aDlg = new MonEditCase(parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), _ObjectName ) ;
+ MonEditBoundaryDi *aDlg = new MonEditBoundaryDi(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 analytique
+ else if (HOMARD_UTILS::isBoundaryAn(obj))
{
- MonEditIteration *aDlg = new MonEditIteration(parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), QString(""), _ObjectName ) ;
+ 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::isBoundaryDi(obj) or 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"),
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) and ( HOMARD_UTILS::isFileType(obj,QString("log")) or HOMARD_UTILS::isFileType(obj,QString("Summary")) or 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;
{
MESSAGE("etape 1401")
MESSAGE("command " << theCommandID << " activated");
- QString CaseName=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("CasHomard"), 1);
- MESSAGE("CaseName " << CaseName.toStdString().c_str() << " choisi dans arbre");
- MonCreateYACS *aDlg = new MonCreateYACS( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), CaseName ) ;
+ QString Name=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("CasHomard"), 1);
+ MESSAGE("Name " << Name.toStdString().c_str() << " choisi dans arbre");
+ MonCreateYACS *aDlg = new MonCreateYACS( true, HOMARD::HOMARD_Gen::_duplicate(homardGen), Name ) ;
aDlg->show();
break;
}
+ case 1402: // Ecriture d'un schéma YACS
+ {
+ MESSAGE("etape 1402")
+ MESSAGE("command " << theCommandID << " activated");
+ QString Name=HOMARD_QT_COMMUN::SelectionArbreEtude(QString("YACSHomard"), 1);
+ if (Name == QString("")) break;
+ try
+ {
+ homardGen->YACSWrite(Name.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;
+ }
+
}
getApp()->updateObjectBrowser();
return true;
EditObject = true ;
DeleteObject = true ;
}
- else if ( HOMARD_UTILS::isZone(obj) )
+ else if ( HOMARD_UTILS::isCase(obj) )
{
+ pix = resMgr->loadPixmap( "HOMARD", "table_view.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_YACS").toLatin1().data()), this, SLOT(YACSCreate()));
EditObject = true ;
DeleteObject = true ;
}
else if ( HOMARD_UTILS::isIter(obj) )
{
pix = resMgr->loadPixmap( "HOMARD", "iter_next.png" );
- menu->addAction(QIcon(pix), tr(QString("HOM_MEN_NEW_ITERATION").toLatin1().data()), this,SLOT(NextIter()));
+ 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" );
EditObject = true ;
DeleteObject = true ;
}
- else if ( HOMARD_UTILS::isCase(obj) )
+ else if ( HOMARD_UTILS::isYACS(obj) )
{
- pix = resMgr->loadPixmap( "HOMARD", "yacs.png" );
- menu->addAction(QIcon(pix), tr(QString("HOM_MEN_YACS").toLatin1().data()), this, SLOT(YACS()));
+ pix = resMgr->loadPixmap( "HOMARD", "write.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_WRITE").toLatin1().data()), this, SLOT(YACSWrite()));
EditObject = true ;
DeleteObject = true ;
}
- else if ( HOMARD_UTILS::isFilelog(obj) or HOMARD_UTILS::isFileSummary(obj) )
+ else if ( HOMARD_UTILS::isZone(obj) )
+ {
+ EditObject = true ;
+ DeleteObject = true ;
+ }
+ else if ( HOMARD_UTILS::isFileType(obj,QString("log")) or HOMARD_UTILS::isFileType(obj,QString("Summary")) or 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()));
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT_MESS_FILE").toLatin1().data()), this, SLOT(EditAsciiFile()));
}
// Ajout d'un menu d'edition pour les objets qui le proposent
if ( EditObject )
{
- pix = resMgr->loadPixmap( "HOMARD", "whatis.png" );
- menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT").toLatin1().data()), this,SLOT(Edit()));
+ pix = resMgr->loadPixmap( "HOMARD", "loop.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_EDIT").toLatin1().data()), this, SLOT(Edit()));
}
// Ajout d'un menu de destruction pour les objets qui le proposent
if ( DeleteObject )
{
pix = resMgr->loadPixmap( "HOMARD", "delete.png" );
- menu->addAction(QIcon(pix), tr(QString("HOM_MEN_DELETE").toLatin1().data()), this,SLOT(Delete()));
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_DELETE").toLatin1().data()), this, SLOT(Delete()));
}
}
}
this->OnGUIEvent(1211);
}
-// void HOMARDGUI::EditAsciiFile()
-// {
-// this->OnGUIEvent(1301);
-// }
-
void HOMARDGUI::EditAsciiFile()
{
this->OnGUIEvent(1302);
}
-void HOMARDGUI::YACS()
+void HOMARDGUI::YACSCreate()
{
this->OnGUIEvent(1401);
}
+void HOMARDGUI::YACSWrite()
+{
+ this->OnGUIEvent(1402);
+}
//
