[Domain] Refine fire smoke reaction behavior

Author: SilverSupplier

src/application/ScenarioAuthoringWidget.cpp

@@ -7,6 +7,7 @@
 #include <utility>
 #include <vector>
 
+#include <QCheckBox>
 #include <QComboBox>
 #include <QDialog>
 #include <QDialogButtonBox>
@@ -172,7 +173,11 @@ QString severityLabel(safecrowd::domain::ScenarioElementSeverity severity) {
 }
 
 QString hazardScheduleSummary(const safecrowd::domain::EnvironmentHazardDraft& hazard) {
-    return QString("%1s - %2s").arg(hazard.startSeconds, 0, 'f', 1).arg(hazard.endSeconds, 0, 'f', 1);
+    const auto start = std::max(0.0, hazard.startSeconds);
+    if (safecrowd::domain::environmentHazardHasOpenEndedSchedule(hazard)) {
+        return QString("%1s - open").arg(start, 0, 'f', 1);
+    }
+    return QString("%1s - %2s").arg(start, 0, 'f', 1).arg(std::max(start, hazard.endSeconds), 0, 'f', 1);
 }
 
 QString hazardZoneSummary(
@@ -245,13 +250,35 @@ bool editEnvironmentHazard(
     startSpin->setRange(0.0, 86400.0);
     startSpin->setDecimals(1);
     startSpin->setSuffix(" s");
-    startSpin->setValue(std::max(0.0, hazard->startSeconds));
+    const auto initialStartSeconds = std::max(0.0, hazard->startSeconds);
+    const auto initialOpenEnded = safecrowd::domain::environmentHazardHasOpenEndedSchedule(*hazard);
+    startSpin->setValue(initialStartSeconds);
 
     auto* endSpin = new QDoubleSpinBox(&dialog);
     endSpin->setRange(0.0, 86400.0);
     endSpin->setDecimals(1);
     endSpin->setSuffix(" s");
-    endSpin->setValue(std::max(0.0, hazard->endSeconds));
+    endSpin->setValue(initialOpenEnded
+        ? initialStartSeconds
+        : std::max(initialStartSeconds, hazard->endSeconds));
+
+    auto* openEndedCheck = new QCheckBox("Open ended", &dialog);
+    openEndedCheck->setChecked(initialOpenEnded);
+    endSpin->setEnabled(!initialOpenEnded);
+
+    QObject::connect(openEndedCheck, &QCheckBox::toggled, &dialog, [=](bool checked) {
+        endSpin->setEnabled(!checked);
+        if (checked) {
+            endSpin->setValue(startSpin->value());
+        } else if (endSpin->value() <= startSpin->value()) {
+            endSpin->setValue(std::min(86400.0, startSpin->value() + 60.0));
+        }
+    });
+    QObject::connect(startSpin, qOverload<double>(&QDoubleSpinBox::valueChanged), &dialog, [=](double value) {
+        if (openEndedCheck->isChecked()) {
+            endSpin->setValue(value);
+        }
+    });
 
     auto* severityCombo = new QComboBox(&dialog);
     severityCombo->addItem("Low", static_cast<int>(safecrowd::domain::ScenarioElementSeverity::Low));
@@ -270,6 +297,7 @@ bool editEnvironmentHazard(
     form->addRow("Y", ySpin);
     form->addRow("Start", startSpin);
     form->addRow("End", endSpin);
+    form->addRow("", openEndedCheck);
     form->addRow("Severity", severityCombo);
     form->addRow("Note", noteEdit);
     root->addLayout(form);
@@ -301,6 +329,11 @@ bool editEnvironmentHazard(
             xSpin->setFocus();
             return;
         }
+        if (!openEndedCheck->isChecked() && endSpin->value() <= startSpin->value()) {
+            QMessageBox::warning(&dialog, "Edit hazard", "Set the end time after the start time.");
+            endSpin->setFocus();
+            return;
+        }
 
         dialog.accept();
     });
@@ -332,14 +365,18 @@ bool editEnvironmentHazard(
         QMessageBox::warning(parent, "Edit hazard", "The hazard location must stay inside the affected zone.");
         return false;
     }
+    if (!openEndedCheck->isChecked() && endSpin->value() <= startSpin->value()) {
+        QMessageBox::warning(parent, "Edit hazard", "Set the end time after the start time.");
+        return false;
+    }
 
     hazard->kind = static_cast<safecrowd::domain::EnvironmentHazardKind>(kindCombo->currentData().toInt());
     hazard->name = name.toStdString();
     hazard->affectedZoneId = selectedZoneId;
     hazard->floorId = selectedZone->floorId;
     hazard->position = selectedPosition;
     hazard->startSeconds = startSpin->value();
-    hazard->endSeconds = std::max(hazard->startSeconds, endSpin->value());
+    hazard->endSeconds = openEndedCheck->isChecked() ? hazard->startSeconds : endSpin->value();
     hazard->severity = static_cast<safecrowd::domain::ScenarioElementSeverity>(severityCombo->currentData().toInt());
     hazard->note = noteEdit->toPlainText().trimmed().toStdString();
     return true;

src/application/ScenarioCanvasWidget.cpp

@@ -215,7 +215,14 @@ QString formatEnvironmentHazardTooltip(const safecrowd::domain::EnvironmentHazar
     if (!hazard.name.empty()) {
         text.append(QString("\n%1").arg(QString::fromStdString(hazard.name)));
     }
-    text.append(QString("\nActive: %1s ~ %2s").arg(hazard.startSeconds, 0, 'f', 1).arg(hazard.endSeconds, 0, 'f', 1));
+    const auto start = std::max(0.0, hazard.startSeconds);
+    if (safecrowd::domain::environmentHazardHasOpenEndedSchedule(hazard)) {
+        text.append(QString("\nActive: %1s ~ open").arg(start, 0, 'f', 1));
+    } else {
+        text.append(QString("\nActive: %1s ~ %2s")
+            .arg(start, 0, 'f', 1)
+            .arg(std::max(start, hazard.endSeconds), 0, 'f', 1));
+    }
     text.append(QString("\nSeverity: %1").arg(severityLabel(hazard.severity)));
     return text;
 }
@@ -232,16 +239,7 @@ std::optional<std::size_t> hoveredEnvironmentHazardIndex(
     double closestDistanceSq = kHoverRadiusPixels * kHoverRadiusPixels;
     for (std::size_t index = 0; index < hazards.size(); ++index) {
         const auto& hazard = hazards[index];
-        auto floorId = hazard.floorId;
-        if (floorId.empty() && !hazard.affectedZoneId.empty()) {
-            const auto zoneIt = std::find_if(layout.zones.begin(), layout.zones.end(), [&](const auto& zone) {
-                return zone.id == hazard.affectedZoneId;
-            });
-            if (zoneIt != layout.zones.end()) {
-                floorId = zoneIt->floorId;
-            }
-        }
-        if (!matchesFloor(floorId, currentFloorId)) {
+        if (!matchesFloor(safecrowd::domain::environmentHazardFloorId(layout, hazard), currentFloorId)) {
             continue;
         }
 
@@ -2045,16 +2043,7 @@ void ScenarioCanvasWidget::drawConnectionBlocks(QPainter& painter, const LayoutC
 
 void ScenarioCanvasWidget::drawEnvironmentHazards(QPainter& painter, const LayoutCanvasTransform& transform) const {
     for (const auto& hazard : environmentHazards_) {
-        auto floorId = hazard.floorId;
-        if (floorId.empty() && !hazard.affectedZoneId.empty()) {
-            const auto zoneIt = std::find_if(layout_.zones.begin(), layout_.zones.end(), [&](const auto& zone) {
-                return zone.id == hazard.affectedZoneId;
-            });
-            if (zoneIt != layout_.zones.end()) {
-                floorId = zoneIt->floorId;
-            }
-        }
-        if (!matchesFloor(floorId, currentFloorId_)) {
+        if (!matchesFloor(safecrowd::domain::environmentHazardFloorId(layout_, hazard), currentFloorId_)) {
             continue;
         }
 

src/application/SimulationCanvasWidget.cpp

@@ -72,45 +72,6 @@ bool connectionShouldBeBlocked(const safecrowd::domain::ConnectionBlockDraft& bl
     return false;
 }
 
-bool hazardIsActive(const safecrowd::domain::EnvironmentHazardDraft& hazard, double timeSeconds) {
-    const auto start = std::max(0.0, hazard.startSeconds);
-    if (timeSeconds + 1e-9 < start) {
-        return false;
-    }
-    if (hazard.endSeconds <= hazard.startSeconds) {
-        return true;
-    }
-    const auto end = std::max(start, hazard.endSeconds);
-    return timeSeconds <= end + 1e-9;
-}
-
-double hazardRadiusMeters(safecrowd::domain::ScenarioElementSeverity severity) {
-    switch (severity) {
-    case safecrowd::domain::ScenarioElementSeverity::Low:
-        return 2.0;
-    case safecrowd::domain::ScenarioElementSeverity::High:
-        return 5.0;
-    case safecrowd::domain::ScenarioElementSeverity::Medium:
-    default:
-        return 3.5;
-    }
-}
-
-std::string hazardFloorId(
-    const safecrowd::domain::FacilityLayout2D& layout,
-    const safecrowd::domain::EnvironmentHazardDraft& hazard) {
-    if (!hazard.floorId.empty()) {
-        return hazard.floorId;
-    }
-    if (hazard.affectedZoneId.empty()) {
-        return {};
-    }
-    const auto zoneIt = std::find_if(layout.zones.begin(), layout.zones.end(), [&](const auto& zone) {
-        return zone.id == hazard.affectedZoneId;
-    });
-    return zoneIt == layout.zones.end() ? std::string{} : zoneIt->floorId;
-}
-
 QString hazardKindLabel(safecrowd::domain::EnvironmentHazardKind kind) {
     switch (kind) {
     case safecrowd::domain::EnvironmentHazardKind::Smoke:
@@ -139,7 +100,7 @@ QString formatEnvironmentHazardTooltip(const safecrowd::domain::EnvironmentHazar
         text.append(QString("\n%1").arg(QString::fromStdString(hazard.name)));
     }
     const auto start = std::max(0.0, hazard.startSeconds);
-    if (hazard.endSeconds <= hazard.startSeconds) {
+    if (safecrowd::domain::environmentHazardHasOpenEndedSchedule(hazard)) {
         text.append(QString("\nActive: %1s ~ open").arg(start, 0, 'f', 1));
     } else {
         text.append(QString("\nActive: %1s ~ %2s")
@@ -295,10 +256,10 @@ std::optional<std::size_t> hoveredActiveEnvironmentHazardIndex(
     double closestDistanceSq = kHoverRadiusPixels * kHoverRadiusPixels;
     for (std::size_t index = 0; index < hazards.size(); ++index) {
         const auto& hazard = hazards[index];
-        if (!hazardIsActive(hazard, elapsedSeconds)) {
+        if (!safecrowd::domain::environmentHazardActiveAt(hazard, elapsedSeconds)) {
             continue;
         }
-        if (!matchesFloor(hazardFloorId(layout, hazard), currentFloorId)) {
+        if (!matchesFloor(safecrowd::domain::environmentHazardFloorId(layout, hazard), currentFloorId)) {
             continue;
         }
 
@@ -960,15 +921,15 @@ void SimulationCanvasWidget::drawEnvironmentHazardOverlay(QPainter& painter, con
     painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
 
     for (const auto& hazard : environmentHazards_) {
-        if (!hazardIsActive(hazard, elapsedSeconds)) {
+        if (!safecrowd::domain::environmentHazardActiveAt(hazard, elapsedSeconds)) {
             continue;
         }
-        if (!matchesFloor(hazardFloorId(layout_, hazard), currentFloorId_)) {
+        if (!matchesFloor(safecrowd::domain::environmentHazardFloorId(layout_, hazard), currentFloorId_)) {
             continue;
         }
 
         const auto center = transform.map(hazard.position);
-        const auto radiusMeters = hazardRadiusMeters(hazard.severity);
+        const auto radiusMeters = safecrowd::domain::environmentHazardRuntimeProfile(hazard).radiusMeters;
         const auto radiusAnchor = transform.map({
             .x = hazard.position.x + radiusMeters,
             .y = hazard.position.y,