weyne/dcs-scratchpad
1
0
Fork 0
mirror of https://github.com/asherao/dcs-scratchpad.git synced 2025-10-29 16:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement new method for adding coords from map

Browse Source 
Refs #3
This commit is contained in:
Markus Ast 2021-10-14 22:29:38 +02:00
parent 8fa31a56b7
commit 8798859a8f
3 changed files with 220 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
Scripts/Hooks/scratchpad-hook.lua
View File

@ -7,78 +7,38 @@ local function loadScratchpad()
local DialogLoader = require("DialogLoader") local DialogLoader = require("DialogLoader")
local Tools = require("tools") local Tools = require("tools")
local Input = require("Input") local Input = require("Input")
local dxgui = require('dxgui')
local isHidden = true -- Scratchpad resources
local keyboardLocked = false
local window = nil local window = nil
local windowDefaultSkin = nil local windowDefaultSkin = nil
local windowSkinHidden = Skin.windowSkinChatMin() local windowSkinHidden = Skin.windowSkinChatMin()
local panel = nil local panel = nil
local textarea = nil local textarea = nil
local getCoordsLua =
[[
function formatCoord(type, isLat, d)
local h
if isLat then
if d < 0 then
h = 'S'
d = -d
else
h = 'N'
end
else
if d < 0 then
h = 'W'
d = -d
else
h = 'E'
end
end
local g = math.floor(d)
local m = math.floor(d * 60 - g * 60)
local s = d * 3600 - g * 3600 - m * 60
if type == "DMS" then -- Degree Minutes Seconds
s = math.floor(s * 100) / 100
return string.format('%s %2d°%.2d\'%2.2f"', h, g, m, s)
elseif type == "DDM" then -- Degree Decimal Minutes
s = math.floor(s / 60 * 1000)
return string.format('%s %2d°%2d.%3.3d\'', h, g, m, s)
else -- Decimal Degrees
return string.format('%f',d)
end
end
local marks = world.getMarkPanels()
local result = ""
for _, mark in pairs(marks) do
local lat, lon = coord.LOtoLL({
x = mark.pos.x,
y = 0,
z = mark.pos.z
})
local alt = land.getHeight({
x = mark.pos.x,
y = mark.pos.z
})
result = result .. "\n"
result = result .. formatCoord("DMS", true, lat) .. ", " .. formatCoord("DMS", false, lon) .. "\n"
result = result .. formatCoord("DDM", true, lat) .. ", " .. formatCoord("DDM", false, lon) .. "\n"
result = result .. string.format("%.0f", alt) .. "m, ".. string.format("%.0f", alt*3.28084) .. "ft, " .. mark.text .. "\n"
end
return result
]]
local logFile = io.open(lfs.writedir() .. [[Logs\Scratchpad.log]], "w") local logFile = io.open(lfs.writedir() .. [[Logs\Scratchpad.log]], "w")
local config = nil local config = nil
local panel = nil
local textarea = nil
local crosshairCheckbox = nil
local insertCoordsBtn = nil
local prevButton = nil
local nextButton = nil
-- State
local isHidden = true
local keyboardLocked = false
local inMission = false
-- Pages State
local dirPath = lfs.writedir() .. [[Scratchpad\]] local dirPath = lfs.writedir() .. [[Scratchpad\]]
local currentPage = nil local currentPage = nil
local pagesCount = 0 local pagesCount = 0
local pages = {} local pages = {}
-- Crosshair resources
local crosshairWindow = nil
local function log(str) local function log(str)
if not str then if not str then
return return
@ -250,15 +210,53 @@ local function loadScratchpad()
keyboardLocked = true keyboardLocked = true
end end
local function insertCoordinates() function formatCoord(type, isLat, d)
local coords = net.dostring_in("server", getCoordsLua) local h
local lineCountBefore = textarea:getLineCount() if isLat then
if d < 0 then
if coords == "" then h = 'S'
textarea:setText(textarea:getText() .. "\nNo marks found\n") d = -d
else else
textarea:setText(textarea:getText() .. coords .. "\n") h = 'N'
end end
else
if d < 0 then
h = 'W'
d = -d
else
h = 'E'
end
end
local g = math.floor(d)
local m = math.floor(d * 60 - g * 60)
local s = d * 3600 - g * 3600 - m * 60
if type == "DMS" then -- Degree Minutes Seconds
s = math.floor(s * 100) / 100
return string.format('%s %2d°%.2d\'%2.2f"', h, g, m, s)
elseif type == "DDM" then -- Degree Decimal Minutes
s = math.floor(s / 60 * 1000)
return string.format('%s %2d°%2d.%3.3d\'', h, g, m, s)
else -- Decimal Degrees
return string.format('%f',d)
end
end
local function insertCoordinates()
local pos = Export.LoGetCameraPosition().p
local alt = Export.LoGetAltitude(pos.x, pos.z)
local coords = Export.LoLoCoordinatesToGeoCoordinates(pos.x, pos.z)
local lat = coords.latitude
local lon = coords.longitude
local result = ""
result = result .. formatCoord("DMS", true, lat) .. ", " .. formatCoord("DMS", false, lon) .. "\n"
result = result .. formatCoord("DDM", true, lat) .. ", " .. formatCoord("DDM", false, lon) .. "\n"
result = result .. string.format("%.0f", alt) .. "m, ".. string.format("%.0f", alt*3.28084) .. "ft\n"
local lineCountBefore = textarea:getLineCount()
textarea:setText(textarea:getText() .. result .. "\n")
-- scroll to the bottom of the textarea -- scroll to the bottom of the textarea
local lastLine = textarea:getLineCount() - 1 local lastLine = textarea:getLineCount() - 1
@ -278,9 +276,10 @@ local function loadScratchpad()
textarea:setBounds(0, 0, w, h - 20 - 20) textarea:setBounds(0, 0, w, h - 20 - 20)
prevButton:setBounds(0, h - 40, 50, 20) prevButton:setBounds(0, h - 40, 50, 20)
nextButton:setBounds(55, h - 40, 50, 20) nextButton:setBounds(55, h - 40, 50, 20)
crosshairCheckbox:setBounds(120, h - 39, 20, 20)
if pagesCount > 1 then if pagesCount > 1 then
insertCoordsBtn:setBounds(120, h - 40, 50, 20) insertCoordsBtn:setBounds(145, h - 40, 50, 20)
else else
insertCoordsBtn:setBounds(0, h - 40, 50, 20) insertCoordsBtn:setBounds(0, h - 40, 50, 20)
end end
@ -295,9 +294,16 @@ local function loadScratchpad()
saveConfiguration() saveConfiguration()
end end
local function updateCoordsMode()
-- insert coords only works if the client is the server, so hide the button otherwise
crosshairCheckbox:setVisible(inMission and Export.LoIsOwnshipExportAllowed())
crosshairWindow:setVisible(inMission and crosshairCheckbox:getState())
insertCoordsBtn:setVisible(inMission and crosshairCheckbox:getState())
end
local function show() local function show()
if window == nil then if window == nil then
local status, err = pcall(createWindow) local status, err = pcall(createScratchpadWindow)
if not status then if not status then
net.log("[Scratchpad] Error creating window: " .. tostring(err)) net.log("[Scratchpad] Error creating window: " .. tostring(err))
end end
@ -308,13 +314,6 @@ local function loadScratchpad()
panel:setVisible(true) panel:setVisible(true)
window:setHasCursor(true) window:setHasCursor(true)
-- insert coords only works if the client is the server, so hide the button otherwise
if DCS.isServer() then
insertCoordsBtn:setVisible(true)
else
insertCoordsBtn:setVisible(false)
end
-- show prev/next buttons only if we have more than one page -- show prev/next buttons only if we have more than one page
if pagesCount > 1 then if pagesCount > 1 then
prevButton:setVisible(true) prevButton:setVisible(true)
@ -324,6 +323,8 @@ local function loadScratchpad()
nextButton:setVisible(false) nextButton:setVisible(false)
end end
updateCoordsMode()
isHidden = false isHidden = false
end end
@ -335,14 +336,45 @@ local function loadScratchpad()
-- window.setVisible(false) -- if you make the window invisible, its destroyed -- window.setVisible(false) -- if you make the window invisible, its destroyed
unlockKeyboardInput(true) unlockKeyboardInput(true)
crosshairWindow:setVisible(false)
isHidden = true isHidden = true
end end
local function createWindow() local function createCrosshairWindow()
window = DialogLoader.spawnDialogFromFile(lfs.writedir() .. "Scripts\\Scratchpad\\ScratchpadWindow.dlg", cdata) if crosshairWindow ~= nil then
return
end
crosshairWindow = DialogLoader.spawnDialogFromFile(
lfs.writedir() .. "Scripts\\Scratchpad\\CrosshairWindow.dlg",
cdata
)
local screenWidth, screenHeigt = dxgui.GetScreenSize()
local x = screenWidth/2 - 4
local y = screenHeigt/2 - 4
crosshairWindow:setBounds(math.floor(x), math.floor(y), 8, 8)
log("Crosshair window created")
end
local function createScratchpadWindow()
if window ~= nil then
return
end
createCrosshairWindow()
window = DialogLoader.spawnDialogFromFile(
lfs.writedir() .. "Scripts\\Scratchpad\\ScratchpadWindow.dlg",
cdata
)
windowDefaultSkin = window:getSkin() windowDefaultSkin = window:getSkin()
panel = window.Box panel = window.Box
textarea = panel.ScratchpadEditBox textarea = panel.ScratchpadEditBox
crosshairCheckbox = panel.ScratchpadCrosshairCheckBox
insertCoordsBtn = panel.ScratchpadInsertCoordsButton insertCoordsBtn = panel.ScratchpadInsertCoordsButton
prevButton = panel.ScratchpadPrevButton prevButton = panel.ScratchpadPrevButton
nextButton = panel.ScratchpadNextButton nextButton = panel.ScratchpadNextButton
@ -375,7 +407,7 @@ local function loadScratchpad()
end end
) )
-- setup button callbacks -- setup button and checkbox callbacks
prevButton:addMouseDownCallback( prevButton:addMouseDownCallback(
function(self) function(self)
prevPage() prevPage()
@ -386,6 +418,13 @@ local function loadScratchpad()
nextPage() nextPage()
end end
) )
crosshairCheckbox:addChangeCallback(
function(self)
local checked = self:getState()
insertCoordsBtn:setVisible(checked)
crosshairWindow:setVisible(checked)
end
)
insertCoordsBtn:addMouseDownCallback( insertCoordsBtn:addMouseDownCallback(
function(self) function(self)
insertCoordinates() insertCoordinates()
@ -418,7 +457,7 @@ local function loadScratchpad()
nextPage() nextPage()
hide() hide()
log("Scratchpad Window created") log("Scratchpad window created")
end end
local handler = {} local handler = {}
@ -429,9 +468,18 @@ local function loadScratchpad()
if not window then if not window then
log("Creating Scratchpad window hidden...") log("Creating Scratchpad window hidden...")
createWindow() createScratchpadWindow()
end end
end end
function handler.onMissionLoadEnd()
inMission = true
updateCoordsMode()
end
function handler.onSimulationStop()
inMission = false
crosshairCheckbox:setState(false)
hide()
end
DCS.setUserCallbacks(handler) DCS.setUserCallbacks(handler)
net.log("[Scratchpad] Loaded ...") net.log("[Scratchpad] Loaded ...")

67
Scripts/Scratchpad/CrosshairWindow.dlg Normal file
View File

@ -0,0 +1,67 @@
dialog = {
["type"] = "Window",
["params"] = {
["bounds"] = {
[1] = {
["h"] = 8,
["w"] = 8,
["x"] = 0,
["y"] = 0
}
},
["draggable"] = false,
["enabled"] = true,
["hasCursor"] = false,
["lockFlow"] = false,
["modal"] = false,
["offscreen"] = false,
["resizable"] = false,
["zOrder"] = 111,
["text"] = ""
},
["skin"] = {
["params"] = {
["headerHeight"] = 0,
["name"] = "windowSkin"
},
["states"] = {
["released"] = {
[1] = {
["bkg"] = {
["center_center"] = "0x00000000"
}
}
}
}
},
["children"] = {
["WaypointCrosshair"] = {
["type"] = "Static",
["params"] = {
["bounds"] = {
["h"] = 8,
["w"] = 8,
["x"] = 0,
["y"] = 0
},
["enabled"] = true,
["visible"] = true,
},
["skin"] = {
["params"] = {
["name"] = "staticSkin"
},
["states"] = {
["released"] = {
[1] = {
["picture"] = {
["color"] = "0xffffffff",
["file"] = "dxgui\\skins\\skinME\\images\\mission_editor\\neutral_coalition.png"
}
}
}
}
}
}
}
}

29
Scripts/Scratchpad/ScratchpadWindow.dlg
View File

@ -16,7 +16,7 @@ dialog = {
["modal"] = false, ["modal"] = false,
["offscreen"] = false, ["offscreen"] = false,
["resizable"] = true, ["resizable"] = true,
["zOrder"] = 111, ["zOrder"] = 112,
["text"] = "Scratchpad" ["text"] = "Scratchpad"
}, },
["skin"] = { ["skin"] = {
@ -115,19 +115,42 @@ dialog = {
}, },
["type"] = "Button" ["type"] = "Button"
}, },
["ScratchpadCrosshairCheckBox"] = {
["params"] = {
["bounds"] = {
["h"] = 20,
["w"] = 20,
["x"] = 110,
["y"] = 181,
},
["enabled"] = true,
["state"] = false,
["tabOrder"] = 140,
["text"] = "",
["tooltip"] = "",
["visible"] = true,
["zindex"] = 0,
},
["skin"] = {
["params"] = {
["name"] = "checkBoxSkin_MENew",
},
},
["type"] = "CheckBox",
},
["ScratchpadInsertCoordsButton"] = { ["ScratchpadInsertCoordsButton"] = {
["params"] = { ["params"] = {
["bounds"] = { ["bounds"] = {
["h"] = 20, ["h"] = 20,
["w"] = 120, ["w"] = 120,
["x"] = 80, ["x"] = 105,
["y"] = 180 ["y"] = 180
}, },
["enabled"] = true, ["enabled"] = true,
["tabOrder"] = 0, ["tabOrder"] = 0,
["text"] = "+L/L", ["text"] = "+L/L",
["tooltip"] = "Insert Coords", ["tooltip"] = "Insert Coords",
["visible"] = true, ["visible"] = false,
["zindex"] = 1 ["zindex"] = 1
}, },
["skin"] = { ["skin"] = {