From a927ed89514e528b4cd18fa8e9a21a733381a018 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de> Date: Tue, 9 Nov 2021 11:02:13 +0100 Subject: [PATCH] two edit widgets moved back to GUI/View/Edit, will be used in several places soon --- GUI/View/{SampleDesigner => Edit}/DoubleLineEdit.cpp | 4 ++-- GUI/View/{SampleDesigner => Edit}/DoubleLineEdit.h | 8 ++++---- GUI/View/{SampleDesigner => Edit}/DoubleSpinBox.cpp | 4 ++-- GUI/View/{SampleDesigner => Edit}/DoubleSpinBox.h | 8 ++++---- GUI/View/SampleDesigner/FormLayouter.cpp | 2 +- GUI/View/SampleDesigner/LayerEditorUtils.cpp | 2 +- GUI/View/SampleDesigner/MaterialInplaceForm.cpp | 4 ++-- GUI/View/SampleDesigner/MultiLayerForm.cpp | 2 +- GUI/View/SampleDesigner/SampleEditorController.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) rename GUI/View/{SampleDesigner => Edit}/DoubleLineEdit.cpp (93%) rename GUI/View/{SampleDesigner => Edit}/DoubleLineEdit.h (87%) rename GUI/View/{SampleDesigner => Edit}/DoubleSpinBox.cpp (96%) rename GUI/View/{SampleDesigner => Edit}/DoubleSpinBox.h (90%) diff --git a/GUI/View/SampleDesigner/DoubleLineEdit.cpp b/GUI/View/Edit/DoubleLineEdit.cpp similarity index 93% rename from GUI/View/SampleDesigner/DoubleLineEdit.cpp rename to GUI/View/Edit/DoubleLineEdit.cpp index 419af368f12..97d4bccddce 100644 --- a/GUI/View/SampleDesigner/DoubleLineEdit.cpp +++ b/GUI/View/Edit/DoubleLineEdit.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/View/SampleDesigner/DoubleLineEdit.cpp +//! @file GUI/View/Edit/DoubleLineEdit.cpp //! @brief Implements class DoubleLineEdit //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "GUI/View/SampleDesigner/DoubleLineEdit.h" +#include "GUI/View/Edit/DoubleLineEdit.h" #include <QDoubleValidator> DoubleLineEdit::DoubleLineEdit(QWidget* parent, const DoubleDescriptor& d) diff --git a/GUI/View/SampleDesigner/DoubleLineEdit.h b/GUI/View/Edit/DoubleLineEdit.h similarity index 87% rename from GUI/View/SampleDesigner/DoubleLineEdit.h rename to GUI/View/Edit/DoubleLineEdit.h index 8039ec5ad4d..24135b954ab 100644 --- a/GUI/View/SampleDesigner/DoubleLineEdit.h +++ b/GUI/View/Edit/DoubleLineEdit.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/View/SampleDesigner/DoubleLineEdit.h +//! @file GUI/View/Edit/DoubleLineEdit.h //! @brief Defines class DoubleLineEdit //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DOUBLELINEEDIT_H -#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DOUBLELINEEDIT_H +#ifndef BORNAGAIN_GUI_VIEW_EDIT_DOUBLELINEEDIT_H +#define BORNAGAIN_GUI_VIEW_EDIT_DOUBLELINEEDIT_H #include "GUI/Model/Types/DoubleDescriptor.h" #include <QLineEdit> @@ -51,4 +51,4 @@ private: }; -#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DOUBLELINEEDIT_H +#endif // BORNAGAIN_GUI_VIEW_EDIT_DOUBLELINEEDIT_H diff --git a/GUI/View/SampleDesigner/DoubleSpinBox.cpp b/GUI/View/Edit/DoubleSpinBox.cpp similarity index 96% rename from GUI/View/SampleDesigner/DoubleSpinBox.cpp rename to GUI/View/Edit/DoubleSpinBox.cpp index 80e9ab837bb..7b176a3d162 100644 --- a/GUI/View/SampleDesigner/DoubleSpinBox.cpp +++ b/GUI/View/Edit/DoubleSpinBox.cpp @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/View/SampleDesigner/DoubleSpinBox.cpp +//! @file GUI/View/Edit/DoubleSpinBox.cpp //! @brief Implements class DoubleSpinBox //! //! @homepage http://www.bornagainproject.org @@ -12,7 +12,7 @@ // // ************************************************************************************************ -#include "GUI/View/SampleDesigner/DoubleSpinBox.h" +#include "GUI/View/Edit/DoubleSpinBox.h" #include "GUI/View/Tool/EditUtil.h" #include <QWheelEvent> diff --git a/GUI/View/SampleDesigner/DoubleSpinBox.h b/GUI/View/Edit/DoubleSpinBox.h similarity index 90% rename from GUI/View/SampleDesigner/DoubleSpinBox.h rename to GUI/View/Edit/DoubleSpinBox.h index 3b1cf107914..8b9d0629d65 100644 --- a/GUI/View/SampleDesigner/DoubleSpinBox.h +++ b/GUI/View/Edit/DoubleSpinBox.h @@ -2,7 +2,7 @@ // // BornAgain: simulate and fit reflection and scattering // -//! @file GUI/View/SampleDesigner/DoubleSpinBox.h +//! @file GUI/View/Edit/DoubleSpinBox.h //! @brief Defines class DoubleSpinBox //! //! @homepage http://www.bornagainproject.org @@ -12,8 +12,8 @@ // // ************************************************************************************************ -#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DOUBLESPINBOX_H -#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DOUBLESPINBOX_H +#ifndef BORNAGAIN_GUI_VIEW_EDIT_DOUBLESPINBOX_H +#define BORNAGAIN_GUI_VIEW_EDIT_DOUBLESPINBOX_H #include "GUI/Model/Types/DoubleDescriptor.h" #include <QDoubleSpinBox> @@ -73,4 +73,4 @@ private: }; -#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_DOUBLESPINBOX_H +#endif // BORNAGAIN_GUI_VIEW_EDIT_DOUBLESPINBOX_H diff --git a/GUI/View/SampleDesigner/FormLayouter.cpp b/GUI/View/SampleDesigner/FormLayouter.cpp index 6d3e2dfc94c..425f9d56844 100644 --- a/GUI/View/SampleDesigner/FormLayouter.cpp +++ b/GUI/View/SampleDesigner/FormLayouter.cpp @@ -15,7 +15,7 @@ #include "GUI/View/SampleDesigner/FormLayouter.h" #include "GUI/Model/Types/UIntDescriptor.h" #include "GUI/Model/Types/VectorDescriptor.h" -#include "GUI/View/SampleDesigner/DoubleSpinBox.h" +#include "GUI/View/Edit/DoubleSpinBox.h" #include "GUI/View/SampleDesigner/LayerEditorUtils.h" #include "GUI/View/SampleDesigner/SampleEditorController.h" #include "GUI/View/Tool/GroupBoxCollapser.h" diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.cpp b/GUI/View/SampleDesigner/LayerEditorUtils.cpp index b9e961761b8..3a40d9879a4 100644 --- a/GUI/View/SampleDesigner/LayerEditorUtils.cpp +++ b/GUI/View/SampleDesigner/LayerEditorUtils.cpp @@ -23,7 +23,7 @@ #include "GUI/Model/Sample/ParticleItem.h" #include "GUI/Model/Trafo/RotationItems.h" #include "GUI/Model/Types/VectorDescriptor.h" -#include "GUI/View/SampleDesigner/DoubleSpinBox.h" +#include "GUI/View/Edit/DoubleSpinBox.h" #include "GUI/View/SampleDesigner/FormLayouter.h" #include "GUI/View/SampleDesigner/MesoCrystalForm.h" #include "GUI/View/SampleDesigner/ParticleCompositionForm.h" diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp index a719bff604c..bc0cdd947a6 100644 --- a/GUI/View/SampleDesigner/MaterialInplaceForm.cpp +++ b/GUI/View/SampleDesigner/MaterialInplaceForm.cpp @@ -23,8 +23,8 @@ #include "GUI/Model/Types/DoubleDescriptor.h" #include "GUI/Model/Types/VectorDescriptor.h" #include "GUI/View/Tool/LayoutUtils.h" -#include "GUI/View/SampleDesigner/DoubleLineEdit.h" -#include "GUI/View/SampleDesigner/DoubleSpinBox.h" +#include "GUI/View/Edit/DoubleLineEdit.h" +#include "GUI/View/Edit/DoubleSpinBox.h" #include "GUI/View/MaterialEditor/MaterialEditorDialog.h" #include "GUI/View/SampleDesigner/LayerEditorUtils.h" #include "GUI/View/SampleDesigner/SampleEditorController.h" diff --git a/GUI/View/SampleDesigner/MultiLayerForm.cpp b/GUI/View/SampleDesigner/MultiLayerForm.cpp index a7b968e6c60..f60bead3a0d 100644 --- a/GUI/View/SampleDesigner/MultiLayerForm.cpp +++ b/GUI/View/SampleDesigner/MultiLayerForm.cpp @@ -15,7 +15,7 @@ #include "GUI/View/SampleDesigner/MultiLayerForm.h" #include "GUI/Model/Sample/MultiLayerItem.h" #include "GUI/Model/Types/VectorDescriptor.h" -#include "GUI/View/SampleDesigner/DoubleSpinBox.h" +#include "GUI/View/Edit/DoubleSpinBox.h" #include "GUI/View/SampleDesigner/LayerForm.h" #include "GUI/View/SampleDesigner/MesoCrystalForm.h" #include "GUI/View/SampleDesigner/ParticleCompositionForm.h" diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp index 93c41cefcd7..a1849dc3865 100644 --- a/GUI/View/SampleDesigner/SampleEditorController.cpp +++ b/GUI/View/SampleDesigner/SampleEditorController.cpp @@ -21,7 +21,7 @@ #include "GUI/Model/Sample/ParticleItem.h" #include "GUI/Model/Sample/ParticleLayoutItem.h" #include "GUI/Model/Types/UIntDescriptor.h" -#include "GUI/View/SampleDesigner/DoubleSpinBox.h" +#include "GUI/View/Edit/DoubleSpinBox.h" #include "GUI/View/SampleDesigner/InterferenceForm.h" #include "GUI/View/SampleDesigner/LayerForm.h" #include "GUI/View/SampleDesigner/MaterialInplaceForm.h" -- GitLab