Changeset 174 for ether_megapoli
- Timestamp:
- 09/02/11 14:45:07 (13 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 332 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/persistence/implementation/hibernate-domain.cfg.xml
r154 r174 7 7 <session-factory> 8 8 9 < mapping resource="com/medias/objects/Adresse.hbm.xml"/>10 < mapping resource="com/medias/objects/Bilan.hbm.xml"/>11 < mapping resource="com/medias/objects/Capteur.hbm.xml"/>12 < mapping resource="com/medias/objects/Categorie.hbm.xml"/>13 < mapping resource="com/medias/objects/CategorieParam.hbm.xml"/>14 < mapping resource="com/medias/objects/Commentaire.hbm.xml"/>15 < mapping resource="com/medias/objects/DeltaMesure.hbm.xml"/>16 < mapping resource="com/medias/objects/Fabriquant.hbm.xml"/>17 < mapping resource="com/medias/objects/Fichier.hbm.xml"/>18 < mapping resource="com/medias/objects/Flag.hbm.xml"/>19 < mapping resource="com/medias/objects/Jeu.hbm.xml"/>20 < mapping resource="com/medias/objects/Langue.hbm.xml"/>21 < mapping resource="com/medias/objects/Localisation.hbm.xml"/>22 < mapping resource="com/medias/objects/Mesure.hbm.xml"/>23 < mapping resource="com/medias/objects/Organisme.hbm.xml"/>24 < mapping resource="com/medias/objects/Parametre.hbm.xml"/>25 < mapping resource="com/medias/objects/Personne.hbm.xml"/>26 < mapping resource="com/medias/objects/Plateforme.hbm.xml"/>27 < mapping resource="com/medias/objects/RequeteNbvalsJeu.hbm.xml"/>28 < mapping resource="com/medias/objects/RequetePlatLoc.hbm.xml"/>29 < mapping resource="com/medias/objects/Sequence.hbm.xml"/>30 < mapping resource="com/medias/objects/TypeCapteur.hbm.xml"/>31 < mapping resource="com/medias/objects/TypePlateforme.hbm.xml"/>32 < mapping resource="com/medias/objects/Unite.hbm.xml"/>33 < mapping resource="com/medias/objects/Valeur.hbm.xml"/>34 < mapping resource="com/medias/objects/Zone.hbm.xml"/>9 <!--<mapping resource="com/medias/objects/Adresse.hbm.xml"/>--> 10 <!--<mapping resource="com/medias/objects/Bilan.hbm.xml"/>--> 11 <!--<mapping resource="com/medias/objects/Capteur.hbm.xml"/>--> 12 <!--<mapping resource="com/medias/objects/Categorie.hbm.xml"/>--> 13 <!--<mapping resource="com/medias/objects/CategorieParam.hbm.xml"/>--> 14 <!--<mapping resource="com/medias/objects/Commentaire.hbm.xml"/>--> 15 <!--<mapping resource="com/medias/objects/DeltaMesure.hbm.xml"/>--> 16 <!--<mapping resource="com/medias/objects/Fabriquant.hbm.xml"/>--> 17 <!--<mapping resource="com/medias/objects/Fichier.hbm.xml"/>--> 18 <!--<mapping resource="com/medias/objects/Flag.hbm.xml"/>--> 19 <!--<mapping resource="com/medias/objects/Jeu.hbm.xml"/>--> 20 <!--<mapping resource="com/medias/objects/Langue.hbm.xml"/>--> 21 <!--<mapping resource="com/medias/objects/Localisation.hbm.xml"/>--> 22 <!--<mapping resource="com/medias/objects/Mesure.hbm.xml"/>--> 23 <!--<mapping resource="com/medias/objects/Organisme.hbm.xml"/>--> 24 <!--<mapping resource="com/medias/objects/Parametre.hbm.xml"/>--> 25 <!--<mapping resource="com/medias/objects/Personne.hbm.xml"/>--> 26 <!--<mapping resource="com/medias/objects/Plateforme.hbm.xml"/>--> 27 <!--<mapping resource="com/medias/objects/RequeteNbvalsJeu.hbm.xml"/>--> 28 <!--<mapping resource="com/medias/objects/RequetePlatLoc.hbm.xml"/>--> 29 <!--<mapping resource="com/medias/objects/Sequence.hbm.xml"/>--> 30 <!--<mapping resource="com/medias/objects/TypeCapteur.hbm.xml"/>--> 31 <!--<mapping resource="com/medias/objects/TypePlateforme.hbm.xml"/>--> 32 <!--<mapping resource="com/medias/objects/Unite.hbm.xml"/>--> 33 <!--<mapping resource="com/medias/objects/Valeur.hbm.xml"/>--> 34 <!--<mapping resource="com/medias/objects/Zone.hbm.xml"/>--> 35 35 36 36 </session-factory> -
ether_megapoli/trunk/service/implementation/com/ether/JPanelToImageManager.java
r171 r174 42 42 final BufferedImage bufferedImage = new BufferedImage( component.getWidth(), component.getHeight(), BufferedImage.TYPE_INT_RGB ); 43 43 44 // if( component instanceof JPlotLayout )45 // {46 // final Graphics2D graphics2D = bufferedImage.createGraphics();47 // graphics2D.setBackground( Color.red );48 // ( (JPlotLayout) component ).draw( graphics2D );49 // }50 // else51 // {52 44 final CellRendererPane crp = new CellRendererPane(); 53 45 crp.add( component ); 54 46 crp.paintComponent( bufferedImage.createGraphics(), component, crp, component.getBounds() ); 55 // }56 47 return bufferedImage; 57 48 } -
ether_megapoli/trunk/web/src/com/ether/ControllerPlot.java
r171 r174 3 3 import com.medias.Context; 4 4 import com.medias.database.objects.Parametre; 5 import com.medias.database.objects.Unite; 5 6 import org.apache.commons.logging.Log; 6 7 import org.apache.commons.logging.LogFactory; … … 68 69 final String dateEnd = request.getParameter( "dateEnd" ); 69 70 final Calendar calendar = Calendar.getInstance(); 70 final Date formatedDateBegin; 71 final Date formatedDateEnd; 72 try 73 { 74 calendar.setTimeInMillis( Long.valueOf( dateBegin ) ); 75 formatedDateBegin = calendar.getTime(); 76 calendar.setTimeInMillis( Long.valueOf( dateEnd ) ); 77 formatedDateEnd = calendar.getTime(); 78 } 79 catch( Exception e ) 80 { 81 createErrorPane( response, request, WebException.WebCode.INVALID_DATE.toString(), e ); 82 flagException = true; 83 throw new ServletException( WebException.WebCode.INVALID_DATE.toString(), e ); 84 } 71 Date formatedDateBegin = null; 72 Date formatedDateEnd = null; 73 if( null != dateBegin && null != dateEnd && !"false".equals( dateBegin ) && !"false".equals( dateEnd ) ) 74 try 75 { 76 calendar.setTimeInMillis( Long.valueOf( dateBegin ) ); 77 formatedDateBegin = calendar.getTime(); 78 calendar.setTimeInMillis( Long.valueOf( dateEnd ) ); 79 formatedDateEnd = calendar.getTime(); 80 } 81 catch( Exception e ) 82 { 83 createErrorPane( response, request, WebException.WebCode.INVALID_DATE.toString(), e ); 84 flagException = true; 85 throw new ServletException( WebException.WebCode.INVALID_DATE.toString(), e ); 86 } 85 87 86 88 // Parameter 87 final Parametre parametre = _etherService.getParameterById( parameterId );88 //final Parametre parametre = new Parametre();89 //parametre.setParametreNom( "Ozone" );90 //final Unite unit = new Unite();91 //unit.setUniteCode( "ppb" );92 //parametre.setUnite( unit );89 // final Parametre parametre = _etherService.getParameterById( parameterId ); 90 final Parametre parametre = new Parametre(); 91 parametre.setParametreNom( "Ozone" ); 92 final Unite unit = new Unite(); 93 unit.setUniteCode( "ppb" ); 94 parametre.setUnite( unit ); 93 95 if( null == parametre ) 94 96 { -
ether_megapoli/trunk/web/visualization/visu_parameter_by_pf-script.jsp
r173 r174 294 294 // + "&axeType=" + this.selectAxes.getValue(); 295 295 296 var url = "visualization/plotEther?plateformId=14"297 + "¶meterId=90"298 + "&dateBegin=" + this.beginDate299 + "&dateEnd=" + this.endDate300 + "&title=" + encodeURIComponent( $( "textareaTitle" ).value )301 + "&axeType=" + this.selectAxes.getValue();302 303 this.plotWindow.getContent().innerHTML = '<img src=' + url + ' />';304 305 // this.plotWindow.getContent().innerHTML = '<applet width="500" height="200" code="AppletPlot.class">Now somewhere in the black moutains...</applet>';296 // var url = "visualization/plotEther?plateformId=14" 297 // + "¶meterId=90" 298 // + "&dateBegin=" + this.beginDate 299 // + "&dateEnd=" + this.endDate 300 // + "&title=" + encodeURIComponent( $( "textareaTitle" ).value ) 301 // + "&axeType=" + this.selectAxes.getValue(); 302 303 // this.plotWindow.getContent().innerHTML = '<img src=' + url + ' />'; 304 305 this.plotWindow.getContent().innerHTML = '<applet code="AppletEE.class" codebase="<%=request.getContextPath()%>/applets" height="400px" width="400px"></applet>'; 306 306 this.plotWindow.setSize( <%=EtherPlotServiceImpl.getMaxWidth()%>, <%=EtherPlotServiceImpl.getMaxHeight()%> ); 307 307 this.plotWindow.show();
Note: See TracChangeset
for help on using the changeset viewer.