leonarski_fandClaude Opus 4.8
aceff23ce2
The dataset-info plot now overlays every run as a separate named line instead of replacing the plot when a snapshot is activated: - Reader gains AllSnapshotDatasets() (every snapshot's dataset, Original first). - The worker owns the run collection: a stable snapshot id plus an editable display label (RunData), emitted as runsChanged(runs, active_id) on file open, snapshot register, activate and rename. RenameRun(id, label) updates the legend label without touching the reader key (decoupled id vs label). - The chart view draws the active run as the primary series (markers, hover, binning, axes) and the other runs as overlay lines sharing its axes, with a legend shown when overlaying (appendSeries factored out for both). - The dataset-info widget holds the run list + the live run, extracts the selected metric from each (ExtractMetric), and unions the available metrics across runs. - The live run is its own "Live" overlay (lightweight per-tick refresh, no combo rebuild); it is cleared on finish so the persisted snapshot takes over. - The processing jobs table gets a "Started" column and an editable Name column; editing a name renames that run's legend label. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
81 lines
3.0 KiB
C++
81 lines
3.0 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <QString>
|
|
#include <QWidget>
|
|
#include <vector>
|
|
|
|
#include "../JFJochProcessController.h"
|
|
#include "../JFJochImageReadingWorker.h" // ReprocessingInputs
|
|
|
|
class QTableWidget;
|
|
class QProgressBar;
|
|
class QStackedWidget;
|
|
class QToolBar;
|
|
|
|
// Makes processing a first-class GUI activity: a dockable panel with a table of processing jobs run
|
|
// on the current dataset. A job can be run locally (off the GUI thread, via JFJochProcessController)
|
|
// or its jfjoch_process command line copied for a cluster. A finished local run is registered as a
|
|
// reader snapshot so its results become a selectable view of the dataset. Re-processing reads a
|
|
// stored HDF5 file, so the panel shows an explanatory message while connected to a live HTTP stream.
|
|
class JFJochProcessingJobsWindow : public QWidget {
|
|
Q_OBJECT
|
|
public:
|
|
explicit JFJochProcessingJobsWindow(JFJochImageReadingWorker *worker, QWidget *parent = nullptr);
|
|
|
|
signals:
|
|
void registerSnapshot(QString id, QString label, QString master_path);
|
|
void activateSnapshot(QString id);
|
|
void renameRun(QString id, QString label);
|
|
void writeStatusBar(QString message, int timeout_ms = 0);
|
|
// Live per-image results while a job runs, for the dataset-info plots (nullptr clears it).
|
|
void liveDataset(std::shared_ptr<const JFJochReaderDataset> dataset);
|
|
|
|
public slots:
|
|
void onHttpConnectionChanged(bool connected, QString addr);
|
|
|
|
private slots:
|
|
void newJob();
|
|
void cancelJob();
|
|
void viewResults();
|
|
void showOriginal();
|
|
void onPhase(QString phase);
|
|
void onProgress(quint64 done, quint64 total);
|
|
void onFinished(ProcessResult result);
|
|
void onFailed(QString error);
|
|
|
|
private:
|
|
struct JobInfo {
|
|
QString id; // stable reader-snapshot key
|
|
QString label; // editable display name (legend / table)
|
|
QString snapshot_path; // empty unless saved
|
|
bool has_result = false;
|
|
};
|
|
struct JobSpec {
|
|
ProcessMode mode = ProcessMode::FullAnalysis;
|
|
int images = 0; // 0 == all
|
|
int threads = 4;
|
|
bool save = true;
|
|
QString prefix;
|
|
bool rotation = false;
|
|
bool scaling = false;
|
|
};
|
|
|
|
// Returns 0 = cancel, 1 = run locally, 2 = copy command line; fills spec from the dialog.
|
|
int askJob(const ReprocessingInputs &inputs, JobSpec &spec);
|
|
ProcessConfig buildConfig(const JobSpec &spec, const ReprocessingInputs &inputs) const;
|
|
void setStatus(int row, const QString &text);
|
|
|
|
JFJochImageReadingWorker *worker_;
|
|
JFJochProcessController *controller_;
|
|
QToolBar *toolbar_;
|
|
QStackedWidget *stack_; // page 0: jobs table, page 1: HTTP-mode message
|
|
QTableWidget *table_;
|
|
QProgressBar *running_bar_ = nullptr; // lives in the running row's Status cell
|
|
int running_row_ = -1;
|
|
int job_counter_ = 0;
|
|
std::vector<JobInfo> jobs_;
|
|
};
|