mx/Jungfraujoch
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 33 Wiki Activity

v1.0.0-rc.105 #10

Merged
leonarski_f merged 7 commits from 2511-1.0.0-rc.105 into main 2025-11-20 09:46:26 +01:00
Conversation 0 Commits 7 Files Changed 152 +14 -13
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4e0bb917b1 - Show all commits

26
viewer/JFJochViewerSidePanel.cpp
View File

@@ -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<float> &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<float> &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);

1
viewer/widgets/ResolutionRingWidget.cpp
View File

@@ -28,7 +28,6 @@ ResolutionRingWidget::ResolutionRingWidget(QWidget *parent)
button_group->addButton(est_button, 3);
QVBoxLayout *layout = new QVBoxLayout(this);
layout->addWidget(new QLabel("<b>Resolution rings</b>"));
layout->addWidget(none_button);
layout->addWidget(auto_button);