v1.0.0-rc.97

This is an UNSTABLE release and not recommended for production use (please use rc.96 instead).

* jfjoch_broker: For DECTRIS detectors add dark data collection during initialization for bad pixel mask
* jfjoch_broker: Refactor of calibration logic for more clear code (likely to introduce problems)
* jfjoch_viewer: Add option to handle user pixel mask (experimental)
* jfjoch_viewer: More options for ROI
* jfjoch_viewer: Add window to display calibration

Reviewed-on: #2
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
Co-committed-by: Filip Leonarski <filip.leonarski@psi.ch>

viewer/JFJochViewerMenu.cpp

@@ -35,36 +35,17 @@ JFJochViewerMenu::JFJochViewerMenu(QWidget *parent) : QMenuBar(parent) {
     const QAction *quitAction = fileMenu->addAction("&Quit");
     connect(quitAction, &QAction::triggered, this, &JFJochViewerMenu::quitSelected);
 
-    QMenu *windowMenu = addMenu("Window");
-    toggleImageWindowAction = windowMenu->addAction("Image list");
-    toggleImageWindowAction->setCheckable(true);
-    toggleImageWindowAction->setChecked(false);
-    connect(toggleImageWindowAction, &QAction::toggled,
-            this, &JFJochViewerMenu::imageListWindowToggled);
+    QMenu *maskMenu = addMenu("Mask");
+    const QAction *saveMaskTiff = maskMenu->addAction("Save User Mask as &TIFF...");
+    connect(saveMaskTiff, &QAction::triggered, this, &JFJochViewerMenu::saveUserMaskAsTiffSelected);
 
-    toggleMetadataWindowAction = windowMenu->addAction("Metadata");
-    toggleMetadataWindowAction->setCheckable(true);
-    toggleMetadataWindowAction->setChecked(false);
-    connect(toggleMetadataWindowAction, &QAction::toggled,
-            this, &JFJochViewerMenu::metadataWindowToggled);
+    const QAction *uploadMask = maskMenu->addAction("&Upload User Mask");
+    connect(uploadMask, &QAction::triggered, this, &JFJochViewerMenu::uploadUserMaskAction);
 
-    toggleSpotWindowAction = windowMenu->addAction("Spot list");
-    toggleSpotWindowAction->setCheckable(true);
-    toggleSpotWindowAction->setChecked(false);
-    connect(toggleSpotWindowAction, &QAction::toggled,
-            this, &JFJochViewerMenu::spotListWindowToggled);
+    const QAction *clearMask = maskMenu->addAction("&Clear User Mask");
+    connect(clearMask, &QAction::triggered, [this] () {emit clearUserMaskSelected();});
 
-    toggleReflectionWindowAction = windowMenu->addAction("Reflection list");
-    toggleReflectionWindowAction->setCheckable(true);
-    toggleReflectionWindowAction->setChecked(false);
-    connect(toggleReflectionWindowAction, &QAction::toggled,
-            this, &JFJochViewerMenu::reflectionListWindowToggled);
-
-    toggleProcessingWindowAction = windowMenu->addAction("Processing");
-    toggleProcessingWindowAction->setCheckable(true);
-    toggleProcessingWindowAction->setChecked(false);
-    connect(toggleProcessingWindowAction, &QAction::toggled,
-        this, &JFJochViewerMenu::processingWindowToggled);
+    windowMenu = addMenu("Window");
 
     QMenu *helpMenu = addMenu("Help");
     // Add "About" action
@@ -72,6 +53,15 @@ JFJochViewerMenu::JFJochViewerMenu(QWidget *parent) : QMenuBar(parent) {
     connect(aboutAction, &QAction::triggered, this, &JFJochViewerMenu::aboutSelected);
 }
 
+void JFJochViewerMenu::AddWindowEntry(JFJochHelperWindow *window, const QString &name) {
+    auto action = windowMenu->addAction(name);
+    action->setCheckable(true);
+    action->setChecked(false);
+    connect(action, &QAction::toggled, window, &JFJochHelperWindow::toggle);
+    connect(window, &JFJochHelperWindow::closing, [action] {action->setChecked(false);});
+}
+
+
 void JFJochViewerMenu::aboutSelected() {
     QString version(QString::fromStdString(jfjoch_version()));
     // Create QMessageBox
@@ -121,59 +111,6 @@ void JFJochViewerMenu::quitSelected() {
     QApplication::quit();
 }
 
-void JFJochViewerMenu::imageListWindowToggled(bool checked) {
-    if (checked)
-        emit openImageListWindow();
-    else
-        emit closeImageListWindow();
-}
-
-void JFJochViewerMenu::metadataWindowToggled(bool checked) {
-    if (checked)
-        emit openMetadataWindow();
-    else
-        emit closeMetadataWindow();
-}
-
-void JFJochViewerMenu::imageListWindowClosing() {
-    toggleImageWindowAction->setChecked(false);
-}
-
-void JFJochViewerMenu::metadataWindowClosing() {
-    toggleMetadataWindowAction->setChecked(false);
-}
-
-void JFJochViewerMenu::spotListWindowToggled(bool checked) {
-    if (checked)
-        emit openSpotListWindow();
-    else
-        emit closeSpotListWindow();
-}
-
-void JFJochViewerMenu::spotListWindowClosing() {
-    toggleSpotWindowAction->setChecked(false);
-}
-
-void JFJochViewerMenu::reflectionListWindowToggled(bool checked) {
-    if (checked)
-        emit openReflectionListWindow();
-    else
-        emit closeReflectionListWindow();
-}
-
-void JFJochViewerMenu::reflectionListWindowClosing() {
-    toggleReflectionWindowAction->setChecked(false);
-}
-
-void JFJochViewerMenu::processingWindowToggled(bool checked) {
-    if (checked)
-        emit openProcessingWindow();
-    else
-        emit closeProcessingWindow();
-}
-void JFJochViewerMenu::processingWindowClosing() {
-    toggleProcessingWindowAction->setChecked(false);
-}
 
 void JFJochViewerMenu::openHttpSelected() {
     QDialog dialog(this);
@@ -208,3 +145,28 @@ void JFJochViewerMenu::openHttpSelected() {
         emit fileOpenSelected(url, -1, 1);
     }
 }
+
+void JFJochViewerMenu::saveUserMaskAsTiffSelected() {
+    QString filename = QFileDialog::getSaveFileName(
+        this,
+        "Save User Mask as TIFF",
+        "",
+        "TIFF Images (*.tif *.tiff);;All Files (*)"
+    );
+    if (!filename.isEmpty()) {
+        emit saveUserMaskTiffSelected(filename);
+    }
+}
+
+void JFJochViewerMenu::uploadUserMaskAction() {
+    auto reply = QMessageBox::question(
+        this,
+        "Upload User Mask",
+        "Upload current user mask to the server?",
+        QMessageBox::Yes | QMessageBox::No,
+        QMessageBox::No
+    );
+    if (reply == QMessageBox::Yes) {
+        emit uploadUserMaskSelected();
+    }
+}