fudaa-cvs-commit

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr
In directory sc8-pr-cvs1:/tmp/cvs-serv11020/test/tr

Modified Files:
	TestTelemacCasViewer.java TestTrMaillage.java 
Log Message:
Maj tr



Index: TestTelemacCasViewer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr/TestTelemacCasViewer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestTelemacCasViewer.java	4 Jul 2003 15:56:41 -0000	1.2
--- TestTelemacCasViewer.java	18 Aug 2003 11:54:43 -0000	1.3
***************
*** 18,22 ****
  
  import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.dodico.telemac.io.TelemacCasFileFormat;
  import org.fudaa.fudaa.dico.FDicoEntitePanel;
  import org.fudaa.fudaa.tr.telemac.TrTelemacProjet;
--- 18,22 ----
  
  import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.dodico.telemac.io.Telemac2dFileFormat;
  import org.fudaa.fudaa.dico.FDicoEntitePanel;
  import org.fudaa.fudaa.tr.telemac.TrTelemacProjet;
***************
*** 31,35 ****
    public TestTelemacCasViewer(File _fileCas)
    {
!     TrTelemacProjet p=TrTelemacProjet.init(_fileCas, TelemacCasFileFormat.getInstance(), null,null);
      initFrame(p);
    }
--- 31,35 ----
    public TestTelemacCasViewer(File _fileCas)
    {
!     TrTelemacProjet p=TrTelemacProjet.init(_fileCas, (Telemac2dFileFormat.TelemacVersion)Telemac2dFileFormat.getInstance().getLastVersionImpl(), null,null);
      initFrame(p);
    }
***************
*** 43,47 ****
      if (_param != null)
      {
!       FDicoEntitePanel pn=new FDicoEntitePanel(_param.getKeys());
        setContentPane(pn);
      }
--- 43,47 ----
      if (_param != null)
      {
!       FDicoEntitePanel pn=new FDicoEntitePanel(_param.getKeys().getDicoParams());
        setContentPane(pn);
      }

Index: TestTrMaillage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr/TestTrMaillage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestTrMaillage.java	4 Jul 2003 16:00:32 -0000	1.1
--- TestTrMaillage.java	18 Aug 2003 11:54:43 -0000	1.2
***************
*** 16,27 ****
  import javax.swing.JFrame;
  
- import com.memoire.bu.BuBorderLayout;
  import com.memoire.bu.BuDesktop;
- import com.memoire.bu.BuPanel;
  import com.memoire.bu.BuSplit2Pane;
  
  import org.fudaa.dodico.commun.DodicoLib;
  import org.fudaa.dodico.fichiers.FileOperationSynthese;
- import org.fudaa.dodico.h2d.H2dLib;
  import org.fudaa.dodico.telemac.io.SerafinFileFormat;
  import org.fudaa.dodico.telemac.io.SerafinInterface;
--- 16,24 ----
***************
*** 30,34 ****
  import org.fudaa.ebli.calque.BGroupeCalque;
  import org.fudaa.ebli.calque.BVueCalque;
- import org.fudaa.ebli.calque.EbliFilleCalques;
  import org.fudaa.ebli.calque.ZCalqueLongPolygone;
  import org.fudaa.ebli.calque.ZCalquePoint;
--- 27,30 ----
***************
*** 94,98 ****
      FileOperationSynthese op = new FileOperationSynthese();
      System.out.println("Debut Lecture");
!     SerafinInterface inter = SerafinFileFormat.getInstance().read(f, op, null);
      System.out.println("fin Lecture");
      if (op.containsFatalError()) {
--- 90,94 ----
      FileOperationSynthese op = new FileOperationSynthese();
      System.out.println("Debut Lecture");
!     SerafinInterface inter = SerafinFileFormat.getInstance().getLastVersionImpl().read(f, op, null);
      System.out.println("fin Lecture");
      if (op.containsFatalError()) {
***************
*** 109,113 ****
      System.out.println(inter.getPtsFrontiere()[0]);
      long t1=System.currentTimeMillis();
!     inter.getMaillage().computeBordFast(null);
      long t2=System.currentTimeMillis();
      System.out.println("temps "+(t2-t1));
--- 105,109 ----
      System.out.println(inter.getPtsFrontiere()[0]);
      long t1=System.currentTimeMillis();
!     inter.getMaillage().computeBordV2(null);
      long t2=System.currentTimeMillis();
      System.out.println("temps "+(t2-t1));