From 725bae58d9c058f2721c0a4c4ca7f799746b0318 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 29 Sep 2023 16:35:35 +0200
Subject: [PATCH] ...
---
GUI/View/Fit/FitSessionController.cpp | 2 +-
GUI/View/FitControl/GUIFitObserver.h | 2 +-
GUI/View/{FitDisplay => FitMessage}/FitLog.cpp | 4 ++--
GUI/View/{FitDisplay => FitMessage}/FitLog.h | 8 ++++----
.../{FitDisplay => FitMessage}/FitProgressInfo.cpp | 4 ++--
GUI/View/{FitDisplay => FitMessage}/FitProgressInfo.h | 8 ++++----
.../{FitDisplay => FitMessage}/JobMessagePanel.cpp | 4 ++--
GUI/View/{FitDisplay => FitMessage}/JobMessagePanel.h | 10 +++++-----
GUI/View/Job/JobView.cpp | 2 +-
9 files changed, 22 insertions(+), 22 deletions(-)
rename GUI/View/{FitDisplay => FitMessage}/FitLog.cpp (91%)
rename GUI/View/{FitDisplay => FitMessage}/FitLog.h (86%)
rename GUI/View/{FitDisplay => FitMessage}/FitProgressInfo.cpp (86%)
rename GUI/View/{FitDisplay => FitMessage}/FitProgressInfo.h (85%)
rename GUI/View/{FitDisplay => FitMessage}/JobMessagePanel.cpp (96%)
rename GUI/View/{FitDisplay => FitMessage}/JobMessagePanel.h (79%)
diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
index 93a7b47e128..43dabe67296 100644
--- a/GUI/View/Fit/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -18,7 +18,7 @@
#include "GUI/Model/Job/FitParameterContainerItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/View/FitDisplay/FitLog.h"
+#include "GUI/View/FitMessage/FitLog.h"
#include "GUI/View/FitControl/FitObjectiveBuilder.h"
#include "GUI/View/FitControl/FitWorkerLauncher.h"
#include "GUI/View/FitControl/GUIFitObserver.h"
diff --git a/GUI/View/FitControl/GUIFitObserver.h b/GUI/View/FitControl/GUIFitObserver.h
index a227c76dbd3..296be1179db 100644
--- a/GUI/View/FitControl/GUIFitObserver.h
+++ b/GUI/View/FitControl/GUIFitObserver.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_FITCONTROL_GUIFITOBSERVER_H
#define BORNAGAIN_GUI_VIEW_FITCONTROL_GUIFITOBSERVER_H
-#include "GUI/View/FitDisplay/FitProgressInfo.h"
+#include "GUI/View/FitMessage/FitProgressInfo.h"
#include <QObject>
#include <condition_variable>
#include <mutex>
diff --git a/GUI/View/FitDisplay/FitLog.cpp b/GUI/View/FitMessage/FitLog.cpp
similarity index 91%
rename from GUI/View/FitDisplay/FitLog.cpp
rename to GUI/View/FitMessage/FitLog.cpp
index cb991d38e3e..f8aa84fe68b 100644
--- a/GUI/View/FitDisplay/FitLog.cpp
+++ b/GUI/View/FitMessage/FitLog.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitDisplay/FitLog.cpp
+//! @file GUI/View/FitMessage/FitLog.cpp
//! @brief Implements class FitLog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitDisplay/FitLog.h"
+#include "GUI/View/FitMessage/FitLog.h"
FitLog::FitLog(QObject* parent)
: QObject(parent)
diff --git a/GUI/View/FitDisplay/FitLog.h b/GUI/View/FitMessage/FitLog.h
similarity index 86%
rename from GUI/View/FitDisplay/FitLog.h
rename to GUI/View/FitMessage/FitLog.h
index c75e9dc9ec7..f8f69aafc51 100644
--- a/GUI/View/FitDisplay/FitLog.h
+++ b/GUI/View/FitMessage/FitLog.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitDisplay/FitLog.h
+//! @file GUI/View/FitMessage/FitLog.h
//! @brief Defines class FitLog
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_FITLOG_H
-#define BORNAGAIN_GUI_VIEW_FITDISPLAY_FITLOG_H
+#ifndef BORNAGAIN_GUI_VIEW_FITMESSAGE_FITLOG_H
+#define BORNAGAIN_GUI_VIEW_FITMESSAGE_FITLOG_H
#include <QObject>
@@ -46,4 +46,4 @@ private:
std::vector<Message> m_messages;
};
-#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_FITLOG_H
+#endif // BORNAGAIN_GUI_VIEW_FITMESSAGE_FITLOG_H
diff --git a/GUI/View/FitDisplay/FitProgressInfo.cpp b/GUI/View/FitMessage/FitProgressInfo.cpp
similarity index 86%
rename from GUI/View/FitDisplay/FitProgressInfo.cpp
rename to GUI/View/FitMessage/FitProgressInfo.cpp
index 058868b2386..beda6cc1814 100644
--- a/GUI/View/FitDisplay/FitProgressInfo.cpp
+++ b/GUI/View/FitMessage/FitProgressInfo.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitDisplay/FitProgressInfo.cpp
+//! @file GUI/View/FitMessage/FitProgressInfo.cpp
//! @brief Implements class FitProgressInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitDisplay/FitProgressInfo.h"
+#include "GUI/View/FitMessage/FitProgressInfo.h"
FitProgressInfo::FitProgressInfo()
: m_chi2(0.0)
diff --git a/GUI/View/FitDisplay/FitProgressInfo.h b/GUI/View/FitMessage/FitProgressInfo.h
similarity index 85%
rename from GUI/View/FitDisplay/FitProgressInfo.h
rename to GUI/View/FitMessage/FitProgressInfo.h
index 7db150f42b6..f4b87cc765a 100644
--- a/GUI/View/FitDisplay/FitProgressInfo.h
+++ b/GUI/View/FitMessage/FitProgressInfo.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitDisplay/FitProgressInfo.h
+//! @file GUI/View/FitMessage/FitProgressInfo.h
//! @brief Defines class FitProgressInfo
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_FITPROGRESSINFO_H
-#define BORNAGAIN_GUI_VIEW_FITDISPLAY_FITPROGRESSINFO_H
+#ifndef BORNAGAIN_GUI_VIEW_FITMESSAGE_FITPROGRESSINFO_H
+#define BORNAGAIN_GUI_VIEW_FITMESSAGE_FITPROGRESSINFO_H
#include <string>
#include <vector>
@@ -41,4 +41,4 @@ private:
std::vector<double> m_sim_values;
};
-#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_FITPROGRESSINFO_H
+#endif // BORNAGAIN_GUI_VIEW_FITMESSAGE_FITPROGRESSINFO_H
diff --git a/GUI/View/FitDisplay/JobMessagePanel.cpp b/GUI/View/FitMessage/JobMessagePanel.cpp
similarity index 96%
rename from GUI/View/FitDisplay/JobMessagePanel.cpp
rename to GUI/View/FitMessage/JobMessagePanel.cpp
index 4e5c2d71432..37168c8ef5f 100644
--- a/GUI/View/FitDisplay/JobMessagePanel.cpp
+++ b/GUI/View/FitMessage/JobMessagePanel.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitDisplay/JobMessagePanel.cpp
+//! @file GUI/View/FitMessage/JobMessagePanel.cpp
//! @brief Implements class JobMessagePanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "GUI/View/FitDisplay/JobMessagePanel.h"
+#include "GUI/View/FitMessage/JobMessagePanel.h"
#include "GUI/Support/Tool/mainwindow_constants.h"
#include <QScrollBar>
#include <QSettings>
diff --git a/GUI/View/FitDisplay/JobMessagePanel.h b/GUI/View/FitMessage/JobMessagePanel.h
similarity index 79%
rename from GUI/View/FitDisplay/JobMessagePanel.h
rename to GUI/View/FitMessage/JobMessagePanel.h
index 1e1565b7247..7b888b7f11d 100644
--- a/GUI/View/FitDisplay/JobMessagePanel.h
+++ b/GUI/View/FitMessage/JobMessagePanel.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file GUI/View/FitDisplay/JobMessagePanel.h
+//! @file GUI/View/FitMessage/JobMessagePanel.h
//! @brief Defines class JobMessagePanel
//!
//! @homepage http://www.bornagainproject.org
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_GUI_VIEW_FITDISPLAY_JOBMESSAGEPANEL_H
-#define BORNAGAIN_GUI_VIEW_FITDISPLAY_JOBMESSAGEPANEL_H
+#ifndef BORNAGAIN_GUI_VIEW_FITMESSAGE_JOBMESSAGEPANEL_H
+#define BORNAGAIN_GUI_VIEW_FITMESSAGE_JOBMESSAGEPANEL_H
-#include "GUI/View/FitDisplay/FitLog.h"
+#include "GUI/View/FitMessage/FitLog.h"
#include <QTextEdit>
//! Shows log messages from FitActivityPanel at the bottom part of JobView.
@@ -38,4 +38,4 @@ private:
FitLog* m_log;
};
-#endif // BORNAGAIN_GUI_VIEW_FITDISPLAY_JOBMESSAGEPANEL_H
+#endif // BORNAGAIN_GUI_VIEW_FITMESSAGE_JOBMESSAGEPANEL_H
diff --git a/GUI/View/Job/JobView.cpp b/GUI/View/Job/JobView.cpp
index 82d640b82c7..413746e871b 100644
--- a/GUI/View/Job/JobView.cpp
+++ b/GUI/View/Job/JobView.cpp
@@ -15,7 +15,7 @@
#include "GUI/View/Job/JobView.h"
#include "GUI/Support/Data/ID.h"
#include "GUI/View/Fit/FitActivityPanel.h"
-#include "GUI/View/FitDisplay/JobMessagePanel.h"
+#include "GUI/View/FitMessage/JobMessagePanel.h"
#include "GUI/View/Fit/JobRealTimeWidget.h"
#include "GUI/View/Job/JobProgressAssistant.h"
#include "GUI/View/Job/JobResultsPresenter.h"
--
GitLab