X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fgenericgui%2FBL_CreateJobWizard.hxx;h=740cdb5f5573f6da0b55d94e56f4f69c5d7e5813;hb=94317c743eafd6b6de89a47378e31410b4a8fdf3;hp=28f1585eb4136b1c8741399e5abda9e88c76eab6;hpb=ab9701f6df795114320806eafcf2071053f10e2f;p=modules%2Fjobmanager.git

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
old mode 100755
new mode 100644
index 28f1585..740cdb5
--- a/src/genericgui/BL_CreateJobWizard.hxx
+++ b/src/genericgui/BL_CreateJobWizard.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2014  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
@@ -20,21 +20,27 @@
 #ifndef _BL_CREATEJOBWIZARD_HXX_
 #define _BL_CREATEJOBWIZARD_HXX_
 
-#include <QtGui>
-
 #include "BL_Traces.hxx"
 #include "BL_SALOMEServices.hxx"
 #include "JM_ResourceCatalog.hxx"
 
+#include <QWizard>
+#include <QWizardPage>
 #include <string>
 #include <list>
 
+class QGridLayout;
+class QLabel;
+class QLineEdit;
+class QListWidget;
+
 namespace Ui {
   class ResourceRequirementsWizardPage;
   class FilesWizardPage;
+  class AdvancedParametersWizardPage;
 }
 
-namespace BL{
+namespace BL {
 
   class JobsManager_QT;
   class JobNamePage;
@@ -66,12 +72,14 @@ namespace BL{
     public:
       // Results
       std::string job_name;
+      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;
 
@@ -79,9 +87,10 @@ namespace BL{
       std::string coorm_batch_directory;
 
       std::string maximum_duration;
-      unsigned long mem_limit;
+      long mem_limit;
       BL::Job::MemReqType mem_req_type;
       int nb_proc;
+      int nb_node;
       bool exclusive;
 
       // Parameters for COORM
@@ -94,10 +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,
@@ -108,6 +121,7 @@ namespace BL{
             Page_COORM_BatchParameters,
             Page_Files,
             Page_Resource,
+            Page_Advanced,
             Page_Conclusion};
   };
 
@@ -126,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:
@@ -133,9 +148,6 @@ namespace BL{
       QLabel * _explanation;
 
     public:
-      QRadioButton * _yacs_schema_button;
-      QRadioButton * _command_button;
-      QRadioButton * _python_salome_button;
       bool _check_name;
   };
 
@@ -170,6 +182,10 @@ namespace BL{
       BL::Job::MemReqType getMemReqType() const;
       void setMemReqType(BL::Job::MemReqType mem_req_type);
 
+    public slots:
+      void timeChanged();
+      void memChanged();
+
     private:
       Ui::ResourceRequirementsWizardPage * ui;
       BL::SALOMEServices * _salome_services;
@@ -269,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
@@ -290,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
@@ -311,11 +331,30 @@ 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
+  {
+    Q_OBJECT
+
+    public:
+      AdvancedParametersPage(BL::CreateJobWizard * parent);
+      virtual ~AdvancedParametersPage();
+
+      virtual int nextId() const;
+      virtual void cleanupPage() {}
+
+    private:
+      Ui::AdvancedParametersWizardPage * ui;
+
+  };
+
 }
 
 #endif