Skip to content
Snippets Groups Projects
Commit a5330e21 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

make source editors non-collapsible

parent e036b4cf
No related branches found
No related tags found
1 merge request!2097Make subforms of 'GISASBeamEditor' and 'ScanEditor' non-collapsible (#825)
...@@ -22,11 +22,10 @@ ...@@ -22,11 +22,10 @@
#include <QFormLayout> #include <QFormLayout>
FootprintForm::FootprintForm(QWidget* parent, SourceItem* item) FootprintForm::FootprintForm(QWidget* parent, SourceItem* item)
: CollapsibleGroupBox("Footprint correction", parent, item->expandFootprint) : QGroupBox("Footprint correction", parent)
, m_item(item) , m_item(item)
{ {
m_formLayout = new QFormLayout; m_formLayout = new QFormLayout(this);
body()->setLayout(m_formLayout);
m_formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint); m_formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
ASSERT(item->footprintSelection().currentItem()); ASSERT(item->footprintSelection().currentItem());
auto* typeCombo = GUI::Util::createComboBoxFromProperty( auto* typeCombo = GUI::Util::createComboBoxFromProperty(
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_DEVICE_FOOTPRINTFORM_H #ifndef BORNAGAIN_GUI_VIEW_DEVICE_FOOTPRINTFORM_H
#define BORNAGAIN_GUI_VIEW_DEVICE_FOOTPRINTFORM_H #define BORNAGAIN_GUI_VIEW_DEVICE_FOOTPRINTFORM_H
#include "GUI/View/Widget/GroupBoxes.h" #include <QGroupBox>
class QFormLayout; class QFormLayout;
class SourceItem; class SourceItem;
...@@ -23,7 +23,7 @@ class SourceItem; ...@@ -23,7 +23,7 @@ class SourceItem;
//! FootprintCorrection editor (i.e. background) for instrument editors. //! FootprintCorrection editor (i.e. background) for instrument editors.
//! Operates on InstrumentItem. //! Operates on InstrumentItem.
class FootprintForm : public CollapsibleGroupBox { class FootprintForm : public QGroupBox {
Q_OBJECT Q_OBJECT
public: public:
FootprintForm(QWidget* parent, SourceItem* item); FootprintForm(QWidget* parent, SourceItem* item);
......
...@@ -20,11 +20,10 @@ ...@@ -20,11 +20,10 @@
#include "GUI/View/Instrument/DistributionSelector.h" #include "GUI/View/Instrument/DistributionSelector.h"
AlphaScanEditor::AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool allow_distr) AlphaScanEditor::AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool allow_distr)
: CollapsibleGroupBox("Grazing angles (deg)", parent, item->expandGroupBox) : QGroupBox("Grazing angles (deg)", parent)
, m_item(item) , m_item(item)
{ {
auto* layout = new QHBoxLayout; auto* layout = new QHBoxLayout(this);
body()->setLayout(layout);
auto* gform = new QFormLayout; auto* gform = new QFormLayout;
layout->addLayout(gform); layout->addLayout(gform);
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_ALPHASCANEDITOR_H #ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_ALPHASCANEDITOR_H
#define BORNAGAIN_GUI_VIEW_INSTRUMENT_ALPHASCANEDITOR_H #define BORNAGAIN_GUI_VIEW_INSTRUMENT_ALPHASCANEDITOR_H
#include "GUI/View/Widget/GroupBoxes.h" #include <QGroupBox>
class DistributionPlot; class DistributionPlot;
class DistributionSelector; class DistributionSelector;
...@@ -24,7 +24,7 @@ class SphericalAxisForm; ...@@ -24,7 +24,7 @@ class SphericalAxisForm;
//! Editor for scanning inclination angles //! Editor for scanning inclination angles
class AlphaScanEditor : public CollapsibleGroupBox { class AlphaScanEditor : public QGroupBox {
Q_OBJECT Q_OBJECT
public: public:
AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool allow_distr); AlphaScanEditor(QWidget* parent, GrazingScanItem* item, bool allow_distr);
......
...@@ -21,10 +21,9 @@ DistributionEditor::DistributionEditor(const QString& title, ...@@ -21,10 +21,9 @@ DistributionEditor::DistributionEditor(const QString& title,
const std::optional<MeanConfig>& mean_config, const std::optional<MeanConfig>& mean_config,
GUI::ID::Distributions distributions, QWidget* parent, GUI::ID::Distributions distributions, QWidget* parent,
BeamDistributionItem* item, bool allow_distr) BeamDistributionItem* item, bool allow_distr)
: CollapsibleGroupBox(title, parent, item->expandGroupBox) : QGroupBox(title, parent)
{ {
auto* layout = new QVBoxLayout; auto* layout = new QVBoxLayout(this);
body()->setLayout(layout);
m_selector = new DistributionSelector(mean_config, distributions, this, item, allow_distr); m_selector = new DistributionSelector(mean_config, distributions, this, item, allow_distr);
layout->addWidget(m_selector); layout->addWidget(m_selector);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "GUI/Support/Data/ID.h" #include "GUI/Support/Data/ID.h"
#include "GUI/View/Instrument/DistributionSelector.h" // MeanConfig #include "GUI/View/Instrument/DistributionSelector.h" // MeanConfig
#include "GUI/View/Widget/GroupBoxes.h" #include <QGroupBox>
#include <optional> #include <optional>
class BeamDistributionItem; class BeamDistributionItem;
...@@ -27,7 +27,7 @@ class DoubleSpinBox; ...@@ -27,7 +27,7 @@ class DoubleSpinBox;
//! DistributionSelector contained in a GroupBox with a title and a button //! DistributionSelector contained in a GroupBox with a title and a button
//! to open the distribution dialog //! to open the distribution dialog
class DistributionEditor : public CollapsibleGroupBox { class DistributionEditor : public QGroupBox {
Q_OBJECT Q_OBJECT
public: public:
DistributionEditor(const QString& title, const std::optional<MeanConfig>& mean_config, DistributionEditor(const QString& title, const std::optional<MeanConfig>& mean_config,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment