Skip to content
Snippets Groups Projects
Commit 930cb1aa authored by Matthias Puchner's avatar Matthias Puchner
Browse files

adapt editors to changed item classes

parent 797dfb20
No related branches found
No related tags found
1 merge request!624Remove SessionItem from Instrument items
Hide whitespace changes
Inline Side-by-side
Showing
with 147 additions and 32 deletions
GUI/View/Instrument/AxisPropertyEditor.cpp 0 → 100644
+ 71
− 0
View file @ 930cb1aa
// ************************************************************************************************
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Instrument/AxisPropertyEditor.cpp
//! @brief Implement class AxisPropertyEditor
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
//! @copyright Forschungszentrum Jülich GmbH 2022
//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
//
// ************************************************************************************************
#include "GUI/View/Instrument/AxisPropertyEditor.h"
#include "GUI/Model/Item/AxesItems.h"
#include "GUI/Model/Types/AxisProperty.h"
#include "GUI/View/Edit/DoubleSpinBox.h"
#include "GUI/View/Tool/WidgetUtils.h"
#include <QFormLayout>
#include <QGroupBox>
#include <QSpinBox>
AxisPropertyEditor::AxisPropertyEditor(QWidget* parent, const QString& groupTitle,
AxisProperty* axisProperty)
: QGroupBox(groupTitle, parent)
, m_axisProperty(axisProperty)
{
auto* formLayout = new QFormLayout(this);
nbinsSpinBox = GUI::Util::createSpinBox(formLayout, axisProperty->nbins());
m_minSpinBox = GUI::Util::createSpinBox(formLayout, axisProperty->min());
m_maxSpinBox = GUI::Util::createSpinBox(formLayout, axisProperty->max());
connect(nbinsSpinBox, qOverload<int>(&QSpinBox::valueChanged), [=](int v) {
if (axisProperty->nbins() != v) {
axisProperty->setNbins(v);
emit dataChanged();
}
});
connect(m_minSpinBox, qOverload<double>(&DoubleSpinBox::baseValueChanged), [=](double v) {
if (m_axisProperty->min() != v) {
m_axisProperty->setMin(v);
emit dataChanged();
if (m_axisProperty->max() < v) {
m_axisProperty->setMax(v);
m_maxSpinBox->updateValue();
}
}
});
connect(m_maxSpinBox, qOverload<double>(&DoubleSpinBox::baseValueChanged), [=](double v) {
if (m_axisProperty->max() != v) {
m_axisProperty->setMax(v);
emit dataChanged();
if (m_axisProperty->min() > v) {
m_axisProperty->setMin(v);
m_minSpinBox->updateValue();
}
}
});
}
void AxisPropertyEditor::updateData()
{
QSignalBlocker b(nbinsSpinBox);
nbinsSpinBox->setValue(m_axisProperty->nbins());
m_minSpinBox->updateValue();
m_maxSpinBox->updateValue();
}
GUI/View/Instrument/AxisPropertyEditor.h 0 → 100644
+ 47
− 0
View file @ 930cb1aa
// ************************************************************************************************
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Instrument/AxisPropertyEditor.h
//! @brief Defines class AxisPropertyEditor
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
//! @copyright Forschungszentrum Jülich GmbH 2022
//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_AxisPropertyEditor_H
#define BORNAGAIN_GUI_VIEW_INSTRUMENT_AxisPropertyEditor_H
#include <QGroupBox>
class QSpinBox;
class AxisProperty;
class DoubleSpinBox;
/// The form for a spherical axis: contains the bare bone widgets for the user to enter
/// the number of bins and to select the range in degrees (minimum & maximum)
/// The input widgets will be inserted in the form given in the constructor
class AxisPropertyEditor : public QGroupBox {
Q_OBJECT
public:
AxisPropertyEditor(QWidget* parent, const QString& groupTitle, AxisProperty* axisProperty);
//! Reload UI from data
void updateData();
signals:
void dataChanged();
private:
QSpinBox* nbinsSpinBox;
AxisProperty* m_axisProperty;
DoubleSpinBox* m_minSpinBox;
DoubleSpinBox* m_maxSpinBox;
};
#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_AxisPropertyEditor_H
GUI/View/Instrument/DepthProbeInstrumentEditor.cpp
+ 6
− 6
View file @ 930cb1aa
......@@ -15,6 +15,7 @@
#include "GUI/View/Instrument/DepthProbeInstrumentEditor.h"
#include "GUI/Model/Item/BeamWavelengthItem.h"
#include "GUI/Model/Item/InstrumentItems.h"
#include "GUI/View/Instrument/AxisPropertyEditor.h"
#include "GUI/View/Instrument/Detail/CreateDetails.h"
#include "GUI/View/Instrument/DistributionEditor.h"
#include "GUI/View/Instrument/InclinationAnglesEditor.h"
......@@ -39,15 +40,16 @@ DepthProbeInstrumentEditor::DepthProbeInstrumentEditor(QWidget* parent,
MeanConfig wave_cfg{boost::numeric::interval<double>(std::numeric_limits<double>::min(),
std::numeric_limits<double>::max()),
4, true};
auto* m_wavelengthEditor = new DistributionEditor("Wavelength [nm]", wave_cfg,
GUI::ID::Distributions::Symmetric, this);
auto* m_wavelengthEditor =
new DistributionEditor("Wavelength [nm]", wave_cfg, GUI::ID::Distributions::Symmetric, this,
instrument->beamItem()->wavelengthItem());
grid->addWidget(m_wavelengthEditor, 1, 0);
auto* inclinationEditor =
new InclinationAnglesEditor(this, instrument->beamItem()->inclinationAngleItem());
grid->addWidget(inclinationEditor, 1, 1);
auto* depthAxisEditor = new SphericalAxisEditor("Depth axis [nm]", this, instrument->zAxis());
auto* depthAxisEditor = new AxisPropertyEditor(this, "Depth axis [nm]", &instrument->zAxis());
grid->addWidget(depthAxisEditor, 1, 2);
layout->addWidget(GUI::Detail::createDetailsWidget(grid, "Parameters"));
......@@ -58,13 +60,11 @@ DepthProbeInstrumentEditor::DepthProbeInstrumentEditor(QWidget* parent,
layout->addStretch();
m_wavelengthEditor->setItem(instrument->beamItem()->wavelengthItem());
connect(m_wavelengthEditor, &DistributionEditor::distributionChanged, this,
&DepthProbeInstrumentEditor::dataChanged);
connect(inclinationEditor, &InclinationAnglesEditor::dataChanged, this,
&DepthProbeInstrumentEditor::dataChanged);
connect(depthAxisEditor, &SphericalAxisEditor::dataChanged, this,
connect(depthAxisEditor, &AxisPropertyEditor::dataChanged, this,
&DepthProbeInstrumentEditor::dataChanged);
connect(polpairAnalysisEditor, &PolarizationAnalysisEditor::dataChanged, this,
&DepthProbeInstrumentEditor::dataChanged);
......
GUI/View/Instrument/GISASBeamEditor.cpp
+ 8
− 9
View file @ 930cb1aa
......@@ -43,26 +43,25 @@ GISASBeamEditor::GISASBeamEditor(QWidget* parent, BeamItem* item)
MeanConfig wave_cfg{boost::numeric::interval<double>(std::numeric_limits<double>::min(),
std::numeric_limits<double>::max()),
4, true};
auto* wavelengthEditor =
new DistributionEditor("Wavelength [nm]", wave_cfg, GUI::ID::Distributions::All, this);
auto* wavelengthEditor = new DistributionEditor(
"Wavelength [nm]", wave_cfg, GUI::ID::Distributions::All, this, item->wavelengthItem());
grid->addWidget(wavelengthEditor, 1, 0);
// valid input range is [0,90]
MeanConfig incl_cfg{boost::numeric::interval<double>(0.0, 90.0), 3, false};
auto* inclinationEditor = new DistributionEditor("Inclination angle [deg]", incl_cfg,
GUI::ID::Distributions::All, this);
auto* inclinationEditor =
new DistributionEditor("Inclination angle [deg]", incl_cfg, GUI::ID::Distributions::All,
this, item->inclinationAngleItem());
grid->addWidget(inclinationEditor, 1, 1);
// valid input range is [-90,90]
MeanConfig azim_cfg{boost::numeric::interval<double>(-90.0, 90.0), 3, false};
auto* azimuthalEditor = new DistributionEditor("Azimuthal angle [deg]", azim_cfg,
GUI::ID::Distributions::All, this);
auto* azimuthalEditor =
new DistributionEditor("Azimuthal angle [deg]", azim_cfg, GUI::ID::Distributions::All, this,
item->azimuthalAngleItem());
grid->addWidget(azimuthalEditor, 1, 2);
intensityEditor->setText(QString::number(item->intensity()));
wavelengthEditor->setItem(item->wavelengthItem());
inclinationEditor->setItem(item->inclinationAngleItem());
azimuthalEditor->setItem(item->azimuthalAngleItem());
connect(wavelengthEditor, &DistributionEditor::distributionChanged, this,
&GISASBeamEditor::dataChanged);
......
GUI/View/Instrument/OffSpecularBeamEditor.cpp
+ 5
− 6
View file @ 930cb1aa
......@@ -49,7 +49,8 @@ OffSpecularBeamEditor::OffSpecularBeamEditor(QWidget* parent, OffSpecularInstrum
std::numeric_limits<double>::max()),
4, true};
auto* wavelengthEditor =
new DistributionEditor("Wavelength [nm]", wave_cfg, GUI::ID::Distributions::All, this);
new DistributionEditor("Wavelength [nm]", wave_cfg, GUI::ID::Distributions::All, this,
item->beamItem()->wavelengthItem());
grid->addWidget(wavelengthEditor, 1, 0);
auto* inclinationEditor =
......@@ -58,15 +59,13 @@ OffSpecularBeamEditor::OffSpecularBeamEditor(QWidget* parent, OffSpecularInstrum
// valid input range is [-90,90]
MeanConfig azim_cfg{boost::numeric::interval<double>(-90.0, 90.0), 3, false};
auto* azimuthalEditor = new DistributionEditor("Azimuthal angle [deg]", azim_cfg,
GUI::ID::Distributions::All, this);
auto* azimuthalEditor =
new DistributionEditor("Azimuthal angle [deg]", azim_cfg, GUI::ID::Distributions::All, this,
item->beamItem()->azimuthalAngleItem());
grid->addWidget(azimuthalEditor, 1, 2);
intensityEditor->setText(QString::number(item->beamItem()->intensity()));
wavelengthEditor->setItem(item->beamItem()->wavelengthItem());
azimuthalEditor->setItem(item->beamItem()->azimuthalAngleItem());
connect(wavelengthEditor, &DistributionEditor::distributionChanged, this,
&OffSpecularBeamEditor::dataChanged);
connect(inclinationEditor, &SphericalAxisEditor::dataChanged, this,
......
GUI/View/Instrument/PolarizationAnalysisEditor.cpp
+ 2
− 2
View file @ 930cb1aa
......@@ -82,8 +82,8 @@ PolarizationAnalysisEditor::PolarizationAnalysisEditor(QWidget* parent, Instrume
onCheckBoxToggled();
m_checkbox->setChecked(m_instrument->withPolarizerAnalyzer());
m_polarizerEditor->setVector(m_instrument->polarizationVector());
m_analyzerEditor->setVector(m_instrument->analyzerDirectionVector());
m_polarizerEditor->setVector(m_instrument->polarization());
m_analyzerEditor->setVector(m_instrument->analyzerDirection());
connect(m_polarizerEditor, &VectorEditor::vectorChanged, this,
&PolarizationAnalysisEditor::dataChanged);
......
GUI/View/Instrument/SpecularBeamEditor.cpp
+ 3
− 3
View file @ 930cb1aa
......@@ -50,8 +50,9 @@ SpecularBeamEditor::SpecularBeamEditor(QWidget* parent, SpecularBeamItem* item,
MeanConfig wave_cfg{boost::numeric::interval<double>(std::numeric_limits<double>::min(),
std::numeric_limits<double>::max()),
4, true};
auto* wavelengthEditor = new DistributionEditor("Wavelength [nm]", wave_cfg,
GUI::ID::Distributions::Symmetric, this);
auto* wavelengthEditor =
new DistributionEditor("Wavelength [nm]", wave_cfg, GUI::ID::Distributions::Symmetric, this,
item->wavelengthItem());
grid->addWidget(wavelengthEditor, 1, 0);
auto* inclinationEditor = new InclinationAnglesEditor(this, item->inclinationAngleItem());
......@@ -61,7 +62,6 @@ SpecularBeamEditor::SpecularBeamEditor(QWidget* parent, SpecularBeamItem* item,
grid->addWidget(footprintEditor, 1, 2);
intensityLineEdit->setText(QString::number(item->intensity()));
wavelengthEditor->setItem(item->wavelengthItem());
// order of the next two connections is important! Indicators have to be recalculated first,
// then updated (recalculation is done in EditController)
......
GUI/View/Instrument/SphericalDetectorEditor.cpp
+ 5
− 6
View file @ 930cb1aa
......@@ -14,9 +14,8 @@
#include "GUI/View/Instrument/SphericalDetectorEditor.h"
#include "GUI/Model/Item/SphericalDetectorItem.h"
#include "GUI/View/Instrument/AxisPropertyEditor.h"
#include "GUI/View/Instrument/ResolutionFunctionEditor.h"
#include "GUI/View/Instrument/SphericalAxisEditor.h"
#include <QGridLayout>
SphericalDetectorEditor::SphericalDetectorEditor(QWidget* parent, SphericalDetectorItem* item)
......@@ -28,10 +27,10 @@ SphericalDetectorEditor::SphericalDetectorEditor(QWidget* parent, SphericalDetec
grid->setColumnStretch(1, 1);
grid->setColumnStretch(2, 1);
auto* phiAxisEditor = new SphericalAxisEditor(u8"\u03c6 axis", this, item->phiAxisItem());
auto* phiAxisEditor = new AxisPropertyEditor(this, u8"\u03c6 axis", &item->phiAxis());
grid->addWidget(phiAxisEditor, 1, 0);
auto* alphaAxisEditor = new SphericalAxisEditor(u8"\u03b1 axis", this, item->alphaAxisItem());
auto* alphaAxisEditor = new AxisPropertyEditor(this, u8"\u03b1 axis", &item->alphaAxis());
grid->addWidget(alphaAxisEditor, 1, 1);
auto* resolutionFunctionEditor =
......@@ -40,10 +39,10 @@ SphericalDetectorEditor::SphericalDetectorEditor(QWidget* parent, SphericalDetec
grid->setRowStretch(2, 1);
connect(phiAxisEditor, &SphericalAxisEditor::dataChanged, this,
connect(phiAxisEditor, &AxisPropertyEditor::dataChanged, this,
&SphericalDetectorEditor::dataChanged);
connect(alphaAxisEditor, &SphericalAxisEditor::dataChanged, this,
connect(alphaAxisEditor, &AxisPropertyEditor::dataChanged, this,
&SphericalDetectorEditor::dataChanged);
connect(resolutionFunctionEditor, &ResolutionFunctionEditor::dataChanged, this,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment