From e57d8415ee4e787e752c2d5a893e139f966f4d18 Mon Sep 17 00:00:00 2001 From: PCigales <58741513+PCigales@users.noreply.github.com> Date: Tue, 31 May 2022 21:03:05 +0200 Subject: [PATCH] Implementation of point infos in subjective 3d --- GPXTweaker.py | 56 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/GPXTweaker.py b/GPXTweaker.py index 9ffa730..42def0f 100644 --- a/GPXTweaker.py +++ b/GPXTweaker.py @@ -304,7 +304,7 @@ 'jpace': 'Progression:', 'jvfov': 'Champ de vue vertical:', 'jheight': 'Hauteur de vue:', - 'jminimap': 'clic sur la mini-carte pour l\'agrandir / la réduire clic droit sur la mini-carte pour afficher / masquer le panneau d\'informations, et lorsqu\'il est visible: clic droit sur la vue 3D pour afficher la description du point alt + clic droit sur la vue 3D pour afficher la description du point et son géocodage inversé clic sur l\'oeil ou la cible pour créer ou déplacer à cet emplacement le point de cheminement dédié dans l\'onglet d\'édition de trace shift + clic sur l\'oeil ou la cible pour compléter la description du point par son géocodage inversé ctrl + clic droit sur la mini-carte pour afficher / masquer le panneau de sélection du fournisseur de géocodages inversés', + 'jminimap': 'clic sur la mini-carte pour l\'agrandir / la réduire clic droit sur la mini-carte pour afficher / masquer le panneau d\'informations, et lorsqu\'il est visible: clic droit sur la vue 3D pour afficher la description du point alt + clic droit sur la vue 3D pour afficher la description du point et son géocodage inversé clic sur l\'oeil ou la cible pour créer ou déplacer à cet emplacement le point de cheminement dédié dans l\'onglet d\'édition de trace alt + clic sur l\'oeil ou la cible pour compléter la description du point par son géocodage inversé ctrl + clic droit sur la mini-carte pour afficher / masquer le panneau de sélection du fournisseur de géocodages inversés', 'jplat': 'lat:', 'jplon': 'lon:', 'jpele': 'ele:', @@ -597,7 +597,7 @@ 'jpace': 'Progression:', 'jvfov': 'Vertical field of view:', 'jheight': 'Height of view:', - 'jminimap': 'click on the mini-map to enlarge / reduce it right click on the mini-map to show / hide the informations panel, and when it is visible: right click on the 3D view to display the description of the point alt + right click on the 3D view to display the description of the point and its reverse geocoding click on the eye or the target to create or move to this location the dedicated waypoint in the track edition tab shift + click on the eye or the target to complete the description of the point with its reverse geocoding ctrl + right click on the mini-map to show / hide the reverse geocodings provider panel', + 'jminimap': 'click on the mini-map to enlarge / reduce it right click on the mini-map to show / hide the informations panel, and when it is visible: right click on the 3D view to display the description of the point alt + right click on the 3D view to display the description of the point and its reverse geocoding click on the eye or the target to create or move to this location the dedicated waypoint in the track edition tab alt + click on the eye or the target to complete the description of the point with its reverse geocoding ctrl + right click on the mini-map to show / hide the reverse geocodings provider panel', 'jplat': 'lat:', 'jplon': 'lon:', 'jpele': 'ele:', @@ -7454,6 +7454,8 @@ class GPXTweakerWebInterfaceServer(): ' element_click(null, document.getElementById(wpt.id + "desc"), false);\r\n' \ ' document.getElementById(wpt.id + "lat").value = coord[0].toFixed(6);\r\n' \ ' document.getElementById(wpt.id + "lon").value = coord[1].toFixed(6);\r\n' \ + ' document.getElementById(wpt.id + "ele").value = "";\r\n' \ + ' document.getElementById(wpt.id + "time").value = "";\r\n' \ ' point_edit(false, true, false, true);\r\n' \ ' } else {\r\n' \ ' point_insert("a", coord);\r\n' \ @@ -10630,14 +10632,22 @@ class GPXTweakerWebInterfaceServer(): ' \r\n' \ ' \r\n' \ ' \r\n' \ - ' \r\n' \ + ' \r\n' \ ' \r\n' \ ' \r\n' \ + ' \r\n' \ ' \r\n' \ ' \r\n' \ ' \r\n' \ @@ -10688,6 +10698,7 @@ class GPXTweakerWebInterfaceServer(): ' var p_infos = document.getElementById("panel_infos");\r\n' \ ' var e_info = document.getElementById("eye_info");\r\n' \ ' var t_info = document.getElementById("target_info");\r\n' \ + ' var t_mark = document.getElementById("target_mark");\r\n' \ ' var p_rg = document.getElementById("panel_rg");\r\n' \ ' var s_rg = document.getElementById("select_rg");\r\n' \ ' var minimap = document.getElementById("mini_map");\r\n' \ @@ -10704,6 +10715,7 @@ class GPXTweakerWebInterfaceServer(): ' var p_texture = null;\r\n' \ ' var pd_texture = null;\r\n' \ ' var pfrbuf = null;\r\n' \ + ' var predraw = false;\r\n' \ ' var mzoom = 1;\r\n' \ ' var show_infos = false;\r\n' \ ' var rgset = (s_rg.options.length > 0)?s_rg.selectedIndex:-1;\r\n' \ @@ -10724,6 +10736,7 @@ class GPXTweakerWebInterfaceServer(): ' if (v != null) {c_vfov.value = v.toString();}\r\n' \ ' cv_vfov.innerHTML = Math.round(parseFloat(c_vfov.value)).toString();\r\n' \ ' vfov = 1 / Math.tan(parseFloat(c_vfov.value) / 360 * Math.PI);\r\n' \ + ' if (show_infos) {clear_tinfos(true);}\r\n' \ ' } else if (p == "h") {\r\n' \ ' if (v != null) {\r\n' \ ' c_height.value = (Math.min(v, 10) * 2 + Math.min(Math.max(v - 10, 0), 40) / 2 + Math.min(Math.max(v - 50, 0), 150) / 7.5 + Math.min(Math.max(v - 200, 0), 300) / 15 + Math.max(v - 500, 0) / 25).toString();\r\n' \ @@ -10742,11 +10755,13 @@ class GPXTweakerWebInterfaceServer(): ' case "t":\r\n' \ ' if (v != null) {c_tangle.value = v.toString();}\r\n' \ ' angle = (90 + parseFloat(c_tangle.value)) * Math.PI / 180;\r\n' \ + ' if (show_infos) {clear_tinfos(true);}\r\n' \ ' break;\r\n' \ ' case "r":\r\n' \ ' if (v != null) {c_rangle.value = v.toString();}\r\n' \ ' angle = parseFloat(c_rangle.value) * Math.PI / -180;\r\n' \ ' if (eposition != null) {eye.setAttribute("transform", `translate(${eposition[0]} ${-eposition[1]}) rotate(${parseFloat(c_rangle.value)}) scale(${trscale / mzoom})`);}\r\n' \ + ' if (show_infos) {clear_tinfos(true);}\r\n' \ ' break;\r\n' \ ' case "lt":\r\n' \ ' if (v != null) {c_ltangle.value = v.toString();}\r\n' \ @@ -10799,6 +10814,7 @@ class GPXTweakerWebInterfaceServer(): ' canvas.style.width = canvas.parentNode.offsetWidth.toString() + "px";;\r\n' \ ' canvas.style.height = canvas.parentNode.offsetHeight.toString() + "px";\r\n' \ ' gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);\r\n' \ + ' if (show_infos) {clear_tinfos(true);}\r\n' \ ' gl.bindBuffer(gl.ARRAY_BUFFER, rvposition);\r\n' \ ' let rr = canvas.clientHeight / canvas.clientWidth;\r\n' \ ' let ra = 2 * Math.PI / rnt;\r\n' \ @@ -11133,7 +11149,8 @@ class GPXTweakerWebInterfaceServer(): ' mat4_mult(mat4_perspective(), vmatrix);\r\n' \ ' program_uniforms();\r\n' \ ' gl.drawArrays(gl.TRIANGLE_STRIP, 0, vpositions.length / 3);\r\n' \ - ' if (show_infos) {\r\n' \ + ' if (predraw) {\r\n' \ + ' predraw = false;\r\n' \ ' gl.bindFramebuffer(gl.FRAMEBUFFER, pfrbuf);\r\n' \ ' gl.viewport(0, 0, gl.drawingBufferWidth / ssampling, gl.drawingBufferHeight / ssampling);\r\n' \ ' gl.clearBufferiv(gl.COLOR, 0, new Int16Array([-32768, -32768, 0, 0]));\r\n' \ @@ -11181,8 +11198,6 @@ class GPXTweakerWebInterfaceServer(): ' c_height.disabled = false;\r\n' \ ' canvas.focus();\r\n' \ ' canvas.style.outline="none";\r\n' \ - ' \r\n' \ - ' \r\n' \ ' }\r\n' \ ' let xhr = new XMLHttpRequest();\r\n' \ ' xhr.onerror = (e) => derror_cb(e.target);\r\n' \ @@ -11267,7 +11282,7 @@ class GPXTweakerWebInterfaceServer(): ' set_param("h");\r\n' \ ' break;\r\n' \ ' case "enter":\r\n' \ - ' if (document.fullscreenElement) {document.exitFullscreen();} else { canvas.parentNode.requestFullscreen();}\r\n' \ + ' if (document.fullscreenElement) {document.exitFullscreen();} else {canvas.parentNode.requestFullscreen();}\r\n' \ ' break;\r\n' \ ' default:\r\n' \ ' return;\r\n' \ @@ -11292,7 +11307,8 @@ class GPXTweakerWebInterfaceServer(): ' show_infos = false;\r\n' \ ' p_infos.style.display = "none";\r\n' \ ' e_info.value = "";\r\n' \ - ' t_info.value = "";\r\n' \ + ' clear_tinfos();\r\n' \ + ' predraw = false;\r\n' \ ' } else {\r\n' \ ' show_infos = true;\r\n' \ ' p_infos.style.display = "block";\r\n' \ @@ -11301,18 +11317,26 @@ class GPXTweakerWebInterfaceServer(): ' gl.bindFramebuffer(gl.FRAMEBUFFER, pfrbuf);\r\n' \ ' ptexture_attach(gl.TEXTURE3);\r\n' \ ' gl.bindFramebuffer(gl.FRAMEBUFFER, null);\r\n' \ - ' canvas_redraw();\r\n' \ ' }\r\n' \ + ' predraw = true;\r\n' \ + ' canvas_redraw();\r\n' \ ' update_infos();\r\n' \ ' }\r\n' \ ' }\r\n' \ + ' function clear_tinfos(prd=false) {\r\n' \ + ' t_info.value = "";\r\n' \ + ' t_mark.style.display = "none";\r\n' \ + ' t_mark.style.left = "0%";\r\n' \ + ' t_mark.style.top = "0%";\r\n' \ + ' if (prd) {predraw = true;}\r\n' \ + ' }\r\n' \ ' function update_infos(e=null) {\r\n' \ ' if (e) {\r\n' \ ' e.preventDefault();\r\n' \ ' e.stopPropagation();\r\n' \ ' gl.bindFramebuffer(gl.FRAMEBUFFER, pfrbuf);\r\n' \ ' let pxy = new Int16Array(2)\r\n' \ - ' gl.readPixels(e.offsetX, gl.drawingBufferHeight / ssampling - e.offsetY - 1, 1, 1, gl.RG_INTEGER, gl.SHORT, pxy);\r\n' \ + ' gl.readPixels(Math.round(e.offsetX / canvas.parentNode.offsetWidth * gl.drawingBufferWidth / ssampling), Math.round((canvas.parentNode.offsetHeight - e.offsetY - 1) / canvas.parentNode.offsetHeight * gl.drawingBufferHeight / ssampling), 1, 1, gl.RG_INTEGER, gl.SHORT, pxy);\r\n' \ ' gl.bindFramebuffer(gl.FRAMEBUFFER, null);\r\n' \ ' if (pxy[0] != -32768 && pxy[1] != -32768) {\r\n' \ ' let px = pxy[0] / 32767;\r\n' \ @@ -11323,16 +11347,20 @@ class GPXTweakerWebInterfaceServer(): ' let pele = (pz + 1) * ppos[0] / ppos[4] + ppos[3];\r\n' \ ' let pdist = ppos[0] / ppos[4] * Math.sqrt((px - eposition[0]) ** 2 + (py - eposition[1]) ** 2);\r\n' \ ' t_info.value = "{#jplat#} " + plat.toFixed(6) + "° {#jplon#} " + plon.toFixed(6) + "° {#jpele#} " + pele.toFixed(1) + "m {#jpdist#} " + pdist.toFixed(0) + "m";\r\n' \ + ' t_mark.style.left = `calc(${e.offsetX * 100 / canvas.parentNode.offsetWidth}% - 1vh)`;\r\n' \ + ' t_mark.style.top = `calc(${e.offsetY * 100 / canvas.parentNode.offsetHeight}% - 1vh)`;\r\n' \ + ' t_mark.style.display = "block";\r\n' \ ' if (e.altKey) {complete_infos();}\r\n' \ ' } else {\r\n' \ - ' t_info.value = "";\r\n' \ + ' clear_tinfos();\r\n' \ ' }\r\n' \ ' } else {\r\n' \ ' let plat = (2 * Math.atan(Math.exp((eposition[1] * ppos[0] + ppos[2]) / 6378137)) - Math.PI / 2) * 180 / Math.PI;\r\n' \ ' let plon = (eposition[0] * ppos[0] + ppos[1]) * 180 / Math.PI / 6378137;\r\n' \ ' let pele = (trpaces[pace][2] + zoff + 1) * ppos[0] / ppos[4] + ppos[3];\r\n' \ ' e_info.value = "{#jplat#} " + plat.toFixed(6) + "° {#jplon#} " + plon.toFixed(6) + "° {#jpele#} " + pele.toFixed(1) + "m";\r\n' \ - ' t_info.value = "";\r\n '\ + ' clear_tinfos();\r\n '\ + ' predraw = true;\r\n' \ ' }\r\n' \ ' }\r\n' \ ' function update_waypoint(e) {\r\n' \