Update copyrights

[modules/jobmanager.git] / src / genericgui / BL_JobsManager_QT.cxx

diff --git a/src/genericgui/BL_JobsManager_QT.cxx b/src/genericgui/BL_JobsManager_QT.cxx
index 42f82ea2cd7acd69eb082c590c56a7c0ab815855..37273380527246b201086e5e3239588328ee2fdc 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.cxx
+++ b/src/genericgui/BL_JobsManager_QT.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2019  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
@@ -68,9 +68,10 @@ BL::JobsManager_QT::JobsManager_QT(QWidget * parent, BL::GenericGui * main_gui,
   connect(_load_jobs, SIGNAL(clicked()), this, SLOT(load_jobs_button()));
   connect(_save_jobs, SIGNAL(clicked()), this, SLOT(save_jobs_button()));
 
-  _auto_refresh_jobs = new QPushButton("Auto Refresh: no");
+  _auto_refresh_jobs = new QPushButton("Auto Refresh: 30s");
   _timer = new QTimer(this);
   _timer->stop();
+  _timer->start(30 * 1000);
   connect(_timer, SIGNAL(timeout()), this, SLOT(RefreshJobs()));
 
   // Menu for auto refresh
@@ -298,6 +299,11 @@ BL::JobsManager_QT::create_job_with_wizard(BL::CreateJobWizard & wizard)
     new_job->setType(BL::Job::COMMAND);
     new_job->setJobFile(wizard.command);
     break;
+  case BL::CreateJobWizard::COMMAND_SALOME:
+    // Command Job
+    new_job->setType(BL::Job::COMMAND_SALOME);
+    new_job->setJobFile(wizard.command);
+    break;
   case BL::CreateJobWizard::PYTHON_SALOME:
     // Python Salome Job
     new_job->setType(BL::Job::PYTHON_SALOME);
@@ -309,6 +315,7 @@ BL::JobsManager_QT::create_job_with_wizard(BL::CreateJobWizard & wizard)
 
   // For all jobs
   new_job->setEnvFile(wizard.env_file);
+  new_job->setPreCommand(wizard.pre_command);
   BL::Job::BatchParam param;
 
   // For COORM
@@ -325,6 +332,7 @@ BL::JobsManager_QT::create_job_with_wizard(BL::CreateJobWizard & wizard)
   param.mem_limit = wizard.mem_limit;
   param.mem_req_type = wizard.mem_req_type;
   param.nb_proc = wizard.nb_proc;
+  param.nb_node = wizard.nb_node;
   param.exclusive = wizard.exclusive;
 
   // Parameters for COORM
@@ -339,6 +347,7 @@ BL::JobsManager_QT::create_job_with_wizard(BL::CreateJobWizard & wizard)
   new_job->setFilesParameters(files_params);
   new_job->setResource(wizard.resource_choosed);
   new_job->setBatchQueue(wizard.batch_queue);
+  new_job->setBatchPartition(wizard.batch_partition);
   new_job->setLoadLevelerJobType(wizard.ll_jobtype);
   new_job->setWCKey(wizard.wckey);
   new_job->setExtraParams(wizard.extra_params);
@@ -453,7 +462,7 @@ BL::JobsManager_QT::event(QEvent * e)
   {
     if (event->event_name == "Ok")
     {
-      write_normal_text("Results of Job " + job_name + " are get\n");
+      write_normal_text("Results of Job " + job_name + " have been got.\n");
     }
     else
     {