leonarski_f
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>
47 lines
1.6 KiB
C++
47 lines
1.6 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include "JFJochReader.h"
|
|
#include "../common/BrokerStatus.h"
|
|
#include "../common/ImageBuffer.h"
|
|
|
|
class JFJochHttpReader : public JFJochReader {
|
|
mutable std::mutex http_mutex;
|
|
std::string addr;
|
|
|
|
std::optional<int64_t> last_image_buffer_counter;
|
|
bool last_op_http_sync = false;
|
|
|
|
ImageBufferStatus GetImageBufferStatus() const;
|
|
|
|
bool LoadImage_i(std::shared_ptr<JFJochReaderDataset> &dataset,
|
|
DataMessage& message,
|
|
std::vector<uint8_t> &buffer,
|
|
int64_t image_number,
|
|
bool update_dataset) override;
|
|
std::shared_ptr<JFJochReaderDataset> UpdateDataset_i();
|
|
std::vector<float> GetPlot_i(const std::string &plot_type, float fill_value = 0.0) const;
|
|
public:
|
|
~JFJochHttpReader() override = default;
|
|
|
|
void ReadURL(const std::string& url);
|
|
uint64_t GetNumberOfImages() const override;
|
|
void Close() override;
|
|
|
|
// Refresh dataset/plots if the image buffer changed since the last poll (returns nullptr if
|
|
// unchanged). Always writes the current number of images to num_images_out. Does not load an image.
|
|
std::shared_ptr<const JFJochReaderDataset> RefreshDatasetIfChanged(int64_t &num_images_out);
|
|
|
|
void UploadUserMask(const std::vector<uint32_t>& mask);
|
|
|
|
BrokerStatus GetBrokerStatus() const;
|
|
|
|
std::shared_ptr<JFJochReaderRawImage> GetRawImage(int64_t image_number) override;
|
|
std::vector<SpotToSave> ReadSpots(int64_t image) const override;
|
|
};
|
|
|
|
|
|
|