56ddfaef96
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 11m38s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 11m49s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m55s
Build Packages / build:rpm (rocky8) (push) Successful in 12m55s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m4s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 13m16s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 14m12s
Build Packages / XDS test (durin plugin) (push) Successful in 8m5s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 8m1s
Build Packages / Generate python client (push) Successful in 19s
Build Packages / Create release (push) Skipped
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m55s
Build Packages / Build documentation (push) Successful in 45s
Build Packages / XDS test (neggia plugin) (push) Successful in 7m58s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 10m56s
Build Packages / build:rpm (rocky9) (push) Successful in 11m58s
Build Packages / DIALS test (push) Successful in 11m59s
Build Packages / Unit tests (push) Successful in 55m33s
Add a status-bar cluster, shown when connected over HTTP, that surfaces the broker state and live acquisition info: - broker state box (QProgressBar) with progress drawn as the bar fill, polled ~1 Hz on its own timer independent of image sync - Live/Disconnected connection badge (host:port in tooltip) - "+N new" badge and effective live-rate (Hz) readout All widgets are fixed-width and only blanked in place, so the bar never reflows when things appear/disappear. Add a third autoload mode (HTTPSyncDataset): manually selecting an image while following live now freezes the displayed image but keeps the dataset, plots and image count updating. Surfaced via a tri-state HTTP Sync button (off / live / data-only). Also fix GetBrokerStatus() dropping the message field and a couple of copy-pasted exception strings in JFJochHttpReader. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
129 lines
4.4 KiB
C++
129 lines
4.4 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "JFJochViewerStatusBar.h"
|
|
|
|
#include <algorithm>
|
|
|
|
JFJochViewerStatusBar::JFJochViewerStatusBar(QWidget *parent) : QStatusBar(parent) {
|
|
// Added left-to-right within the permanent (right-aligned) area.
|
|
conn_label = new QLabel(this);
|
|
conn_label->setFixedWidth(100);
|
|
conn_label->setAlignment(Qt::AlignCenter);
|
|
addPermanentWidget(conn_label);
|
|
|
|
state_box = new QProgressBar(this);
|
|
state_box->setFixedWidth(110);
|
|
state_box->setRange(0, 1000);
|
|
state_box->setValue(0);
|
|
state_box->setTextVisible(true);
|
|
state_box->setAlignment(Qt::AlignCenter);
|
|
state_box->setFormat("");
|
|
addPermanentWidget(state_box);
|
|
|
|
new_label = new QLabel(this);
|
|
new_label->setFixedWidth(70);
|
|
new_label->setAlignment(Qt::AlignCenter);
|
|
addPermanentWidget(new_label);
|
|
|
|
rate_label = new QLabel(this);
|
|
rate_label->setFixedWidth(60);
|
|
rate_label->setAlignment(Qt::AlignCenter);
|
|
addPermanentWidget(rate_label);
|
|
}
|
|
|
|
void JFJochViewerStatusBar::display(QString input) {
|
|
showMessage(input, 60000);
|
|
}
|
|
|
|
void JFJochViewerStatusBar::setBrokerStatus(BrokerStatus status) {
|
|
QString text;
|
|
switch (status.state) {
|
|
case JFJochState::Inactive: text = "Inactive"; break;
|
|
case JFJochState::Idle: text = "Idle"; break;
|
|
case JFJochState::Measuring: text = "Measuring"; break;
|
|
case JFJochState::Error: text = "Error"; break;
|
|
case JFJochState::Busy: text = "Busy"; break;
|
|
case JFJochState::Calibration: text = "Calibration"; break;
|
|
}
|
|
state_box->setFormat(text);
|
|
|
|
if (status.progress.has_value())
|
|
state_box->setValue(std::clamp(static_cast<int>(status.progress.value() * 1000.0f), 0, 1000));
|
|
else
|
|
state_box->setValue(0);
|
|
|
|
const QString chunk = (status.state == JFJochState::Error) ? "#d9534f" : "#5cb85c";
|
|
state_box->setStyleSheet(QString(
|
|
"QProgressBar { border: 1px solid #aaa; border-radius: 2px; background: transparent; }"
|
|
"QProgressBar::chunk { background-color: %1; }").arg(chunk));
|
|
|
|
if (status.message.has_value() && !status.message.value().empty())
|
|
state_box->setToolTip(QString::fromStdString(status.message.value()));
|
|
else
|
|
state_box->setToolTip(text);
|
|
}
|
|
|
|
void JFJochViewerStatusBar::setHttpConnection(bool connected, QString addr) {
|
|
if (addr.isEmpty()) {
|
|
// No detector session at all -> blank the whole cluster (but keep the reserved space).
|
|
conn_label->setText("");
|
|
conn_label->setToolTip("");
|
|
conn_label->setStyleSheet("");
|
|
state_box->setFormat("");
|
|
state_box->setValue(0);
|
|
state_box->setStyleSheet("");
|
|
state_box->setToolTip("");
|
|
rate_label->setText("");
|
|
new_label->setText("");
|
|
new_label->setStyleSheet("");
|
|
return;
|
|
}
|
|
|
|
conn_label->setToolTip(addr);
|
|
if (connected) {
|
|
conn_label->setText("Live");
|
|
conn_label->setStyleSheet("color: white; background-color: #5cb85c; border-radius: 3px;");
|
|
} else {
|
|
conn_label->setText("Disconnected");
|
|
conn_label->setStyleSheet("color: white; background-color: #d9534f; border-radius: 3px;");
|
|
// Connection lost: clear live readouts but keep the badge so the user sees why.
|
|
state_box->setFormat("");
|
|
state_box->setValue(0);
|
|
state_box->setToolTip("");
|
|
rate_label->setText("");
|
|
new_label->setText("");
|
|
}
|
|
}
|
|
|
|
void JFJochViewerStatusBar::setAutoloadMode(JFJochImageReadingWorker::AutoloadMode mode) {
|
|
autoload_mode = mode;
|
|
UpdateNewLabel();
|
|
}
|
|
|
|
void JFJochViewerStatusBar::setImageNumber(int64_t in_total_images, int64_t in_current_image) {
|
|
total_images = in_total_images;
|
|
current_image = in_current_image;
|
|
UpdateNewLabel();
|
|
}
|
|
|
|
void JFJochViewerStatusBar::setLiveRate(double hz) {
|
|
if (hz > 0.0)
|
|
rate_label->setText(QString::number(hz, 'f', 1) + " Hz");
|
|
else
|
|
rate_label->setText("");
|
|
}
|
|
|
|
void JFJochViewerStatusBar::UpdateNewLabel() {
|
|
if (autoload_mode == JFJochImageReadingWorker::AutoloadMode::HTTPSyncDataset) {
|
|
const int64_t n = total_images - 1 - current_image;
|
|
if (n > 0) {
|
|
new_label->setText(QString("+%1 new").arg(n));
|
|
new_label->setStyleSheet("color: #f0ad4e; font-weight: bold;");
|
|
return;
|
|
}
|
|
}
|
|
new_label->setText("");
|
|
new_label->setStyleSheet("");
|
|
}
|