Changeset 366


Ignore:
Timestamp:
02/02/12 17:58:07 (12 years ago)
Author:
vmipsl
Message:

Réparation bug chrome liens
Réparation chrome style
Data protocol (accueil, pdf, inscription)
Ajout période UTC dans plot 2D

Location:
ether_megapoli/trunk
Files:
14 edited
2 copied
2 moved

Legend:

Unmodified
Added
Removed

  • ether_megapoli/trunk/common/implementation/com/ether/MethodDescription.java

    r285 r366  
    3737    { 
    3838        return _view; 
     39    } 
     40 
     41    public void setView( @NotNull final String view ) 
     42    { 
     43        _view = view; 
    3944    } 
    4045 

  • ether_megapoli/trunk/common/implementation/com/medias/Constantes.java

    r139 r366  
    33import java.util.Locale; 
    44 
    5 public class Constantes { 
     5public class Constantes 
     6{ 
    67 
    78    public static String lang = Locale.getDefault().getLanguage(); 
    8      
    9     public static String[] listeTypeCapteurs = {"Aerosol Collector","Aerosol Mass Spectrometer","Aerosol/Cloud Particle Sizer", 
    10         "Aethalometer","Airpointer","Anemometer","Autoanalyser","AWS (Automated Weather System)","Backscatter LIDAR","Balance", 
    11         "Camera","Carbon Analyser","Ceilometer","Chemiluminescence","CHN Analyzer (Carbon, Hydrogen, Nitrogen)", 
    12         "CIMS Mass Spectrometer","CO2 Analyser","CPC (Condensation Particle Counter)","Disdrometer","Dropsonde", 
    13         "EAS (Electrical Aerosol Spectrometer)","EC-OC","Eddy Correlation Device","Gas Analyser","Gas Chromatograph", 
    14         "Gas Sampler","GPS Receiver","HTDMA (Hygroscopicity Tandem Differential Mobility Analyser)","Humidity Sensor", 
    15         "Interferometer","LIDAR (Light Detection and Ranging)","MAAP (Multi Angle Absorption Photometer)","Magnetometer", 
    16         "Meteo Station","Microscope","Nephelometer","OPC (Optic Particle Counter)","Oxygen Analyser","Ozone Analyser", 
    17         "Particle Detector","PH Meter","Photometer","PILS-IC","PILS-TOC","Pressure Sensor", 
    18         "PSAP (Particle Soot Absorption Photometer)","PTRMS","RADAR (Radio Detection and Ranging)","Radiometer", 
    19         "Radiosonde","Rain gauge","SMPS (Scanning Mobility Particle Sizer)","SODAR (Sound Detection and Ranging)", 
    20         "Spectrometer","Spectroradiometer","TDMPS","Temperature Sensor","TEOM (Tapered Element Oscillating Microbalance)", 
    21         "Tethersonde","UVAPS (Ultraviolet Aerodynamic Particle Sizer)","Video Camera","Visual Observations", 
    22         "VSMPS (Volatility Scanning Mobility Particle Sizer)","VTDMA (Volatility Tandem Differential Mobility Analyser)", 
    23         "Wet Deposition Collector","Wet/Dry Precipitation Sampler","Wind Profiler"}; 
    24     public static String[] listeUnites = {"no unit","deg","degC","degK","%","cm-3","hPa","m","m-1","mbar","mm","mm-1", 
    25         "mm.h-1","m.s-1","microg.m-3","ng.m-3","ppbv","ppmv","pptv","s","s-1","W.m-2"}; 
    26     public static String[] listePlateformes = {"ATR-42","Piper-Aztec","Ballon Air de Paris","Champs-sur-Marne","Créteil", 
    27         "Grignon","Jussieu","LHVP","Livry-Gargan","Roissy","SIRTA","Tour Eiffel","CEA-LIDAR","MPI-DOAS","MPI-MOLA","PSI"}; 
    28     public static String[] listeCategParams = {"Gas Species","Aerosol Chemical Composition/Mass","Aerosol Properties", 
    29         "Meteo/Radiation","Aircraft Parameters","VOC","Sums of VOC from PTRMS"}; 
    30     public static String[] listeNomParams = {"222Rn (Radon 222)","CH3OH (Methanol)","CH4 (Methane)","CO (Carbon Monoxide)", 
    31         "CO2 (Carbon Dioxide)","DMS (Dimethyl Sulfide)","H2SO4g (Sulfuric Acid)","HCHO (Formaldehyde)", 
    32         "HO2 (Hydroxyl Peroxyl Radical)","HONO (Nitrous Oxide)","JNO2 (Photolysis Frequency JNO2)", 
    33         "JO1D (Photolysis Frequency JO1D)","NO (Nitrogen Monoxide)","NO2 (Nitrogen Dioxide)","NOx (Nitrogen Oxides)", 
    34         "Noy (Sum Reactive Nitrogen)","O3 (Ozone)","OH (Hydroxyl Radical)","PAN (Peroxyacetyl Nitrate)", 
    35         "RO2 (Peroxyl Radical)","SF6 (Sulfurhexafluoride)","SO2 (Sulfur Dioxide)", 
    36         "PM1 (AEROSOL MASS PM1)","BBOA-PM1 (Biomass Burning Organic Aerosol)","BC-PM1 (Black Carbon)","Cl-PM1 (Chloride)", 
    37         "HOA-PM1 (Hydrocarbon Like Organic Aerosol)","LV-OOA-PM1 (Low Volatility Oxidised Organic Aerosol)", 
    38         "NH4-PM1 (Ammonium)","NO3-PM1 (Nitrate)","OA-PM1 (Organic Aerosol)","OOA-PM1 (Oxidised Organic Aerosol)", 
    39         "SO4-PM1 (Suftate)","SV-OOA-PM1 (Semivolatile Oxidised Organic Aerosol)","PM2.5 (AEROSOL MASS PM2.5)", 
    40         "BC-PM2.5 (Black Carbon)","C14-PM2.5 (Carbon-14)","Ca-PM2.5 (Calcium)","Cl-PM2.5 (Chloride)", 
    41         "EC-PM2.5 (Elemental Carbon)","K-PM2.5 (Potassium)","Levo-PM2.5 (Levoglucosan)","Mg-PM2.5 (Magnesium)", 
    42         "Na-PM2.5 (Sodium)","NH4-PM2.5 (Ammonium)","NO3-PM2.5 (Nitrate)","OC-PM2.5 (Organic Carbon)", 
    43         "SO4-PM2.5 (Sulfate)","TC-PM2.5 (Total Carbon)","WIOC-PM2.5 (Water Insoluble Organic Carbon)", 
    44         "WSOC-PM2.5 (Water Soluble Organic Carbon)", 
    45         "Bckscat 450 (Backscattering Coefficient 450 nm)","Bckscat 550 (Backscattering Coefficient 550 nm)", 
    46         "Bckscat 700 (Backscattering Coefficient 700 nm)","CCN (Condensation Nuclei Number/Concentration)", 
    47         "GF (Hygroscopic Growth Factor at 90% Humidity)","Lightabs 470 (Light Absorption Coefficient at 470nm)", 
    48         "Lightabs 522 (Light Absorption Coefficient at 522nm)","Lightabs 650 (Light Absorption Coefficient at 650nm)", 
    49         "N (Particle Number / Concentration)","Scat 450 (Scattering Coefficient 450 nm)", 
    50         "Scat 550 (Scattering Coefficient 550 nm)","Scat 700 (Scattering Coefficient 700 nm)", 
    51         "VFR (Volume Fraction Remaining at Heater Temperature 100°C)", 
    52         "Cloudfrac 0-3 (Cloud Fraction Low Level Clouds from 0 to 3 km)", 
    53         "Cloudfrac 3-7 (Cloud Fraction Medium Level Clouds from 3 to 7 km)", 
    54         "Cloudfrac >7 (Cloud Fraction High Level Clouds >7 km)","DP (DewPoint)","Ext (Aerosol Extinction-Vertical Profile)", 
    55         "MLD (Mixing Layer Height)","P (Pressure)","P2m (Pressure 2m)","PC (Cumulated Precipitation)", 
    56         "PR (Precipitation Rate)","PR-VP (Polarisation Ratio-Vertical Profile)", 
    57         "R2 (Normalised Backscatter Ratio-Vertical Profile)","RH (Relative Humidity)","RH2m (Relative Humidity 2m)", 
    58         "SR (Solar Radiation)","T (Temperature)","T2m (Temperature 2m)","UV (UV_index)","WD (Wind Direction)", 
    59         "WD10m (Wind Direction 10m)","WS (Wind Speed)","WS-VP (Wind Speed-Vertical Profile)","WS10m (Wind Speed 10m)", 
    60         "Alt (Altitude : Derived from pressure assuming Hydrostatic law along aircraft's trajectory)", 
    61         "CLW (cloud_liquid_water_mixing_ratio : from King-Probe","CO (chm_COvrai_Mozart_sync_1 : from Mozart instrument)", 
    62         "DSRIA (downwelling_shortwave_radiance_in_air : from Eppley PSP pyranometer, not corrected for attitude angles)", 
    63         "EW (eastward_wind : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
    64         "Hei (Height : from radar-altimeter, range[0-15000] ft)","Lat (Latitude : from INS)","Lon (Longitude : from INS)", 
    65         "NW (northward_wind : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
    66         "O3 (chm_Ozone_Mozart_sync_1 : from Mozart instrument)", 
    67         "P (air_pressure : from first front sensor, corrected for the so-called static defect)", 
    68         "PO (platform_orientation : Geographic Heading, from INS)","PPA (platform_pitch_angle : from INS)", 
    69         "PRA (platform_roll_angle : from INS)","RH (humidity_mixing_ratio : from bottom dew-point hygrometer)", 
    70         "T (air_temperature : from non-deiced Rosemount 102 E2AL sensor)", 
    71         "UAV (upward_air_velocity : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
    72         "USRIA (upwelling_shortwave_radiance_in_air : from Eppley PSP pyranometer)", 
    73         "WD (wind_from_direction : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
    74         "WS (wind_speed : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
    75         "C2Cl4 (Tetrachloroethylene)","C2H4 (Ethylene)", 
    76         "C2H6 (Ethane)","C3H6 (Propylene)","C3H8 (Propane)","i-C4H10 (Iso-butane)","n-C4H10 (N-butane)","C5H8 (Isoprene)", 
    77         "i-C5H12 (Iso-pentane)","n-C5H12 (N-pentane)","C6H3Cl3 (Benzene, 1,2,4-trichloro-)","C6H4(CH3)(CH2CH3) (O-ethyltoluene)", 
    78         "C6H4Cl2 (Benzene, 1,2-dichloro-)","C6H5CHCH2 (Styrene)","C6H5Cl (Benzene, chloro-)","C6H5(CH2CH2CH3) (N-propylbenzene)", 
    79         "C6H5(CH2CH3) (Ethylbenzene)","C6H6 (Benzene)","c-C6H12 (Cyclohexane)","C6H14 (Hexane)","C7H8 (Toluene)", 
    80         "o-C7H8 (O-xylene)","m+p-C7H8 (M,P-xylenes)","n-C7H16 (N-heptane)","n-C8H18 (N-OCTANE)","n-C9H20 (Nonane)", 
    81         "C10H8 (Naphthalene)","C10H16 (A-pinen)","n-C10H22 (N-decane)","CCl4 (Carbon Tetrachloride) ", 
    82         "CF2Cl2 (Dichlorodifluoromethane)","CH2=CHCH=CH2 (1,3-butadiene)","CH2=CHCH2CH2CH2CH3 (1-hexene)", 
    83         "CH2=CHCH2CH2CH3 (1-pentene)","CH2=CHCH2CH3 (1-butene)","c-(CH2CH2CH2CH2CH)CH3 (ME-cyclopentane)", 
    84         "c-(CH2CH2CH2CH2CH2CH)CH3 (ME-cyclohexane)","CH2ClCHClCH3 (Propane, 1,2-dichloro-)","(CH3)2C=CH2 (I-butene)", 
    85         "(CH3)2CCH(CH3)CH(CH3)2 (2,3,4-TME-pentane)","(CH3)2CH=CHCH3 (2-ME-2-butene)","(CH3)2CHCH2CH3 (2-ME pentane)", 
    86         "(CH3)2CHCH2CH3 (3-ME-pentane)","(CH3)2CH(CH3)CHCH2CH3 (2,3-dimethyl pentane)", 
    87         "(CH3)3CCH2CH(CH3)2 (2,2,4-TM-pentane)","cis-CH3CH=CHCH3 (CIS-2-butene)","t-CH3CH=CHCH2CH3 (Trans-2-pentene)", 
    88         "t-CH3CH=CHCH3 (Trans-2-butene)","CH3CH2CH(CH3)CHCH2CH2CH3 (3-ME-heptane)",     "CH3CH2CH(CH3)CHCH2CH3 (3-ME-hexane)", 
    89         "CH3CHO (Acetaldehyde)","CHCl2CH2Cl (Ethane, 1,1,2-trichloro-)","CHCl3 (Trichloromethane)","CH3CN (Acetonitrile)", 
    90         "CH3COOCH2CH3 (Ethyl acetate)","1,2,4 TMB (1,2,4-trimethylbenzene)","1,3,5 TMB (1,3,5-trimethylbenzene)", 
    91         "m/z 43 (Sum propene, acetic acid + acetone + PAN + alkanes & alkenes fragments)","m/z 47 (Sum formic acid, ethanol)", 
    92         "m/z 57 (Sum mtbe + alkanes + butanol fragments + acrolein + butene isomers)","m/z 59 (Sum acetone + propanal + glyoxal)", 
    93         "m/z 61 (Sum acetic acid, ethyl acetate fragment)","m/z 71 (Sum Methacrolein + Methyl vinyl Ketone)", 
    94         "m/z 73 (Sum Methyl ethyl ketone, butanal, Methyl glyoxal + C5-C9 n-aldehydes)","m/z 75 (Sum butanol, hydroxyacetone)", 
    95         "m/z 77 (Sum peroxyacetic nitric anhydride PAN)","m/z 81 (Sum hexenal + monoterpenes fragments)", 
    96         "m/z 83 (Sum cis hexenol + hexanal fragments, hexadienes, cyclohexene, methyl furan + C5-C9 n-aldehydes)", 
    97         "m/z 85 (Sum ethyl vinyl ketone + alkanes & alkenes fragments)","m/z 87 (Sum 2-methyl-3-butanol, C carbonyls)", 
    98         "m/z 97 (Sum furan derivatives + C5-C9 n-aldehydes)","m/z 101 (Sum isoprene hydroperoxides + hexanal + cis hexenol)", 
    99         "m/z 105 (Sum styrene, PiBN)","m/z 107 (Sum C8 aromatics + benzaldehyde)","m/z 121 (Sum C9 aromatics + tolualdehyde)", 
    100         "m/z 137 (Sum monoterpenes)","m/z 151 (Pinonaldehyde)","m/z 153 (Vanillin)"}; 
     9 
     10    public static String[] listeTypeCapteurs = {"Aerosol Collector", "Aerosol Mass Spectrometer", "Aerosol/Cloud Particle Sizer", 
     11            "Aethalometer", "Airpointer", "Anemometer", "Autoanalyser", "AWS (Automated Weather System)", "Backscatter LIDAR", "Balance", 
     12            "Camera", "Carbon Analyser", "Ceilometer", "Chemiluminescence", "CHN Analyzer (Carbon, Hydrogen, Nitrogen)", 
     13            "CIMS Mass Spectrometer", "CO2 Analyser", "CPC (Condensation Particle Counter)", "Disdrometer", "Dropsonde", 
     14            "EAS (Electrical Aerosol Spectrometer)", "EC-OC", "Eddy Correlation Device", "Gas Analyser", "Gas Chromatograph", 
     15            "Gas Sampler", "GPS Receiver", "HTDMA (Hygroscopicity Tandem Differential Mobility Analyser)", "Humidity Sensor", 
     16            "Interferometer", "LIDAR (Light Detection and Ranging)", "MAAP (Multi Angle Absorption Photometer)", "Magnetometer", 
     17            "Meteo Station", "Microscope", "Nephelometer", "OPC (Optic Particle Counter)", "Oxygen Analyser", "Ozone Analyser", 
     18            "Particle Detector", "PH Meter", "Photometer", "PILS-IC", "PILS-TOC", "Pressure Sensor", 
     19            "PSAP (Particle Soot Absorption Photometer)", "PTRMS", "RADAR (Radio Detection and Ranging)", "Radiometer", 
     20            "Radiosonde", "Rain gauge", "SMPS (Scanning Mobility Particle Sizer)", "SODAR (Sound Detection and Ranging)", 
     21            "Spectrometer", "Spectroradiometer", "TDMPS", "Temperature Sensor", "TEOM (Tapered Element Oscillating Microbalance)", 
     22            "Tethersonde", "UVAPS (Ultraviolet Aerodynamic Particle Sizer)", "Video Camera", "Visual Observations", 
     23            "VSMPS (Volatility Scanning Mobility Particle Sizer)", "VTDMA (Volatility Tandem Differential Mobility Analyser)", 
     24            "Wet Deposition Collector", "Wet/Dry Precipitation Sampler", "Wind Profiler"}; 
     25    public static String[] listeUnites = {"no unit", "deg", "degC", "degK", "%", "cm-3", "hPa", "m", "m-1", "mbar", "mm", "mm-1", 
     26            "mm.h-1", "m.s-1", "microg.m-3", "ng.m-3", "ppbv", "ppmv", "pptv", "s", "s-1", "W.m-2"}; 
     27    public static String[] listePlateformes = {"ATR-42", "Piper-Aztec", "Ballon Air de Paris", "Champs-sur-Marne", "Créteil", 
     28            "Grignon", "Jussieu", "LHVP", "Livry-Gargan", "Roissy", "SIRTA", "Tour Eiffel", "CEA-LIDAR", "MPI-DOAS", "MPI-MOLA", "PSI"}; 
     29    public static String[] listeCategParams = {"Gas Species", "Aerosol Chemical Composition/Mass", "Aerosol Properties", 
     30            "Meteo/Radiation", "Aircraft Parameters", "VOC", "Sums of VOC from PTRMS"}; 
     31    public static String[] listeNomParams = {"222Rn (Radon 222)", "CH3OH (Methanol)", "CH4 (Methane)", "CO (Carbon Monoxide)", 
     32            "CO2 (Carbon Dioxide)", "DMS (Dimethyl Sulfide)", "H2SO4g (Sulfuric Acid)", "HCHO (Formaldehyde)", 
     33            "HO2 (Hydroxyl Peroxyl Radical)", "HONO (Nitrous Oxide)", "JNO2 (Photolysis Frequency JNO2)", 
     34            "JO1D (Photolysis Frequency JO1D)", "NO (Nitrogen Monoxide)", "NO2 (Nitrogen Dioxide)", "NOx (Nitrogen Oxides)", 
     35            "Noy (Sum Reactive Nitrogen)", "O3 (Ozone)", "OH (Hydroxyl Radical)", "PAN (Peroxyacetyl Nitrate)", 
     36            "RO2 (Peroxyl Radical)", "SF6 (Sulfurhexafluoride)", "SO2 (Sulfur Dioxide)", 
     37            "PM1 (AEROSOL MASS PM1)", "BBOA-PM1 (Biomass Burning Organic Aerosol)", "BC-PM1 (Black Carbon)", "Cl-PM1 (Chloride)", 
     38            "HOA-PM1 (Hydrocarbon Like Organic Aerosol)", "LV-OOA-PM1 (Low Volatility Oxidised Organic Aerosol)", 
     39            "NH4-PM1 (Ammonium)", "NO3-PM1 (Nitrate)", "OA-PM1 (Organic Aerosol)", "OOA-PM1 (Oxidised Organic Aerosol)", 
     40            "SO4-PM1 (Suftate)", "SV-OOA-PM1 (Semivolatile Oxidised Organic Aerosol)", "PM2.5 (AEROSOL MASS PM2.5)", 
     41            "BC-PM2.5 (Black Carbon)", "C14-PM2.5 (Carbon-14)", "Ca-PM2.5 (Calcium)", "Cl-PM2.5 (Chloride)", 
     42            "EC-PM2.5 (Elemental Carbon)", "K-PM2.5 (Potassium)", "Levo-PM2.5 (Levoglucosan)", "Mg-PM2.5 (Magnesium)", 
     43            "Na-PM2.5 (Sodium)", "NH4-PM2.5 (Ammonium)", "NO3-PM2.5 (Nitrate)", "OC-PM2.5 (Organic Carbon)", 
     44            "SO4-PM2.5 (Sulfate)", "TC-PM2.5 (Total Carbon)", "WIOC-PM2.5 (Water Insoluble Organic Carbon)", 
     45            "WSOC-PM2.5 (Water Soluble Organic Carbon)", 
     46            "Bckscat 450 (Backscattering Coefficient 450 nm)", "Bckscat 550 (Backscattering Coefficient 550 nm)", 
     47            "Bckscat 700 (Backscattering Coefficient 700 nm)", "CCN (Condensation Nuclei Number/Concentration)", 
     48            "GF (Hygroscopic Growth Factor at 90% Humidity)", "Lightabs 470 (Light Absorption Coefficient at 470nm)", 
     49            "Lightabs 522 (Light Absorption Coefficient at 522nm)", "Lightabs 650 (Light Absorption Coefficient at 650nm)", 
     50            "N (Particle Number / Concentration)", "Scat 450 (Scattering Coefficient 450 nm)", 
     51            "Scat 550 (Scattering Coefficient 550 nm)", "Scat 700 (Scattering Coefficient 700 nm)", 
     52            "VFR (Volume Fraction Remaining at Heater Temperature 100°C)", 
     53            "Cloudfrac 0-3 (Cloud Fraction Low Level Clouds from 0 to 3 km)", 
     54            "Cloudfrac 3-7 (Cloud Fraction Medium Level Clouds from 3 to 7 km)", 
     55            "Cloudfrac >7 (Cloud Fraction High Level Clouds >7 km)", "DP (DewPoint)", "Ext (Aerosol Extinction-Vertical Profile)", 
     56            "MLD (Mixing Layer Height)", "P (Pressure)", "P2m (Pressure 2m)", "PC (Cumulated Precipitation)", 
     57            "PR (Precipitation Rate)", "PR-VP (Polarisation Ratio-Vertical Profile)", 
     58            "R2 (Normalised Backscatter Ratio-Vertical Profile)", "RH (Relative Humidity)", "RH2m (Relative Humidity 2m)", 
     59            "SR (Solar Radiation)", "T (Temperature)", "T2m (Temperature 2m)", "UV (UV_index)", "WD (Wind Direction)", 
     60            "WD10m (Wind Direction 10m)", "WS (Wind Speed)", "WS-VP (Wind Speed-Vertical Profile)", "WS10m (Wind Speed 10m)", 
     61            "Alt (Altitude : Derived from pressure assuming Hydrostatic law along aircraft's trajectory)", 
     62            "CLW (cloud_liquid_water_mixing_ratio : from King-Probe", "CO (chm_COvrai_Mozart_sync_1 : from Mozart instrument)", 
     63            "DSRIA (downwelling_shortwave_radiance_in_air : from Eppley PSP pyranometer, not corrected for attitude angles)", 
     64            "EW (eastward_wind : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
     65            "Hei (Height : from radar-altimeter, range[0-15000] ft)", "Lat (Latitude : from INS)", "Lon (Longitude : from INS)", 
     66            "NW (northward_wind : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
     67            "O3 (chm_Ozone_Mozart_sync_1 : from Mozart instrument)", 
     68            "P (air_pressure : from first front sensor, corrected for the so-called static defect)", 
     69            "PO (platform_orientation : Geographic Heading, from INS)", "PPA (platform_pitch_angle : from INS)", 
     70            "PRA (platform_roll_angle : from INS)", "RH (humidity_mixing_ratio : from bottom dew-point hygrometer)", 
     71            "T (air_temperature : from non-deiced Rosemount 102 E2AL sensor)", 
     72            "UAV (upward_air_velocity : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
     73            "USRIA (upwelling_shortwave_radiance_in_air : from Eppley PSP pyranometer)", 
     74            "WD (wind_from_direction : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
     75            "WS (wind_speed : Attitudes and speed wrt ground from INS, air angles from radome, air speed from pitot)", 
     76            "C2Cl4 (Tetrachloroethylene)", "C2H4 (Ethylene)", 
     77            "C2H6 (Ethane)", "C3H6 (Propylene)", "C3H8 (Propane)", "i-C4H10 (Iso-butane)", "n-C4H10 (N-butane)", "C5H8 (Isoprene)", 
     78            "i-C5H12 (Iso-pentane)", "n-C5H12 (N-pentane)", "C6H3Cl3 (Benzene, 1,2,4-trichloro-)", "C6H4(CH3)(CH2CH3) (O-ethyltoluene)", 
     79            "C6H4Cl2 (Benzene, 1,2-dichloro-)", "C6H5CHCH2 (Styrene)", "C6H5Cl (Benzene, chloro-)", "C6H5(CH2CH2CH3) (N-propylbenzene)", 
     80            "C6H5(CH2CH3) (Ethylbenzene)", "C6H6 (Benzene)", "c-C6H12 (Cyclohexane)", "C6H14 (Hexane)", "C7H8 (Toluene)", 
     81            "o-C7H8 (O-xylene)", "m+p-C7H8 (M,P-xylenes)", "n-C7H16 (N-heptane)", "n-C8H18 (N-OCTANE)", "n-C9H20 (Nonane)", 
     82            "C10H8 (Naphthalene)", "C10H16 (A-pinen)", "n-C10H22 (N-decane)", "CCl4 (Carbon Tetrachloride) ", 
     83            "CF2Cl2 (Dichlorodifluoromethane)", "CH2=CHCH=CH2 (1,3-butadiene)", "CH2=CHCH2CH2CH2CH3 (1-hexene)", 
     84            "CH2=CHCH2CH2CH3 (1-pentene)", "CH2=CHCH2CH3 (1-butene)", "c-(CH2CH2CH2CH2CH)CH3 (ME-cyclopentane)", 
     85            "c-(CH2CH2CH2CH2CH2CH)CH3 (ME-cyclohexane)", "CH2ClCHClCH3 (Propane, 1,2-dichloro-)", "(CH3)2C=CH2 (I-butene)", 
     86            "(CH3)2CCH(CH3)CH(CH3)2 (2,3,4-TME-pentane)", "(CH3)2CH=CHCH3 (2-ME-2-butene)", "(CH3)2CHCH2CH3 (2-ME pentane)", 
     87            "(CH3)2CHCH2CH3 (3-ME-pentane)", "(CH3)2CH(CH3)CHCH2CH3 (2,3-dimethyl pentane)", 
     88            "(CH3)3CCH2CH(CH3)2 (2,2,4-TM-pentane)", "cis-CH3CH=CHCH3 (CIS-2-butene)", "t-CH3CH=CHCH2CH3 (Trans-2-pentene)", 
     89            "t-CH3CH=CHCH3 (Trans-2-butene)", "CH3CH2CH(CH3)CHCH2CH2CH3 (3-ME-heptane)", "CH3CH2CH(CH3)CHCH2CH3 (3-ME-hexane)", 
     90            "CH3CHO (Acetaldehyde)", "CHCl2CH2Cl (Ethane, 1,1,2-trichloro-)", "CHCl3 (Trichloromethane)", "CH3CN (Acetonitrile)", 
     91            "CH3COOCH2CH3 (Ethyl acetate)", "1,2,4 TMB (1,2,4-trimethylbenzene)", "1,3,5 TMB (1,3,5-trimethylbenzene)", 
     92            "m/z 43 (Sum propene, acetic acid + acetone + PAN + alkanes & alkenes fragments)", "m/z 47 (Sum formic acid, ethanol)", 
     93            "m/z 57 (Sum mtbe + alkanes + butanol fragments + acrolein + butene isomers)", "m/z 59 (Sum acetone + propanal + glyoxal)", 
     94            "m/z 61 (Sum acetic acid, ethyl acetate fragment)", "m/z 71 (Sum Methacrolein + Methyl vinyl Ketone)", 
     95            "m/z 73 (Sum Methyl ethyl ketone, butanal, Methyl glyoxal + C5-C9 n-aldehydes)", "m/z 75 (Sum butanol, hydroxyacetone)", 
     96            "m/z 77 (Sum peroxyacetic nitric anhydride PAN)", "m/z 81 (Sum hexenal + monoterpenes fragments)", 
     97            "m/z 83 (Sum cis hexenol + hexanal fragments, hexadienes, cyclohexene, methyl furan + C5-C9 n-aldehydes)", 
     98            "m/z 85 (Sum ethyl vinyl ketone + alkanes & alkenes fragments)", "m/z 87 (Sum 2-methyl-3-butanol, C carbonyls)", 
     99            "m/z 97 (Sum furan derivatives + C5-C9 n-aldehydes)", "m/z 101 (Sum isoprene hydroperoxides + hexanal + cis hexenol)", 
     100            "m/z 105 (Sum styrene, PiBN)", "m/z 107 (Sum C8 aromatics + benzaldehyde)", "m/z 121 (Sum C9 aromatics + tolualdehyde)", 
     101            "m/z 137 (Sum monoterpenes)", "m/z 151 (Pinonaldehyde)", "m/z 153 (Vanillin)"}; 
     102 
     103    public static String french_language = "fr"; 
     104    public static String english_language = "en"; 
    101105} 

  • ether_megapoli/trunk/service/implementation/com/ether/EtherPlotContentServiceImpl.java

    r365 r366  
    123123        /** ********************************** **/ 
    124124        final SoTRange ynRange = Graph.computeRange( yRange, _intervalsNumber ); 
     125        final SoTRange xnRange2 = Graph.computeRange( xnRange, _intervalsNumber ); 
    125126        final SoTPoint originPoint = new SoTPoint( ynRange.getStart(), xnRange.getStart() ); 
    126127 
    … …  
    242243        // Copyright 
    243244        displayCopyright( jPlotLayout, 1.0, 1.0, 1.15, 0.03 ); 
     245 
     246        // Period 
     247        displayPeriod( jPlotLayout, megapoliPlot.getBeginDate(), megapoliPlot.getEndDate() ); 
    244248 
    245249        return jPlotLayout; 
    … …  
    331335     * This method display the copyright in the bottom right corner of the plot 
    332336     * 
    333      * @param mainPane 
     337     * @param jPane 
    334338     * @param xSize 
    335339     * @param ySize 
    … …  
    337341     * @param yPosition 
    338342     */ 
    339     private void displayCopyright( @NotNull final JPane mainPane, final double xSize, final double ySize, final double xPosition, final double yPosition ) 
    340     { 
    341         final Layer copyrightLayer = new Layer( "Copyright", new Dimension2D( xSize, ySize ) ); 
    342         mainPane.add( copyrightLayer ); 
     343    private void displayCopyright( @NotNull final JPane jPane, final double xSize, final double ySize, final double xPosition, final double yPosition ) 
     344    { 
     345        final Layer copyrightLayer = new Layer( "CopyrightLayer", new Dimension2D( xSize, ySize ) ); 
     346        jPane.add( copyrightLayer ); 
    343347 
    344348        final Calendar calendar = Calendar.getInstance(); 
    345349        final int year = calendar.get( Calendar.YEAR ); 
    346350        final String copyright = "@" + year + _copyright; 
    347         final SGLabel copyrightLabel = new SGLabel( "copyright", copyright, new Point2D.Double( xPosition, yPosition ) ); 
     351        final SGLabel copyrightLabel = new SGLabel( "Copyright", copyright, new Point2D.Double( xPosition, yPosition ) ); 
    348352        copyrightLabel.setAlign( SGLabel.TOP, SGLabel.CENTER ); 
    349353        copyrightLabel.setFont( _copyrightFont ); 
    350354 
    351355        copyrightLayer.addChild( copyrightLabel ); 
     356    } 
     357 
     358    /** 
     359     * This method display the period's dates given by the user for a 2D plot 
     360     * 
     361     * @param jPane 
     362     * @param beginDate 
     363     * @param endDate 
     364     */ 
     365    private void displayPeriod( @NotNull final JPane jPane, @Nullable final Date beginDate, @Nullable final Date endDate ) 
     366    { 
     367        if( null != beginDate || null != endDate ) 
     368        { 
     369            String periodStr = null != beginDate ? "[" + DateHelper.formatDate( beginDate, DateHelper.ENGLISH_DATE_PATTERN ) : "[X"; 
     370            periodStr += null != endDate ? " - " + DateHelper.formatDate( endDate, DateHelper.ENGLISH_DATE_PATTERN ) + "] (UTC)" : " - X] (UTC)"; 
     371 
     372            final Layer periodLayer = new Layer( "PeriodLayer", new Dimension2D( 1.0, 1.0 ) ); 
     373            jPane.add( periodLayer ); 
     374 
     375            final SGLabel periodLabel = new SGLabel( "Period", periodStr, new Point2D.Double( 1.04, 0.99 ) ); 
     376            periodLabel.setAlign( SGLabel.TOP, SGLabel.CENTER ); 
     377            periodLabel.setFont( _periodFont ); 
     378 
     379            periodLayer.addChild( periodLabel ); 
     380        } 
    352381    } 
    353382 
    … …  
    652681    protected static final Font _axisFont = new Font( "Helvetica", Font.PLAIN, 15 ); 
    653682    protected static final Font _copyrightFont = new Font( "Helvetica", Font.PLAIN, 8 ); 
     683    protected static final Font _periodFont = new Font( "Helvetica", Font.PLAIN, 10 ); 
    654684    protected static final String _copyright = " CNES-CNRS"; 
    655685    protected static final double _heightAxisFont = 0.14; 

  • ether_megapoli/trunk/web/index.jsp

    r307 r366  
    2121    <tiles:put name="body" type="string"> 
    2222        <bean:message key="data.intro0"/> 
    23         <bean:message key="data.intro1"/><html:link href="mailto:${webmaster}?subject=[MEGAPOLI]">webmaster</html:link>. 
     23        <a onclick='javascript:neededLogin("#")'><bean:message key="data.intro1"/></a> 
     24        <bean:message key="data.intro2"/> 
     25        <a href="project?methodName=viewHomeDataProtocol"><bean:message key="data.intro3"/></a> 
     26 
    2427        <bean:define id="upload" value="upload"/> 
    2528        <bean:define id="access" value="access"/> 

  • ether_megapoli/trunk/web/project/home_dataProtocol_en.jsp

    r292 r366  
    1 The access to Megapoli data (download and upload) is managed by the following data protocol.<BR/> 
    2 You have to accept this protocol to ask for an account. An email will be sent to inform you about the activation of your account. 
    3 <BR/><BR/> 
     1<%@ page contentType="text/html; charset=UTF-8" %> 
     2<%@ page language="java" contentType="text/html; charset=UTF-8" %> 
     3<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> 
     4<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> 
     5<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> 
     6<%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 
     7 
     8<tiles:insert page="../resources/templates/templateMegapoli.jsp" flush="true"> 
     9 
     10    <tiles:put name="insertCss" type="string"></tiles:put> 
     11    <tiles:put name="insertJsOrJsp" type="string"></tiles:put> 
    412 
    513 
    6 <div class="title1">Data protocol</div> 
    7 <BR/> 
    8 Work in progress... 
     14    <tiles:put name="title" type="string"><bean:message key="app.title"/> - MEGAPOLI Data Policy and Data Protocol</tiles:put> 
     15    <tiles:put name="nav" type="string"> 
     16        <html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&nbsp;&gt; 
     17        <html:link page="/project?methodName=viewHomeDataProtocol">MEGAPOLI Data Policy and Data Protocol</html:link> 
     18    </tiles:put> 
    919 
    10 <BR/> 
    11 <a href="SendFileToClient.do?path=dataProtocol_en.pdf"><button class="dataProtocolDownloadButton">Download</button></a> 
     20    <%-- ****************** CONTENT ****************** --%> 
     21    <tiles:put name="bodytitle" type="string">MEGAPOLI Data Policy and Data Protocol</tiles:put> 
    1222 
    13 <BR/><BR/> 
    14 <hr width="50%"> 
     23    <tiles:put name="body" type="string"> 
     24        According to Ether policy the exchange of data and products are of free access for scientific usage. 
     25        The MEGAPOLI Data Base and services represent a great interest for the international scientific community, so it is our philosophy to maximize the scientific use of the observations and to have a large scientific output in atmospheric and climate research. 
     26        <BR/><BR/> 
    1527 
    16 <div class="title1">Ask for an account</div> 
    17 <BR/> 
     28        Candidate users are invited to sign the MEGAPOLI data protocol which commits themselves on four obligations : 
     29        <ul> 
     30            <li>to use data for their own account for a scientific use only, without any direct or indirect commercial use,<BR/><BR/></li> 
     31            <li>not to redistribute of these data to third parties,<BR/><BR/></li> 
     32            <li>to include acknowledgements in publications with those sentences :</li> 
     33        </ul> 
     34        <div style="font-style:italic;">«Data used have been produced in the frame of the European Union's Seventh Framework Programme FP/2007-2011 within the project MEGAPOLI,grant agreement n°212520, with additional support of the French ANR and LEFE/CHAT MEGAPOLI-PARIS projects. 
     35        The authors acknowledge Ether the French data centre for atmospheric chemistry, created and co-directed by CNES (the French Space Agency) and INSU-CNRS (National Institute of Sciences of the Universe) to support the MEGAPOLI database.» 
     36        </div><BR/> 
     37        <ul> 
     38            <li>in case of publication to contact the MEGAPOLI Principal Investigator according to the dataset used (see in the meta data) and to offer co-authorship ; 
     39                each data owner has the right to refuse to allow his/her work to be used in another publication prior to his/her own publication of the work. The data owner must 
     40                then publish the work within reasonable time (12 months after the request). 
     41            </li> 
     42        </ul> 
    1843 
    19 <table class="roundTable" border="1"> 
    20     <tr> 
    21         <td><label for="lastName">Last Name</label></td> 
    22         <td><input id="lastName" name="lastName" type="text" size="30"></td> 
    23     </tr> 
    24     <tr> 
    25         <td><label for="firstName">First Name</label></td> 
    26         <td><input id="firstName" name="firstName" type="text" size="30"></td> 
    27     </tr> 
    28     <tr> 
    29         <td><label for="email">Email</label></td> 
    30         <td><input id="email" name="email" type="text" size="30"></td> 
    31     </tr> 
    32     <tr> 
    33         <td><label for="password">Password</label></td> 
    34         <td><input id="password" name="password" type="text" size="30"></td> 
    35     </tr> 
    36     <tr> 
    37         <td> 
    38             <input id="checkboxUser" type="checkbox" class="dataProtocolCheckbox"> 
    39  
    40             <div class="dataProtocolCheckboxText">I accept the data protocol</div> 
    41         </td> 
    42         <td> 
    43             <button onclick="javascript:onClickAcceptDataProtocol()" class="dataProtocolButton">Ask</button> 
    44         </td> 
    45     </tr> 
    46 </table> 
    47  
    48 <div id="infosAccount"></div> 
    49  
     44    </tiles:put> 
     45</tiles:insert> 

  • ether_megapoli/trunk/web/project/home_dataProtocol_fr.jsp

    r292 r366  
    1 L'accÚs aux données Megapoli (téléchargement, dépÃŽt) est régi par le protocole ci-dessous.<BR/> 
    2 Vous devez donc l'accepter pour demander un compte utilisateur, un email vous sera ensuite envoyé afin de vous informer de la décision de l'administrateur. 
    3 <BR/><BR/> 
     1<%@ page contentType="text/html; charset=UTF-8" %> 
     2<%@ page language="java" contentType="text/html; charset=UTF-8" %> 
     3<%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> 
     4<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> 
     5<%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> 
     6<%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 
     7 
     8<tiles:insert page="../resources/templates/templateMegapoli.jsp" flush="true"> 
     9 
     10    <tiles:put name="insertCss" type="string"></tiles:put> 
     11    <tiles:put name="insertJsOrJsp" type="string"></tiles:put> 
    412 
    513 
    6 <div class="title1">Protocole d'utilisation des données</div> 
    7 <BR/> 
    8 En cours... 
     14    <tiles:put name="title" type="string"><bean:message key="app.title"/> - Protocole d'utilisation des données MEGAPOLI</tiles:put> 
     15    <tiles:put name="nav" type="string"> 
     16        <html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&nbsp;&gt; 
     17        <html:link page="/project?methodName=viewHomeDataProtocol">Protocole d'utilisation des données MEGAPOLI</html:link> 
     18    </tiles:put> 
    919 
    10 <BR/> 
    11 <a href="SendFileToClient.do?path=dataProtocol_fr.pdf"><button class="dataProtocolDownloadButton">Téléchargement</button></a> 
    1220 
    13 <BR/><BR/> 
    14 <hr width="50%"> 
     21    <%-- ****************** CONTENT ****************** --%> 
     22    <tiles:put name="bodytitle" type="string">Protocole d'utilisation des données MEGAPOLI</tiles:put> 
    1523 
    16 <div class="title1">Demande de compte</div> 
    17 <BR/> 
     24    <tiles:put name="body" type="string"> 
     25        Conformément à la politique de distribution des données Ether, les données et produits sont libres d'accÚs pour un usage scientifique. 
     26        Nous encourageons vivement la communauté scientifique internationale à utiliser les observations de la base de données MEGAPOLI qui participent à la recherche atmosphérique et climatologique. 
     27        <BR/><BR/> 
    1828 
    19 <table class="roundTable" border="1"> 
    20     <tr> 
    21         <td><label for="lastName">Nom</label></td> 
    22         <td><input id="lastName" name="lastName" type="text" size="30"></td> 
    23     </tr> 
    24     <tr> 
    25         <td><label for="firstName">Prénom</label></td> 
    26         <td><input id="firstName" name="firstName" type="text" size="30"></td> 
    27     </tr> 
    28     <tr> 
    29         <td><label for="email">Email</label></td> 
    30         <td><input id="email" name="email" type="text" size="30"></td> 
    31     </tr> 
    32     <tr> 
    33         <td><label for="password">Mot de passe</label></td> 
    34         <td><input id="password" name="password" type="text" size="30"></td> 
    35     </tr> 
    36     <tr> 
    37         <td> 
    38             <input id="checkboxUser" type="checkbox" class="dataProtocolCheckbox"> 
     29        En signant le protocole d'utilisation des données MEGAPOLI, les utilisateurs s'engagent à : 
     30        <ul> 
     31            <li>utiliser les données pour leur propre compte dans un cadre scientifique uniquement, sans but commercial qu'il soit direct ou indirect,<BR/><BR/></li> 
     32            <li>ne pas redistribuer ces données ou produits à des tierces personnes,<BR/><BR/></li> 
     33            <li> inclure dans leurs publications les remerciements suivants :</li> 
     34        </ul> 
     35        <div style="font-style:italic;">«Les données utilisées ont été produites au sein du projet MEGAPOLI (septiÚme programme-cadre de l'Union Européenne FP/2007-2011, accord n°212520), soutenu par l'ANR et les projets LEFE/CHAT. 
     36        Les auteurs remercient Ether, le pÃŽle de la Chimie de l'AtmosphÚre crée et co-dirigé par le CNES (l'Agence Française de l'Espace) et l'INSU-CNRS (Institut National des Sciences de l'Univers) pour son support de la base de données MEGAPOLI.» 
     37        </div><BR/> 
     38        <ul> 
     39            <li> 
     40                en cas de publication, contacter, le scientifique responsable des données utilisées (information fournie dans les méta-données) et proposer une co-signature ; 
     41                Chaque propriétaire de données a le droit de refuser toute utilisation de ses produits pour des publications précédent ses propres parutions, il devra néanmoins 
     42                publier ses résultats dans un délai raisonnable (12 mois aprÚs la demande). 
     43            </li> 
     44        </ul> 
    3945 
    40             <div class="dataProtocolCheckboxText">J'accepte le protocole</div> 
    41         </td> 
    42         <td> 
    43             <button onclick="javascript:onClickAcceptDataProtocol()" class="dataProtocolButton">Demande</button> 
    44         </td> 
    45     </tr> 
    46 </table> 
    47  
    48 <div id="infosAccount"></div> 
    49  
     46    </tiles:put> 
     47</tiles:insert> 

  • ether_megapoli/trunk/web/resources/css/megapoli.css

    r339 r366  
    446446 
    447447.dataProtocolButton { 
    448     margin-left: 51px; 
     448    /*margin-left: 140px;*/ 
    449449} 
    450450 

  • ether_megapoli/trunk/web/resources/css/visu_parameter_by_pf.css

    r339 r366  
    1414#containerOptionTitle { 
    1515    margin-right: 22px; 
     16} 
     17 
     18/* Hack pour chrome */ 
     19@media screen and (-webkit-min-device-pixel-ratio:0) { 
     20    #containerOptionTitle { 
     21        margin-right: 40px; 
     22    } 
    1623} 
    1724 

  • ether_megapoli/trunk/web/resources/jsp/dataProtocol_en.jsp

    r292 r366  
    44 
    55 
    6 <div class="title1">Data protocol</div> 
     6<div class="title1">MEGAPOLI Data Policy and Data Protocol</div> 
    77<BR/> 
    8 Work in progress... 
     8I accept : 
     9<ul> 
     10    <li>to use data for my own account for a scientific use only, without any direct or indirect commercial use,</li> 
     11    <li>not to redistribute of these data to third parties,</li> 
     12    <li>to include acknowledgements in my publications with those sentences :</li> 
     13</ul> 
    914 
     15<div style="font-style:italic">«Data used have been produced in the frame of the European Union's Seventh Framework Programme FP/2007-2011 within the project MEGAPOLI,grant 
     16    agreement n°212520, with additional support of the French ANR and LEFE/CHAT MEGAPOLI-PARIS projects. 
     17    The authors acknowledge Ether the French data centre for atmospheric chemistry, created and co-directed by CNES (the French Space Agency) and INSU-CNRS (National Institute of 
     18    Sciences of the Universe) to support the MEGAPOLI database.» 
     19</div> 
     20<ul> 
     21    <li>in case of publication to contact the MEGAPOLI Principal Investigator according to the dataset used (see in the meta data) and to offer co-authorship ; each data owner has 
     22        the right to refuse to allow his/her work to be used in another publication prior to his/her own publication of the work. The data owner must then publish the work within 
     23        reasonable time (12 months after the request). 
     24    </li> 
     25</ul> 
    1026<BR/> 
    11 <a href="SendFileToClient.do?path=dataProtocol_en.pdf"><button class="dataProtocolDownloadButton">Download</button></a> 
     27<a href="SendFileToClient.do?path=dataProtocol_en.pdf"> 
     28    <button class="dataProtocolDownloadButton">Download</button> 
     29</a> 
    1230 
    1331<BR/><BR/> 
    … …  
    2038    <tr> 
    2139        <td><label for="lastName">Last Name</label></td> 
    22         <td><input id="lastName" name="lastName" type="text" size="30"></td> 
     40        <td><input id="lastName" name="lastName" type="text" size="40"></td> 
    2341    </tr> 
    2442    <tr> 
    2543        <td><label for="firstName">First Name</label></td> 
    26         <td><input id="firstName" name="firstName" type="text" size="30"></td> 
     44        <td><input id="firstName" name="firstName" type="text" size="40"></td> 
    2745    </tr> 
    2846    <tr> 
    2947        <td><label for="email">Email</label></td> 
    30         <td><input id="email" name="email" type="text" size="30"></td> 
     48        <td><input id="email" name="email" type="text" size="40"></td> 
    3149    </tr> 
    3250    <tr> 
    3351        <td><label for="password">Password</label></td> 
    34         <td><input id="password" name="password" type="text" size="30"></td> 
     52        <td><input id="password" name="password" type="text" size="40"></td> 
    3553    </tr> 
    3654    <tr> 

  • ether_megapoli/trunk/web/resources/jsp/dataProtocol_fr.jsp

    r292 r366  
    66<div class="title1">Protocole d'utilisation des données</div> 
    77<BR/> 
    8 En cours... 
    98 
     9Je m'engage à : 
     10<ul> 
     11    <li>utiliser les données pour mon propre compte dans un cadre scientifique uniquement, sans but commercial qu'il soit direct ou indirect,</li> 
     12    <li>ne pas redistribuer ces données ou produits à des tierces personnes,</li> 
     13    <li>inclure dans mes publications les remerciements suivants :</li> 
     14</ul> 
     15<div style="font-style:italic"> 
     16    «Les données utilisées ont été produites au sein du projet MEGAPOLI (du septiÚme programme-cadre de l'Union Européenne FP/2007-2011, accord n°212520), soutenu par l'ANR et les 
     17    projets LEFE/CHAT. 
     18    Les auteurs remercient le Centre de Produits et de Services de Chimie de l'AtmosphÚre Ether, crée et co-dirigé par le CNES (l'Agence Française de l'Espace) et l'INSU-CNRS 
     19    (Institut National des Sciences de l'Univers) pour leur support dans la création de la base de données MEGAPOLI.» 
     20</div> 
     21 
     22<ul> 
     23    <li>en cas de publication, contacter le scientifique responsable des données utilisées (information fournie dans les méta-données) et proposer une co-signature ; Chaque 
     24        propriétaire de données a le droit de refuser toute utilisation de ses produits pour des publications précédent ses propres parutions, il devra néanmoins publier ses 
     25        résultats dans un délai raisonnable (12 mois aprÚs la demande). 
     26    </li> 
     27</ul> 
    1028<BR/> 
    11 <a href="SendFileToClient.do?path=dataProtocol_fr.pdf"><button class="dataProtocolDownloadButton">Téléchargement</button></a> 
     29<a href="SendFileToClient.do?path=dataProtocol_fr.pdf"> 
     30    <button class="dataProtocolDownloadButton">Téléchargement</button> 
     31</a> 
    1232 
    1333<BR/><BR/> 
    … …  
    2040    <tr> 
    2141        <td><label for="lastName">Nom</label></td> 
    22         <td><input id="lastName" name="lastName" type="text" size="30"></td> 
     42        <td><input id="lastName" name="lastName" type="text" size="40"></td> 
    2343    </tr> 
    2444    <tr> 
    2545        <td><label for="firstName">Prénom</label></td> 
    26         <td><input id="firstName" name="firstName" type="text" size="30"></td> 
     46        <td><input id="firstName" name="firstName" type="text" size="40"></td> 
    2747    </tr> 
    2848    <tr> 
    2949        <td><label for="email">Email</label></td> 
    30         <td><input id="email" name="email" type="text" size="30"></td> 
     50        <td><input id="email" name="email" type="text" size="40"></td> 
    3151    </tr> 
    3252    <tr> 
    3353        <td><label for="password">Mot de passe</label></td> 
    34         <td><input id="password" name="password" type="text" size="30"></td> 
     54        <td><input id="password" name="password" type="text" size="40"></td> 
    3555    </tr> 
    3656    <tr> 

  • ether_megapoli/trunk/web/resources/templates/templateBackoffice.jsp

    r306 r366  
    3535    <ether:htmlJs jsFile="TwitterLogin/javascripts/jquery.tipsy"/> 
    3636 
    37     <ether:htmlResourceJsp jspFile="backofficeHead"/> 
     37    <ether:htmlJsp jspFile="templateBackoffice_script"/> 
    3838 
    3939    <tiles:insert attribute="insertCss"/> 

  • ether_megapoli/trunk/web/resources/templates/templateMegapoli.jsp

    r318 r366  
    3838    <ether:htmlJs jsFile="jquery-ui-1.8.16.custom/js/jquery-ui-1.8.16.custom.min"/> 
    3939 
    40     <ether:htmlResourceJsp jspFile="megapoliHead"/> 
     40    <ether:htmlJsp jspFile="templateMegapoli_script"/> 
    4141 
    4242    <tiles:insert attribute="insertCss"/> 

  • ether_megapoli/trunk/web/resources/templates/templateMegapoli_script.jsp

    r339 r366  
    4040    createTools: function() 
    4141    { 
    42         var backofficeButton = new Button( {value:templateTexts["app.backoffice"], parent:this.containerTools, id:"button_bo", className: "blue_button", classNameText:"blue_button_text", title : templateTexts["app.backoffice.help"], onClick:jQuery.proxy( this.onClickBO, this )} ); 
    43         backofficeButton.hide(); 
    44  
     42//        var backofficeButton = new Button( {value:templateTexts["app.backoffice"], parent:this.containerTools, id:"button_bo", className: "blue_button", classNameText:"blue_button_text", title : templateTexts["app.backoffice.help"], onClick:jQuery.proxy( this.onClickBO, this )} ); 
     43//        backofficeButton.hide(); 
     44// 
    4545        var mailButton = new Button( {value:templateTexts["data.upload.metadata.contact.mail"], parent:this.containerTools, id:"button_mail", className: "blue_button", classNameText:"blue_button_text", onClick:jQuery.proxy( this.onClickMail, this )} ); 
    4646 
    … …  
    7878        liExtract.append('<a onclick=\'javascript:neededLogin("/DataAccess.do")\'><span>' + templateTexts["data.access.extract.short"] + '</span></a>'); 
    7979        ulData.append( liExtract ); 
     80 
    8081        var liDownload = $( document.createElement( "li" ) ); 
    81         var aDownload = $( document.createElement( "a" ) ); 
    82         aDownload.attr( {onclick:'javascript:neededLogin("/PrepareTree.do")'} ); 
    83         aDownload.html( "<span>" + templateTexts["data.upload.short"] + "</span>" ); 
    84         liDownload.append( aDownload ); 
     82        liDownload.append('<a onclick=\'javascript:neededLogin("/PrepareTree.do")\'><span>' + templateTexts["data.upload.short"] + '</span></a>'); 
    8583        ulData.append( liDownload ); 
    8684    }, 
    … …  
    149147                             autoOpen: false, 
    150148                             title: loginTexts["login.inscription"], 
    151                              height: 700, 
    152                              width: 600 
     149                             height: 800, 
     150                             width: 750 
    153151                         } ); 
    154152        $dialog.dialog( 'open' ); 

  • ether_megapoli/trunk/web/src/ApplicationResources.properties

    r312 r366  
    9292data.categ2=SURFACE FIXE 
    9393data.categ3=SURFACE MOBILE 
    94 data.intro0=Cette zone est r\u00E9serv\u00E9e aux participants du projet.  
    95 data.intro1=Vous pouvez demander l'ouverture d'un compte personnalis\u00E9 en envoyant un email au  
     94data.intro0=Cette zone est r\u00E9serv\u00E9e aux participants du projet. Vous pouvez demander l'ouverture d'un compte personnalis\u00E9 via 
     95data.intro1=le module d'inscription 
     96data.intro2=en signant 
     97data.intro3=le protocole d'utilisation de donn\u00E9es. 
    9698 
    9799data.upload=D\u00E9p\u00F4t de donn\u00E9es 

  • ether_megapoli/trunk/web/src/ApplicationResources_en.properties

    r312 r366  
    9393data.categ2=FIXED SURFACE TYPE 
    9494data.categ3=MOBILE PLATFORM-SURFACE 
    95 data.intro0=This area is accessible for Megapoli project members only.  
    96 data.intro1=You can ask for a login account by sending an email to the  
     95data.intro0=This area is accessible for Megapoli project members only. You can ask for a login account by using 
     96data.intro1=the connection module 
     97data.intro2=and signing 
     98data.intro3=the data protocol. 
    9799 
    98100data.upload=Data upload 

  • ether_megapoli/trunk/web/src/com/ether/ControllerEponge.java

    r306 r366  
    66import com.ether.user.UserRole; 
    77import com.ether.user.UserState; 
     8import com.medias.Constantes; 
     9import com.medias.Context; 
    810import com.medias.annuaire.Personne; 
    911import com.medias.mail.Mail; 
    … …  
    4547            throws ServiceException 
    4648    { 
     49        return new HashMap<String, Object>(); 
     50    } 
     51 
     52    @ControllerMethod(view = VIEW_DATA_PROTOCOL_EN, requestMandatory = true) 
     53    public Map<String, Object> viewHomeDataProtocol( @NotNull final HttpServletRequest request ) 
     54            throws ServiceException 
     55    { 
     56        final MethodDescription methodDescription = getMethods().get( "viewHomeDataProtocol" ); 
     57 
     58        if( Context.getLangue( request ).equals( Constantes.french_language ) ) 
     59            methodDescription.setView( VIEW_DATA_PROTOCOL_FR ); 
     60        else 
     61            methodDescription.setView( VIEW_DATA_PROTOCOL_EN ); 
    4762        return new HashMap<String, Object>(); 
    4863    } 
    … …  
    188203    private static final String VIEW_ERRORS = "project/errors"; 
    189204    private static final String VIEW_LOGIN = "project/login"; 
     205    private static final String VIEW_DATA_PROTOCOL_EN = "project/home_dataProtocol_en"; 
     206    private static final String VIEW_DATA_PROTOCOL_FR = "project/home_dataProtocol_fr"; 
    190207} 

  • ether_megapoli/trunk/web/visualization/visu_parameter_by_pf-script.jsp

    r363 r366  
    341341    { 
    342342        if( !getJSONUser() ) 
    343         // Method showLogin writen in megapoliHead.jsp 
    344343            getLoginModule().showLogin( templateTexts["login.text"] ); 
    345344        else 
Note: See TracChangeset for help on using the changeset viewer.