Files
leonarski_f cb5a2f032a
Build Packages / Create release (push) Successful in 23s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 10m6s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 9m6s
Build Packages / build:viewer-tgz:cpu (push) Successful in 11m15s
Build Packages / build:viewer-tgz:cuda (push) Successful in 12m21s
Build Packages / build:windows:nocuda (push) Successful in 17m9s
Build Packages / build:windows:cuda (push) Successful in 19m49s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m42s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 16m0s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 14m54s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 17m7s
Build Packages / build:rugnux:windows (push) Successful in 10m47s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 17m4s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 17m8s
Build Packages / Generate python client (push) Successful in 45s
Build Packages / Build documentation (push) Successful in 1m45s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 19m23s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 19m20s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 18m43s
Build Packages / build:rpm (rocky8) (push) Successful in 19m31s
Build Packages / build:rpm (rocky9) (push) Successful in 20m16s
Build Packages / Unit tests (push) Successful in 1h41m19s
v1.0.0-rc.170 (#80)
* Fixed a `jfjoch_broker` crash during indexing: sorting no longer misbehaves on non-finite values, and GPU FFT indexer kernel launches are now error-checked.
* rugnux needs about a third less peak memory to scale, merge and post-refine rotation data, with identical results.
* `rugnux --model`: the placed coordinate file carries the space group its own coordinates obey, and says so when that is not the group the reflection files beside it carry.
* `jfjoch_viewer`: fixes in the dataset plots, inspector and layout; spot markers lose their black outline by default (a checkbox under "Image features" restores it) and the highest-pixel markers are white boxes around the pixel.

Reviewed-on: #80
Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
2026-09-16 18:17:46 +02:00

47 lines
1.7 KiB
C++

// SPDX-FileCopyrightText: 2024 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
// SPDX-License-Identifier: GPL-3.0-only
#include <cmath>
#include "ROICircle.h"
#include "JFJochException.h"
ROICircle::ROICircle(const std::string &name, float in_x, float in_y, float in_r_pxl)
: ROIElement(name), center_x(in_x), center_y(in_y), r_pxl(in_r_pxl), r_pxl_2(in_r_pxl * in_r_pxl) {
// isfinite, not just > 0: NaN passes every <= test, inf passes > 0, and both then reach the
// preview drawing, where a non-finite bound becomes an endless loop.
if (!std::isfinite(r_pxl) || r_pxl <= 0.0)
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"ROICircle: radius must be a positive finite number");
if (!std::isfinite(center_x) || !std::isfinite(center_y))
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"ROICircle: center must be finite");
}
float ROICircle::GetX() const {
return center_x;
}
float ROICircle::GetY() const {
return center_y;
}
float ROICircle::GetRadius_pxl() const {
return r_pxl;
}
ROIConfig ROICircle::ExportMetadata() const {
return ROIConfig{
.type = ROIConfig::ROIType::Circle,
.name = name,
.circle = ROIConfigCircle{.r = r_pxl, .x = center_x, .y = center_y}
};
}
bool ROICircle::CheckROI(int64_t x, int64_t y, float resolution, float phi_deg) const {
float x_fl = static_cast<float>(x) - center_x;
float y_fl = static_cast<float>(y) - center_y;
float dist_from_center_sq = x_fl * x_fl + y_fl * y_fl;
return (dist_from_center_sq <= r_pxl_2);
}