[Domain] consolidate geometry floor helpers

Author: learncold

CMakeLists.txt

@@ -184,13 +184,17 @@ if (BUILD_TESTING)
     if (SAFECROWD_BUILD_APP)
         target_sources(safecrowd_tests
             PRIVATE
+                tests/LayoutCanvasSnappingTests.cpp
                 tests/ProjectPersistenceTests.cpp
+                src/application/LayoutCanvasRendering.cpp
+                src/application/LayoutCanvasSnapping.cpp
                 src/application/ProjectPersistence.cpp
         )
 
         target_link_libraries(safecrowd_tests
             PRIVATE
                 Qt6::Core
+                Qt6::Gui
         )
     endif()
 

src/application/LayoutCanvasRendering.cpp

@@ -1,5 +1,7 @@
 #include "application/LayoutCanvasRendering.h"
 
+#include "domain/GeometryQueries.h"
+
 #include <algorithm>
 #include <cmath>
 
@@ -19,9 +21,7 @@ namespace {
 const QColor kDoorStrokeColor("#ff8c00");
 const QColor kOpeningStrokeColor("#2f6fb2");
 
-bool matchesFloor(const std::string& elementFloorId, const std::string& floorId) {
-    return floorId.empty() || elementFloorId.empty() || elementFloorId == floorId;
-}
+using safecrowd::domain::matchesFloor;
 
 bool isVerticalConnection(const safecrowd::domain::Connection2D& connection) {
     return connection.kind == safecrowd::domain::ConnectionKind::Stair

src/application/LayoutCanvasSnapping.cpp

@@ -1,5 +1,7 @@
 #include "application/LayoutCanvasSnapping.h"
 
+#include "domain/GeometryQueries.h"
+
 #include <algorithm>
 #include <cmath>
 #include <limits>
@@ -14,24 +16,15 @@ struct SnapGeometry {
     std::vector<safecrowd::domain::LineSegment2D> edges{};
 };
 
-bool matchesFloor(const std::string& elementFloorId, const std::string& floorId) {
-    return floorId.empty() || elementFloorId.empty() || elementFloorId == floorId;
-}
-
-safecrowd::domain::Point2D operator-(const safecrowd::domain::Point2D& lhs, const safecrowd::domain::Point2D& rhs) {
-    return {.x = lhs.x - rhs.x, .y = lhs.y - rhs.y};
-}
+using safecrowd::domain::matchesFloor;
+using safecrowd::domain::closestPointOnSegment;
 
 safecrowd::domain::Point2D operator+(const safecrowd::domain::Point2D& lhs, const safecrowd::domain::Point2D& rhs) {
     return {.x = lhs.x + rhs.x, .y = lhs.y + rhs.y};
 }
 
-safecrowd::domain::Point2D operator*(const safecrowd::domain::Point2D& point, double scalar) {
-    return {.x = point.x * scalar, .y = point.y * scalar};
-}
-
-double dot(const safecrowd::domain::Point2D& lhs, const safecrowd::domain::Point2D& rhs) {
-    return (lhs.x * rhs.x) + (lhs.y * rhs.y);
+safecrowd::domain::Point2D operator-(const safecrowd::domain::Point2D& lhs, const safecrowd::domain::Point2D& rhs) {
+    return {.x = lhs.x - rhs.x, .y = lhs.y - rhs.y};
 }
 
 double screenDistance(
@@ -43,6 +36,15 @@ double screenDistance(
     return std::hypot(a.x() - b.x(), a.y() - b.y());
 }
 
+double maxAxisScreenDistance(
+    const LayoutCanvasTransform& transform,
+    const safecrowd::domain::Point2D& lhs,
+    const safecrowd::domain::Point2D& rhs) {
+    const auto a = transform.map(lhs);
+    const auto b = transform.map(rhs);
+    return std::max(std::abs(a.x() - b.x()), std::abs(a.y() - b.y()));
+}
+
 safecrowd::domain::Point2D snapPointToGrid(const safecrowd::domain::Point2D& point, double spacingMeters) {
     if (spacingMeters <= 0.0) {
         return point;
@@ -59,20 +61,6 @@ LayoutSnapOptions withoutGridSnap(LayoutSnapOptions options) {
     return options;
 }
 
-safecrowd::domain::Point2D closestPointOnSegment(
-    const safecrowd::domain::Point2D& point,
-    const safecrowd::domain::Point2D& start,
-    const safecrowd::domain::Point2D& end) {
-    const auto segment = end - start;
-    const auto lengthSquared = dot(segment, segment);
-    if (lengthSquared <= 1e-9) {
-        return start;
-    }
-
-    const auto t = std::clamp(dot(point - start, segment) / lengthSquared, 0.0, 1.0);
-    return start + (segment * t);
-}
-
 void appendPolygonSnapGeometry(
     const safecrowd::domain::Polygon2D& polygon,
     std::vector<safecrowd::domain::Point2D>& vertices,
@@ -414,7 +402,7 @@ LayoutDragSnapResult snapLayoutSelectionDrag(
             continue;
         }
 
-        const auto distance = screenDistance(transform, moved, snapped.point);
+        const auto distance = maxAxisScreenDistance(transform, moved, snapped.point);
         if (distance <= bestDistance) {
             bestDistance = distance;
             result = {

src/application/LayoutNavigationPanelWidget.cpp

@@ -22,16 +22,13 @@ const QColor kExitAccentColor("#2d8f5b");
 const QColor kDoorAccentColor("#ff8c00");
 
 using safecrowd::domain::distanceToPolygonBoundary;
+using safecrowd::domain::matchesFloor;
 using safecrowd::domain::pointInPolygon;
 
 QString floorActionId(const std::string& floorId) {
     return QString("floor:%1").arg(QString::fromStdString(floorId));
 }
 
-bool matchesFloor(const std::string& elementFloorId, const std::string& floorId) {
-    return floorId.empty() || elementFloorId.empty() || elementFloorId == floorId;
-}
-
 QIcon treeIcon(const QString& resourcePath, const QColor& color) {
     return makeSvgToolIcon(resourcePath, color, QSize(18, 18));
 }

src/application/LayoutPreviewGeometry.cpp

@@ -1,5 +1,7 @@
 #include "application/LayoutPreviewGeometry.h"
 
+#include "domain/GeometryQueries.h"
+
 #include <algorithm>
 #include <cmath>
 #include <functional>
@@ -17,17 +19,11 @@ constexpr double kMinimumDoorWidth = 0.9;
 
 using Bounds2D = LayoutCanvasBounds;
 bool matchesFloor(const std::string& elementFloorId, const QString& floorId) {
-    return floorId.isEmpty() || elementFloorId.empty() || QString::fromStdString(elementFloorId) == floorId;
+    return safecrowd::domain::matchesFloor(elementFloorId, floorId.toStdString());
 }
 
 QString defaultFloorId(const safecrowd::domain::FacilityLayout2D& layout) {
-    if (!layout.floors.empty() && !layout.floors.front().id.empty()) {
-        return QString::fromStdString(layout.floors.front().id);
-    }
-    if (!layout.levelId.empty()) {
-        return QString::fromStdString(layout.levelId);
-    }
-    return "L1";
+    return QString::fromStdString(safecrowd::domain::defaultFloorId(layout, "L1"));
 }
 
 QString nextFloorId(const safecrowd::domain::FacilityLayout2D& layout) {
@@ -47,7 +43,7 @@ QString nextFloorId(const safecrowd::domain::FacilityLayout2D& layout) {
 }
 
 void ensureLayoutFloors(safecrowd::domain::FacilityLayout2D& layout) {
-    const auto floorId = defaultFloorId(layout);
+    const auto floorId = safecrowd::application::defaultFloorId(layout);
     if (layout.floors.empty()) {
         layout.floors.push_back({
             .id = floorId.toStdString(),

src/application/LayoutPreviewWidget.cpp

@@ -1248,6 +1248,29 @@ void LayoutPreviewWidget::mousePressEvent(QMouseEvent* event) {
         return;
     }
 
+    if (event->button() == Qt::LeftButton
+        && toolMode_ == ToolMode::Select
+        && importResult_.layout.has_value()
+        && hasSelection()) {
+        const auto bounds = collectBounds(importResult_, currentFloorId());
+        if (bounds.has_value()) {
+            const LayoutTransform transform(*bounds, previewViewport(rect()), camera_.zoom(), camera_.panOffset());
+            const bool clickedCurrentSelection = selectedElementContainsContextPoint(
+                *importResult_.layout,
+                event->position(),
+                transform,
+                currentFloorId(),
+                selectedZoneIds_,
+                selectedConnectionIds_,
+                selectedBarrierIds_);
+            if (clickedCurrentSelection) {
+                beginSelectionMove(event->position(), transform, *bounds);
+                event->accept();
+                return;
+            }
+        }
+    }
+
     if (camera_.beginPan(event)) {
         return;
     }
@@ -1300,23 +1323,6 @@ void LayoutPreviewWidget::mousePressEvent(QMouseEvent* event) {
             return;
         }
 
-        if (importResult_.layout.has_value() && hasSelection()) {
-            const LayoutTransform transform(*bounds, previewViewport(rect()), camera_.zoom(), camera_.panOffset());
-            const bool clickedCurrentSelection = selectedElementContainsContextPoint(
-                *importResult_.layout,
-                event->position(),
-                transform,
-                currentFloorId(),
-                selectedZoneIds_,
-                selectedConnectionIds_,
-                selectedBarrierIds_);
-            if (clickedCurrentSelection) {
-                beginSelectionMove(event->position(), transform, *bounds);
-                event->accept();
-                return;
-            }
-        }
-
         selectionDragging_ = true;
         selectionDragStart_ = event->position();
         selectionDragCurrent_ = selectionDragStart_;
@@ -1329,16 +1335,16 @@ void LayoutPreviewWidget::mousePressEvent(QMouseEvent* event) {
 }
 
 void LayoutPreviewWidget::mouseReleaseEvent(QMouseEvent* event) {
-    if (camera_.finishPan(event)) {
-        return;
-    }
-
     if (selectionMoveDragging_ && event->button() == Qt::LeftButton) {
         finishSelectionMove(event->position());
         event->accept();
         return;
     }
 
+    if (camera_.finishPan(event)) {
+        return;
+    }
+
     if (selectionDragging_ && event->button() == Qt::LeftButton) {
         selectionDragging_ = false;
         selectionDragCurrent_ = event->position();
@@ -1413,16 +1419,20 @@ void LayoutPreviewWidget::paintEvent(QPaintEvent* event) {
     painter.setRenderHint(QPainter::Antialiasing);
     painter.fillRect(rect(), QColor(250, 252, 255));
 
-    const auto bounds = collectBounds(importResult_, currentFloorId());
-    if (!bounds.has_value()) {
+    const auto liveBounds = collectBounds(importResult_, currentFloorId());
+    if (!liveBounds.has_value()) {
         painter.setPen(QPen(QColor(80, 80, 80), 1));
         painter.setFont(QFont("Segoe UI", 14, QFont::DemiBold));
         painter.drawText(rect(), Qt::AlignCenter, "No layout geometry imported");
         return;
     }
 
-    const QRectF viewport = previewViewport(rect());
-    const LayoutTransform transform(*bounds, viewport, camera_.zoom(), camera_.panOffset());
+    const bool freezeCamera = selectionMoveDragging_ && selectionMoveBounds_.valid();
+    const auto bounds = freezeCamera ? selectionMoveBounds_ : *liveBounds;
+    const QRectF viewport = freezeCamera ? selectionMoveViewport_ : previewViewport(rect());
+    const auto zoom = freezeCamera ? selectionMoveZoom_ : camera_.zoom();
+    const auto panOffset = freezeCamera ? selectionMovePanOffset_ : camera_.panOffset();
+    const LayoutTransform transform(bounds, viewport, zoom, panOffset);
 
     if (gridSnapEnabled_) {
         drawLayoutCanvasGrid(painter, viewport, transform, gridSpacingMeters_);
@@ -1591,7 +1601,7 @@ void LayoutPreviewWidget::paintEvent(QPaintEvent* event) {
 
     painter.setPen(QPen(QColor(115, 128, 140), 1));
     painter.setFont(QFont("Segoe UI", 9, QFont::Medium));
-    painter.drawText(viewport.adjusted(0, -10, 0, 0), Qt::AlignTop | Qt::AlignRight, QString("Zoom %1%").arg(static_cast<int>(camera_.zoom() * 100.0)));
+    painter.drawText(viewport.adjusted(0, -10, 0, 0), Qt::AlignTop | Qt::AlignRight, QString("Zoom %1%").arg(static_cast<int>(zoom * 100.0)));
     painter.drawText(viewport.adjusted(0, -10, 0, 0), Qt::AlignTop | Qt::AlignLeft, "Layout Preview");
 
 }
@@ -1602,6 +1612,11 @@ void LayoutPreviewWidget::resizeEvent(QResizeEvent* event) {
 }
 
 void LayoutPreviewWidget::wheelEvent(QWheelEvent* event) {
+    if (selectionMoveDragging_) {
+        event->accept();
+        return;
+    }
+
     if (switchFloorByWheel(event)) {
         return;
     }

src/application/ProjectPersistence.cpp

@@ -17,6 +17,7 @@
 #include <QStandardPaths>
 #include <QStorageInfo>
 
+#include "domain/GeometryQueries.h"
 #include "domain/ImportValidationService.h"
 
 namespace safecrowd::application {
@@ -625,16 +626,6 @@ safecrowd::domain::Floor2D floorFromJson(const QJsonObject& object) {
     };
 }
 
-std::string defaultFloorId(const safecrowd::domain::FacilityLayout2D& layout) {
-    if (!layout.floors.empty() && !layout.floors.front().id.empty()) {
-        return layout.floors.front().id;
-    }
-    if (!layout.levelId.empty()) {
-        return layout.levelId;
-    }
-    return "L1";
-}
-
 void normalizeFloors(safecrowd::domain::FacilityLayout2D& layout) {
     if (layout.floors.empty()) {
         const auto floorId = layout.levelId.empty() ? std::string("L1") : layout.levelId;
@@ -644,7 +635,7 @@ void normalizeFloors(safecrowd::domain::FacilityLayout2D& layout) {
         });
     }
 
-    const auto floorId = defaultFloorId(layout);
+    const auto floorId = safecrowd::domain::defaultFloorId(layout, "L1");
     if (layout.levelId.empty()) {
         layout.levelId = floorId;
     }