Changeset 745

Timestamp:

01/23/13 17:55:46 (11 years ago)

Author:

cbipsl

Message:

Mise à jour interface quicklook

Location:

ether_iasi/trunk/web

Files:

• project/quicklook.jsp (modified) (1 diff)
• project/quicklook_script.jsp (modified) (3 diffs)
• src/com/ether/Controller.java (modified) (1 diff)

ether_iasi/trunk/web/project/quicklook.jsp

@@ -50 +50 @@
     </div>
 
-    <div id="containerQuickLookA" class="containerQuickLooks"><spring:message code="label.MetOpA"/>
+    <div id="containerQuickLookA" class="containerQuickLooks">
         <div id="containerResultA"></div>
 

ether_iasi/trunk/web/project/quicklook_script.jsp

@@ -63 +63 @@
             paramSelect.parent = div;
             this.selectProjections = new Select( paramSelect );
-            this.selectProjections.add( "GL", '<spring:message code="label.globe"/>' );
-            this.selectProjections.add( "EU", '<spring:message code="label.europe"/>' );
-            this.selectProjections.add( "PN", '<spring:message code="label.pole.north"/>' );
-            this.selectProjections.add( "PS", '<spring:message code="label.pole.south"/>' );
+            this.selectProjections.add( "global", '<spring:message code="label.globe"/>' );
+            this.selectProjections.add( "europe", '<spring:message code="label.europe"/>' );
+            this.selectProjections.add( "pn", '<spring:message code="label.pole.north"/>' );
+            this.selectProjections.add( "ps", '<spring:message code="label.pole.south"/>' );
             this.selectProjections.selectFirst();
         },
@@ -122 +122 @@
             var plotNameA = jQuery.parseJSON( result ).plotNameResultA;
             var plotNameB = jQuery.parseJSON( result ).plotNameResultB;
+            var plotNameC = jQuery.parseJSON( result ).plotNameResultC;
+            var plotNameD = jQuery.parseJSON( result ).plotNameResultD;
+
             if (plotNameA)
-//                this.containerResultA.html(plotNameA);
-                this.containerResultA.html("<img src='"+plotNameA+"' width='80px' height='80'>");
-             if (plotNameB)
-                this.containerResultB.html(plotNameB);
+            {
+
+
+                 this.containerResultA.html("<center>MetOp-A</center><center><img src='resources/img/"+plotNameA+"' width='430px' height='350px' onerror='"+this.bob+"'><img src='resources/img/"+plotNameC+"' width='430px' height='350px'></center>");
+
+            }
+            if (plotNameB)
+                this.containerResultA.html("<center>MetOp-B</center><center><img src='resources/img/"+plotNameB+"' width='430px' height='350px'><img src='resources/img/"+plotNameD+"' width='430px' height='350px'></center>");
+
+
+            if (plotNameA &&  plotNameB )
+            {
+                this.containerResultA.html(plotNameA + plotNameC);
+                this.containerResultB.html(plotNameB + plotNameD);
+           }
+
 
         },
@@ -151 +166 @@
             this.containerErrors.show();
             this.containerErrors.html( result );
-        }
+        },
 
+         bob:function()
+    {
+        alert("pif");
+    }
     } );
 

ether_iasi/trunk/web/src/com/ether/Controller.java

@@ -74 +74 @@
         String plotNameA = "";
         String plotNameB = "";
+        String plotNameC = "";
+        String plotNameD = "";
         if( satellite.equals( "metopa" ) || satellite.equals( "metopab" ) )
-            plotNameA = "iasi_" + species + "_" + projection + "_" + fmtDate + "_" + satellite + ".png";
+        {
+            plotNameA = "metopa_iasi_" + species + "_l2_" + fmtDate + "_day_" + projection + ".png";
+            plotNameC = "metopa_iasi_" + species + "_l2_" + fmtDate + "_night_" + projection + ".png";
+        }
         if( satellite.equals( "metopb" ) || satellite.equals( "metopab" ) )
-            plotNameB = "iasi_" + species + "_" + projection + "_" + fmtDate + "_" + satellite + ".png";
-
+        {
+            plotNameB = "metopb_iasi_" + species + "_l2_" + fmtDate + "_day_" + projection + ".png";
+            plotNameD = "metopb_iasi_" + species + "_l2_" + fmtDate + "_night_" + projection + ".png";
+        }
         final JSONObject result = new JSONObject();
         result.put( "plotNameResultA", plotNameA );
         result.put( "plotNameResultB", plotNameB );
+        result.put( "plotNameResultC", plotNameC );
+        result.put( "plotNameResultD", plotNameD );
         return result;