jfjoch_viewer: Work in (slow) progress
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m35s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m20s
Build Packages / Generate python client (push) Successful in 13s
Build Packages / build:rpm (rocky8) (push) Successful in 12m40s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m41s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m51s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 13m20s
Build Packages / Build documentation (push) Successful in 36s
Build Packages / build:rpm (rocky9) (push) Successful in 13m40s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m8s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m36s
Build Packages / Unit tests (push) Successful in 54m25s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m35s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 12m20s
Build Packages / Generate python client (push) Successful in 13s
Build Packages / build:rpm (rocky8) (push) Successful in 12m40s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 12m41s
Build Packages / Create release (push) Has been skipped
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m51s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 13m20s
Build Packages / Build documentation (push) Successful in 36s
Build Packages / build:rpm (rocky9) (push) Successful in 13m40s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 14m8s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 6m36s
Build Packages / Unit tests (push) Successful in 54m25s
This commit is contained in:
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user