From 587797331fb7eef597f39bee4c6c8a3ec51c47e5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 11:25:36 +0100
Subject: [PATCH 01/12] rm empty lines
---
GUI/View/SampleDesigner/SampleEditorController.cpp | 1 -
GUI/View/SampleDesigner/SampleEditorController.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/GUI/View/SampleDesigner/SampleEditorController.cpp b/GUI/View/SampleDesigner/SampleEditorController.cpp
index f3244782b82..a03e4be01de 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.cpp
+++ b/GUI/View/SampleDesigner/SampleEditorController.cpp
@@ -69,7 +69,6 @@ void SampleEditorController::addLayerItem(LayerItem* before)
void SampleEditorController::addLayerItemFromUndo(int atIndex)
{
-
// -- find a color for the new layer
QColor color;
auto unusedColors = LayerEditorUtils::predefinedLayerColors();
diff --git a/GUI/View/SampleDesigner/SampleEditorController.h b/GUI/View/SampleDesigner/SampleEditorController.h
index de5cdf455c9..95c3a1767b9 100644
--- a/GUI/View/SampleDesigner/SampleEditorController.h
+++ b/GUI/View/SampleDesigner/SampleEditorController.h
@@ -130,5 +130,4 @@ private:
ProjectDocument* m_document;
};
-
#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEEDITORCONTROLLER_H
--
GitLab
From 91b0df94b5ca265f8bdaa9dc3d328613c2e7969d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 14:35:23 +0100
Subject: [PATCH 02/12] assert pointer
---
GUI/View/SampleDesigner/LayerForm.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index d70929fa618..7b8dadc7041 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -13,6 +13,7 @@
// ************************************************************************************************
#include "GUI/View/SampleDesigner/LayerForm.h"
+#include "Base/Util/Assert.h"
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Model/Sample/MaterialModel.h"
@@ -134,7 +135,9 @@ void LayerForm::updateColor()
void LayerForm::updateTitle()
{
- int i = m_ec->sampleItem()->layerItems().indexOf(m_layer);
+ const SampleItem* sampleItem = m_ec->sampleItem();
+ ASSERT(sampleItem);
+ int i = sampleItem->layerItems().indexOf(m_layer);
m_collapser->setTitle("Layer " + QString::number(i)
+ " Material: " + m_layer->materialName());
}
--
GitLab
From d31d92d9213183b8f66cd7b4cc2108014ebe19ae Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:11:54 +0100
Subject: [PATCH 03/12] Revert "ctd, plus some complex fwd decl"
This reverts commit 08dfcccef7bcb4625ece34aaa42b1126115efcd8.
---
GUI/View/Plot2D/ColorMapCanvas.h | 6 ++++--
GUI/View/Plot2D/IntensityDataCanvas.h | 3 ++-
GUI/View/Plot2D/IntensityDataWidget.cpp | 1 -
GUI/View/Plot2D/IntensityDataWidget.h | 4 ++--
GUI/View/SampleDesigner/CompoundForm.cpp | 2 +-
GUI/View/SampleDesigner/CompoundForm.h | 7 +++----
GUI/View/SampleDesigner/CoreAndShellForm.h | 4 +++-
GUI/View/SampleDesigner/LayerForm.cpp | 1 -
GUI/View/SampleDesigner/LayerForm.h | 6 ++----
GUI/View/SampleDesigner/MaterialInplaceForm.h | 3 ++-
GUI/View/SampleDesigner/ParticleForm.h | 1 +
GUI/View/SampleDesigner/ParticleLayoutForm.cpp | 1 -
GUI/View/SampleDesigner/ParticleLayoutForm.h | 11 ++++++-----
GUI/View/SampleDesigner/SampleForm.cpp | 5 +----
GUI/View/SampleDesigner/SampleForm.h | 12 ++++++------
15 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/GUI/View/Plot2D/ColorMapCanvas.h b/GUI/View/Plot2D/ColorMapCanvas.h
index aae170a1c6d..8982189fbf4 100644
--- a/GUI/View/Plot2D/ColorMapCanvas.h
+++ b/GUI/View/Plot2D/ColorMapCanvas.h
@@ -23,10 +23,12 @@ class IntensityDataItem;
class PlotStatusLabel;
class QCustomPlot;
-//! Contains ColorMap for intensity data presentation, and provide control
-//! of font size, status string appearance
+//! The ColorMapCanvas class contains ColorMap for intensity data presentation, and provide
+//! control of font size, status string appearance
class ColorMapCanvas : public QWidget {
+ Q_OBJECT
+
public:
explicit ColorMapCanvas(QWidget* parent = nullptr);
diff --git a/GUI/View/Plot2D/IntensityDataCanvas.h b/GUI/View/Plot2D/IntensityDataCanvas.h
index 2c08e2502d6..3aa14e6622e 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.h
+++ b/GUI/View/Plot2D/IntensityDataCanvas.h
@@ -17,14 +17,15 @@
#include "GUI/View/Common/DataAccessWidget.h"
-class ColorMapCanvas;
class IntensityDataItem;
+class ColorMapCanvas;
class QAction;
//! The IntensityDataCanvas class represents IntensityDataItem as color map,
//! provides standard actions (reset view, save as) for external toolbars and context menus.
class IntensityDataCanvas : public DataAccessWidget {
+ Q_OBJECT
public:
explicit IntensityDataCanvas(QWidget* parent = nullptr);
diff --git a/GUI/View/Plot2D/IntensityDataWidget.cpp b/GUI/View/Plot2D/IntensityDataWidget.cpp
index 38214f52b43..9da0daabfdb 100644
--- a/GUI/View/Plot2D/IntensityDataWidget.cpp
+++ b/GUI/View/Plot2D/IntensityDataWidget.cpp
@@ -18,7 +18,6 @@
#include "GUI/View/Common/IntensityDataPropertyWidget.h"
#include "GUI/View/Plot2D/IntensityDataCanvas.h"
#include "GUI/View/Plot2D/IntensityDataFFTPresenter.h"
-#include <QAction>
#include <QBoxLayout>
#include <QMenu>
diff --git a/GUI/View/Plot2D/IntensityDataWidget.h b/GUI/View/Plot2D/IntensityDataWidget.h
index 79d1805db23..10f8c383358 100644
--- a/GUI/View/Plot2D/IntensityDataWidget.h
+++ b/GUI/View/Plot2D/IntensityDataWidget.h
@@ -16,17 +16,17 @@
#define BORNAGAIN_GUI_VIEW_PLOT2D_INTENSITYDATAWIDGET_H
#include "GUI/View/Common/DataAccessWidget.h"
-#include <QList>
+#include <QAction>
class IntensityDataCanvas;
class IntensityDataPropertyWidget;
class IntensityDataFFTPresenter;
-class QAction;
//! A common widget to display color map (IntensityDataCanvas) and properties
//! (ItemPropertyWidget) of intensity data item.
class IntensityDataWidget : public DataAccessWidget {
+ Q_OBJECT
public:
IntensityDataWidget(QWidget* parent = nullptr);
diff --git a/GUI/View/SampleDesigner/CompoundForm.cpp b/GUI/View/SampleDesigner/CompoundForm.cpp
index b5d648719da..1dbf2ee7e4a 100644
--- a/GUI/View/SampleDesigner/CompoundForm.cpp
+++ b/GUI/View/SampleDesigner/CompoundForm.cpp
@@ -18,8 +18,8 @@
#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
+
#include <QAction>
-#include <QFormLayout>
#include <QPushButton>
CompoundForm::CompoundForm(QWidget* parent, CompoundItem* compositionItem,
diff --git a/GUI/View/SampleDesigner/CompoundForm.h b/GUI/View/SampleDesigner/CompoundForm.h
index cbed67b963c..fc76beabe2a 100644
--- a/GUI/View/SampleDesigner/CompoundForm.h
+++ b/GUI/View/SampleDesigner/CompoundForm.h
@@ -15,17 +15,16 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_COMPOUNDFORM_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_COMPOUNDFORM_H
+#include <QFormLayout>
#include <QGroupBox>
-#include <QList>
+class SampleEditorController;
class CompoundItem;
class ItemWithParticles;
-class QAction;
-class QFormLayout;
-class SampleEditorController;
//! Form for editing a particle composition
class CompoundForm : public QGroupBox {
+ Q_OBJECT
public:
CompoundForm(QWidget* parent, CompoundItem* compositionItem, SampleEditorController* ec,
bool allowRemove = true);
diff --git a/GUI/View/SampleDesigner/CoreAndShellForm.h b/GUI/View/SampleDesigner/CoreAndShellForm.h
index 55e100d580c..9269a68487b 100644
--- a/GUI/View/SampleDesigner/CoreAndShellForm.h
+++ b/GUI/View/SampleDesigner/CoreAndShellForm.h
@@ -19,13 +19,14 @@
#include <QGroupBox>
#include <memory>
-class CoreAndShellItem;
class FormLayouter;
class GroupBoxCollapser;
+class CoreAndShellItem;
class SampleEditorController;
//! Form for editing a core/shell particle
class CoreAndShellForm : public QGroupBox {
+ Q_OBJECT
public:
CoreAndShellForm(QWidget* parent, CoreAndShellItem* item, SampleEditorController* ec,
bool allowRemove = true);
@@ -43,6 +44,7 @@ private:
void showCoreInRealspace();
void showShellInRealspace();
+private:
CoreAndShellItem* m_item;
QAction* m_removeAction = nullptr;
SampleEditorController* m_ec;
diff --git a/GUI/View/SampleDesigner/LayerForm.cpp b/GUI/View/SampleDesigner/LayerForm.cpp
index 7b8dadc7041..4be8963aa3c 100644
--- a/GUI/View/SampleDesigner/LayerForm.cpp
+++ b/GUI/View/SampleDesigner/LayerForm.cpp
@@ -21,7 +21,6 @@
#include "GUI/Support/Util/ActionFactory.h"
#include "GUI/Support/Util/WidgetMoverButton.h"
#include "GUI/View/Numeric/NumWidgetUtils.h"
-#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
diff --git a/GUI/View/SampleDesigner/LayerForm.h b/GUI/View/SampleDesigner/LayerForm.h
index 14dd31a216b..b7d06afbf01 100644
--- a/GUI/View/SampleDesigner/LayerForm.h
+++ b/GUI/View/SampleDesigner/LayerForm.h
@@ -15,18 +15,16 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERFORM_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERFORM_H
+#include "GUI/View/SampleDesigner/FormLayouter.h"
#include <QGroupBox>
#include <memory>
-class FormLayouter;
class GroupBoxCollapser;
-class LayerItem;
-class ParticleLayoutItem;
-class SampleEditorController;
class WidgetMoverButton;
//! Form for editing a layer
class LayerForm : public QGroupBox {
+ Q_OBJECT
public:
LayerForm(QWidget* parent, LayerItem* layer, SampleEditorController* ec);
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.h b/GUI/View/SampleDesigner/MaterialInplaceForm.h
index c04bbb4afda..068ff3756be 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.h
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.h
@@ -15,14 +15,15 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_MATERIALINPLACEFORM_H
+#include <QGridLayout>
#include <QWidget>
class ItemWithMaterial;
-class QGridLayout;
class SampleEditorController;
//! Form to select a material and to edit it in-place
class MaterialInplaceForm : public QWidget {
+ Q_OBJECT
public:
MaterialInplaceForm(QWidget* parent, ItemWithMaterial* item, SampleEditorController* ec);
diff --git a/GUI/View/SampleDesigner/ParticleForm.h b/GUI/View/SampleDesigner/ParticleForm.h
index 12b68eb011a..72df522b130 100644
--- a/GUI/View/SampleDesigner/ParticleForm.h
+++ b/GUI/View/SampleDesigner/ParticleForm.h
@@ -22,6 +22,7 @@ class SampleEditorController;
//! Form for editing a particle
class ParticleForm : public QGroupBox {
+ Q_OBJECT
public:
ParticleForm(QWidget* parent, ParticleItem* item, bool allowAbundance,
SampleEditorController* ec, bool allowRemove = true);
diff --git a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
index 971da766332..06987ba3f88 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
+++ b/GUI/View/SampleDesigner/ParticleLayoutForm.cpp
@@ -20,7 +20,6 @@
#include "GUI/Model/Sample/ParticleLayoutItem.h"
#include "GUI/Support/Util/ActionFactory.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
-#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/InterferenceForm.h"
#include "GUI/View/SampleDesigner/LayerEditorUtils.h"
#include "GUI/View/SampleDesigner/LayerForm.h"
diff --git a/GUI/View/SampleDesigner/ParticleLayoutForm.h b/GUI/View/SampleDesigner/ParticleLayoutForm.h
index 957801999ba..498520d6224 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutForm.h
+++ b/GUI/View/SampleDesigner/ParticleLayoutForm.h
@@ -19,16 +19,17 @@
#include <QGroupBox>
#include <QList>
-class DoubleSpinBox;
-class GroupBoxCollapser;
-class ItemWithParticles;
+class SampleEditorController;
+class ParticleLayoutItem;
class LayerForm;
+class ItemWithParticles;
+class DoubleSpinBox;
class LayerItem;
-class ParticleLayoutItem;
-class SampleEditorController;
+class GroupBoxCollapser;
//! Form for editing a particle layout
class ParticleLayoutForm : public QGroupBox {
+ Q_OBJECT
public:
ParticleLayoutForm(LayerForm* parent, ParticleLayoutItem* layoutItem,
SampleEditorController* ec);
diff --git a/GUI/View/SampleDesigner/SampleForm.cpp b/GUI/View/SampleDesigner/SampleForm.cpp
index 51b573aaa2e..d8348d660f6 100644
--- a/GUI/View/SampleDesigner/SampleForm.cpp
+++ b/GUI/View/SampleDesigner/SampleForm.cpp
@@ -19,19 +19,16 @@
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/SampleDesigner/CompoundForm.h"
#include "GUI/View/SampleDesigner/CoreAndShellForm.h"
-#include "GUI/View/SampleDesigner/FormLayouter.h"
#include "GUI/View/SampleDesigner/LayerForm.h"
#include "GUI/View/SampleDesigner/MesocrystalForm.h"
#include "GUI/View/SampleDesigner/ParticleForm.h"
#include "GUI/View/SampleDesigner/ParticleLayoutForm.h"
-#include "GUI/View/SampleDesigner/SampleEditorController.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
-#include "GUI/View/Tool/LayoutUtils.h"
+#include <QBoxLayout>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QTextEdit>
-#include <QVBoxLayout>
namespace {
diff --git a/GUI/View/SampleDesigner/SampleForm.h b/GUI/View/SampleDesigner/SampleForm.h
index 9dd5792dcbb..d2771a9f29c 100644
--- a/GUI/View/SampleDesigner/SampleForm.h
+++ b/GUI/View/SampleDesigner/SampleForm.h
@@ -15,17 +15,17 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEFORM_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_SAMPLEFORM_H
-#include <QWidget>
+#include <QPushButton>
+#include <QVBoxLayout>
-class LayerForm;
-class LayerItem;
-class QPushButton;
-class QVBoxLayout;
-class SampleEditorController;
class SampleItem;
+class SampleEditorController;
+class LayerItem;
+class LayerForm;
//! Form to present/edit a sample
class SampleForm : public QWidget {
+ Q_OBJECT
public:
SampleForm(QWidget* parent, SampleItem* sampleItem, SampleEditorController* ec);
--
GitLab
From 836e6ab56c5cf31084064d79cfcfdf93d3c66715 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:16:37 +0100
Subject: [PATCH 04/12] sort fwd decls
---
GUI/View/Plot2D/IntensityDataCanvas.h | 2 +-
GUI/View/SampleDesigner/CompoundForm.h | 2 +-
GUI/View/SampleDesigner/CoreAndShellForm.h | 2 +-
GUI/View/SampleDesigner/ParticleLayoutForm.h | 10 +++++-----
GUI/View/SampleDesigner/SampleForm.h | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/GUI/View/Plot2D/IntensityDataCanvas.h b/GUI/View/Plot2D/IntensityDataCanvas.h
index 3aa14e6622e..7d74ec2794b 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.h
+++ b/GUI/View/Plot2D/IntensityDataCanvas.h
@@ -17,8 +17,8 @@
#include "GUI/View/Common/DataAccessWidget.h"
-class IntensityDataItem;
class ColorMapCanvas;
+class IntensityDataItem;
class QAction;
//! The IntensityDataCanvas class represents IntensityDataItem as color map,
diff --git a/GUI/View/SampleDesigner/CompoundForm.h b/GUI/View/SampleDesigner/CompoundForm.h
index fc76beabe2a..05c5e9dafa4 100644
--- a/GUI/View/SampleDesigner/CompoundForm.h
+++ b/GUI/View/SampleDesigner/CompoundForm.h
@@ -18,9 +18,9 @@
#include <QFormLayout>
#include <QGroupBox>
-class SampleEditorController;
class CompoundItem;
class ItemWithParticles;
+class SampleEditorController;
//! Form for editing a particle composition
class CompoundForm : public QGroupBox {
diff --git a/GUI/View/SampleDesigner/CoreAndShellForm.h b/GUI/View/SampleDesigner/CoreAndShellForm.h
index 9269a68487b..f67e430f701 100644
--- a/GUI/View/SampleDesigner/CoreAndShellForm.h
+++ b/GUI/View/SampleDesigner/CoreAndShellForm.h
@@ -19,9 +19,9 @@
#include <QGroupBox>
#include <memory>
+class CoreAndShellItem;
class FormLayouter;
class GroupBoxCollapser;
-class CoreAndShellItem;
class SampleEditorController;
//! Form for editing a core/shell particle
diff --git a/GUI/View/SampleDesigner/ParticleLayoutForm.h b/GUI/View/SampleDesigner/ParticleLayoutForm.h
index 498520d6224..c44fd7ca31a 100644
--- a/GUI/View/SampleDesigner/ParticleLayoutForm.h
+++ b/GUI/View/SampleDesigner/ParticleLayoutForm.h
@@ -19,13 +19,13 @@
#include <QGroupBox>
#include <QList>
-class SampleEditorController;
-class ParticleLayoutItem;
-class LayerForm;
-class ItemWithParticles;
class DoubleSpinBox;
-class LayerItem;
class GroupBoxCollapser;
+class ItemWithParticles;
+class LayerForm;
+class LayerItem;
+class ParticleLayoutItem;
+class SampleEditorController;
//! Form for editing a particle layout
class ParticleLayoutForm : public QGroupBox {
diff --git a/GUI/View/SampleDesigner/SampleForm.h b/GUI/View/SampleDesigner/SampleForm.h
index d2771a9f29c..726ee12f470 100644
--- a/GUI/View/SampleDesigner/SampleForm.h
+++ b/GUI/View/SampleDesigner/SampleForm.h
@@ -18,10 +18,10 @@
#include <QPushButton>
#include <QVBoxLayout>
-class SampleItem;
-class SampleEditorController;
-class LayerItem;
class LayerForm;
+class LayerItem;
+class SampleEditorController;
+class SampleItem;
//! Form to present/edit a sample
class SampleForm : public QWidget {
--
GitLab
From 15e95ecc599097c13d01c7a5b4b480904a0c8a32 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:21:12 +0100
Subject: [PATCH 05/12] Shorten class comment
---
GUI/View/Plot2D/ColorMapCanvas.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/GUI/View/Plot2D/ColorMapCanvas.h b/GUI/View/Plot2D/ColorMapCanvas.h
index 8982189fbf4..e32eaa9d5ff 100644
--- a/GUI/View/Plot2D/ColorMapCanvas.h
+++ b/GUI/View/Plot2D/ColorMapCanvas.h
@@ -23,8 +23,8 @@ class IntensityDataItem;
class PlotStatusLabel;
class QCustomPlot;
-//! The ColorMapCanvas class contains ColorMap for intensity data presentation, and provide
-//! control of font size, status string appearance
+//! Contains ColorMap for intensity data presentation, and provides control of font size.
+//! Controls appearance of the status string.
class ColorMapCanvas : public QWidget {
Q_OBJECT
--
GitLab
From 4f0fd8576bea311a9872896e203fd499a0541adb Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:30:20 +0100
Subject: [PATCH 06/12] rm duplicate label
---
GUI/View/SampleDesigner/CoreAndShellForm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/GUI/View/SampleDesigner/CoreAndShellForm.h b/GUI/View/SampleDesigner/CoreAndShellForm.h
index f67e430f701..4b3771c8b46 100644
--- a/GUI/View/SampleDesigner/CoreAndShellForm.h
+++ b/GUI/View/SampleDesigner/CoreAndShellForm.h
@@ -44,7 +44,6 @@ private:
void showCoreInRealspace();
void showShellInRealspace();
-private:
CoreAndShellItem* m_item;
QAction* m_removeAction = nullptr;
SampleEditorController* m_ec;
--
GitLab
From b2c8e4ad386205509828f570eb4d81259b88c49f Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:36:03 +0100
Subject: [PATCH 07/12] rm duplicate label
---
GUI/View/SampleDesigner/LayerForm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/GUI/View/SampleDesigner/LayerForm.h b/GUI/View/SampleDesigner/LayerForm.h
index b7d06afbf01..748c9e05cd8 100644
--- a/GUI/View/SampleDesigner/LayerForm.h
+++ b/GUI/View/SampleDesigner/LayerForm.h
@@ -39,7 +39,6 @@ public:
private:
void updateColor();
-private:
GroupBoxCollapser* m_collapser;
std::unique_ptr<FormLayouter> m_layouter;
LayerItem* m_layer;
--
GitLab
From 040882d17e9c067b58cb4c7b568aa9ee56d53b87 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:36:29 +0100
Subject: [PATCH 08/12] rm empty line
---
GUI/View/SampleDesigner/LayerForm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/GUI/View/SampleDesigner/LayerForm.h b/GUI/View/SampleDesigner/LayerForm.h
index 748c9e05cd8..4db6a65f046 100644
--- a/GUI/View/SampleDesigner/LayerForm.h
+++ b/GUI/View/SampleDesigner/LayerForm.h
@@ -50,5 +50,4 @@ private:
WidgetMoverButton* m_moveButton;
};
-
#endif // BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYERFORM_H
--
GitLab
From 7f3f7a7cab26e4ab1a9eabc77d6d6955ca7cb13a Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:22:47 +0100
Subject: [PATCH 09/12] rm Q_OBJECT from Plot2D classes
---
GUI/View/Plot2D/ColorMapCanvas.h | 2 --
GUI/View/Plot2D/IntensityDataCanvas.h | 1 -
GUI/View/Plot2D/IntensityDataWidget.h | 1 -
3 files changed, 4 deletions(-)
diff --git a/GUI/View/Plot2D/ColorMapCanvas.h b/GUI/View/Plot2D/ColorMapCanvas.h
index e32eaa9d5ff..1969d942162 100644
--- a/GUI/View/Plot2D/ColorMapCanvas.h
+++ b/GUI/View/Plot2D/ColorMapCanvas.h
@@ -27,8 +27,6 @@ class QCustomPlot;
//! Controls appearance of the status string.
class ColorMapCanvas : public QWidget {
- Q_OBJECT
-
public:
explicit ColorMapCanvas(QWidget* parent = nullptr);
diff --git a/GUI/View/Plot2D/IntensityDataCanvas.h b/GUI/View/Plot2D/IntensityDataCanvas.h
index 7d74ec2794b..2c08e2502d6 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.h
+++ b/GUI/View/Plot2D/IntensityDataCanvas.h
@@ -25,7 +25,6 @@ class QAction;
//! provides standard actions (reset view, save as) for external toolbars and context menus.
class IntensityDataCanvas : public DataAccessWidget {
- Q_OBJECT
public:
explicit IntensityDataCanvas(QWidget* parent = nullptr);
diff --git a/GUI/View/Plot2D/IntensityDataWidget.h b/GUI/View/Plot2D/IntensityDataWidget.h
index 10f8c383358..4e1d014dadc 100644
--- a/GUI/View/Plot2D/IntensityDataWidget.h
+++ b/GUI/View/Plot2D/IntensityDataWidget.h
@@ -26,7 +26,6 @@ class IntensityDataFFTPresenter;
//! (ItemPropertyWidget) of intensity data item.
class IntensityDataWidget : public DataAccessWidget {
- Q_OBJECT
public:
IntensityDataWidget(QWidget* parent = nullptr);
--
GitLab
From 5158c82442811f99058218b45f824e8eb75bcdc9 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:29:47 +0100
Subject: [PATCH 10/12] rm 1 Q_OBJECT
---
GUI/View/SampleDesigner/MaterialInplaceForm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/GUI/View/SampleDesigner/MaterialInplaceForm.h b/GUI/View/SampleDesigner/MaterialInplaceForm.h
index 068ff3756be..e18074cadc1 100644
--- a/GUI/View/SampleDesigner/MaterialInplaceForm.h
+++ b/GUI/View/SampleDesigner/MaterialInplaceForm.h
@@ -23,7 +23,6 @@ class SampleEditorController;
//! Form to select a material and to edit it in-place
class MaterialInplaceForm : public QWidget {
- Q_OBJECT
public:
MaterialInplaceForm(QWidget* parent, ItemWithMaterial* item, SampleEditorController* ec);
--
GitLab
From 22bb6024470538b9626ac8cb662772503c304baf Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:32:00 +0100
Subject: [PATCH 11/12] rm 1 Q_OBJECT
---
GUI/View/SampleDesigner/CoreAndShellForm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/GUI/View/SampleDesigner/CoreAndShellForm.h b/GUI/View/SampleDesigner/CoreAndShellForm.h
index 4b3771c8b46..55e100d580c 100644
--- a/GUI/View/SampleDesigner/CoreAndShellForm.h
+++ b/GUI/View/SampleDesigner/CoreAndShellForm.h
@@ -26,7 +26,6 @@ class SampleEditorController;
//! Form for editing a core/shell particle
class CoreAndShellForm : public QGroupBox {
- Q_OBJECT
public:
CoreAndShellForm(QWidget* parent, CoreAndShellItem* item, SampleEditorController* ec,
bool allowRemove = true);
--
GitLab
From 55a0e902fcfaf4ad18b93d36bad5b93cd6fae087 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Mar 2023 15:34:42 +0100
Subject: [PATCH 12/12] rm 1 Q_OBJECT
---
GUI/View/SampleDesigner/CompoundForm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/GUI/View/SampleDesigner/CompoundForm.h b/GUI/View/SampleDesigner/CompoundForm.h
index 05c5e9dafa4..1bd0884d909 100644
--- a/GUI/View/SampleDesigner/CompoundForm.h
+++ b/GUI/View/SampleDesigner/CompoundForm.h
@@ -24,7 +24,6 @@ class SampleEditorController;
//! Form for editing a particle composition
class CompoundForm : public QGroupBox {
- Q_OBJECT
public:
CompoundForm(QWidget* parent, CompoundItem* compositionItem, SampleEditorController* ec,
bool allowRemove = true);
--
GitLab