v1.0.0-rc.101 (#6)

This is an UNSTABLE release.

* jfjoch_viewer: Auto load is better handling change of states
* jfjoch_viewer: Fix DBus registration
* jfjoch_viewer: Handle charts better with vertical lines on hover and status bar update
* jfjoch_viewer: Calculate ROI in a more efficient way

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

viewer/widgets/JFJochAzIntImage.cpp

@@ -18,65 +18,65 @@ void JFJochAzIntImage::Clear() {
         scene()->clear();
 }
 
-// data: size = azimuthal_bins * q_bins
-// Layout: q varies fastest (i % q_bins == q index)
-void JFJochAzIntImage::SetData(const std::vector<float> &data,
-                 const std::vector<float> &in_phi,
-                 const std::vector<float> &in_q,
-                 int azimuthal_bins) {
-    if (azimuthal_bins <= 0) {
+void JFJochAzIntImage::imageLoaded(std::shared_ptr<const JFJochReaderImage> in_image) {
+    if (!in_image) {
         Clear();
-        throw std::runtime_error("azimuthal_bins <= 0");
+        CalcROI();
+        return;
     }
 
-    int q_bins = data.size() / azimuthal_bins;
+    const auto &profile = in_image->ImageData().az_int_profile;
+    const auto &ds = in_image->Dataset();
+    int az_bins = ds.azimuthal_bins;
+    int q_bins = ds.q_bins;
 
-    if (q_bins <= 0 || in_phi.size() != data.size() || in_q.size() != data.size()) {
-        Clear();
-        throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
-                              "Mismatch in input size");
-    }
+    if (az_bins > 0 && q_bins > 0 && profile.size() == static_cast<size_t>(az_bins * q_bins)
+        && ds.az_int_bin_to_phi.size() == profile.size() && ds.az_int_bin_to_q.size() == profile.size()) {
 
-    float local_min = range_min, local_max = range_max;
-    if (auto_range) {
-        local_min = std::numeric_limits<float>::infinity();
-        local_max = -std::numeric_limits<float>::infinity();
-        for (float v : data) {
-            if (std::isfinite(v)) {
-                if (v < local_min) local_min = v;
-                if (v > local_max) local_max = v;
+        image = in_image;
+        float local_min = range_min, local_max = range_max;
+        if (auto_range) {
+            local_min = std::numeric_limits<float>::infinity();
+            local_max = -std::numeric_limits<float>::infinity();
+            for (float v : profile) {
+                if (std::isfinite(v)) {
+                    if (v < local_min) local_min = v;
+                    if (v > local_max) local_max = v;
+                }
+            }
+            if (!std::isfinite(local_min) || !std::isfinite(local_max) || local_max <= local_min) {
+                Clear();
+                return;
+            }
+        } else {
+            if (!(std::isfinite(local_min) && std::isfinite(local_max) && local_max > local_min)) {
+                Clear();
+                return;
             }
         }
-        if (!std::isfinite(local_min) || !std::isfinite(local_max) || local_max <= local_min) {
-            Clear();
-            return;
-        }
+
+        // Update base class members
+        W = q_bins;
+        H = az_bins;
+        image_fp = profile;
+
+        // Update foreground/background for color mapping
+        background = local_min;
+        foreground = local_max;
+        emit backgroundChanged(background);
+        emit foregroundChanged(foreground);
+
+        // Generate pixmap and redraw using base class functionality
+        GeneratePixmap();
+        Redraw();
+        CalcROI();
     } else {
-        if (!(std::isfinite(local_min) && std::isfinite(local_max) && local_max > local_min)) {
-            Clear();
-            return;
-        }
+        Clear();
     }
-
-    phi = in_phi;
-    q = in_q;
-
-    // Update base class members
-    W = q_bins;
-    H = azimuthal_bins;
-    image_fp = data;
-
-    // Update foreground/background for color mapping
-    background = local_min;
-    foreground = local_max;
-
-    // Generate pixmap and redraw using base class functionality
-    GeneratePixmap();
-    Redraw();
 }
 
 void JFJochAzIntImage::mouseHover(QMouseEvent* event) {
-    if (!scene() || W == 0 || H == 0) return;
+    if (!scene() || !image || W == 0 || H == 0) return;
 
     QPointF scenePos = mapToScene(event->pos());
     int x = static_cast<int>(scenePos.x());
@@ -86,10 +86,29 @@ void JFJochAzIntImage::mouseHover(QMouseEvent* event) {
         size_t idx = y * W + x;
 
         QString statusText = QString("Q: %1 Å^-1 phi: %2° value: %3")
-                .arg(QString::number(q[idx], 'f', 3))
-                .arg(QString::number(phi[idx], 'f', 3))
+                .arg(QString::number(image->Dataset().az_int_bin_to_q[idx], 'f', 3))
+                .arg(QString::number(image->Dataset().az_int_bin_to_phi[idx], 'f', 3))
                 .arg(QString::number(image_fp[idx], 'f', 3));
 
         emit writeStatusBar(statusText, 0);
     }
-}
+}
+
+void JFJochAzIntImage::mouseDoubleClickEvent(QMouseEvent *event) {
+    if (!scene() || !image || W == 0 || H == 0) return;
+
+    QPointF scenePos = mapToScene(event->pos());
+    int x = static_cast<int>(scenePos.x());
+    int y = static_cast<int>(scenePos.y());
+
+    if (x >= 0 && x < static_cast<int>(W) && y >= 0 && y < static_cast<int>(H)) {
+        size_t idx = y * W + x;
+
+        float q = image->Dataset().az_int_bin_to_q[idx];
+        float phi = image->Dataset().az_int_bin_to_phi[idx];
+
+        auto geom = image->Dataset().experiment.GetDiffractionGeometry();
+        auto coord = geom.ResPhiToPxl(2 * M_PI / q, phi / 180.0 * M_PI);
+        emit zoomOnBin(QPointF(coord.first, coord.second));
+    }
+}