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
Copyright update 2022
[modules/jobmanager.git]
/
src
/
genericgui
/
BL_CreateJobWizard.hxx
diff --git
a/src/genericgui/BL_CreateJobWizard.hxx
b/src/genericgui/BL_CreateJobWizard.hxx
index b9d37604db2221e4c81bed5e8afc08421aaac1b4..9217744453f5aa531c304d63a80d2b412af8263f 100644
(file)
--- a/
src/genericgui/BL_CreateJobWizard.hxx
+++ b/
src/genericgui/BL_CreateJobWizard.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2009-20
14
CEA/DEN, EDF R&D
+// Copyright (C) 2009-20
22
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
@@
-20,22
+20,27
@@
#ifndef _BL_CREATEJOBWIZARD_HXX_
#define _BL_CREATEJOBWIZARD_HXX_
#ifndef _BL_CREATEJOBWIZARD_HXX_
#define _BL_CREATEJOBWIZARD_HXX_
-#include <QtGui>
-
#include "BL_Traces.hxx"
#include "BL_SALOMEServices.hxx"
#include "JM_ResourceCatalog.hxx"
#include "BL_Traces.hxx"
#include "BL_SALOMEServices.hxx"
#include "JM_ResourceCatalog.hxx"
+#include <QWizard>
+#include <QWizardPage>
#include <string>
#include <list>
#include <string>
#include <list>
+class QGridLayout;
+class QLabel;
+class QLineEdit;
+class QListWidget;
+
namespace Ui {
class ResourceRequirementsWizardPage;
class FilesWizardPage;
class AdvancedParametersWizardPage;
}
namespace Ui {
class ResourceRequirementsWizardPage;
class FilesWizardPage;
class AdvancedParametersWizardPage;
}
-namespace BL{
+namespace BL
{
class JobsManager_QT;
class JobNamePage;
class JobsManager_QT;
class JobNamePage;
@@
-67,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;
@@
-84,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
@@
-96,12
+103,14
@@
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;
bool start_job;
int dump_yacs_state;
std::string ll_jobtype;
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,
public:
enum {Page_JobName,
@@
-131,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:
@@
-275,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
@@
-296,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
@@
-317,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