fcts -> local

GUI/View/Job/JobResultsPresenter.cpp

@@ -27,6 +27,17 @@ QString fitPresentationOfInstrument(JobItem* ji)
     return ji->isSpecularJob() ? "Fit 1D Data" : "Fit 2D Data";
 }
 
+QStringList defaultActivePresentationsOfInstrument(JobItem* ji)
+{
+    return ji->isSpecularJob() ? QStringList{"Reflectometry"}
+                               : QStringList{"Heat Map", "Projections"};
+}
+
+QString defaultPresentationOfInstrument(JobItem* ji)
+{
+    return ji->isSpecularJob() ? "Reflectometry" : "Heat Map";
+}
+
 } // namespace
 
 
@@ -82,7 +93,7 @@ void JobResultsPresenter::setPresentationForActivity(JobViewActivity activity)
 
     case JobViewActivity::RealTime:
     case JobViewActivity::JobView:
-        presentation = defaultPresentationOfInstrument();
+        presentation = defaultPresentationOfInstrument(jobItem());
         break;
     }
     setPresentation(presentation);
@@ -96,7 +107,7 @@ QStringList JobResultsPresenter::activePresentationList() const
     if (!jobItem() || jobItem()->isRunning())
         return {};
 
-    auto result = defaultActivePresentationsOfInstrument();
+    auto result = defaultActivePresentationsOfInstrument(jobItem());
 
     if (jobItem()->isValidForFitting())
         result << fitPresentationOfInstrument(jobItem());
@@ -109,19 +120,8 @@ QStringList JobResultsPresenter::presentationList() const
     if (!jobItem() || jobItem()->isRunning())
         return {};
 
-    auto result = defaultActivePresentationsOfInstrument();
+    auto result = defaultActivePresentationsOfInstrument(jobItem());
     result << fitPresentationOfInstrument(jobItem());
 
     return result;
 }
-
-QString JobResultsPresenter::defaultPresentationOfInstrument() const
-{
-    return jobItem()->isSpecularJob() ? "Reflectometry" : "Heat Map";
-}
-
-QStringList JobResultsPresenter::defaultActivePresentationsOfInstrument() const
-{
-    return jobItem()->isSpecularJob() ? QStringList{"Reflectometry"}
-                                      : QStringList{"Heat Map", "Projections"};
-}

GUI/View/Job/JobResultsPresenter.h

@@ -35,8 +35,6 @@ private:
     QString itemPresentation() const override;
     QStringList activePresentationList() const override;
     QStringList presentationList() const override;
-    QString defaultPresentationOfInstrument() const;
-    QStringList defaultActivePresentationsOfInstrument() const;
 };
 
 #endif // BORNAGAIN_GUI_VIEW_JOB_JOBRESULTSPRESENTER_H