From 4e0bb917b14eaade2443053c8c128a674fdb8d7e Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Wed, 19 Nov 2025 20:21:31 +0100 Subject: [PATCH] jfjoch_viewer: Make resolution rings separate section --- viewer/JFJochViewerSidePanel.cpp | 26 +++++++++++++------------ viewer/widgets/ResolutionRingWidget.cpp | 1 - 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/viewer/JFJochViewerSidePanel.cpp b/viewer/JFJochViewerSidePanel.cpp index c9390d27..e4b7a3e1 100644 --- a/viewer/JFJochViewerSidePanel.cpp +++ b/viewer/JFJochViewerSidePanel.cpp @@ -24,7 +24,6 @@ JFJochViewerSidePanel::JFJochViewerSidePanel(QWidget *parent) : QWidget(parent) layout->addWidget(new TitleLabel("Image features", this)); - // Image features... auto spotToggleCheckBox = new QCheckBox("Show spots", this); spotToggleCheckBox->setCheckState(Qt::CheckState::Checked); @@ -39,15 +38,6 @@ JFJochViewerSidePanel::JFJochViewerSidePanel(QWidget *parent) : QWidget(parent) connect(predictionsToggleCheckBox, &QCheckBox::toggled, this, &JFJochViewerSidePanel::predictionsToggled); - res_rings = new ResolutionRingWidget(this); - - connect(res_rings, &ResolutionRingWidget::resRingsSet, [this] (const QVector &v) { - emit resRingsSet(v); - }); - - connect(res_rings, &ResolutionRingWidget::ringModeSet, [this] (JFJochDiffractionImage::RingMode mode) { - emit ringModeSet(mode); - }); auto highestPixelsComboBox = new QComboBox(this); highestPixelsComboBox->addItem("Show 0 highest pixels", 0); @@ -94,10 +84,22 @@ JFJochViewerSidePanel::JFJochViewerSidePanel(QWidget *parent) : QWidget(parent) image_feature_grid->addWidget(highestPixelsComboBox, 2, 1); image_feature_grid->addWidget(colorSelectButton, 3, 0); image_feature_grid->addWidget(spotColorSelectButton, 3, 1); - image_feature_grid->addWidget(res_rings, 4, 0, 1, 2); - + layout->addLayout(image_feature_grid); + layout->addWidget(new TitleLabel("Resolution rings", this)); + res_rings = new ResolutionRingWidget(this); + + connect(res_rings, &ResolutionRingWidget::resRingsSet, [this] (const QVector &v) { + emit resRingsSet(v); + }); + + connect(res_rings, &ResolutionRingWidget::ringModeSet, [this] (JFJochDiffractionImage::RingMode mode) { + emit ringModeSet(mode); + }); + + layout->addWidget(res_rings); + layout->addWidget(new TitleLabel("Image statistics plot", this)); chart = new JFJochViewerSidePanelChart(this); layout->addWidget(chart); diff --git a/viewer/widgets/ResolutionRingWidget.cpp b/viewer/widgets/ResolutionRingWidget.cpp index 1221823a..1659e753 100644 --- a/viewer/widgets/ResolutionRingWidget.cpp +++ b/viewer/widgets/ResolutionRingWidget.cpp @@ -28,7 +28,6 @@ ResolutionRingWidget::ResolutionRingWidget(QWidget *parent) button_group->addButton(est_button, 3); QVBoxLayout *layout = new QVBoxLayout(this); - layout->addWidget(new QLabel("Resolution rings")); layout->addWidget(none_button); layout->addWidget(auto_button);