X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Fgenericgui%2FBL_CreateJobWizard.hxx;h=740cdb5f5573f6da0b55d94e56f4f69c5d7e5813;hb=94317c743eafd6b6de89a47378e31410b4a8fdf3;hp=d2d0613de3b49c605d2f667d2b1e829f5815693a;hpb=47aa4a47a18a6f09a64d2bb20d1eb595cf795cae;p=modules%2Fjobmanager.git diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx index d2d0613..740cdb5 100644 --- a/src/genericgui/BL_CreateJobWizard.hxx +++ b/src/genericgui/BL_CreateJobWizard.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2009-2016 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,6 +103,7 @@ namespace BL { std::string resource_choosed; std::string batch_queue; + std::string batch_partition; std::string wckey; std::string extra_params; @@ -137,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: @@ -281,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 @@ -302,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 @@ -323,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