Skip to content
Snippets Groups Projects
Commit 149fc1f8 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rm last 'Widgets' from GUI/View subdirectory names

parent 969cf74f
No related branches found
No related tags found
1 merge request!427Reduce include dependences in GUI; break cyclic dependence between View and Model
Pipeline #48790 failed
Showing
with 77 additions and 77 deletions
......@@ -23,7 +23,7 @@
#include "GUI/View/Intensity/IntensityDataPropertyWidget.h"
#include "GUI/View/Intensity/Plot1D.h"
#include "GUI/View/Intensity/PlotStatusLabel.h"
#include "GUI/View/SpecularDataWidgets/Plot1DCanvas.h"
#include "GUI/View/SpecularData/Plot1DCanvas.h"
#include <QAction>
#include <QGridLayout>
#include <QVBoxLayout>
......
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitActivityPanel.cpp
//! @file GUI/View/Fit/FitActivityPanel.cpp
//! @brief Implements class FitActivityPanel
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,15 +12,15 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitActivityPanel.h"
#include "GUI/View/Fit/FitActivityPanel.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/FitWidgets/FitSessionController.h"
#include "GUI/View/FitWidgets/FitSessionManager.h"
#include "GUI/View/FitWidgets/FitSessionWidget.h"
#include "GUI/View/FitWidgets/JobRealTimeWidget.h"
#include "GUI/View/FitWidgets/RunFitControlWidget.h"
#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/View/Fit/FitSessionManager.h"
#include "GUI/View/Fit/FitSessionWidget.h"
#include "GUI/View/Fit/JobRealTimeWidget.h"
#include "GUI/View/Fit/RunFitControlWidget.h"
#include <QLabel>
#include <QPushButton>
#include <QStackedWidget>
......
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitActivityPanel.h
//! @file GUI/View/Fit/FitActivityPanel.h
//! @brief Defines class FitActivityPanel
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITACTIVITYPANEL_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITACTIVITYPANEL_H
#ifndef BORNAGAIN_GUI_VIEW_FIT_FITACTIVITYPANEL_H
#define BORNAGAIN_GUI_VIEW_FIT_FITACTIVITYPANEL_H
#include <QWidget>
......@@ -58,4 +58,4 @@ private:
FitSessionManager* m_fitSessionManager;
};
#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITACTIVITYPANEL_H
#endif // BORNAGAIN_GUI_VIEW_FIT_FITACTIVITYPANEL_H
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitLog.cpp
//! @file GUI/View/Fit/FitLog.cpp
//! @brief Implements class FitLog
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,7 +12,7 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitLog.h"
#include "GUI/View/Fit/FitLog.h"
FitLog::FitLog(QObject* parent) : QObject(parent) {}
......
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitLog.h
//! @file GUI/View/Fit/FitLog.h
//! @brief Defines class FitLog
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITLOG_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITLOG_H
#ifndef BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
#define BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
#include <QObject>
......@@ -46,4 +46,4 @@ private:
std::vector<Message> m_messages;
};
#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITLOG_H
#endif // BORNAGAIN_GUI_VIEW_FIT_FITLOG_H
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitObjectiveBuilder.cpp
//! @file GUI/View/Fit/FitObjectiveBuilder.cpp
//! @brief Implements class SimulationBuilder
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,7 +12,7 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitObjectiveBuilder.h"
#include "GUI/View/Fit/FitObjectiveBuilder.h"
#include "Core/Fitting/FitObjective.h"
#include "Core/Fitting/ObjectiveMetric.h"
#include "Core/Simulation/ISimulation.h"
......@@ -27,7 +27,7 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
#include "GUI/View/FitWidgets/GUIFitObserver.h"
#include "GUI/View/Fit/GUIFitObserver.h"
FitObjectiveBuilder::FitObjectiveBuilder(JobItem* jobItem) : m_jobItem(jobItem)
{
......
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitObjectiveBuilder.h
//! @file GUI/View/Fit/FitObjectiveBuilder.h
//! @brief Defines class FitObjectiveBuilder
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITOBJECTIVEBUILDER_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITOBJECTIVEBUILDER_H
#ifndef BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
#define BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
#include <memory>
......@@ -57,4 +57,4 @@ private:
std::unique_ptr<FitObjective> m_fit_objective;
};
#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITOBJECTIVEBUILDER_H
#endif // BORNAGAIN_GUI_VIEW_FIT_FITOBJECTIVEBUILDER_H
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitParameterWidget.cpp
//! @file GUI/View/Fit/FitParameterWidget.cpp
//! @brief Implements class FitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,7 +12,7 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitParameterWidget.h"
#include "GUI/View/Fit/FitParameterWidget.h"
#include "GUI/Model/Fit/FitParameterHelper.h"
#include "GUI/Model/Fit/FitParameterItems.h"
#include "GUI/Model/Fit/FitParameterProxyModel.h"
......@@ -22,7 +22,7 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModel.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/FitWidgets/ParameterTuningWidget.h"
#include "GUI/View/Fit/ParameterTuningWidget.h"
#include "GUI/View/Info/OverlayLabelController.h"
#include "GUI/View/PropertyEditor/CustomEventFilters.h"
#include "GUI/View/PropertyEditor/SessionModelDelegate.h"
......
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitParameterWidget.h
//! @file GUI/View/Fit/FitParameterWidget.h
//! @brief Defines class FitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
#define BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
#include "GUI/View/Common/SessionItemWidget.h"
#include <memory>
......@@ -95,4 +95,4 @@ private:
OverlayLabelController* m_infoLabel;
};
#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPARAMETERWIDGET_H
#endif // BORNAGAIN_GUI_VIEW_FIT_FITPARAMETERWIDGET_H
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitProgressInfo.cpp
//! @file GUI/View/Fit/FitProgressInfo.cpp
//! @brief Implements class FitProgressInfo
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,6 +12,6 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitProgressInfo.h"
#include "GUI/View/Fit/FitProgressInfo.h"
FitProgressInfo::FitProgressInfo() : m_chi2(0.0), m_iteration_count(0) {}
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitProgressInfo.h
//! @file GUI/View/Fit/FitProgressInfo.h
//! @brief Defines class FitProgressInfo
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPROGRESSINFO_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPROGRESSINFO_H
#ifndef BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
#define BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
#include <string>
#include <vector>
......@@ -41,4 +41,4 @@ private:
std::vector<double> m_sim_values;
};
#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITPROGRESSINFO_H
#endif // BORNAGAIN_GUI_VIEW_FIT_FITPROGRESSINFO_H
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitResultsWidget.cpp
//! @file GUI/View/Fit/FitResultsWidget.cpp
//! @brief Implements class FitResultsWidget
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,7 +12,7 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitResultsWidget.h"
#include "GUI/View/Fit/FitResultsWidget.h"
FitResultsWidget::FitResultsWidget(QWidget* parent) : QWidget(parent)
{
......
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitResultsWidget.h
//! @file GUI/View/Fit/FitResultsWidget.h
//! @brief Defines class FitResultsWidget
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITRESULTSWIDGET_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITRESULTSWIDGET_H
#ifndef BORNAGAIN_GUI_VIEW_FIT_FITRESULTSWIDGET_H
#define BORNAGAIN_GUI_VIEW_FIT_FITRESULTSWIDGET_H
#include <QWidget>
......@@ -26,4 +26,4 @@ public:
FitResultsWidget(QWidget* parent = 0);
};
#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITRESULTSWIDGET_H
#endif // BORNAGAIN_GUI_VIEW_FIT_FITRESULTSWIDGET_H
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitSessionController.cpp
//! @file GUI/View/Fit/FitSessionController.cpp
//! @brief Implements class FitSessionController
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,17 +12,17 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitSessionController.h"
#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Fit/FitParameterItems.h"
#include "GUI/Model/Fit/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/Error.h"
#include "GUI/Util/Path.h"
#include "GUI/View/FitWidgets/FitLog.h"
#include "GUI/View/FitWidgets/FitObjectiveBuilder.h"
#include "GUI/View/FitWidgets/FitWorkerLauncher.h"
#include "GUI/View/FitWidgets/GUIFitObserver.h"
#include "GUI/View/Fit/FitLog.h"
#include "GUI/View/Fit/FitObjectiveBuilder.h"
#include "GUI/View/Fit/FitWorkerLauncher.h"
#include "GUI/View/Fit/GUIFitObserver.h"
namespace {
const bool use_fit_objective = true;
......
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitSessionController.h
//! @file GUI/View/Fit/FitSessionController.h
//! @brief Defines class FitSessionController
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONCONTROLLER_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONCONTROLLER_H
#ifndef BORNAGAIN_GUI_VIEW_FIT_FITSESSIONCONTROLLER_H
#define BORNAGAIN_GUI_VIEW_FIT_FITSESSIONCONTROLLER_H
#include <QObject>
#include <memory>
......@@ -65,4 +65,4 @@ private:
bool m_block_progress_update;
};
#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONCONTROLLER_H
#endif // BORNAGAIN_GUI_VIEW_FIT_FITSESSIONCONTROLLER_H
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitSessionManager.cpp
//! @file GUI/View/Fit/FitSessionManager.cpp
//! @brief Implements class FitSessionManager
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,11 +12,11 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitSessionManager.h"
#include "GUI/View/Fit/FitSessionManager.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/Error.h"
#include "GUI/View/FitWidgets/FitLog.h"
#include "GUI/View/FitWidgets/FitSessionController.h"
#include "GUI/View/Fit/FitLog.h"
#include "GUI/View/Fit/FitSessionController.h"
FitSessionManager::FitSessionManager(QObject* parent) : QObject(parent), m_activeController(nullptr)
{
......
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitSessionManager.h
//! @file GUI/View/Fit/FitSessionManager.h
//! @brief Defines class FitSessionManager
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONMANAGER_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONMANAGER_H
#ifndef BORNAGAIN_GUI_VIEW_FIT_FITSESSIONMANAGER_H
#define BORNAGAIN_GUI_VIEW_FIT_FITSESSIONMANAGER_H
#include <QMap>
#include <QObject>
......@@ -41,4 +41,4 @@ private:
QMap<SessionItem*, FitSessionController*> m_item_to_controller;
};
#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONMANAGER_H
#endif // BORNAGAIN_GUI_VIEW_FIT_FITSESSIONMANAGER_H
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitSessionWidget.cpp
//! @file GUI/View/Fit/FitSessionWidget.cpp
//! @brief Implements class FitSessionWidget
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,14 +12,14 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitSessionWidget.h"
#include "GUI/View/Fit/FitSessionWidget.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Util/mainwindow_constants.h"
#include "GUI/View/FitWidgets/FitParameterWidget.h"
#include "GUI/View/FitWidgets/FitResultsWidget.h"
#include "GUI/View/FitWidgets/FitSessionController.h"
#include "GUI/View/FitWidgets/MinimizerSettingsWidget.h"
#include "GUI/View/FitWidgets/RunFitControlWidget.h"
#include "GUI/View/Fit/FitParameterWidget.h"
#include "GUI/View/Fit/FitResultsWidget.h"
#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/View/Fit/MinimizerSettingsWidget.h"
#include "GUI/View/Fit/RunFitControlWidget.h"
#include <QTabWidget>
#include <QVBoxLayout>
......
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitSessionWidget.h
//! @file GUI/View/Fit/FitSessionWidget.h
//! @brief Defines class FitSessionWidget
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,10 +12,10 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONWIDGET_H
#define BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONWIDGET_H
#ifndef BORNAGAIN_GUI_VIEW_FIT_FITSESSIONWIDGET_H
#define BORNAGAIN_GUI_VIEW_FIT_FITSESSIONWIDGET_H
#include "GUI/View/FitWidgets/FitProgressInfo.h"
#include "GUI/View/Fit/FitProgressInfo.h"
#include <QWidget>
class QTabWidget;
......@@ -55,4 +55,4 @@ private:
FitSessionController* m_sessionController;
};
#endif // BORNAGAIN_GUI_VIEW_FITWIDGETS_FITSESSIONWIDGET_H
#endif // BORNAGAIN_GUI_VIEW_FIT_FITSESSIONWIDGET_H
......@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/FitWidgets/FitWorker.cpp
//! @file GUI/View/Fit/FitWorker.cpp
//! @brief Implements class FitWorker
//!
//! @homepage http://www.bornagainproject.org
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#include "GUI/View/FitWidgets/FitWorker.h"
#include "GUI/View/FitWidgets/FitObjectiveBuilder.h"
#include "GUI/View/Fit/FitWorker.h"
#include "GUI/View/Fit/FitObjectiveBuilder.h"
#include <QDateTime>
void FitWorker::startFit()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment