jfjoch_viewer: Improve HDR mode
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m22s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m4s
Build Packages / Generate python client (push) Successful in 13s
Build Packages / build:rpm (rocky8) (push) Successful in 14m15s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 14m21s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (ubuntu2204) (push) Successful in 14m15s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 14m27s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 15m5s
Build Packages / Build documentation (push) Successful in 52s
Build Packages / build:rpm (rocky9) (push) Successful in 15m1s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 9m14s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 13m5s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 12m35s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 13m24s
Build Packages / Generate python client (pull_request) Successful in 11s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 12m58s
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 13m8s
Build Packages / Create release (pull_request) Has been skipped
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 14m12s
Build Packages / Build documentation (pull_request) Successful in 41s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 10m40s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 7m23s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 8m0s
Build Packages / Unit tests (push) Successful in 1h0m8s
Build Packages / Unit tests (pull_request) Successful in 50m6s

This commit is contained in:
2026-01-31 23:35:40 +01:00
parent a523969a9f
commit 9aaa70c5b6
5 changed files with 44 additions and 7 deletions
+11 -4
View File
@@ -21,6 +21,11 @@ JFJochViewerToolbarDisplay::JFJochViewerToolbarDisplay(QWidget *parent)
auto_foreground_button->setChecked(false);
addWidget(auto_foreground_button);
hdr_mode_button = new QPushButton("HDR");
hdr_mode_button->setCheckable(true);
hdr_mode_button->setChecked(false);
addWidget(hdr_mode_button);
addWidget(new QLabel("&nbsp;&nbsp;<b>Color map</b>&nbsp;&nbsp;"));
// Initialize QComboBox with the options
@@ -41,7 +46,7 @@ JFJochViewerToolbarDisplay::JFJochViewerToolbarDisplay(QWidget *parent)
connect(color_map_select, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, &JFJochViewerToolbarDisplay::colorComboBoxSet);
connect(auto_foreground_button, &QPushButton::clicked, this, &JFJochViewerToolbarDisplay::autoForegroundButtonPressed);
connect(hdr_mode_button, &QPushButton::clicked, this, &JFJochViewerToolbarDisplay::HDRModeButtonPressed);
auto *stretch = new QWidget(this);
stretch->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
addWidget(stretch);
@@ -60,7 +65,6 @@ void JFJochViewerToolbarDisplay::colorComboBoxSet(int val) {
emit colorMapChanged(val);
}
void JFJochViewerToolbarDisplay::autoForegroundButtonPressed() {
emit setAutoForeground(auto_foreground_button->isChecked());
}
@@ -70,15 +74,18 @@ void JFJochViewerToolbarDisplay::updateAutoForeground(bool val) {
auto_foreground_button->setChecked(val);
}
void JFJochViewerToolbarDisplay::HDRModeButtonPressed() {
emit setHDRMode(hdr_mode_button->isChecked());
}
void JFJochViewerToolbarDisplay::imageLoaded(std::shared_ptr<const JFJochReaderImage> image) {
if (image) {
auto valid = image->ValidMinMax();
if (valid.has_value())
if (valid.has_value() && valid->second > 1)
foreground_slider->setMax(valid->second);
else
foreground_slider->setMax(MAX_SLIDER_NO_IMAGE);
} else {
foreground_slider->setMax(MAX_SLIDER_NO_IMAGE);
}
}