From 1f37bb3fd69b700af6e0403942d47b88df3783e5 Mon Sep 17 00:00:00 2001 From: Filip Leonarski Date: Fri, 7 Nov 2025 13:56:43 +0100 Subject: [PATCH] jfjoch_viewer: Work in (slow) progress --- viewer/widgets/JFJochDiffractionImage.cpp | 12 ++++++------ viewer/widgets/JFJochImage.h | 2 -- viewer/widgets/JFJochSimpleImage.h | 6 ------ 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/viewer/widgets/JFJochDiffractionImage.cpp b/viewer/widgets/JFJochDiffractionImage.cpp index aa2d641d..4aeaa3bb 100644 --- a/viewer/widgets/JFJochDiffractionImage.cpp +++ b/viewer/widgets/JFJochDiffractionImage.cpp @@ -392,9 +392,9 @@ void JFJochDiffractionImage::DrawTopPixels() { void JFJochDiffractionImage::updateROI() { if (roi_type == RoiType::RoiBox) { - QRect roi_box_int = QRectF(RoundPoint(roiStartPos), RoundPoint(roiEndPos)).normalized().toRect(); - roiBox= roi_box_int; - emit roiBoxUpdated(roi_box_int); + QRect roiBox_int = QRectF(RoundPoint(roiStartPos), RoundPoint(roiEndPos)).normalized().toRect(); + roiBox= roiBox_int; + emit roiBoxUpdated(roiBox_int); } else { QPointF delta = roiStartPos - roiEndPos; double radius = std::sqrt(delta.x() * delta.x() + delta.y() * delta.y()); @@ -464,14 +464,14 @@ void JFJochDiffractionImage::updateOverlay() { if (show_saturation) DrawSaturation(); - if (roi_box.width() * roi_box.height() > 0) { + if (roiBox.width() * roiBox.height() > 0) { QPen pen(feature_color, 3); pen.setStyle(Qt::DashLine); pen.setCosmetic(true); if (roi_type == RoiType::RoiBox) { - scene()->addRect(roi_box, pen); + scene()->addRect(roiBox, pen); } else { - scene()->addEllipse(roi_box, pen); + scene()->addEllipse(roiBox, pen); double pointRadius = 0.5; QRectF pointBoundingBox = QRectF(roiStartPos.x() - pointRadius, roiStartPos.y() - pointRadius, diff --git a/viewer/widgets/JFJochImage.h b/viewer/widgets/JFJochImage.h index ed4e99c0..e83696e0 100644 --- a/viewer/widgets/JFJochImage.h +++ b/viewer/widgets/JFJochImage.h @@ -18,8 +18,6 @@ class JFJochImage : public QGraphicsView { void resizeEvent(QResizeEvent *event) override; protected: - virtual void writePointOnStatusBar(QMouseEvent* event) = 0; - double scale_factor = 1.0; QColor feature_color = Qt::magenta; diff --git a/viewer/widgets/JFJochSimpleImage.h b/viewer/widgets/JFJochSimpleImage.h index 17fa436b..97b852fd 100644 --- a/viewer/widgets/JFJochSimpleImage.h +++ b/viewer/widgets/JFJochSimpleImage.h @@ -29,12 +29,6 @@ protected: void mouseReleaseEvent(QMouseEvent* event) override; private: - struct Label { - QPointF pos; - QString text; - QColor color; - }; - struct ROIStats { double min = std::numeric_limits::infinity(); double max = -std::numeric_limits::infinity();