[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/h2d H2dCSVFileFormat.java,1.1,1.2 H2dFileFormatEvolutionVersion.java,1.1,1.2 h2d_en.fr_txt,1.9,1.10

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d
In directory sc8-pr-cvs1:/tmp/cvs-serv14635/h2d

Modified Files:
	H2dCSVFileFormat.java H2dFileFormatEvolutionVersion.java 
	h2d_en.fr_txt 
Log Message:
Maj version 0.04


Index: H2dCSVFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dCSVFileFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** H2dCSVFileFormat.java	19 Dec 2003 12:10:36 -0000	1.1
--- H2dCSVFileFormat.java	21 Jan 2004 10:59:09 -0000	1.2
***************
*** 10,13 ****
--- 10,15 ----
  
  import java.io.File;
+ import java.util.HashMap;
+ import java.util.Map;
  
  import org.fudaa.dodico.commun.DodicoResource;
***************
*** 47,50 ****
--- 49,58 ----
    }
  
+   public Map buildOptionSep(String _s) {
+     Map r= new HashMap();
+     r.put("SEP", _s);
+     return r;
+   }
+ 
    /**
     *
***************
*** 67,74 ****
      implements H2dFileFormatEvolutionVersion {
      public CsvVersion() {
!       super(getInstance(), "5.11");
      }
-     
-     
  
      /**
--- 75,80 ----
      implements H2dFileFormatEvolutionVersion {
      public CsvVersion() {
!       super(getInstance(), "1.0");
      }
  
      /**
***************
*** 77,82 ****
      public FileOperationSynthese readEvolutions(
        File _f,
!       ProgressionInterface _prog) {
!         return new EvolutionReader(this).read(_f, _prog);
      }
  
--- 83,103 ----
      public FileOperationSynthese readEvolutions(
        File _f,
!       ProgressionInterface _prog,
!       Map _options) {
!       EvolutionReader r= new EvolutionReader(this);
!       if ((_options != null) && (_options.containsKey("SEP"))) {
!         r.setSepChar((String)_options.get("SEP"));
!       }
!       FileOperationSynthese s= r.read(_f, _prog);
!       EvolutionReguliere[] evol= (EvolutionReguliere[])s.getSource();
!       if (evol != null) {
!         H2dEvolution[] h2dEvol= new H2dEvolution[evol.length];
!         for (int i= evol.length - 1; i >= 0; i--) {
!           h2dEvol[i]= new H2dEvolution(evol[i]);
!         }
!         s.setSource(h2dEvol);
!       }
! 
!       return s;
      }
  

Index: H2dFileFormatEvolutionVersion.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dFileFormatEvolutionVersion.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** H2dFileFormatEvolutionVersion.java	19 Dec 2003 12:10:36 -0000	1.1
--- H2dFileFormatEvolutionVersion.java	21 Jan 2004 10:59:09 -0000	1.2
***************
*** 10,17 ****
--- 10,19 ----
  
  import java.io.File;
+ import java.util.Map;
  
  import org.fudaa.dodico.commun.ProgressionInterface;
  import org.fudaa.dodico.fichiers.FileFormat;
  import org.fudaa.dodico.fichiers.FileOperationSynthese;
+ import org.fudaa.dodico.fichiers.FileReadOperationAbstract;
  
  /**
***************
*** 22,28 ****
    public String getName();
      public FileFormat getFileFormat();
  
      //must return a file operation with a H2dEvolution[] as source
!     public FileOperationSynthese readEvolutions(File _f, ProgressionInterface _prog);
  
  }
--- 24,31 ----
    public String getName();
      public FileFormat getFileFormat();
+     public FileReadOperationAbstract createReader();
  
      //must return a file operation with a H2dEvolution[] as source
!     public FileOperationSynthese readEvolutions(File _f, ProgressionInterface _prog,Map _options);
  
  }

Index: h2d_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/h2d_en.fr_txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** h2d_en.fr_txt	19 Dec 2003 12:10:36 -0000	1.9
--- h2d_en.fr_txt	21 Jan 2004 10:59:09 -0000	1.10
***************
*** 98,103 ****
  Conditions limites=Boundary conditions
  Conditions limites liquides=Liquid boundary conditions
- Courbes transitoire=Transient curves
  Courbes transitoires=Transient curves
  Fond=Bottom
  Recherche des arêtes de contour=Boundary edges search
--- 98,103 ----
  Conditions limites=Boundary conditions
  Conditions limites liquides=Liquid boundary conditions
  Courbes transitoires=Transient curves
+ Courbes temporelles=Time curves
  Fond=Bottom
  Recherche des arêtes de contour=Boundary edges search
***************
*** 195,199 ****
  Frontières Liquides transitoire=Transient liquid boundaries
  Ce fichier contient les valeurs dépendantes du temps pour les frontières liquides=This file contains the time-dependent boundary conditions
! Frontières Liquides (Télémac)=Liquid boundary conditions (Telemac)
  L'unité du temps est traitée en tant que seconde=The time is supposed to be in second
  Les valeurs du temps doivent être croissantes=The time values must be in ascending order
--- 195,199 ----
  Frontières Liquides transitoire=Transient liquid boundaries
  Ce fichier contient les valeurs dépendantes du temps pour les frontières liquides=This file contains the time-dependent boundary conditions
! Télémac frontières liquides=Telemac Liquid boundary conditions
  L'unité du temps est traitée en tant que seconde=The time is supposed to be in second
  Les valeurs du temps doivent être croissantes=The time values must be in ascending order