+ timestamp for peak save corrected

+ reset peak simulation after save
chrxh · Nov 3, 2024 · de6899f · de6899f
1 parent 04e604a
commit de6899f
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 23 deletions.
diff --git a/source/Gui/AutosaveWindow.cpp b/source/Gui/AutosaveWindow.cpp
@@ -229,7 +229,7 @@ void AutosaveWindow::processSettings()
                     _lastAutosaveTimepoint = std::chrono::steady_clock::now();
                 }
             }
-            AlienImGui::Switcher(
+            if (AlienImGui::Switcher(
                 AlienImGui::SwitcherParameters()
                     .name("Catch peak")
                     .textWidth(RightColumnWidth)
@@ -238,7 +238,9 @@ void AutosaveWindow::processSettings()
                         "None",
                         "Genome complexity variance",
                     }),
-                _catchPeak);
+                _catchPeak)) {
+                _peakDeserializedSimulation->setDeserializedSimulation(DeserializedSimulation());
+            }
 
             if (AlienImGui::InputText(
                     AlienImGui::InputTextParameters().name("Directory").textWidth(RightColumnWidth).defaultValue(_origDirectory).folderButton(true),
@@ -285,7 +287,7 @@ void AutosaveWindow::onCreateSavepoint(bool usePeakSimulation)
     }
 
     PersisterRequestId requestId;
-    if (usePeakSimulation) {
+    if (usePeakSimulation && !_peakDeserializedSimulation->isEmpty()) {
         auto senderInfo = SenderInfo{.senderId = SenderId{AutosaveSenderId}, .wishResultData = true, .wishErrorInfo = true};
         auto saveData = SaveDeserializedSimulationRequestData{
             .filename = _directory, .sharedDeserializedSimulation = _peakDeserializedSimulation, .generateNameFromTimestep = true};
@@ -337,20 +339,22 @@ void AutosaveWindow::processAutomaticSavepoints()
         _lastAutosaveTimepoint = std::chrono::steady_clock::now();
     }
 
-    auto minSinceLastCatchPeak = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - _lastPeakTimepoint).count();
-    if (minSinceLastCatchPeak >= 60) {
-        _peakProcessor->executeTask(
-            [&](auto const& senderId) {
-                return _persisterFacade->scheduleGetPeakSimulation(
-                    SenderInfo{.senderId = senderId, .wishResultData = false, .wishErrorInfo = true},
-                    GetPeakSimulationRequestData{
-                        .peakDeserializedSimulation = _peakDeserializedSimulation,
-                        .zoom = Viewport::get().getZoomFactor(),
-                        .center = Viewport::get().getCenterInWorldPos()});
-            },
-            [&](auto const& requestId) {},
-            [](auto const& errors) { GenericMessageDialog::get().information("Error", errors); });
-        _lastPeakTimepoint = std::chrono::steady_clock::now();
+    if (_catchPeak != CatchPeak_None) {
+        auto minSinceLastCatchPeak = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() - _lastPeakTimepoint).count();
+        if (minSinceLastCatchPeak >= 30) {
+            _peakProcessor->executeTask(
+                [&](auto const& senderId) {
+                    return _persisterFacade->scheduleGetPeakSimulation(
+                        SenderInfo{.senderId = senderId, .wishResultData = false, .wishErrorInfo = true},
+                        GetPeakSimulationRequestData{
+                            .peakDeserializedSimulation = _peakDeserializedSimulation,
+                            .zoom = Viewport::get().getZoomFactor(),
+                            .center = Viewport::get().getCenterInWorldPos()});
+                },
+                [&](auto const& requestId) {},
+                [](auto const& errors) { GenericMessageDialog::get().information("Error", errors); });
+            _lastPeakTimepoint = std::chrono::steady_clock::now();
+        }
     }
 }
 
@@ -414,6 +418,7 @@ void AutosaveWindow::updateSavepoint(int row)
                     newEntry->timestamp = StringHelper::format(data.timestamp);
                     newEntry->name = data.projectName;
                     newEntry->filename = data.filename;
+                    _peakDeserializedSimulation->setDeserializedSimulation(DeserializedSimulation());
                 }
             }
             if (requestState.value() == PersisterRequestState::Error) {

diff --git a/source/PersisterImpl/PersisterWorker.cpp b/source/PersisterImpl/PersisterWorker.cpp
@@ -639,7 +639,7 @@ _PersisterWorker::PersisterRequestResultOrError _PersisterWorker::processRequest
             deserializedSimulation.auxiliaryData.simulationParameters = _simulationFacade->getSimulationParameters();
             deserializedSimulation.auxiliaryData.timestep = static_cast<uint32_t>(_simulationFacade->getCurrentTimestep());
             deserializedSimulation.mainData = _simulationFacade->getClusteredSimulationData();
-            requestData.peakDeserializedSimulation->set(std::move(deserializedSimulation));
+            requestData.peakDeserializedSimulation->setDeserializedSimulation(std::move(deserializedSimulation));
         }
         return std::make_shared<_GetPeakSimulationRequestResult>(request->getRequestId(), GetPeakSimulationResultData());
     } catch (...) {
@@ -657,8 +657,7 @@ _PersisterWorker::PersisterRequestResultOrError _PersisterWorker::processRequest
 
         auto const& requestData = request->getData();
 
-        auto timestamp = std::chrono::system_clock::now();
-        auto deserializedData = requestData.sharedDeserializedSimulation->get();
+        auto deserializedData = requestData.sharedDeserializedSimulation->getDeserializedSimulation();
 
         auto filename = requestData.filename;
         if (requestData.generateNameFromTimestep) {
@@ -674,7 +673,7 @@ _PersisterWorker::PersisterRequestResultOrError _PersisterWorker::processRequest
                 .filename = filename,
                 .projectName = deserializedData.auxiliaryData.simulationParameters.projectName,
                 .timestep = deserializedData.auxiliaryData.timestep,
-                .timestamp = timestamp});
+                .timestamp = requestData.sharedDeserializedSimulation->getTimestamp()});
     } catch (...) {
         return std::make_shared<_PersisterRequestError>(
             request->getRequestId(),

diff --git a/source/PersisterInterface/SaveDeserializedSimulationResultData.h b/source/PersisterInterface/SaveDeserializedSimulationResultData.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <filesystem>
+#include <chrono>
+
 struct SaveDeserializedSimulationResultData
 {
     std::filesystem::path filename;

diff --git a/source/PersisterInterface/SharedDeserializedSimulation.h b/source/PersisterInterface/SharedDeserializedSimulation.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <mutex>
+#include <chrono>
 
 #include "DeserializedSimulation.h"
 
@@ -16,20 +17,34 @@ class _SharedDeserializedSimulation
         return _deserializedSimulation.statistics.back();
     }
 
-    void set(DeserializedSimulation&& value)
+    void setDeserializedSimulation(DeserializedSimulation&& value)
     {
         std::lock_guard lock(_mutex);
         _deserializedSimulation = std::move(value);
+        _timestamp = std::chrono::system_clock::now();
     }
 
-    DeserializedSimulation get() const
+    DeserializedSimulation getDeserializedSimulation() const
     {
         std::lock_guard lock(_mutex);
         return _deserializedSimulation;
     }
 
+    std::chrono::system_clock::time_point getTimestamp() const
+    {
+        std::lock_guard lock(_mutex);
+        return _timestamp;
+    }
+
+    bool isEmpty() const
+    {
+        std::lock_guard lock(_mutex);
+        return _deserializedSimulation.mainData.isEmpty();
+    }
+
 private:
     mutable std::mutex _mutex;
     DeserializedSimulation _deserializedSimulation;
+    std::chrono::system_clock::time_point _timestamp;
 };
 using SharedDeserializedSimulation = std::shared_ptr<_SharedDeserializedSimulation>;