Update copyrights

[modules/jobmanager.git] / src / genericgui / BL_CreateJobWizard.hxx

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
index 624577318f2f56fd79f86449d86fa70bab49936c..740cdb5f5573f6da0b55d94e56f4f69c5d7e5813 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.hxx
+++ b/src/genericgui/BL_CreateJobWizard.hxx
@@ -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
@@ -72,13 +72,14 @@ namespace BL {
     public:
       // Results
       std::string job_name;
-      enum {YACS, COMMAND, PYTHON_SALOME} job_type;
+      enum {YACS, COMMAND, PYTHON_SALOME, COMMAND_SALOME} job_type;
 
       std::string yacs_file;
       std::string command;
       std::string python_salome_file;
 
       std::string env_file;
+      std::string pre_command;
 
       std::string batch_directory;
 
@@ -89,6 +90,7 @@ namespace BL {
       long mem_limit;
       BL::Job::MemReqType mem_req_type;
       int nb_proc;
+      int nb_node;
       bool exclusive;
 
       // Parameters for COORM
@@ -101,12 +103,14 @@ namespace BL {
 
       std::string resource_choosed;
       std::string batch_queue;
+      std::string batch_partition;
       std::string wckey;
       std::string extra_params;
 
       bool start_job;
       int dump_yacs_state;
       std::string ll_jobtype;
+      std::string yacs_driver_options;
 
     public:
       enum {Page_JobName,
@@ -136,6 +140,7 @@ namespace BL {
     public slots:
       void yacs_schema_button(bool checked);
       void command_button(bool checked);
+      void command_salome_button(bool checked);
       void python_salome_button(bool checked);
 
     private:
@@ -280,10 +285,12 @@ namespace BL {
     public slots:
       void choose_file();
       void choose_env_file();
+      void choose_pre_command_file();
 
     private:
       QLineEdit * _yacs_file_text;
       QLineEdit * _line_env_file;
+      QLineEdit * _line_pre_command;
   };
 
   class CommandMainPage: public QWizardPage
@@ -301,10 +308,12 @@ namespace BL {
     public slots:
       void choose_command_file();
       void choose_env_file();
+      void choose_pre_command_file();
 
     private:
       QLineEdit * _line_command;
       QLineEdit * _line_env_file;
+      QLineEdit * _line_pre_command;
   };
 
   class PythonSalomeMainPage: public QWizardPage
@@ -322,10 +331,12 @@ namespace BL {
     public slots:
       void choose_PythonSalome_file();
       void choose_env_file();
+      void choose_pre_command_file();
 
     private:
       QLineEdit * _line_PythonSalome;
       QLineEdit * _line_env_file;
+      QLineEdit * _line_pre_command;
   };
 
   class AdvancedParametersPage: public QWizardPage