Changeset 557 for ether_megapoli

Timestamp:

09/26/12 18:42:00 (12 years ago)

Author:

vmipsl

Message:

simulation

• display real data
• getPlateformsByParameter

Location:

ether_megapoli/trunk

Files:

• persistence/implementation/com/ether/dao/ParameterDAOImpl.java (modified) (2 diffs)
• persistence/interface/com/ether/dao/ParameterDAO.java (modified) (1 diff)
• service/implementation/com/ether/EtherPlotServiceImpl.java (modified) (3 diffs)
• service/implementation/com/ether/EtherServiceImpl.java (modified) (1 diff)
• service/interface/com/ether/EtherPlotService.java (modified) (1 diff)
• service/interface/com/ether/EtherService.java (modified) (1 diff)
• web/src/ApplicationResources.properties (modified) (1 diff)
• web/src/ApplicationResources_en.properties (modified) (1 diff)
• web/src/com/ether/ControllerSimulation.java (modified) (1 diff)
• web/src/com/ether/ControllerSimulationPlot.java (modified) (5 diffs)
• web/visualization/visu_simulation-script.jsp (modified) (2 diffs)

ether_megapoli/trunk/persistence/implementation/com/ether/dao/ParameterDAOImpl.java

@@ -5 +5 @@
 import org.hibernate.criterion.DetachedCriteria;
 import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
 import org.jetbrains.annotations.NotNull;
@@ -57 +58 @@
         return selectAllByCriteria( Parametre.class, criteria );
     }
+
+    @Nullable
+    public Integer getParameterByCode( @NotNull final String parameterCode )
+            throws PersistenceException
+    {
+        final DetachedCriteria criteria = DetachedCriteria.forClass( Parametre.class )
+                .add( Restrictions.eq( "parametreCode", parameterCode ) )
+                .setProjection( Projections.property( "parametreId" ) );
+
+        return selectByCriteria( Integer.class, criteria );
+    }
 }

ether_megapoli/trunk/persistence/interface/com/ether/dao/ParameterDAO.java

@@ -26 +26 @@
     List<Parametre> getAllParametersOrderByCategoryByName()
             throws PersistenceException;
+
+    @Nullable
+    Integer getParameterByCode( @NotNull final String parameterCode )
+            throws PersistenceException;
 }

ether_megapoli/trunk/service/implementation/com/ether/EtherPlotServiceImpl.java

@@ -69 +69 @@
 
         // Bottom Pane
-        final JPane jPaneBottom = createBottomPane( megapoliPlot.getValuesNumber(), locale );
+        final JPane jPaneBottom;
+        if( megapoliPlot instanceof SimulationPlot )
+            jPaneBottom = createBottomPane( megapoliPlot.getValuesNumber(), ( (SimulationPlot) megapoliPlot ).getRealDataNumber(), locale );
+        else
+            jPaneBottom = createBottomPane( megapoliPlot.getValuesNumber(), null, locale );
         jPane.add( jPaneBottom, BorderLayout.SOUTH );
 
@@ -149 +153 @@
      * Create the bottom JPane with the text "published .. (date)"
      *
-     * @param dataNumber : the number of datas extracted from the base
+     * @param dataNumber
+     * @param realDataNumber
      * @param locale
      * @return
      */
     @NotNull
-    public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Locale locale )
+    public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Integer realDataNumber, @Nullable final Locale locale )
     {
         final ResourceBundle bundle = WebHelper.getBundle( locale );
@@ -171 +176 @@
         if( null != dataNumber )
         {
-            final String messageDataNumber = bundle.getString( "plot.dataNumber" );
-            final JLabel jLabelDataNumber = new JLabel( messageDataNumber + ' ' + dataNumber );
-            jLabelDataNumber.setFont( police );
-            jPaneBottom.add( jLabelDataNumber, BorderLayout.WEST );
+            if( null != realDataNumber )
+            {
+                final JLabel jLabelDataNumber = new JLabel( bundle.getString( "plot.dataNumber" ) + ' ' + dataNumber + ' ' + bundle.getString( "plot.simulatedDataNumber" ) + ", " + realDataNumber + ' ' + bundle.getString( "plot.realDataNumber" ) );
+                jLabelDataNumber.setFont( police );
+                jPaneBottom.add( jLabelDataNumber, BorderLayout.WEST );
+            }
+            else
+            {
+                final String messageDataNumber = bundle.getString( "plot.dataNumber" );
+                final JLabel jLabelDataNumber = new JLabel( messageDataNumber + ' ' + dataNumber );
+                jLabelDataNumber.setFont( police );
+                jPaneBottom.add( jLabelDataNumber, BorderLayout.WEST );
+            }
         }
 

ether_megapoli/trunk/service/implementation/com/ether/EtherServiceImpl.java

@@ -997 +997 @@
     }
 
+    @Nullable
+    @Transactional(readOnly = true)
+    public Integer getParameterByCode( @NotNull final String parameterCode )
+            throws ServiceException
+    {
+        try
+        {
+            return _parameterDAO.getParameterByCode( parameterCode );
+        }
+        catch( PersistenceException e )
+        {
+            throw new ServiceException( ServiceException.ServiceCode.PARAMETER_NOT_FOUND, e );
+        }
+    }
+
     /**
      * This method insert in database the new dimensions, attributes, variables and simulation

ether_megapoli/trunk/service/interface/com/ether/EtherPlotService.java

@@ -23 +23 @@
 
     @NotNull
-    public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Locale locale );
+    public JPane createBottomPane( @Nullable final Integer dataNumber, @Nullable final Integer realDataNumber, @Nullable final Locale locale );
 
     @NotNull

ether_megapoli/trunk/service/interface/com/ether/EtherService.java

@@ -231 +231 @@
     List<Plateforme> getPlateformsByParameter( @NotNull final String parameterCode )
             throws ServiceException;
+
+    @Nullable
+    Integer getParameterByCode( @NotNull final String parameterCode )
+            throws ServiceException;
 }

ether_megapoli/trunk/web/src/ApplicationResources.properties

@@ -552 +552 @@
 plot.published=Publi\u00E9 le
 plot.dataNumber=Nombre de donn\u00E9es extraites :
+plot.simulatedDataNumber=(simul\u00E9es)
+plot.realDataNumber=(r\u00E9elles)
 plot.errorMessage=Erreur de cr\u00E9ation du quicklook. <BR>Veuillez essayer de corriger les erreurs suivantes ou contacter l'administrateur en indiquant les erreurs rencontr\u00E9es.
 plot.noData=Aucune donn\u00E9e extraite

ether_megapoli/trunk/web/src/ApplicationResources_en.properties

@@ -553 +553 @@
 plot.published=Published
 plot.dataNumber=Number of extracted datas :
+plot.simulatedDataNumber=(simulated)
+plot.realDataNumber=(real)
 plot.errorMessage=Error creating the quicklook. <BR>Please try to correct the following errors or contact the administrator with the detected errors.
 plot.noData=No extracted data

ether_megapoli/trunk/web/src/com/ether/ControllerSimulation.java

@@ -71 +71 @@
 
     @ControllerMethod(jsonResult = true)
-    public JSONObject searchPlateformsByVariable( @Mandatory @ParamName(ParameterConstants.PARAMETER_CODE) final String variableCode )
+    public JSONObject searchMobilePlateformsByVariable( @Mandatory @ParamName(ParameterConstants.PARAMETER_CODE) final String variableCode )
             throws ServiceException
     {
         final List<Plateforme> plateformsByParameter = getEtherService().getPlateformsByParameter( variableCode );
 
+        final List<Plateforme> mobilePlateforms = new ArrayList<Plateforme>();
+        for( final Plateforme plateforme : plateformsByParameter )
+        {
+            if( "MOBILE".equals( plateforme.getTypePlateforme().getTypePlateformeNom() ) )
+                mobilePlateforms.add( plateforme );
+        }
+
         final JSONObject result = new JSONObject();
-        result.put( ParameterConstants.PARAMETER_PLATEFORMS, getJsonHelper().toJSON( plateformsByParameter ) );
+        result.put( ParameterConstants.PARAMETER_PLATEFORMS, getJsonHelper().toJSON( mobilePlateforms ) );
         return result;
     }

ether_megapoli/trunk/web/src/com/ether/ControllerSimulationPlot.java

@@ -18 +18 @@
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -56 +58 @@
             throws ServletException
     {
-//        final boolean flagException = false;
-
         try
         {
@@ -70 +70 @@
             final boolean displayRealData = Boolean.parseBoolean( request.getParameter( "isRealDataToDisplay" ) );
 
-            // Dates
-//            final String dateBegin = request.getParameter( ParameterConstants.PARAMETER_DATE_BEGIN );
-//            final String dateEnd = request.getParameter( ParameterConstants.PARAMETER_DATE_END );
-//            final Calendar calendar = Calendar.getInstance();
-//            Date formatedDateBegin = null;
-//            Date formatedDateEnd = null;
-//            if( null != dateBegin && null != dateEnd && !"false".equals( dateBegin ) && !"false".equals( dateEnd ) )
-//                try
-//                {
-//                    calendar.setTimeInMillis( Long.valueOf( dateBegin ) );
-//                    formatedDateBegin = calendar.getTime();
-//                    calendar.setTimeInMillis( Long.valueOf( dateEnd ) );
-//                    formatedDateEnd = calendar.getTime();
-//                }
-//                catch( Exception e )
-//                {
-//                    createErrorPane( response, request, WebException.WebCode.INVALID_DATE.toString(), e );
-//                    flagException = true;
-//                    throw new ServletException( WebException.WebCode.INVALID_DATE.toString(), e );
-//                }
+            Integer plateformId = null;
+            if( null != request.getParameter( ParameterConstants.PARAMETER_PLATEFORM_ID ) )
+                plateformId = Integer.parseInt( request.getParameter( ParameterConstants.PARAMETER_PLATEFORM_ID ) );
 
             // Create plot
@@ -118 +101 @@
             megapoliPlot.setValuesNumber( parameterValues.size() );
 
-            if( displayRealData )
+            if( displayRealData && null != plateformId )
             {
-                // 2D plot : only one parameter to display
-//                final Integer plateformId = (Integer) pIdPIdList.get( 0 ).getFirstValue();
-//                final Integer parameterId = (Integer) pIdPIdList.get( 0 ).getSecondValue();
-//                final Data realValuesLists = _etherService.getListsByPlateformByParameterByPeriodFor2D( plateformId, parameterId, formatedDateBegin, formatedDateEnd );
-//                final Data<List, List, List> valuesLists = BouchonHelper.createValuesFor2D( 50 );
-//                megapoliPlot.setRealData( valuesLists );
+                final Integer parameterId = _etherService.getParameterByCode( variableName );
+                // Dates
+                final Calendar calendar = Calendar.getInstance();
+                final Date formatedDateBegin = DateHelper.parseDate( date, "yyyy-MM-dd" );
+                calendar.setTime( formatedDateBegin );
+                calendar.add( Calendar.DAY_OF_YEAR, 1 );
+                final Date formatedDateEnd = calendar.getTime();
 
-//                megapoliPlot.setRealDataNumber( ( (ArrayList) realValuesLists.getFirstArray() ).size() );
+                final Data realValuesLists = _etherService.getListsByPlateformByParameterByPeriodFor2D( plateformId, parameterId, formatedDateBegin, formatedDateEnd );
+                megapoliPlot.setRealData( realValuesLists );
+                megapoliPlot.setRealDataNumber( ( (ArrayList) realValuesLists.getFirstArray() ).size() );
             }
 
@@ -137 +123 @@
             try
             {
-//                if( !flagException )
                 createErrorPane( response, request, "", e1 );
             }

ether_megapoli/trunk/web/visualization/visu_simulation-script.jsp

@@ -109 +109 @@
         if( this.selectedVariable )
             $.ajax( {
-                url: "simulation?methodName=searchPlateformsByVariable&code=" + this.selectedVariable.getName(),
+                url: "simulation?methodName=searchMobilePlateformsByVariable&code=" + this.selectedVariable.getName(),
                 success:jQuery.proxy( this.handlePlateformsByVariable, this )
             } );
@@ -242 +242 @@
                     + "&level=" + this.selectLevels.getValue()
                     + "&isRasterContour=" + this.selectTypes.getValue()
-                    + "&displayRealData=" + $( "#displayRealData" ).attr( 'checked' )
+                    + "&isRealDataToDisplay=" + $( "#displayRealData" ).attr( 'checked' )
                     + "&title=" + encodeURIComponent( $( "#textareaTitle" ).val() );
+
+            if( this.selectPlateforms && this.selectPlateforms.getValue() )
+                parameters += "&plateformId=" + this.selectPlateforms.getValue();
 
             var url = "simulation/simulationPlotEther?" + parameters;