Merge branch 'V7_dev'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41dc8924c9de2b23924524feb5ff117eb8d0e611..39fb9fb794c2ae7fd7653861ef83abda24117a6b 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ CMAKE_POLICY(SET CMP0003 NEW)
 # Project name, upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
+SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
@@ -94,9 +94,12 @@ ELSE(EXISTS ${GUI_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
 ENDIF(EXISTS ${GUI_ROOT_DIR})
 
-# Qt4
-FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
-INCLUDE(${QT_USE_FILE})
+# Qt
+IF(NOT SALOME_GUI_BUILD_WITH_QT5)
+  FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml)
+ELSE()
+  FIND_PACKAGE(SalomeQt5 REQUIRED)
+ENDIF()
 
 # Detection summary:
 SALOME_PACKAGE_REPORT_AND_CHECK()

diff --git a/src/engine/BL_Job.cxx b/src/engine/BL_Job.cxx
index c6ec860eaad5c6c4f9f82cbd64ff481e34972814..a380c86b681556a00c7470b945d5090401358388 100644 (file)
--- a/src/engine/BL_Job.cxx
+++ b/src/engine/BL_Job.cxx
@@ -39,6 +39,7 @@ BL::Job::Job()
   _thread_state = BL::Job::NOTHING;
   _salome_launcher_id = -1;
   _dump_yacs_state = 0;
+  _yacs_driver_options = "";
   _ll_jobtype = "";
 
   // Parameters for COORM
@@ -66,6 +67,7 @@ BL::Job::Job(const std::string & name)
   _thread_state = BL::Job::NOTHING;
   _salome_launcher_id = -1;
   _dump_yacs_state = 0;
+  _yacs_driver_options = "";
   _ll_jobtype = "";
 
   // Parameters for COORM
@@ -129,6 +131,18 @@ BL::Job::getDumpYACSState()
   return _dump_yacs_state;
 }
 
+void
+BL::Job::setYacsDriverOptions(const std::string& options)
+{
+  _yacs_driver_options = options;
+}
+
+const std::string&
+BL::Job::getYacsDriverOptions()const
+{
+  return _yacs_driver_options;
+}
+
 void 
 BL::Job::setJobFile(const std::string & job_file)
 {

diff --git a/src/engine/BL_Job.hxx b/src/engine/BL_Job.hxx
index f09f0e4bb2ebe2d170ad7c26bf1d4ccbc01d4fed..f2dc145d43fb3f359e44fb6c5ca9f3c2fd30ea09 100644 (file)
--- a/src/engine/BL_Job.hxx
+++ b/src/engine/BL_Job.hxx
@@ -56,6 +56,9 @@ namespace BL{
       void setDumpYACSState(const int & dump_yacs_state);
       int getDumpYACSState();
 
+      void setYacsDriverOptions(const std::string& options);
+      const std::string& getYacsDriverOptions()const;
+
       enum MemReqType {MEM_PER_NODE, MEM_PER_CPU};
 
       struct BatchParam
@@ -114,6 +117,7 @@ namespace BL{
       BL::Job::State _state;
       BL::Job::ThreadState _thread_state;
       int _dump_yacs_state;
+      std::string _yacs_driver_options;
 
       std::string _name;
 

diff --git a/src/engine/BL_SALOMEServices.cxx b/src/engine/BL_SALOMEServices.cxx
index 06cd29059f31cacd11988e707fa4b48446a1c52d..2082b221e744d910eba0a61b4b26c8911a11147c 100644 (file)
--- a/src/engine/BL_SALOMEServices.cxx
+++ b/src/engine/BL_SALOMEServices.cxx
@@ -277,6 +277,14 @@ BL::SALOMEServices::create_job(BL::Job * job)
       new_parameter->value = CORBA::string_dup(oss.str().c_str());
       job_parameters->specific_parameters[job_parameters->specific_parameters.length() - 1] = new_parameter;
     }
+    if (not job->getYacsDriverOptions().empty())
+    {
+      job_parameters->specific_parameters.length(job_parameters->specific_parameters.length() + 1);
+      Engines::Parameter_var new_parameter = new Engines::Parameter;
+      new_parameter->name = CORBA::string_dup("YACSDriverOptions");
+      new_parameter->value = CORBA::string_dup(job->getYacsDriverOptions().c_str());
+      job_parameters->specific_parameters[job_parameters->specific_parameters.length() - 1] = new_parameter;
+    }
   }
   if (job->getLoadLevelerJobType() != "")
   {
@@ -670,6 +678,11 @@ BL::SALOMEServices::get_new_job(int job_number)
         iss >> value;
         job_return->setDumpYACSState(value);
       }
+      if (std::string(job_parameters->specific_parameters[i].name.in()) == "YACSDriverOptions")
+      {
+        std::string user_value = job_parameters->specific_parameters[i].value.in();
+        job_return->setYacsDriverOptions(user_value);
+      }
       if (std::string(job_parameters->specific_parameters[i].name.in()) == "LoalLevelerJobType")
       {
         std::string user_value = job_parameters->specific_parameters[i].value.in();

diff --git a/src/genericgui/BL_CreateJobWizard.cxx b/src/genericgui/BL_CreateJobWizard.cxx
index 74ec5832d651519b6692dd59b31dafc69a0ca937..bf4fd3a0d50aaab82273e62ae03f2d84a21e758a 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.cxx
+++ b/src/genericgui/BL_CreateJobWizard.cxx
@@ -77,6 +77,7 @@ BL::CreateJobWizard::CreateJobWizard(BL::JobsManager_QT * jobs_manager, BL::SALO
 
   start_job = false;
   dump_yacs_state = -1;
+  yacs_driver_options = "";
   ll_jobtype = "";
 
   setOptions(QWizard::NoBackButtonOnStartPage);
@@ -138,6 +139,10 @@ BL::CreateJobWizard::clone(const std::string & name)
         value.setNum(job->getDumpYACSState());
         setField("dump_yacs_state", value);
       }
+      if (not job->getYacsDriverOptions().empty())
+      {
+        setField("yacs_driver_options", job->getYacsDriverOptions().c_str());
+      }
     }
     else if (job->getType() == BL::Job::COMMAND)
     {
@@ -263,6 +268,7 @@ BL::CreateJobWizard::end(int result)
     QString f_yacs_file = field("yacs_file").toString();
     yacs_file = f_yacs_file.trimmed().toUtf8().constData();
     dump_yacs_state = field("dump_yacs_state").toInt();
+    yacs_driver_options = field("yacs_driver_options").toString().trimmed().toUtf8().constData();
 
     // Command Panel
     QString f_command = field("command").toString();
@@ -558,15 +564,18 @@ BL::YACSSchemaPage::YACSSchemaPage(QWidget * parent)
 
   QGroupBox * spec_param_box = new QGroupBox("YACS specific parameters");
   QLabel * label_dump =  new QLabel("Dump YACS state each secs (0 disable this feature)");
-  QLabel * label_dump_warning = new QLabel("(WARNING: can only be used with SALOME >= 6.3.0)");
+  QLabel * label_driver_options = new QLabel("YACS driver options - see YACS driver documentation.");
   QSpinBox * spin_dump = new QSpinBox(this);
   spin_dump->setMinimum(0);
   spin_dump->setMaximum(1000000);
   registerField("dump_yacs_state", spin_dump);
+  QLineEdit* edit_yacs_driver_options = new QLineEdit(this);
+  registerField("yacs_driver_options", edit_yacs_driver_options);
   QGridLayout * specific_layout = new QGridLayout;
   specific_layout->addWidget(label_dump, 0, 0);
   specific_layout->addWidget(spin_dump, 0, 1);
-  specific_layout->addWidget(label_dump_warning, 1, 0);
+  specific_layout->addWidget(label_driver_options, 1, 0);
+  specific_layout->addWidget(edit_yacs_driver_options, 1, 1);
   spec_param_box->setLayout(specific_layout);
 
   QVBoxLayout * main_layout = new QVBoxLayout;

diff --git a/src/genericgui/BL_CreateJobWizard.hxx b/src/genericgui/BL_CreateJobWizard.hxx
index e09c27d3b8e58b555982fa63fe0b80c652c26284..d2d0613de3b49c605d2f667d2b1e829f5815693a 100644 (file)
--- a/src/genericgui/BL_CreateJobWizard.hxx
+++ b/src/genericgui/BL_CreateJobWizard.hxx
@@ -107,6 +107,7 @@ namespace BL {
       bool start_job;
       int dump_yacs_state;
       std::string ll_jobtype;
+      std::string yacs_driver_options;
 
     public:
       enum {Page_JobName,

diff --git a/src/genericgui/BL_JobsManager_QT.cxx b/src/genericgui/BL_JobsManager_QT.cxx
index b405b68362c093b4217836536f986f38d6dc217f..e56bde129d86812aa84a053fb9292ad164bb4df9 100644 (file)
--- a/src/genericgui/BL_JobsManager_QT.cxx
+++ b/src/genericgui/BL_JobsManager_QT.cxx
@@ -291,6 +291,7 @@ BL::JobsManager_QT::create_job_with_wizard(BL::CreateJobWizard & wizard)
     new_job->setType(BL::Job::YACS_SCHEMA);
     new_job->setJobFile(wizard.yacs_file);
     new_job->setDumpYACSState(wizard.dump_yacs_state);
+    new_job->setYacsDriverOptions(wizard.yacs_driver_options);
     break;
   case BL::CreateJobWizard::COMMAND:
     // Command Job

diff --git a/src/genericgui/BL_JobsTable.cxx b/src/genericgui/BL_JobsTable.cxx
index 6403bdcd4bd360107119ac10e82bd15cede812e3..c04c9efa2c547fb4adc033d1bf0c06f91dfc6b60 100644 (file)
--- a/src/genericgui/BL_JobsTable.cxx
+++ b/src/genericgui/BL_JobsTable.cxx
@@ -42,7 +42,11 @@ BL::JobsTable::JobsTable(QWidget *parent) : QTableView(parent)
   setSelectionMode(QAbstractItemView::ExtendedSelection);
 
   QHeaderView * header_view = verticalHeader();
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
   header_view->setClickable(false);
+#else
+  header_view->setSectionsClickable(false);
+#endif
 }
 
 BL::JobsTable::~JobsTable()

diff --git a/src/genericgui/CMakeLists.txt b/src/genericgui/CMakeLists.txt
index c6d2d485a779e46c69c8195ab1fcc320ece30e4b..6b625820accb05fb1975e8d4a26a7df77c0f56bf 100644 (file)
--- a/src/genericgui/CMakeLists.txt
+++ b/src/genericgui/CMakeLists.txt
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-INCLUDE(UseQt4Ext)
+INCLUDE(UseQtExt)
 
 # --- options ---
 # additional include directories
@@ -65,7 +65,7 @@ SET(BL_GenericGui_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${BL_GenericGui_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${BL_GenericGui_HEADERS})
 
 # sources / static
 SET(_other_SOURCES 
@@ -92,7 +92,7 @@ SET(_uic_files
 )
 
 # header files / uic wrappings
-QT4_WRAP_UI(_uic_HEADERS ${_uic_files})
+QT_WRAP_UIC(_uic_HEADERS ${_uic_files})
 
 # sources / to compile
 SET(BL_GenericGui_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS})

diff --git a/src/salomegui/CMakeLists.txt b/src/salomegui/CMakeLists.txt
index d11c818444a9a83c74b3e1e05dd9a2352be652b8..f186102618ef1b97c56c5f6d53d6851ed781d739 100644 (file)
--- a/src/salomegui/CMakeLists.txt
+++ b/src/salomegui/CMakeLists.txt
@@ -17,6 +17,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+INCLUDE(UseQtExt)
+
 # --- options ---
 # additional include directories
 INCLUDE_DIRECTORIES(
@@ -58,7 +60,7 @@ SET(JOBMANAGER_HEADERS
 # --- sources ---
 
 # sources / moc wrappings
-QT4_WRAP_CPP(_moc_SOURCES ${JOBMANAGER_HEADERS})
+QT_WRAP_MOC(_moc_SOURCES ${JOBMANAGER_HEADERS})
 
 # sources / static
 SET(_other_SOURCES