Merge pull request #36 from BeneSim/fix-progress

Fix progress
BeneSim · Feb 22, 2022 · a8e2486 · a8e2486
2 parents 465c8b7 + c3e3f68
commit a8e2486
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/html/js/progress/progress.js b/html/js/progress/progress.js
@@ -67,7 +67,7 @@ function setupProgress(data_refs) {
 
     function setProgressBarValue() {
         let ratio = getRatio(data_refs["flight/distance_to_destination"].data, data_refs["flight/route_distance"].data);
-        $("#progress-line").attr("x2", "calc((100% - 20) * " + (1 - ratio) + " + 10)");
+        $("#progress-line").attr("x2", "calc((100% - 20px) * " + (1 - ratio) + " + 10px)");
     }
 
     attachToFun(setProgressBarValue, data_refs["flight/distance_to_destination"]);

diff --git a/html/progress.html b/html/progress.html
@@ -37,10 +37,10 @@
                             <use xlink:href="#airplane-half" x="0" y="0" transform="scale(1,-1)" />
                         </marker>
                     </defs>
-                    <line x1="10" x2="calc(100% - 10)" y1="50%" y2="50%" stroke-width="7" class="primary-stroke" />
+                    <line x1="10" x2="calc(100% - 10px)" y1="50%" y2="50%" stroke-width="7" class="primary-stroke" />
                     <circle cx="10" cy="50%" r="10" class="secondary-fill" />
-                    <circle cx="calc(100% - 10)" cy="50%" r="10" class="secondary-fill" />
-                    <line id="progress-line" x1="10" x2="calc((100% - 20) * 0.5 + 10)" y1="50%" y2="50%" stroke-width="7" class="secondary-stroke" marker-end="url(#head)" />
+                    <circle cx="calc(100% - 10px)" cy="50%" r="10" class="secondary-fill" />
+                    <line id="progress-line" x1="10" x2="calc((100% - 20px) * 0.5 + 10px)" y1="50%" y2="50%" stroke-width="7" class="secondary-stroke" marker-end="url(#head)" />
                 </svg>
 
                 <span width="100%" id="route" class="primary-color primary-font">BRANE Q201 BUREL UM736 TABAT UL87 ANELA UN869 TEDGO T724 RILAX	</span>

diff --git a/include/version.h b/include/version.h
@@ -3,7 +3,7 @@
 
 int const VERSION_MAJOR = 1;
 int const VERSION_MINOR = 2;
-int const VERSION_PATCH = 1;
+int const VERSION_PATCH = 2;
 bool const VERSION_PRERELEASE = false;
 
 QString const VERSION_STRING = VERSION_PRERELEASE ? QString("%1.%2.%3 (Beta)")