2511-eiger-mask #2

Merged
leonarski_f merged 69 commits from 2511-eiger-mask into main 2025-11-09 12:42:28 +01:00
3 changed files with 6 additions and 14 deletions
Showing only changes of commit 1f37bb3fd6 - Show all commits

View File

@@ -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,

View File

@@ -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;

View File

@@ -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<double>::infinity();
double max = -std::numeric_limits<double>::infinity();