Modified dialog to include distance from last waypoint

okopanja · May 18, 2024 · d542f2a · d542f2a
1 parent a0db253
commit d542f2a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/SharkPlanner/UI/CrosshairWindow.dlg b/SharkPlanner/UI/CrosshairWindow.dlg
@@ -85,6 +85,28 @@ dialog = {
           },
           ["type"] = "Static",
         },
+        ["ObjectID"] = {
+          ["params"] = {
+            ["bounds"] = {
+              ["x"] = 400 - 150,
+              ["y"] = 200 + 13,
+              ["h"] = 26,
+              ["w"] = 150,
+            },
+            ["enabled"] = false,
+            ["text"] = "",
+            ["tooltip"] = "Distance from last waypoint",
+            ["visible"] = true,
+            ["zindex"] = 0,
+          },
+          ["skin"] = {
+            -- ["params"] = {
+            --   ["name"] = "buttonSkinAwacs",
+            --   -- ["name"] = "staticSkin_ME",
+            -- },
+          },
+          ["type"] = "Static",
+        },
         ["DistanceFromLast"] = {
           ["params"] = {
             ["bounds"] = {

diff --git a/SharkPlanner/UI/CrosshairWindow.lua b/SharkPlanner/UI/CrosshairWindow.lua
@@ -12,6 +12,7 @@ local Camera = require("SharkPlanner.Base.Camera")
 local Position = require("SharkPlanner.Base.Position")
 local Mathematics = require("SharkPlanner.Mathematics")
 local SkinHelper = require("SharkPlanner.UI.SkinHelper")
+local JSON = require("JSON")
 
 local CrosshairWindow = DialogLoader.spawnDialogFromFile(
     lfs.writedir() .. "Scripts\\SharkPlanner\\UI\\CrosshairWindow.dlg"
@@ -31,6 +32,7 @@ function CrosshairWindow:new(o)
     local staticCrosshairValueSkin = SkinHelper.loadSkin('staticCrosshairRightLightValue')
     local staticCrosshairLightValueSkin = SkinHelper.loadSkin('staticCrosshairRightLightValue')
     o.ObjectModel:setSkin(staticCrosshairLightValueSkin)
+    o.ObjectID:setSkin(staticCrosshairLightValueSkin)
     o.DistanceFromLast:setSkin(staticCrosshairValueSkin)
     o.Longitude:setSkin(staticCrosshairValueSkin)
     o.Latitude:setSkin(staticCrosshairValueSkin)
@@ -93,8 +95,11 @@ end
 function CrosshairWindow:updateObjectModel(eventArgs)
   if #eventArgs.objects > 0 then
       self.ObjectModel:setText(eventArgs.objects[1].model)
+      self.ObjectID:setText(eventArgs.objects[1].id)
+      Logging.debug("Object: "..JSON:encode_pretty(eventArgs.objects[1]))
   else
       self.ObjectModel:setText("")
+      self.ObjectID:setText("")
   end
 end