Salome HOME
projects
/
modules
/
jobmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 e658d2499de3d9fae3e27431e0ce2e7bc74e0cf2..740cdb5f5573f6da0b55d94e56f4f69c5d7e5813 100644
(file)
--- a/
src/genericgui/BL_CreateJobWizard.hxx
+++ b/
src/genericgui/BL_CreateJobWizard.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2009-201
5
CEA/DEN, EDF R&D
+// Copyright (C) 2009-201
9
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
//
// 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;
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 yacs_file;
std::string command;
std::string python_salome_file;
std::string env_file;
+ std::string pre_command;
std::string batch_directory;
std::string batch_directory;
@@
-89,6
+90,7
@@
namespace BL {
long mem_limit;
BL::Job::MemReqType mem_req_type;
int nb_proc;
long mem_limit;
BL::Job::MemReqType mem_req_type;
int nb_proc;
+ int nb_node;
bool exclusive;
// Parameters for COORM
bool exclusive;
// Parameters for COORM
@@
-101,6
+103,7
@@
namespace BL {
std::string resource_choosed;
std::string batch_queue;
std::string resource_choosed;
std::string batch_queue;
+ std::string batch_partition;
std::string wckey;
std::string extra_params;
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);
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:
void python_salome_button(bool checked);
private:
@@
-281,10
+285,12
@@
namespace BL {
public slots:
void choose_file();
void choose_env_file();
public slots:
void choose_file();
void choose_env_file();
+ void choose_pre_command_file();
private:
QLineEdit * _yacs_file_text;
QLineEdit * _line_env_file;
private:
QLineEdit * _yacs_file_text;
QLineEdit * _line_env_file;
+ QLineEdit * _line_pre_command;
};
class CommandMainPage: public QWizardPage
};
class CommandMainPage: public QWizardPage
@@
-302,10
+308,12
@@
namespace BL {
public slots:
void choose_command_file();
void choose_env_file();
public slots:
void choose_command_file();
void choose_env_file();
+ void choose_pre_command_file();
private:
QLineEdit * _line_command;
QLineEdit * _line_env_file;
private:
QLineEdit * _line_command;
QLineEdit * _line_env_file;
+ QLineEdit * _line_pre_command;
};
class PythonSalomeMainPage: public QWizardPage
};
class PythonSalomeMainPage: public QWizardPage
@@
-323,10
+331,12
@@
namespace BL {
public slots:
void choose_PythonSalome_file();
void choose_env_file();
public slots:
void choose_PythonSalome_file();
void choose_env_file();
+ void choose_pre_command_file();
private:
QLineEdit * _line_PythonSalome;
QLineEdit * _line_env_file;
private:
QLineEdit * _line_PythonSalome;
QLineEdit * _line_env_file;
+ QLineEdit * _line_pre_command;
};
class AdvancedParametersPage: public QWizardPage
};
class AdvancedParametersPage: public QWizardPage