v1.0.0-rc.111 (#17)
Some checks failed
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m27s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 8m51s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 7m45s
Build Packages / Generate python client (push) Successful in 28s
Build Packages / Build documentation (push) Successful in 57s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 8m53s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m26s
Build Packages / build:rpm (rocky9) (push) Successful in 9m21s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 7m42s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 8m11s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 7m7s
Build Packages / Unit tests (push) Has been skipped
Some checks failed
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 9m27s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 8m51s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 7m45s
Build Packages / Generate python client (push) Successful in 28s
Build Packages / Build documentation (push) Successful in 57s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8) (push) Successful in 8m53s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 9m26s
Build Packages / build:rpm (rocky9) (push) Successful in 9m21s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 7m42s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 8m11s
Build Packages / build:rpm (rocky9_nocuda) (push) Failing after 7m7s
Build Packages / Unit tests (push) Has been skipped
This is an UNSTABLE release. * jfjoch_viewer: Remove 3D lattice viewer (not really useful at this moment) * jfjoch_viewer: Fix auto contrast not refreshing image Reviewed-on: #17 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch> Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>
This commit was merged in pull request #17.
This commit is contained in:
@@ -23,7 +23,6 @@
|
||||
#include "toolbar/JFJochViewerToolbarImage.h"
|
||||
#include "windows/JFJoch2DAzintImageWindow.h"
|
||||
#include "windows/JFJochAzIntWindow.h"
|
||||
#include "windows/JFJochViewerLatticeWindow.h"
|
||||
|
||||
JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString &file) : QMainWindow(parent) {
|
||||
menuBar = new JFJochViewerMenu(this);
|
||||
@@ -97,7 +96,6 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
|
||||
auto calibrationWindow = new JFJochCalibrationWindow(this);
|
||||
auto azintWindow = new JFJochAzIntWindow(experiment.GetAzimuthalIntegrationSettings(), this);
|
||||
auto azintImageWindow = new JFJoch2DAzintImageWindow(this);
|
||||
auto latticeWindow = new JFJochViewerLatticeWindow(this);
|
||||
|
||||
menuBar->AddWindowEntry(tableWindow, "Image list");
|
||||
menuBar->AddWindowEntry(spotWindow, "Spot list");
|
||||
@@ -107,7 +105,6 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
|
||||
menuBar->AddWindowEntry(calibrationWindow, "Calibration image viewer");
|
||||
menuBar->AddWindowEntry(azintWindow, "Azimuthal integration settings");
|
||||
menuBar->AddWindowEntry(azintImageWindow, "Azimuthal integration 2D image");
|
||||
menuBar->AddWindowEntry(latticeWindow, "Lattice view (experimental)");
|
||||
|
||||
if (dbus) {
|
||||
// Create adaptor attached to this window
|
||||
@@ -307,9 +304,6 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
|
||||
connect(azintImageWindow, &JFJoch2DAzintImageWindow::zoomOnBin,
|
||||
viewer, &JFJochDiffractionImage::centerOnSpot);
|
||||
|
||||
connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
|
||||
latticeWindow, &JFJochViewerLatticeWindow::imageLoaded);
|
||||
|
||||
// Ensure worker is deleted in its own thread when the thread stops
|
||||
connect(reading_thread, &QThread::finished, reading_worker, &QObject::deleteLater);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user