merge fcts

GUI/Model/Tune/JobsSet.cpp

@@ -76,18 +76,6 @@ void JobsSet::restore(JobItem* job_item, int index)
     job_item->parameterContainerItem()->restoreBackupValues(index);
 }
 
-bool JobsSet::hasUnfinishedJobs()
-{
-    if (hasUnfinishedJobs2())
-        return true;
-
-    for (auto* job_item : jobItems())
-        if (isFitting(job_item->batchInfo()->status()))
-            return true;
-
-    return false;
-}
-
 void JobsSet::clear()
 {
     for (auto* job : jobItems())
@@ -172,11 +160,6 @@ void JobsSet::readDatafiles(const QString& projectDir, MessageService* messageSe
     dataFilesCleaner.recollectDataNames(dataItems());
 }
 
-void JobsSet::runJob(JobItem* job_item)
-{
-    runJob2(job_item);
-}
-
 void JobsSet::cancelJob(JobItem* job_item)
 {
     cancelJob2(job_item->batchInfo()->identifier());
@@ -200,15 +183,21 @@ QString JobsSet::generateJobName()
 }
 
 
-
 //  ************************************************************************************************
 //  previously in JobQueueData
 //  ************************************************************************************************
 
 
-bool JobsSet::hasUnfinishedJobs2()
+bool JobsSet::hasUnfinishedJobs()
 {
-    return !m_simulations.empty();
+    if (!m_simulations.empty())
+        return true;
+
+    for (auto* job_item : jobItems())
+        if (isFitting(job_item->batchInfo()->status()))
+            return true;
+
+    return false;
 }
 
 //  ************************************************************************************************
@@ -260,7 +249,7 @@ void JobsSet::onFinishedJob()
     clearSimulation(worker->workerIdentifier());
     assignForDeletion(worker);
 
-    if (!hasUnfinishedJobs2())
+    if (!m_simulations.empty())
         emit globalProgress(100);
 }
 
@@ -295,7 +284,7 @@ void JobsSet::onProgressUpdate()
 
 //! Submits job and run it in a thread.
 
-void JobsSet::runJob2(JobItem* job_item)
+void JobsSet::runJob(JobItem* job_item)
 {
     QString identifier = job_item->batchInfo()->identifier();
     if (getThread(identifier))

GUI/Model/Tune/JobsSet.h

@@ -83,9 +83,6 @@ private:
     //! generates numbered job name with new/unused number
     QString generateJobName();
 
-    bool hasUnfinishedJobs2();
-
-    void runJob2(JobItem* job_item);
     void cancelJob2(const QString& identifier);
     void removeJob2(const QString& identifier);