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

viewer: per-image plot reuses the dataset-info combo (no second combo)

Browse Source 
In per-image mode the embedded chart brought its own combo box, so the plot
panel showed two. Drop the per-image chart's combo and drive it from the one
dataset-info combo:

- JFJochViewerSidePanelChart loses its combo; it exposes PlotTypes() (the
  available profiles) and a setPlotType(code) slot, driven externally.
- JFJochViewerDatasetInfo fills its single combo with the per-image plot types
  while in per-image mode (per-dataset metrics otherwise) and routes the
  selection to the chart; dataset/runs/live updates leave the per-image combo
  and plot untouched.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
leonarski_f
2026-06-23 16:26:15 +02:00
co-authored by Claude Opus 4.8
parent 83d006e79b
commit 6ead87fcce
3 changed files with 90 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
viewer/widgets/JFJochViewerSidePanelChart.cpp
+53 -60
View File
@@ -6,78 +6,71 @@
JFJochViewerSidePanelChart::JFJochViewerSidePanelChart(QWidget *parent) : QWidget(parent) {
auto layout = new QVBoxLayout(this);
combo_box = new QComboBox(this);
combo_box->addItem("Azimuthal integration (1D)", 0);
combo_box->addItem("Wilson plot", 1);
combo_box->addItem("I/sigma", 2);
combo_box->addItem("Spots (count)", 5);
combo_box->addItem("Spots (intensity)", 6);
combo_box->addItem("X-ray fluorescence spectrum", 4);
layout->addWidget(combo_box);
connect(combo_box, &QComboBox::currentIndexChanged,
this, &JFJochViewerSidePanelChart::comboBoxSelected);
layout->setContentsMargins(0, 0, 0, 0);
azint_plot = new JFJochSimpleChartView(this);
layout->addWidget(azint_plot); // index 0
layout->addWidget(azint_plot);
setLayout(layout);
connect(azint_plot, &JFJochSimpleChartView::writeStatusBar,
[&](QString string, int timeout_ms) {
emit writeStatusBar(string, timeout_ms);
});
[&](QString string, int timeout_ms) { emit writeStatusBar(string, timeout_ms); });
}
void JFJochViewerSidePanelChart::comboBoxSelected(int val) {
QList<QPair<QString, int>> JFJochViewerSidePanelChart::PlotTypes() {
return {
{"Azimuthal integration (1D)", 0},
{"Wilson plot", 1},
{"I/sigma", 2},
{"Spots (count)", 5},
{"Spots (intensity)", 6},
{"X-ray fluorescence spectrum", 4},
};
}
void JFJochViewerSidePanelChart::setPlotType(int code) {
plot_type_ = code;
redrawPlot();
}
void JFJochViewerSidePanelChart::redrawPlot() {
if (!image)
return;
std::vector<float> x, y;
if (image) {
auto index = combo_box->currentIndex();
switch (combo_box->itemData(index).toInt()) {
case 0:
x = image->GetAzInt1D_BinToQ();
y = image->GetAzInt1D();
azint_plot->UpdateData(x, y, "Q [Å^-1]", "", false);
break;
case 1:
x = image->ImageData().integration_B_one_over_d_square;
y = image->ImageData().integration_B_logI;
azint_plot->UpdateData(x, y, "d [Å]", "ln(&lt;I&gt;)", true);
break;
case 2:
x = image->ImageData().integration_Isigma_one_over_d_square;
y = image->ImageData().integration_Isigma;
azint_plot->UpdateData(x, y, "d [Å]", "I/sigma", true);
break;
case 4:
x = image->Dataset().experiment.GetFluorescenceSpectrum().GetEnergy_eV();
y = image->Dataset().experiment.GetFluorescenceSpectrum().GetData();
for (auto &iter: x)
iter /= 1000.0; // Convert eV to keV
azint_plot->UpdateData(x, y, "E [keV]", "", false);
break;
case 5:
x = image->ImageData().spot_plot_one_over_d_square;
y = image->ImageData().spot_plot_count;
azint_plot->UpdateData(x, y, "d [Å]", "Count", true);
break;
case 6:
x = image->ImageData().spot_plot_one_over_d_square;
y = image->ImageData().spot_plot_intensity;
azint_plot->UpdateData(x, y, "d [Å]", "Count", true);
break;
}
switch (plot_type_) {
case 0:
x = image->GetAzInt1D_BinToQ();
y = image->GetAzInt1D();
azint_plot->UpdateData(x, y, "Q [Å^-1]", "", false);
break;
case 1:
x = image->ImageData().integration_B_one_over_d_square;
y = image->ImageData().integration_B_logI;
azint_plot->UpdateData(x, y, "d [Å]", "ln(&lt;I&gt;)", true);
break;
case 2:
x = image->ImageData().integration_Isigma_one_over_d_square;
y = image->ImageData().integration_Isigma;
azint_plot->UpdateData(x, y, "d [Å]", "I/sigma", true);
break;
case 4:
x = image->Dataset().experiment.GetFluorescenceSpectrum().GetEnergy_eV();
y = image->Dataset().experiment.GetFluorescenceSpectrum().GetData();
for (auto &iter: x)
iter /= 1000.0; // Convert eV to keV
azint_plot->UpdateData(x, y, "E [keV]", "", false);
break;
case 5:
x = image->ImageData().spot_plot_one_over_d_square;
y = image->ImageData().spot_plot_count;
azint_plot->UpdateData(x, y, "d [Å]", "Count", true);
break;
case 6:
x = image->ImageData().spot_plot_one_over_d_square;
y = image->ImageData().spot_plot_intensity;
azint_plot->UpdateData(x, y, "d [Å]", "Count", true);
break;
}
}
void JFJochViewerSidePanelChart::loadImage(std::shared_ptr<const JFJochReaderImage> in_image) {