From e7cc8d8f3f2a32b5560ca72967e4e97a968a6c08 Mon Sep 17 00:00:00 2001
From: Nico Melone <nico.a.melone@gmail.com>
Date: Thu, 25 Aug 2022 12:08:24 -0500
Subject: [PATCH] adjusted tick marks

---
 .DS_Store                  | Bin 8196 -> 8196 bytes
 Widgets/.DS_Store          | Bin 6148 -> 6148 bytes
 Widgets/vessels/vessels.js |  44 ++++++++++++++++++++++++++++---------
 3 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 4e6d7950dc24445eff2b6e8ef2e9d7cb69247e7b..d6920c5d7c59734fc18c43980eb2f5d452d9e337 100644
GIT binary patch
delta 41
xcmZp1XmOa}&&a<qU^hP_|7IS6Y0Mlc#mPBI`T04M`-LY?c9D_U94@k!8vq=E4Zr{Z

delta 33
pcmZp1XmOa}&&aniU^hP_-)0_xY0Q)N3fFB`;CarxnO)*9I{>_$3poG)

diff --git a/Widgets/.DS_Store b/Widgets/.DS_Store
index 7055477ca82d66810abf26d6f57d3b7b8d7ed246..c6404ea441df60c031fe4da6f40e304f97842b0f 100644
GIT binary patch
delta 42
ycmZoMXfc@J&&atkU^gQp=VSvWk;w{7(>PO#lXH^t^K%$CFJbav-OSGMmmdHVNDU1D

delta 36
scmZoMXfc@J&&aVcU^nALJ+{fFO#G7-n5J#M$YjPku|aw>JI7ys0N2<HvH$=8

diff --git a/Widgets/vessels/vessels.js b/Widgets/vessels/vessels.js
index 008902e..a776c14 100644
--- a/Widgets/vessels/vessels.js
+++ b/Widgets/vessels/vessels.js
@@ -34,11 +34,11 @@ self.onDataUpdated = function () {
 };
 
 self.drawTank = function (ctx, compartmentWidth, compartmentHeight) {
-  ctx.moveTo(compartmentWidth * 0.05, compartmentHeight * 0.05);
+  ctx.moveTo(compartmentWidth * 0.05, compartmentHeight * 0.1);
   ctx.lineTo(compartmentWidth * 0.05, compartmentHeight * 0.95);
   ctx.ellipse(compartmentWidth / 2, compartmentHeight * 0.95, compartmentWidth / 2 - compartmentWidth * 0.05, compartmentHeight * 0.025, 0, Math.PI, 0, true);
-  ctx.lineTo(compartmentWidth * 0.95, compartmentHeight * 0.05);
-  ctx.ellipse(compartmentWidth / 2, compartmentHeight * 0.05, compartmentWidth / 2 - compartmentWidth * 0.05, compartmentHeight * 0.025, 0, 0, 2 * Math.PI);
+  ctx.lineTo(compartmentWidth * 0.95, compartmentHeight * 0.1);
+  ctx.ellipse(compartmentWidth / 2, compartmentHeight * 0.1, compartmentWidth / 2 - compartmentWidth * 0.05, compartmentHeight * 0.025, 0, 0, 2 * Math.PI);
 };
 
 self.drawPond = function (ctx, compartmentWidth, compartmentHeight) {
@@ -56,9 +56,10 @@ self.drawVessels = function (ctx, canvas, numVessels, cols, rows) {
       for (let j = 0; j < self.ctx.defaultSubscription.data.length; j++) {
         //console.log(self.ctx.settings.vessels[i - 1].volumeKey);
         //console.log(self.ctx.settings.vessels[i - 1].fluidLevelKey);
-        if (self.ctx.defaultSubscription.data[j].dataKey.name === self.ctx.settings.vessels[i - 1].volumeKey) {
+        //console.log(self.ctx.defaultSubscription.data[j].dataKey);
+        if (self.ctx.defaultSubscription.data[j].dataKey.label === self.ctx.settings.vessels[i - 1].volumeKey) {
           self.volume = typeof self.ctx.defaultSubscription.data[j].data[0] !== "undefined" ? self.ctx.defaultSubscription.data[j].data[0][1] : 0;
-        } else if (self.ctx.defaultSubscription.data[j].dataKey.name === self.ctx.settings.vessels[i - 1].fluidLevelKey) {
+        } else if (self.ctx.defaultSubscription.data[j].dataKey.label === self.ctx.settings.vessels[i - 1].fluidLevelKey) {
           self.fluidLevel = typeof self.ctx.defaultSubscription.data[j].data[0] !== "undefined" ? self.ctx.defaultSubscription.data[j].data[0][1] : 0;
         }
         //console.log(self.volume);
@@ -121,7 +122,7 @@ self.drawVessels = function (ctx, canvas, numVessels, cols, rows) {
       ctx.restore();
       ctx.restore();
 
-      self.drawTicks(ctx, compartmentWidth, compartmentHeight);
+      self.drawTicks(ctx, compartmentWidth, compartmentHeight, vesselType);
       self.drawText(ctx, compartmentWidth, compartmentHeight);
 
       if (i % cols === 0) {
@@ -141,12 +142,12 @@ self.drawText = function (ctx, compartmentWidth, compartmentHeight) {
   ctx.textAlign = "center";
   ctx.fillStyle = "rgba(0,0,0,1)";
   var padding = Math.max(Math.sqrt(compartmentWidth), Math.sqrt(compartmentHeight));
-  ctx.fillText(`${(self.fluidLevelPercent * 100).toFixed(2)} %  ${fl} Ft  ${vl} BBLs`, compartmentWidth / 2, compartmentHeight * 0.05);
+  ctx.fillText(`${fl} Ft  ${vl} BBLs`, compartmentWidth / 2, compartmentHeight * 0.05);
   //ctx.fillText(`${fl} Ft`, compartmentWidth / 4 - padding, compartmentHeight / 2 + padding);
   //ctx.fillText(`${vl} BBLs`, compartmentWidth / 4 - padding, compartmentHeight / 2 + 2 * padding);
 };
 
-self.drawTicks = function (ctx, compartmentWidth, compartmentHeight, guageAlignment) {
+self.drawTicks = function (ctx, compartmentWidth, compartmentHeight, vesselType, guageAlignment) {
   ctx.fillStyle = "rgba(0,0,0,1)";
   ctx.textBaseline = "middle";
   var widthOffset;
@@ -156,17 +157,40 @@ self.drawTicks = function (ctx, compartmentWidth, compartmentHeight, guageAlignm
       break;
     case "left":
       widthOffset = compartmentWidth * 0.05;
+      vesselType = "Pond";
       break;
     case "right":
       widthOffset = compartmentWidth * 0.95;
+      vesselType = "Pond";
       break;
     default:
       widthOffset = compartmentWidth * 0.5;
   }
-  var heightOffset = compartmentHeight * 0.1;
+  var heightOffset;
+  switch (vesselType) {
+    case "Pond":
+      var heightOffset = compartmentHeight * 0.1;
+      break;
+    case "Tank":
+      var heightOffset = compartmentHeight * 0.1 + compartmentHeight * 0.025;
+      break;
+    default:
+      var heightOffset = compartmentHeight * 0.1;
+  }
+
   var heightRange = compartmentHeight * 0.85;
   var numTicks = Math.min(Math.round(compartmentHeight / 40), 10);
-  ctx.moveTo(widthOffset, compartmentHeight - compartmentHeight*0.05);
+  switch (vesselType) {
+    case "Pond":
+      ctx.moveTo(widthOffset, compartmentHeight - compartmentHeight * 0.05);
+      break;
+    case "Tank":
+      ctx.moveTo(widthOffset, compartmentHeight - compartmentHeight * 0.05 + compartmentHeight * 0.025);
+      break;
+    default:
+      ctx.moveTo(widthOffset, compartmentHeight - compartmentHeight * 0.05);
+  }
+
   ctx.lineTo(widthOffset, heightOffset);
 
   for (let i = 0; i < numTicks; i++) {