jfjoch_viewer: Pressing "A" sets auto contrast
All checks were successful
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m27s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 13m53s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 13m57s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m56s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m55s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m11s
Build Packages / Generate python client (push) Successful in 18s
Build Packages / build:rpm (rocky8) (push) Successful in 14m18s
Build Packages / Build documentation (push) Successful in 40s
Build Packages / build:rpm (rocky9) (push) Successful in 14m44s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m37s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 10m26s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 12m22s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 12m28s
Build Packages / Generate python client (pull_request) Successful in 22s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 12m32s
Build Packages / Build documentation (pull_request) Successful in 34s
Build Packages / Create release (pull_request) Has been skipped
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 13m4s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 13m36s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 10m49s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 9m10s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 7m32s
Build Packages / Unit tests (push) Successful in 1h2m59s
Build Packages / Unit tests (pull_request) Successful in 53m48s
All checks were successful
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m27s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 13m53s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 13m57s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 13m56s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m55s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m11s
Build Packages / Generate python client (push) Successful in 18s
Build Packages / build:rpm (rocky8) (push) Successful in 14m18s
Build Packages / Build documentation (push) Successful in 40s
Build Packages / build:rpm (rocky9) (push) Successful in 14m44s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 10m37s
Build Packages / build:rpm (ubuntu2404_nocuda) (pull_request) Successful in 10m26s
Build Packages / build:rpm (ubuntu2204_nocuda) (pull_request) Successful in 12m22s
Build Packages / build:rpm (rocky8_nocuda) (pull_request) Successful in 12m28s
Build Packages / Generate python client (pull_request) Successful in 22s
Build Packages / build:rpm (rocky8) (pull_request) Successful in 12m32s
Build Packages / Build documentation (pull_request) Successful in 34s
Build Packages / Create release (pull_request) Has been skipped
Build Packages / build:rpm (rocky8_sls9) (pull_request) Successful in 13m4s
Build Packages / build:rpm (rocky9_nocuda) (pull_request) Successful in 13m36s
Build Packages / build:rpm (rocky9) (pull_request) Successful in 10m49s
Build Packages / build:rpm (ubuntu2204) (pull_request) Successful in 9m10s
Build Packages / build:rpm (ubuntu2404) (pull_request) Successful in 7m32s
Build Packages / Unit tests (push) Successful in 1h2m59s
Build Packages / Unit tests (pull_request) Successful in 53m48s
This commit is contained in:
@@ -328,6 +328,9 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
|
||||
connect(this, &JFJochViewerWindow::adjustForegroundButton,
|
||||
viewer, &JFJochDiffractionImage::adjustForeground);
|
||||
|
||||
connect(this, &JFJochViewerWindow::setAutoForegroundOnce,
|
||||
viewer, &JFJochDiffractionImage::setAutoForegroundOnce);
|
||||
|
||||
if (!file.isEmpty())
|
||||
LoadFile(file, 0, 1, false);
|
||||
}
|
||||
@@ -380,6 +383,11 @@ void JFJochViewerWindow::keyPressEvent(QKeyEvent *event) {
|
||||
event->accept();
|
||||
return;
|
||||
}
|
||||
if (event->key() == Qt::Key_A && ! event->isAutoRepeat()) {
|
||||
emit setAutoForegroundOnce();
|
||||
event->accept();
|
||||
return;
|
||||
}
|
||||
QMainWindow::keyPressEvent(event);
|
||||
}
|
||||
|
||||
|
||||
@@ -47,6 +47,7 @@ signals:
|
||||
void LoadFileRequest(const QString &filename, qint64 image_number, qint64 summation, bool retry);
|
||||
void LoadImageRequest(int64_t image_number, int64_t summation);
|
||||
void adjustForegroundButton(bool input);
|
||||
void setAutoForegroundOnce();
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -342,14 +342,19 @@ void JFJochDiffractionImage::loadImage(std::shared_ptr<const JFJochReaderImage>
|
||||
|
||||
void JFJochDiffractionImage::setAutoForeground(bool input) {
|
||||
auto_fg = input;
|
||||
if (image && auto_fg) {
|
||||
// If auto_foreground is not set, then view stays with the current settings till these are explicitly changed
|
||||
// If auto_foreground is not set, then view stays with the current settings till these are explicitly changed
|
||||
if (auto_fg)
|
||||
setAutoForegroundOnce();
|
||||
emit autoForegroundChanged(auto_fg);
|
||||
}
|
||||
|
||||
void JFJochDiffractionImage::setAutoForegroundOnce() {
|
||||
if (image) {
|
||||
foreground = image->GetAutoContrastValue();
|
||||
emit foregroundChanged(foreground);
|
||||
GeneratePixmap();
|
||||
Redraw();
|
||||
}
|
||||
emit autoForegroundChanged(auto_fg);
|
||||
}
|
||||
|
||||
void JFJochDiffractionImage::setResolutionRing(QVector<float> v) {
|
||||
|
||||
@@ -56,7 +56,7 @@ private:
|
||||
public slots:
|
||||
void loadImage(std::shared_ptr<const JFJochReaderImage> image);
|
||||
void setAutoForeground(bool input);
|
||||
|
||||
void setAutoForegroundOnce();
|
||||
void setResolutionRing(QVector<float> v);
|
||||
void setResolutionRingMode(RingMode mode);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user