Changeset 70 for ether_eccad/trunk/ECCAD_INTERFACE/JavaScript

Timestamp:

04/26/10 19:12:49 (14 years ago)

Author:

cbipsl

Message:

maj eccad V3.2

File:

• ether_eccad/trunk/ECCAD_INTERFACE/JavaScript/selectSouris.js (modified) (8 diffs)

ether_eccad/trunk/ECCAD_INTERFACE/JavaScript/selectSouris.js

@@ -19 +19 @@
         
 function onClicCarte(e) {
-        var coeff =1/parseInt((imgHaut/(imgLATmax-imgLATmin))*resolution);
-        document.getElementById("form_carte:clicX").value = parseInt( ( xCurseur(e) - findPosX(document.getElementById("form_carte:carte")) ) *coeff) / coeff;
-        document.getElementById("form_carte:clicY").value = parseInt( ( yCurseur(e) - findPosY(document.getElementById("form_carte:carte")) ) *coeff) / coeff;
+        var posX = xCurseur(e);
+        var posY = yCurseur(e);
+        var posXimg = posX - findPosX(document.getElementById("form_carte:carte"));
+        var posYimg = posY - findPosY(document.getElementById("form_carte:carte"));
+//      var coeff =1/parseInt((imgHaut/(imgLATmax-imgLATmin))*resolution);
+//      document.getElementById("form_carte:clicX").value = parseInt( posXimg *coeff) / coeff;
+//      document.getElementById("form_carte:clicY").value = parseInt( posYimg *coeff) / coeff;
+        document.getElementById("form_carte:clicX").value = posXimg;
+        document.getElementById("form_carte:clicY").value = posYimg;
         
         document.getElementById("form_carte:centerLonClick").value = findLonN(document.getElementById("form_carte:clicX").value);
         document.getElementById("form_carte:centerLatClick").value = findLatN(document.getElementById("form_carte:clicY").value);
+//alert("imgHaut="+imgHaut+",imglatmax="+imgLATmax+",imglatmin="+imgLATmin+",resol="+resolution+",coef="+coeff+",latcenter="+document.getElementById("form_carte:centerLatClick").value+",loncenter="+document.getElementById("form_carte:centerLonClick").value);
         document.getElementById("calque_chargement").style.display = "inline";
         document.getElementById("resizediv").style.display = "none";
-        
-        
+
         //alert("nouvelle position :: " + document.getElementById("form_carte:clicX").value + " " + document.getElementById("form_carte:clicY").value );
         
-        
 }       
         
-        // position x de la sourie
+        // position x de la souris
         function xCurseur(e) {
                 if (document.all) return event.clientX + document.body.scrollLeft;
@@ -40 +45 @@
         }
         
-        // position y de la sourie
+        // position y de la souris
         function yCurseur(e) {
                 if (document.all) return event.clientY + document.body.scrollTop;
@@ -69 +74 @@
         var posY = yCurseur(e);
         //var coeff =1/parseInt((imgHaut/(imgLATmax-imgLATmin))*resolution);
-        
-        
         //var posXimg = parseInt( ( xCurseur(e) - findPosX(document.getElementById("form_carte:carte")) ) *coeff) / coeff;
         //var posYimg = parseInt( ( yCurseur(e) - findPosY(document.getElementById("form_carte:carte")) ) *coeff) / coeff;
-        
+
         var posXimg = posX - findPosX(document.getElementById("form_carte:carte"));
         var posYimg = posY - findPosY(document.getElementById("form_carte:carte"));
+//alert("X="+posX+", Y="+posY+", Ximg="+posXimg+", Yimg="+posYimg+", lon="+findLonN(posXimg)+", lat="+findLatN(posYimg));
+
         var div1 = document.getElementById("position1");
         //div.style.left = (posX + 10) + "px";
@@ -116 +121 @@
                 //imgLarg = parseInt( 720/ (imgLONmax-imgLONmin))*(imgLONmax-imgLONmin);
                 resolution = document.getElementById("form_carte:resolution").value;
-                
+//              alert("latmin="+imgLATmin+",latmax="+imgLATmax+",lonmin="+imgLONmin+",lonmax="+imgLONmax);
                 if (imgLATmax == null || imgLATmin == null || imgLONmax == null || imgLONmin == null)
                         alert("erreur d'initialisation des coordonnees");
@@ -133 +138 @@
                                         curleft += obj.offsetLeft;
                                         obj = obj.offsetParent; 
-                                        } 
                                 } 
-                else 
-                        if (obj.x){ 
-                                curleft += obj.x; } 
-                        return curleft; 
-                        } 
+                         }
+                        else if (obj.x){
+                                curleft += obj.x;
+                        }
+                        return curleft+2; 
+                } 
                 return 0; 
         }
@@ -153 +158 @@
                                 } 
                         } 
-                else if (obj.y) { 
-                        curtop += obj.y; } 
-                return curtop; 
+                        else if (obj.y) { 
+                                curtop += obj.y;
+                        } 
+                        return curtop+2; 
                 } 
-        return 0; 
+                return 0; 
         } 
 
@@ -165 +171 @@
 
 //converti de pixel ? Lat bloque a -90 90
-function findLatN(lat) { 
-        var coef = (imgLATmax-imgLATmin)/imgHaut;
-        var lati = (imgHaut-lat)*coef - (-imgLATmin);
-        if (lati>90)
+function findLatN(lat) {
+//      var coef = (imgLATmax-imgLATmin)/imgHaut;
+//      var lati = (imgHaut-lat+resolution)*coef - (-imgLATmin);
+        var hauteur = imgLATmax-imgLATmin;
+        var lat1 = hauteur * (lat-1);
+        var lat2 = imgHaut * resolution;
+        var y = Math.floor(lat1/lat2)+1;
+        var latitude = parseFloat(imgLATmax) - resolution*(y-0.5);
+        if (latitude>90) {
                 return 90;
-        if (lati<-90)
-                return -90
-        return Math.round(lati*100)/100; 
+        } else if (latitude<-90) {
+                return -90;
+        }
+//      return Math.round(lati*100)/100; 
+        return latitude;
 } 
  
 //converti de pixel ? Lon bloque a -180 180
-function findLonN(lon){ 
-        coef = (imgLONmax - imgLONmin)/imgLarg;
-        longitude = lon*coef - (-imgLONmin);
-        if (longitude>180)
+function findLonN(lon){
+//      coef = (imgLONmax - imgLONmin)/imgLarg;
+//      longitude = (lon-resolution)*coef - (-imgLONmin);
+        var largeur = imgLONmax - imgLONmin;
+        var lon1 = largeur * (lon-1);
+        var lon2 = imgLarg * resolution;
+        var x = Math.floor(lon1/lon2)+1;
+        var longitude = parseFloat(imgLONmin) + resolution*(x-0.5);
+        if (longitude>180) {
                 return 180;
-        if (longitude <-180)
+        } else if (longitude <-180) {
                 return -180;
-        return Math.round(longitude*100)/100;
+        }
+//      return Math.round(longitude*100)/100;
+        return longitude;
 } 
 
@@ -212 +232 @@
         pixelY = (imgLATmax-lat)/(imgLATmax-imgLATmin)*imgHaut;
         return Math.round(pixelY); 
-}       
+}
+
+function showClickedPixel() {
+        showPosPixel = document.getElementById("form_carte:showPosPixel").value;
+        if (showPosPixel == "true") {
+                document.getElementById("title_pixel").style.visibility = "visible";
+                document.getElementById("title_pixel").style.display = "";
+                document.getElementById("pos_pixel").style.visibility = "visible";
+                document.getElementById("pos_pixel").style.display = "";
+                document.getElementById("value_pixel").style.visibility = "visible";
+                document.getElementById("value_pixel").style.display = "";
+        } else {
+                document.getElementById("title_pixel").style.visibility = "hidden";
+                document.getElementById("title_pixel").style.display = "none";
+                document.getElementById("pos_pixel").style.visibility = "hidden";
+                document.getElementById("pos_pixel").style.display = "none";
+                document.getElementById("value_pixel").style.visibility = "hidden";
+                document.getElementById("value_pixel").style.display = "none";
+        }
+}
+
+function changeMode(elemId) {
+        var val;
+        if (elemId != null)
+                val = elemId.value;
+        else
+                val = "";
+        if (val == "totals") {
+                document.getElementById("title_globalsum").style.visibility = "visible";
+                document.getElementById("title_globalsum").style.display = "";
+                document.getElementById("value_globalsum").style.visibility = "visible";
+                document.getElementById("value_globalsum").style.display = "";
+        } else {
+                document.getElementById("title_globalsum").style.visibility = "hidden";
+                document.getElementById("title_globalsum").style.display = "none";
+                document.getElementById("value_globalsum").style.visibility = "hidden";
+                document.getElementById("value_globalsum").style.display = "none";
+        }
+}