diff --git a/viewer/widgets/JFJochViewerImageStatistics.cpp b/viewer/widgets/JFJochViewerImageStatistics.cpp index bde745d7..a099e591 100644 --- a/viewer/widgets/JFJochViewerImageStatistics.cpp +++ b/viewer/widgets/JFJochViewerImageStatistics.cpp @@ -105,8 +105,9 @@ JFJochViewerImageStatistics::JFJochViewerImageStatistics(QWidget *parent) : QWid exposure_time = new QLabel(this); layout->addRow(new QLabel("Exposure Time:"), exposure_time); + rotation_angle_label = new QLabel(this); rotation_angle = new QLabel(this); - layout->addRow(new QLabel("Image angle:"), rotation_angle); + layout->addRow(rotation_angle_label, rotation_angle); valid_values = new QLabel(this); layout->addRow(new QLabel("Valid values:"), valid_values); @@ -156,6 +157,7 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptrsetToolTip(""); rotation_angle->setText(""); rotation_angle->setToolTip(""); + rotation_angle_label->setText(""); valid_values->setText(""); valid_values->setToolTip(""); spots->setText(""); @@ -201,16 +203,30 @@ void JFJochViewerImageStatistics::loadImage(std::shared_ptrsetToolTip(mkSampleTooltip(exp)); if (exp.GetGoniometer()) { + rotation_angle_label->setText("Image angle:"); rotation_angle->setText(QString("%1°") .arg(TrimZeros(exp.GetGoniometer()->GetIncrement_deg(), 3))); rotation_angle->setToolTip(QString("Start angle: %1°
This image: %2°") .arg(TrimZeros(exp.GetGoniometer()->GetStart_deg(), 3)) .arg(TrimZeros(exp.GetGoniometer()->GetAngle_deg(image->ImageData().number), 3)) - ); + ); + } else if (exp.GetGridScan()) { + rotation_angle_label->setText("Grid scan:"); + rotation_angle->setText(QString("%1 x %2 μm") + .arg(QString::number(exp.GetGridScan()->GetGridStepX_um(), 'f', 1)) + .arg(QString::number(exp.GetGridScan()->GetGridStepY_um(), 'f', 1))); + rotation_angle->setToolTip(QString("Grid size: %1 x %2 μm
" + "Grid elements: %3 x %4") + .arg(QString::number(exp.GetGridScan()->GetGridSizeX_um())) + .arg(QString::number(exp.GetGridScan()->GetGridSizeY_um())) + .arg(QString::number(exp.GetGridScan()->GetGridSizeX_step())) + .arg(QString::number(exp.GetGridScan()->GetGridSizeY_step()))); } else { - rotation_angle->setText(QString("-")); + rotation_angle_label->setText(""); + rotation_angle->setText(QString("")); rotation_angle->setToolTip(""); } + exposure_time->setText(QString("%1 s").arg(FormatTime(exp.GetImageTime()))); exposure_time->setToolTip(QString("Count time: %1 s
").arg(FormatTime(exp.GetImageCountTime()))); diff --git a/viewer/widgets/JFJochViewerImageStatistics.h b/viewer/widgets/JFJochViewerImageStatistics.h index dede97d8..9bcfcfb2 100644 --- a/viewer/widgets/JFJochViewerImageStatistics.h +++ b/viewer/widgets/JFJochViewerImageStatistics.h @@ -16,6 +16,7 @@ class JFJochViewerImageStatistics : public QWidget { QLabel *dataset_name; QLabel *detector_name; QLabel *exposure_time; + QLabel *rotation_angle_label; QLabel *rotation_angle; QLabel *spots; QLabel *valid_values;