Changeset 70 for ether_eccad/trunk/ECCAD_INTERFACE/WEB-INF/src/org/medias/eccad/presentation/bean/emission/FacteurResultatBean.java

Timestamp:

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

Author:

cbipsl

Message:

maj eccad V3.2

File:

• ether_eccad/trunk/ECCAD_INTERFACE/WEB-INF/src/org/medias/eccad/presentation/bean/emission/FacteurResultatBean.java (modified) (8 diffs)

ether_eccad/trunk/ECCAD_INTERFACE/WEB-INF/src/org/medias/eccad/presentation/bean/emission/FacteurResultatBean.java

@@ -20 +20 @@
 public class FacteurResultatBean extends AbstractVueBean {
         private String url;
-        private Zone zone_affichee;
+        private Zone zone_demandee;
+        private Zone zone_visible;
         private int clicX;
         private int clicY;
@@ -33 +34 @@
         private Long colormap_id;
         private UISelectOne colormapUI;
+        
+        private List<SelectItem> liste_classdis;
+        private Long classdis_id;
+        private UISelectOne classdisUI;
         
         private List<SelectItem> liste_grille;
@@ -57 +62 @@
         public void initialisation() {
                 // FIXME: virer les colormap exponentielles
-                zone_affichee = new Zone();
+                zone_demandee = new Zone();
                 Zone zone_init = emission.getFacteur().getZone();
-                zone_affichee.setNorthbc(zone_init.getNorthbc());
-                zone_affichee.setSouthbc(zone_init.getSouthbc());
-                zone_affichee.setEastbc(zone_init.getEastbc());
-                zone_affichee.setWestbc(zone_init.getWestbc());
+                zone_demandee.setNorthbc(zone_init.getNorthbc());
+                zone_demandee.setSouthbc(zone_init.getSouthbc());
+                zone_demandee.setEastbc(zone_init.getEastbc());
+                zone_demandee.setWestbc(zone_init.getWestbc());
                 
                 liste_grille = serviceMetier.getListGrille(emission.getBurnt().getBurnt().getId_item(),
                                                                    emission.getBurnt().getDate_debut(), 
-                                                                   emission.getBurnt().getDate_fin());
+                                                                   emission.getBurnt().getDate_fin(), null);
                 grille_id = (Long) liste_grille.get(0).getValue();
                 if (grilleUI != null)
                         grilleUI.setValue(grille_id);
 
-                liste_colormap = serviceMetier.getListColorDynamique(true);
+//              liste_colormap = serviceMetier.getListColorDynamique(true);
+                liste_colormap = serviceMetier.getListMappingColor();
                 colormap_id = (Long) liste_colormap.get(0).getValue();
                 if (colormapUI != null)
                         colormapUI.setValue(colormap_id);
                 
+                liste_classdis = serviceMetier.getListClassDynamique();
+                classdis_id = (Long) liste_classdis.get(0).getValue();
+                if (classdisUI != null)
+                        classdisUI.setValue(classdis_id);
+                
                 requete.setDatedeb(liste_grille.get(0).getLabel());
                 requete.setDatefin(liste_grille.get(0).getLabel());
                 requete.setColormap(colormap_id);
-                
-                majURLCarte();
+                requete.setClassdis(classdis_id);
+                
+                majURLCarte(false,true);
         }
         
@@ -89 +101 @@
         public void clicOnCarte(ActionEvent event) {
                 service.zoom(clicX, clicY);
-                zone_affichee = service.getzone();
-        
-                majURLCarte();
-        }
-        
-        private void majURLCarte() {
-                url = service.getCarte(requete, zone_affichee, getIdUnique());
-                url_legend = service.getLegend(colormap_id, 5040, url);
+                zone_visible = service.getzone();
+        
+                majURLCarte(true,false);
+        }
+        
+        private void majURLCarte(boolean zoom, boolean firstAff) {
+                url = service.getCarte(requete, zone_demandee, getIdUnique(), zoom, firstAff);
+                url_legend = service.getLegend(colormap_id, classdis_id, 5040, url);
+                zone_visible = service.getzone();
                 ////system.out.println(url_legend);
         }
@@ -113 +126 @@
                 }
                 
-                majURLCarte();
+                majURLCarte(false,false);
         }
         
@@ -122 +135 @@
                 requete.setColormap(colormap_id);
                 
-                majURLCarte();
+                majURLCarte(false,false);
         }
         
@@ -211 +224 @@
         public void setWestbc(UIOutput westbc) {
                 this.westbc = westbc;
-        }
-        
-        public Zone getZone_affichee() {
-                return zone_affichee;
-        }
-        
-        public void setZone_affichee(Zone zone_affichee) {
-                this.zone_affichee = zone_affichee;
         }
         
@@ -261 +266 @@
                 this.liste_grille = liste_grille;
         }
-        
-        
-        }
+
+        public Zone getZone_demandee() {
+                return zone_demandee;
+        }
+
+        public void setZone_demandee(Zone zoneDemandee) {
+                zone_demandee = zoneDemandee;
+        }
+
+        public Zone getZone_visible() {
+                return zone_visible;
+        }
+
+        public void setZone_visible(Zone zoneVisible) {
+                zone_visible = zoneVisible;
+        }
+}