Skip to content

[Application] Improve project save/load result persistence #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
learncold merged 1 commit into from
May 9, 2026
Merged

[Application] Improve project save/load result persistence #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 49 additions & 5 deletions src/application/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ ProjectWorkspaceState makeEvacuationScenarioDemoWorkspace() {
.frame = std::move(fixture.frame),
.risk = std::move(fixture.risk),
.artifacts = std::move(fixture.artifacts),
.navigationView = SavedResultNavigationView::Bottleneck,
};
workspace.batchResult = SavedScenarioBatchResultState{
.results = {*workspace.result},
Expand Down Expand Up @@ -454,6 +455,7 @@ void MainWindow::openProject(const ProjectMetadata& metadata) {
workspace.result->frame,
workspace.result->risk,
workspace.result->artifacts,
workspace.result->navigationView,
workspace.authoring.has_value()
? std::make_optional(initialStateFromSaved(*workspace.authoring, *importResult.layout))
: std::nullopt);
Expand Down Expand Up @@ -500,16 +502,55 @@ void MainWindow::saveCurrentProject() {
}
}

if (auto* authoringWidget = visibleChild<ScenarioAuthoringWidget>(centralWidget())) {
auto* authoringWidget = visibleChild<ScenarioAuthoringWidget>(centralWidget());
auto* batchResultWidget = visibleChild<ScenarioBatchResultWidget>(centralWidget());
auto* resultWidget = visibleChild<ScenarioResultWidget>(centralWidget());
auto* runWidget = visibleChild<ScenarioRunWidget>(centralWidget());

const auto rootWidget = centralWidget();
const auto widgetDepth = [rootWidget](QWidget* widget) {
int depth = 0;
for (auto* current = widget; current != nullptr; current = current->parentWidget()) {
if (current == rootWidget) {
return depth;
}
++depth;
}
return -1;
};

QWidget* activeWorkflowWidget = nullptr;
int activeWorkflowDepth = -1;
const auto chooseActiveWorkflowWidget = [&](QWidget* widget) {
const int depth = widgetDepth(widget);
if (depth > activeWorkflowDepth) {
activeWorkflowDepth = depth;
activeWorkflowWidget = widget;
}
};
chooseActiveWorkflowWidget(authoringWidget);
chooseActiveWorkflowWidget(batchResultWidget);
chooseActiveWorkflowWidget(resultWidget);
chooseActiveWorkflowWidget(runWidget);

if (activeWorkflowWidget == authoringWidget) {
workspace.activeView = ProjectWorkspaceView::ScenarioAuthoring;
workspace.authoring = authoringWidget->currentSavedState();
} else if (auto* batchResultWidget = visibleChild<ScenarioBatchResultWidget>(centralWidget())) {
} else if (activeWorkflowWidget == batchResultWidget) {
workspace.activeView = ProjectWorkspaceView::ScenarioResult;
if (auto authoring = batchResultWidget->returnAuthoringState(); authoring.has_value()) {
workspace.authoring = savedStateFromInitial(*authoring);
}
auto results = batchResultWidget->results();
if (!results.empty()) {
const auto index = std::clamp(
batchResultWidget->currentResultIndex(),
0,
static_cast<int>(results.size()) - 1);
results[static_cast<std::size_t>(index)].navigationView = batchResultWidget->currentSavedNavigationView();
}
workspace.batchResult = SavedScenarioBatchResultState{
.results = batchResultWidget->results(),
.results = std::move(results),
.currentResultIndex = batchResultWidget->currentResultIndex(),
};
if (!workspace.batchResult->results.empty()) {
Expand All @@ -519,7 +560,7 @@ void MainWindow::saveCurrentProject() {
static_cast<int>(workspace.batchResult->results.size()) - 1);
workspace.result = workspace.batchResult->results[static_cast<std::size_t>(index)];
}
} else if (auto* resultWidget = visibleChild<ScenarioResultWidget>(centralWidget())) {
} else if (activeWorkflowWidget == resultWidget) {
workspace.activeView = ProjectWorkspaceView::ScenarioResult;
if (resultWidget->returnAuthoringState().has_value()) {
workspace.authoring = savedStateFromInitial(*resultWidget->returnAuthoringState());
Expand All @@ -529,8 +570,9 @@ void MainWindow::saveCurrentProject() {
.frame = resultWidget->frame(),
.risk = resultWidget->risk(),
.artifacts = resultWidget->artifacts(),
.navigationView = resultWidget->currentSavedNavigationView(),
};
} else if (auto* runWidget = visibleChild<ScenarioRunWidget>(centralWidget())) {
} else if (activeWorkflowWidget == runWidget) {
if (runWidget->returnAuthoringState().has_value()) {
workspace.authoring = savedStateFromInitial(*runWidget->returnAuthoringState());
}
Expand Down Expand Up @@ -732,6 +774,7 @@ void MainWindow::showScenarioResult(
const safecrowd::domain::SimulationFrame& frame,
const safecrowd::domain::ScenarioRiskSnapshot& risk,
const safecrowd::domain::ScenarioResultArtifacts& artifacts,
SavedResultNavigationView savedNavigationView,
std::optional<ScenarioAuthoringWidget::InitialState> returnAuthoringState) {
setCentralWidget(new ScenarioResultWidget(
currentProject_.name,
Expand All @@ -755,6 +798,7 @@ void MainWindow::showScenarioResult(
showLayoutReview(currentProject_);
}
},
savedNavigationView,
std::move(returnAuthoringState),
this));
}
Expand Down
1 change: 1 addition & 0 deletions src/application/MainWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class MainWindow : public QMainWindow {
const safecrowd::domain::SimulationFrame& frame,
const safecrowd::domain::ScenarioRiskSnapshot& risk,
const safecrowd::domain::ScenarioResultArtifacts& artifacts,
SavedResultNavigationView savedNavigationView = SavedResultNavigationView::Bottleneck,
std::optional<ScenarioAuthoringWidget::InitialState> returnAuthoringState = std::nullopt);

safecrowd::domain::SafeCrowdDomain& domain_;
Expand Down
192 changes: 192 additions & 0 deletions src/application/ProjectPersistence.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,157 @@ safecrowd::domain::ScenarioRiskSnapshot riskSnapshotFromJson(const QJsonObject&
return risk;
}

QJsonObject densityCellMetricToJson(const safecrowd::domain::DensityCellMetric& cell) {
QJsonObject object;
object["center"] = pointArray(cell.center);
object["cellMin"] = pointArray(cell.cellMin);
object["cellMax"] = pointArray(cell.cellMax);
object["floorId"] = QString::fromStdString(cell.floorId);
object["agentCount"] = static_cast<qint64>(cell.agentCount);
object["densityPeoplePerSquareMeter"] = cell.densityPeoplePerSquareMeter;
return object;
}

safecrowd::domain::DensityCellMetric densityCellMetricFromJson(const QJsonObject& object) {
return {
.center = pointFromJson(object.value("center")),
.cellMin = pointFromJson(object.value("cellMin")),
.cellMax = pointFromJson(object.value("cellMax")),
.floorId = object.value("floorId").toString().toStdString(),
.agentCount = static_cast<std::size_t>(object.value("agentCount").toInteger()),
.densityPeoplePerSquareMeter = object.value("densityPeoplePerSquareMeter").toDouble(),
};
}

QJsonObject densityFieldSnapshotToJson(const safecrowd::domain::DensityFieldSnapshot& snapshot) {
QJsonObject object;
object["timeSeconds"] = snapshot.timeSeconds;
object["cellSizeMeters"] = snapshot.cellSizeMeters;
QJsonArray cells;
for (const auto& cell : snapshot.cells) {
cells.append(densityCellMetricToJson(cell));
}
object["cells"] = cells;
return object;
}

safecrowd::domain::DensityFieldSnapshot densityFieldSnapshotFromJson(const QJsonObject& object) {
safecrowd::domain::DensityFieldSnapshot snapshot;
snapshot.timeSeconds = object.value("timeSeconds").toDouble();
snapshot.cellSizeMeters = object.value("cellSizeMeters").toDouble();
for (const auto& value : object.value("cells").toArray()) {
snapshot.cells.push_back(densityCellMetricFromJson(value.toObject()));
}
return snapshot;
}

QJsonObject densitySummaryToJson(const safecrowd::domain::DensitySummary& summary) {
QJsonObject object;
object["cellSizeMeters"] = summary.cellSizeMeters;
object["highDensityThresholdPeoplePerSquareMeter"] = summary.highDensityThresholdPeoplePerSquareMeter;
object["peakDensityPeoplePerSquareMeter"] = summary.peakDensityPeoplePerSquareMeter;
object["peakAgentCount"] = static_cast<qint64>(summary.peakAgentCount);
object["peakAtSeconds"] = optionalDoubleToJson(summary.peakAtSeconds);
if (summary.peakCell.has_value()) {
object["peakCell"] = densityCellMetricToJson(*summary.peakCell);
}
object["highDensityDurationSeconds"] = summary.highDensityDurationSeconds;
QJsonArray peakCells;
for (const auto& cell : summary.peakCells) {
peakCells.append(densityCellMetricToJson(cell));
}
object["peakCells"] = peakCells;
object["peakField"] = densityFieldSnapshotToJson(summary.peakField);
return object;
}

safecrowd::domain::DensitySummary densitySummaryFromJson(const QJsonObject& object) {
safecrowd::domain::DensitySummary summary;
summary.cellSizeMeters = object.value("cellSizeMeters").toDouble();
summary.highDensityThresholdPeoplePerSquareMeter =
object.value("highDensityThresholdPeoplePerSquareMeter").toDouble(4.0);
summary.peakDensityPeoplePerSquareMeter = object.value("peakDensityPeoplePerSquareMeter").toDouble();
summary.peakAgentCount = static_cast<std::size_t>(object.value("peakAgentCount").toInteger());
summary.peakAtSeconds = optionalDoubleFromJson(object.value("peakAtSeconds"));
if (object.value("peakCell").isObject()) {
summary.peakCell = densityCellMetricFromJson(object.value("peakCell").toObject());
}
summary.highDensityDurationSeconds = object.value("highDensityDurationSeconds").toDouble();
for (const auto& value : object.value("peakCells").toArray()) {
summary.peakCells.push_back(densityCellMetricFromJson(value.toObject()));
}
if (object.value("peakField").isObject()) {
summary.peakField = densityFieldSnapshotFromJson(object.value("peakField").toObject());
}
return summary;
}

QJsonObject exitUsageMetricToJson(const safecrowd::domain::ExitUsageMetric& exit) {
QJsonObject object;
object["exitZoneId"] = QString::fromStdString(exit.exitZoneId);
object["exitLabel"] = QString::fromStdString(exit.exitLabel);
object["floorId"] = QString::fromStdString(exit.floorId);
object["evacuatedCount"] = static_cast<qint64>(exit.evacuatedCount);
object["usageRatio"] = exit.usageRatio;
object["lastExitTimeSeconds"] = optionalDoubleToJson(exit.lastExitTimeSeconds);
return object;
}

safecrowd::domain::ExitUsageMetric exitUsageMetricFromJson(const QJsonObject& object) {
safecrowd::domain::ExitUsageMetric exit;
exit.exitZoneId = object.value("exitZoneId").toString().toStdString();
exit.exitLabel = object.value("exitLabel").toString().toStdString();
exit.floorId = object.value("floorId").toString().toStdString();
exit.evacuatedCount = static_cast<std::size_t>(object.value("evacuatedCount").toInteger());
exit.usageRatio = object.value("usageRatio").toDouble();
exit.lastExitTimeSeconds = optionalDoubleFromJson(object.value("lastExitTimeSeconds"));
return exit;
}

QJsonObject zoneCompletionMetricToJson(const safecrowd::domain::ZoneCompletionMetric& zone) {
QJsonObject object;
object["zoneId"] = QString::fromStdString(zone.zoneId);
object["zoneLabel"] = QString::fromStdString(zone.zoneLabel);
object["floorId"] = QString::fromStdString(zone.floorId);
object["initialCount"] = static_cast<qint64>(zone.initialCount);
object["evacuatedCount"] = static_cast<qint64>(zone.evacuatedCount);
object["lastCompletionTimeSeconds"] = optionalDoubleToJson(zone.lastCompletionTimeSeconds);
return object;
}

safecrowd::domain::ZoneCompletionMetric zoneCompletionMetricFromJson(const QJsonObject& object) {
safecrowd::domain::ZoneCompletionMetric zone;
zone.zoneId = object.value("zoneId").toString().toStdString();
zone.zoneLabel = object.value("zoneLabel").toString().toStdString();
zone.floorId = object.value("floorId").toString().toStdString();
zone.initialCount = static_cast<std::size_t>(object.value("initialCount").toInteger());
zone.evacuatedCount = static_cast<std::size_t>(object.value("evacuatedCount").toInteger());
zone.lastCompletionTimeSeconds = optionalDoubleFromJson(object.value("lastCompletionTimeSeconds"));
return zone;
}

QJsonObject placementCompletionMetricToJson(const safecrowd::domain::PlacementCompletionMetric& placement) {
QJsonObject object;
object["placementId"] = QString::fromStdString(placement.placementId);
object["zoneId"] = QString::fromStdString(placement.zoneId);
object["floorId"] = QString::fromStdString(placement.floorId);
object["initialCount"] = static_cast<qint64>(placement.initialCount);
object["evacuatedCount"] = static_cast<qint64>(placement.evacuatedCount);
object["lastCompletionTimeSeconds"] = optionalDoubleToJson(placement.lastCompletionTimeSeconds);
return object;
}

safecrowd::domain::PlacementCompletionMetric placementCompletionMetricFromJson(const QJsonObject& object) {
safecrowd::domain::PlacementCompletionMetric placement;
placement.placementId = object.value("placementId").toString().toStdString();
placement.zoneId = object.value("zoneId").toString().toStdString();
placement.floorId = object.value("floorId").toString().toStdString();
placement.initialCount = static_cast<std::size_t>(object.value("initialCount").toInteger());
placement.evacuatedCount = static_cast<std::size_t>(object.value("evacuatedCount").toInteger());
placement.lastCompletionTimeSeconds = optionalDoubleFromJson(object.value("lastCompletionTimeSeconds"));
return placement;
}

QJsonObject resultArtifactsToJson(const safecrowd::domain::ScenarioResultArtifacts& artifacts) {
QJsonObject object;
QJsonArray progress;
Expand All @@ -1100,13 +1251,36 @@ QJsonObject resultArtifactsToJson(const safecrowd::domain::ScenarioResultArtifac
timing["t90Seconds"] = optionalDoubleToJson(artifacts.timingSummary.t90Seconds);
timing["t95Seconds"] = optionalDoubleToJson(artifacts.timingSummary.t95Seconds);
timing["finalEvacuationTimeSeconds"] = optionalDoubleToJson(artifacts.timingSummary.finalEvacuationTimeSeconds);
timing["targetTimeSeconds"] = artifacts.timingSummary.targetTimeSeconds;
timing["marginSeconds"] = optionalDoubleToJson(artifacts.timingSummary.marginSeconds);
if (artifacts.timingSummary.t90Frame.has_value()) {
timing["t90Frame"] = simulationFrameToJson(*artifacts.timingSummary.t90Frame);
}
if (artifacts.timingSummary.t95Frame.has_value()) {
timing["t95Frame"] = simulationFrameToJson(*artifacts.timingSummary.t95Frame);
}
object["timingSummary"] = timing;

object["densitySummary"] = densitySummaryToJson(artifacts.densitySummary);

QJsonArray exitUsage;
for (const auto& exit : artifacts.exitUsage) {
exitUsage.append(exitUsageMetricToJson(exit));
}
object["exitUsage"] = exitUsage;

QJsonArray zoneCompletion;
for (const auto& zone : artifacts.zoneCompletion) {
zoneCompletion.append(zoneCompletionMetricToJson(zone));
}
object["zoneCompletion"] = zoneCompletion;

QJsonArray placementCompletion;
for (const auto& placement : artifacts.placementCompletion) {
placementCompletion.append(placementCompletionMetricToJson(placement));
}
object["placementCompletion"] = placementCompletion;

return object;
}

Expand All @@ -1130,12 +1304,28 @@ safecrowd::domain::ScenarioResultArtifacts resultArtifactsFromJson(const QJsonOb
artifacts.timingSummary.t90Seconds = optionalDoubleFromJson(timing.value("t90Seconds"));
artifacts.timingSummary.t95Seconds = optionalDoubleFromJson(timing.value("t95Seconds"));
artifacts.timingSummary.finalEvacuationTimeSeconds = optionalDoubleFromJson(timing.value("finalEvacuationTimeSeconds"));
artifacts.timingSummary.targetTimeSeconds = timing.value("targetTimeSeconds").toDouble();
artifacts.timingSummary.marginSeconds = optionalDoubleFromJson(timing.value("marginSeconds"));
if (timing.value("t90Frame").isObject()) {
artifacts.timingSummary.t90Frame = simulationFrameFromJson(timing.value("t90Frame").toObject());
}
if (timing.value("t95Frame").isObject()) {
artifacts.timingSummary.t95Frame = simulationFrameFromJson(timing.value("t95Frame").toObject());
}

if (object.value("densitySummary").isObject()) {
artifacts.densitySummary = densitySummaryFromJson(object.value("densitySummary").toObject());
}
for (const auto& value : object.value("exitUsage").toArray()) {
artifacts.exitUsage.push_back(exitUsageMetricFromJson(value.toObject()));
}
for (const auto& value : object.value("zoneCompletion").toArray()) {
artifacts.zoneCompletion.push_back(zoneCompletionMetricFromJson(value.toObject()));
}
for (const auto& value : object.value("placementCompletion").toArray()) {
artifacts.placementCompletion.push_back(placementCompletionMetricFromJson(value.toObject()));
}

return artifacts;
}

Expand Down Expand Up @@ -1185,6 +1375,7 @@ QJsonObject resultStateToJson(const SavedScenarioResultState& result) {
object["frame"] = simulationFrameToJson(result.frame);
object["risk"] = riskSnapshotToJson(result.risk);
object["artifacts"] = resultArtifactsToJson(result.artifacts);
object["navigationView"] = static_cast<int>(result.navigationView);
return object;
}

Expand All @@ -1194,6 +1385,7 @@ SavedScenarioResultState resultStateFromJson(const QJsonObject& object) {
.frame = simulationFrameFromJson(object.value("frame").toObject()),
.risk = riskSnapshotFromJson(object.value("risk").toObject()),
.artifacts = resultArtifactsFromJson(object.value("artifacts").toObject()),
.navigationView = static_cast<SavedResultNavigationView>(object.value("navigationView").toInt()),
};
}

Expand Down
8 changes: 8 additions & 0 deletions src/application/ProjectWorkspaceState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ enum class SavedRightPanelMode {
Run,
};

enum class SavedResultNavigationView {
Bottleneck,
Hotspot,
Zone,
Groups,
};

struct SavedScenarioState {
safecrowd::domain::ScenarioDraft draft{};
std::string baseScenarioId{};
Expand All @@ -48,6 +55,7 @@ struct SavedScenarioResultState {
safecrowd::domain::SimulationFrame frame{};
safecrowd::domain::ScenarioRiskSnapshot risk{};
safecrowd::domain::ScenarioResultArtifacts artifacts{};
SavedResultNavigationView navigationView{SavedResultNavigationView::Bottleneck};
};

struct SavedScenarioBatchResultState {
Expand Down
Loading
Loading