use doubles for percentage, combine linear timing function, 400ms tra…

…nsition and status update 3 times a second for smooth load bar
ad-freiburg · Oct 6, 2023 · 7ca1671 · 7ca1671
1 parent 83822b9
commit 7ca1671
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/qlever-petrimaps/GeomCache.cpp b/src/qlever-petrimaps/GeomCache.cpp
@@ -354,12 +354,12 @@ double GeomCache::getLoadStatusPercent(bool total) {
 
   if (!total) {
     return std::atomic<size_t>(_curRow) / static_cast<double>(_totalSize) *
-           100.0f;
+           100.0;
   }
 
-  float parsePercent = 95.0f;
-  float parseIdsPercent = 5.0f;
-  float totalPercent = 0.0f;
+  double parsePercent = 95.0;
+  double parseIdsPercent = 5.0;
+  double totalPercent = 0.0;
   switch (_loadStatusStage) {
     case _LoadStatusStages::Parse:
       totalPercent = std::atomic<size_t>(_curRow) /

diff --git a/src/qlever-petrimaps/server/Server.cpp b/src/qlever-petrimaps/server/Server.cpp
@@ -4,12 +4,12 @@
 
 #include <png.h>
 
+#include <algorithm>
 #include <chrono>
 #include <codecvt>
 #include <csignal>
 #include <locale>
 #include <memory>
-#include <algorithm>
 #include <random>
 #include <set>
 #include <unordered_set>
@@ -1128,7 +1128,8 @@ util::http::Answer Server::handleLoadStatusReq(const Params& pars) const {
   int loadStatusStage = cache->getLoadStatusStage();
 
   std::stringstream json;
-  json << "{\"percent\": " << loadStatusPercent << ", \"stage\": " << loadStatusStage << "}";
+  json << "{\"percent\": " << loadStatusPercent
+       << ", \"stage\": " << loadStatusStage << "}";
   util::http::Answer ans = util::http::Answer("200 OK", json.str());
 
   return ans;
@@ -1182,7 +1183,7 @@ void Server::createCache(const std::string& backend) const {
 
 // _____________________________________________________________________________
 void Server::loadCache(const std::string& backend) const {
-  //std::shared_ptr<Requestor> reqor;
+  // std::shared_ptr<Requestor> reqor;
   std::shared_ptr<GeomCache> cache = _caches[backend];
 
   try {

diff --git a/web/script.js b/web/script.js
@@ -287,7 +287,7 @@ async function fetchLoadStatus() {
 }
 
 fetchResults();
-fetchLoadStatusInterval(1000);
+fetchLoadStatusInterval(333);
 
 document.getElementById("ex-geojson").onclick = function() {
     if (!sessionId) return;

diff --git a/web/style.css b/web/style.css
@@ -700,7 +700,6 @@ h1, #msg-inner {
 
 #load-status {
     display: grid;
-
     width: 100%;
     background-color: white;
 
@@ -715,7 +714,8 @@ h1, #msg-inner {
     width: 0%;
     height: 30px;
     background-color: black;
-    transition: width 500ms;
+    transition: width 400ms;
+    transition-timing-function: linear;
 }
 
 #load-percent {
@@ -775,4 +775,4 @@ h1, #msg-inner {
 
 .export-link {
     font-size: 80%;
-}
+}