#include <QMenu>
#include "MonCreateCase.h"
#include "MonCreateIteration.h"
+#include "MonPursueIteration.h"
#include "MonEditFile.h"
#include "MonEditCase.h"
#include "MonEditIteration.h"
#include "MonEditBoundaryAn.h"
#include "MonEditBoundaryDi.h"
#include "MonMeshInfo.h"
+#include "MonCreateYACS.h"
#include "MonIterInfo.h"
#include "HomardQtCommun.h"
//================================================
void HOMARDGUI::createActions(){
//
- createHOMARDAction( 1101, "NEW_CASE", "cas_calcule.png" );
- createHOMARDAction( 1102, "NEW_ITERATION", "iter_next.png" );
- createHOMARDAction( 1111, "COMPUTE", "mesh_compute.png" );
- createHOMARDAction( 1121, "MESH_INFO", "advanced_mesh_info.png" );
+ createHOMARDAction( 1101, "NEW_CASE", "cas_calcule.png" );
+ createHOMARDAction( 1102, "PURSUE_ITERATION", "iter_poursuite.png" );
+ createHOMARDAction( 1103, "NEW_ITERATION", "iter_next.png" );
+ createHOMARDAction( 1111, "COMPUTE", "mesh_compute.png" );
+ createHOMARDAction( 1121, "MESH_INFO", "advanced_mesh_info.png" );
//
- createHOMARDAction( 1201, "EDIT", "whatis.png" );
- createHOMARDAction( 1211, "DELETE", "delete.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( 1301, "MESH_INFO", "advanced_mesh_info.png" );
+ createHOMARDAction( 1302, "EDIT_MESS_FILE", "texte.png" );
+//
+ createHOMARDAction( 1401, "YACS", "table_view.png" );
//
}
//
int HOMARD_Id = createMenu( tr( "HOM_MEN_HOMARD" ), -1, 5, 10 );
createMenu( 1101, HOMARD_Id, -1 ); //Create_Case
- createMenu( 1102, HOMARD_Id, -1 ); //Create_Iteration
+ createMenu( 1102, HOMARD_Id, -1 ); //Pursue_Iteration
+ createMenu( 1103, HOMARD_Id, -1 ); //Create_Iteration
createMenu( 1111, HOMARD_Id, -1 ); //COMPUTE
//
HOMARD_Id = createMenu( tr( "HOM_MEN_MODIFICATION" ), -1, 5, 10 );
createMenu( separator(), HOMARD_Id,-1);
createMenu( 1201, HOMARD_Id, -1 ); //Edit
createMenu( separator(), HOMARD_Id,-1);
-// createMenu( 1201, HOMARD_Id, -1 ); //Edit
+//
+ HOMARD_Id = createMenu( tr( "HOM_MEN_YACS" ), -1, 5, 10 );
+ createMenu( 1401, HOMARD_Id, -1 ); // Création d'un schéma YACS
+ createMenu( separator(), HOMARD_Id,-1);
+//
+/*// La langue des preferences
+ SUIT_ResourceMgr* resMgr = getApp()->resourceMgr();
+ QString langue = resMgr->stringValue("language", "language", "en");
+ MESSAGE("langue " << langue.toStdString().c_str() );*/
}
//================================================
//=======================================================================
bool HOMARDGUI::OnGUIEvent (int theCommandID)
{
- MESSAGE("OnGUIEvent(int)");
+ MESSAGE("OnGUIEvent avec theCommandID = "<<theCommandID);
SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( application() );
if ( !app ) return false;
}
getApp()->updateObjectBrowser();
+
SCRUTE(theCommandID);
switch (theCommandID)
{
case 1101: // Creation d un Cas
{
- MESSAGE("etape 1101")
MESSAGE("command " << theCommandID << " activated");
MonCreateCase *aDlg = new MonCreateCase( parent, true,
HOMARD::HOMARD_Gen::_duplicate(homardGen) ) ;
break;
}
- case 1102: // Creation d une Iteration
+ case 1102: // Poursuite d une iteration
+ {
+ MESSAGE("command " << theCommandID << " activated");
+ MonPursueIteration *aDlg = new MonPursueIteration( parent, 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);
if (monIter == QString("")) break;
try
{
- homardGen->Compute(monIter.toStdString().c_str(), 0, 1, -1);
+ homardGen->Compute(monIter.toStdString().c_str(), 0, 1, -1, 2);
}
catch( SALOME::SALOME_Exception& S_ex )
{
if (HOMARD_UTILS::isCase(obj))
{
try
- { homardGen->DeleteCase(_ObjectName.toStdString().c_str()); }
+ { homardGen->DeleteCase(_ObjectName.toStdString().c_str(), 1); }
catch( SALOME::SALOME_Exception& S_ex )
{
QMessageBox::critical( 0, QObject::tr("HOM_ERROR"),
if ( aDlg->_codret == 0 ) { aDlg->show(); }
}
break;
- }
+ }
+
+ case 1401: // Création d'un schéma 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 ) ;
+ 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);
+ MESSAGE("YACSHomard " << Name.toStdString().c_str() << " choisi dans arbre");
+ MonCreateYACS *aDlg = new MonCreateYACS( parent, true, HOMARD::HOMARD_Gen::_duplicate(homardGen), Name ) ;
+ aDlg->show();
+ break;
+ }
}
getApp()->updateObjectBrowser();
_PTR(SObject) HOMARDGUI::chercheMonObjet()
//========================================
{
-
- SALOMEDSClient_SObject* aSO = NULL;
- _PTR(SObject) obj;
- SALOME_ListIO lst;
- getApp()->selectionMgr()->selectedObjects( lst );
- if ( lst.Extent() == 1 )
- {
- Handle(SALOME_InteractiveObject) io = lst.First();
- SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( application()->activeStudy() );
- _PTR(Study) study = appStudy->studyDS();
- _PTR(SObject) obj = study->FindObjectID( io->getEntry() );
- _ObjectName = QString( obj->GetName().c_str() );
- return obj;
- }
- else
- return _PTR(SObject)(aSO);
+ SALOMEDSClient_SObject* aSO = NULL;
+ _PTR(SObject) obj;
+ SALOME_ListIO lst;
+ getApp()->selectionMgr()->selectedObjects( lst );
+ if ( lst.Extent() == 1 )
+ {
+ Handle(SALOME_InteractiveObject) io = lst.First();
+ SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( application()->activeStudy() );
+ _PTR(Study) study = appStudy->studyDS();
+ _PTR(SObject) obj = study->FindObjectID( io->getEntry() );
+ _ObjectName = QString( obj->GetName().c_str() );
+ return obj;
+ }
+ else { return _PTR(SObject)(aSO); }
}
//=============================================================================
void HOMARDGUI::contextMenuPopup( const QString& client, QMenu* menu, QString& title )
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", "save.png" );
+ menu->addAction(QIcon(pix), tr(QString("HOM_MEN_YACS").toLatin1().data()), this, SLOT(YACSWrite()));
+ EditObject = true ;
+ DeleteObject = true ;
+ }
+ else if ( HOMARD_UTILS::isZone(obj) )
{
EditObject = true ;
DeleteObject = true ;
else if ( HOMARD_UTILS::isFilelog(obj) or HOMARD_UTILS::isFileSummary(obj) )
{
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()));
}
}
}
void HOMARDGUI::NextIter()
{
- this->OnGUIEvent(1102);
+ this->OnGUIEvent(1103);
}
void HOMARDGUI::LanceCalcul()
this->OnGUIEvent(1302);
}
+void HOMARDGUI::YACSCreate()
+{
+ this->OnGUIEvent(1401);
+}
+void HOMARDGUI::YACSWrite()
+{
+ this->OnGUIEvent(1402);
+}
+
+
//
//=============================================================================
// Export the module
