leonarski_fandClaude Opus 4.8
2af822436e
- "Remove result" toolbar action drops a reprocessing run: reader RemoveSnapshot (Original is protected; if the removed run was active the view falls back to Original), worker RemoveRun, and the table row is removed. - Opening a new file clears the jobs table (worker fileOpened -> clearJobs) to match the reader, which already resets snapshots on ReadFile. - Plot fixes: each run keeps a stable colour by its position (Original = blue), so colours no longer swap when the active run changes; the current-image marker is hidden from the legend (was the stray "[Image #N]" entry). - The status bar shows processing rate (Hz) and estimated remaining time while a job runs. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
71 lines
2.8 KiB
C++
71 lines
2.8 KiB
C++
// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <optional>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "JFJochReader.h"
|
|
#include "JFJochReaderSpots.h"
|
|
#include "HDF5ImageSource.h"
|
|
#include "HDF5MetadataSource.h"
|
|
#include "../writer/HDF5Objects.h"
|
|
#include "../image_analysis/IntegrationOutcome.h"
|
|
|
|
// Composes one shared raw-image source with one or more metadata sources ("snapshots") over the
|
|
// same images: the original _master.h5 plus optional reprocessing _process.h5 results. The active
|
|
// snapshot supplies the dataset and per-image metadata; the image source always supplies pixels,
|
|
// so switching snapshots never reloads image data.
|
|
class JFJochHDF5Reader : public JFJochReader {
|
|
HDF5ImageSource image_source_;
|
|
std::map<std::string, std::shared_ptr<HDF5MetadataSource> > snapshots_;
|
|
std::shared_ptr<HDF5MetadataSource> active_metadata_;
|
|
std::string active_snapshot_;
|
|
size_t number_of_images = 0;
|
|
|
|
bool LoadImage_i(std::shared_ptr<JFJochReaderDataset> &dataset,
|
|
DataMessage &message,
|
|
std::vector<uint8_t> &buffer,
|
|
int64_t image_number,
|
|
bool update_dataset) override;
|
|
|
|
HDF5ImageLocator::Location GetImageLocation(int64_t image_number) const;
|
|
|
|
public:
|
|
~JFJochHDF5Reader() override = default;
|
|
|
|
void ReadFile(const std::string &filename);
|
|
|
|
uint64_t GetNumberOfImages() const override;
|
|
|
|
void Close() override;
|
|
|
|
std::vector<HDF5DataSourceMessage> GetHDF5DataSource(
|
|
uint64_t first_image = 0,
|
|
std::optional<uint64_t> image_count = {}
|
|
) const;
|
|
|
|
std::vector<IntegrationOutcome> ReadReflections(size_t start_image = 0, std::optional<size_t> end_image = {}) const;
|
|
|
|
std::vector<SpotToSave> ReadSpots(int64_t image) const override;
|
|
|
|
CompressedImage ReadCalibration(std::vector<uint8_t> &tmp, const std::string &name) const;
|
|
|
|
std::shared_ptr<JFJochReaderRawImage> GetRawImage(int64_t image_number) override;
|
|
|
|
// Metadata snapshots over the same images. The original file is registered as "Original" on
|
|
// ReadFile and is the initial active snapshot; reprocessing results can be added later.
|
|
void RegisterSnapshot(const std::string &name, const std::string &master_path);
|
|
void RemoveSnapshot(const std::string &name); // "Original" cannot be removed
|
|
void SetActiveSnapshot(const std::string &name);
|
|
std::vector<std::string> SnapshotNames() const;
|
|
std::string ActiveSnapshot() const;
|
|
|
|
// All snapshot datasets (name -> dataset), for overlaying every run's plots at once.
|
|
std::vector<std::pair<std::string, std::shared_ptr<const JFJochReaderDataset>>> AllSnapshotDatasets() const;
|
|
};
|