[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/test TestIrregulier.java,1.5,1.6 TestMaillageIrregulier.java,1.4,1.5

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24627/src/org/fudaa/fudaa/test

Modified Files:
	TestIrregulier.java TestMaillageIrregulier.java 
Log Message:
Maj explorer et prepro

Index: TestIrregulier.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/TestIrregulier.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestIrregulier.java	25 Nov 2003 10:14:27 -0000	1.5
--- TestIrregulier.java	14 May 2004 10:27:21 -0000	1.6
***************
*** 18,21 ****
--- 18,22 ----
  import org.fudaa.dodico.corba.reflux.*;
  import org.fudaa.dodico.ef.*;
+ import org.fudaa.dodico.objet.UsineLib;
  import org.fudaa.dodico.reflux.*;
  import java.io.*;
***************
*** 52,56 ****
        IElement[] e_t3= new IElement[ielements.length * 4];
        for (int i= 0; i < ielements.length * 4; i += 4) {
!         e_t3[i]= IElementHelper.narrow(new DElement().tie());
          e_t3[i].noeuds(
            new INoeud[] {
--- 53,57 ----
        IElement[] e_t3= new IElement[ielements.length * 4];
        for (int i= 0; i < ielements.length * 4; i += 4) {
!         e_t3[i]= UsineLib.findUsine().creeEfElement()/*IElementHelper.narrow(new DElement().tie())*/;
          e_t3[i].noeuds(
            new INoeud[] {
***************
*** 60,64 ****
          e_t3[i].type(LTypeElement.T3);
          e_t3[i].numero(3);
!         e_t3[i + 1]= IElementHelper.narrow(new DElement().tie());
          e_t3[i
            + 1].noeuds(
--- 61,65 ----
          e_t3[i].type(LTypeElement.T3);
          e_t3[i].numero(3);
!         e_t3[i + 1]= UsineLib.findUsine().creeEfElement();
          e_t3[i
            + 1].noeuds(
***************
*** 78,82 ****
          e_t3[i + 2].type(LTypeElement.T3);
          e_t3[i + 2].numero(3);
!         e_t3[i + 3]= IElementHelper.narrow(new DElement().tie());
          e_t3[i
            + 3].noeuds(
--- 79,83 ----
          e_t3[i + 2].type(LTypeElement.T3);
          e_t3[i + 2].numero(3);
!         e_t3[i + 3]= UsineLib.findUsine().creeEfElement();
          e_t3[i
            + 3].noeuds(

Index: TestMaillageIrregulier.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/TestMaillageIrregulier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMaillageIrregulier.java	25 Nov 2003 10:14:27 -0000	1.4
--- TestMaillageIrregulier.java	14 May 2004 10:27:21 -0000	1.5
***************
*** 8,29 ****
   */
  package org.fudaa.fudaa.test;
! import java.awt.*;
! import java.awt.event.*;
! import javax.swing.*;
! import javax.swing.event.*;
! import java.lang.reflect.*;
! import org.fudaa.dodico.fichiers.*;
! import org.fudaa.dodico.corba.ef.*;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.corba.reflux.*;
! import org.fudaa.dodico.ef.*;
! import org.fudaa.dodico.reflux.*;
! import java.io.*;
  import com.sun.j3d.utils.image.TextureLoader;
! import javax.media.j3d.*;
! import javax.vecmath.*;
! import org.fudaa.ebli.volume.*;
! import org.fudaa.ebli.volume.controles.*;
! import org.fudaa.ebli.geometrie.*;
  /**
   * @version      $Revision$ $Date$ by $Author$
--- 8,58 ----
   */
  package org.fudaa.fudaa.test;
! import java.awt.BorderLayout;
! import java.awt.Color;
! import java.awt.Dimension;
! import java.awt.FlowLayout;
! import java.awt.event.ActionEvent;
! import java.awt.event.ActionListener;
! import java.awt.event.ItemEvent;
! import java.awt.event.ItemListener;
! import java.awt.event.WindowAdapter;
! import java.awt.event.WindowEvent;
! import java.io.File;
! import java.io.IOException;
! import java.lang.reflect.Method;
! 
! import javax.media.j3d.AmbientLight;
! import javax.media.j3d.BoundingSphere;
! import javax.media.j3d.BranchGroup;
! import javax.media.j3d.DirectionalLight;
! import javax.media.j3d.SpotLight;
! import javax.swing.ButtonGroup;
! import javax.swing.JButton;
! import javax.swing.JCheckBox;
! import javax.swing.JFrame;
! import javax.swing.JPanel;
! import javax.swing.JRadioButton;
! import javax.swing.WindowConstants;
! import javax.vecmath.Color3f;
! import javax.vecmath.Point3d;
! import javax.vecmath.Vector3f;
! 
  import com.sun.j3d.utils.image.TextureLoader;
! 
! import org.fudaa.dodico.corba.ef.IElement;
! import org.fudaa.dodico.corba.ef.IElementHelper;
! import org.fudaa.dodico.corba.ef.IMaillage;
! import org.fudaa.dodico.corba.ef.INoeud;
! import org.fudaa.dodico.corba.geometrie.LTypeElement;
! import org.fudaa.dodico.corba.reflux.SResultatsReflux;
! import org.fudaa.dodico.ef.DElement;
! import org.fudaa.dodico.fichiers.MaillageCORELEBTH;
! import org.fudaa.dodico.objet.UsineLib;
! import org.fudaa.dodico.reflux.DResultatsReflux;
! import org.fudaa.ebli.geometrie.GrPoint;
! import org.fudaa.ebli.volume.BGrilleIrreguliere;
! import org.fudaa.ebli.volume.BUnivers;
! import org.fudaa.ebli.volume.controles.BControleVolume;
! import org.fudaa.ebli.volume.controles.BUniversInteraction;
  /**
   * @version      $Revision$ $Date$ by $Author$
***************
*** 60,64 ****
        IElement[] e_t3= new IElement[ielements.length * 4];
        for (int i= 0; i < ielements.length * 4; i += 4) {
!         e_t3[i]= IElementHelper.narrow(new DElement().tie());
          e_t3[i].noeuds(
            new INoeud[] {
--- 89,93 ----
        IElement[] e_t3= new IElement[ielements.length * 4];
        for (int i= 0; i < ielements.length * 4; i += 4) {
!         e_t3[i]= UsineLib.findUsine().creeEfElement();
          e_t3[i].noeuds(
            new INoeud[] {
***************
*** 77,81 ****
          e_t3[i + 1].type(LTypeElement.T3);
          e_t3[i + 1].numero(3);
!         e_t3[i + 2]= IElementHelper.narrow(new DElement().tie());
          e_t3[i
            + 2].noeuds(
--- 106,110 ----
          e_t3[i + 1].type(LTypeElement.T3);
          e_t3[i + 1].numero(3);
!         e_t3[i + 2]= UsineLib.findUsine().creeEfElement();
          e_t3[i
            + 2].noeuds(
***************
*** 86,90 ****
          e_t3[i + 2].type(LTypeElement.T3);
          e_t3[i + 2].numero(3);
!         e_t3[i + 3]= IElementHelper.narrow(new DElement().tie());
          e_t3[i
            + 3].noeuds(
--- 115,119 ----
          e_t3[i + 2].type(LTypeElement.T3);
          e_t3[i + 2].numero(3);
!         e_t3[i + 3]= UsineLib.findUsine().creeEfElement();
          e_t3[i
            + 3].noeuds(
***************
*** 274,278 ****
                IElement[] e_t3= new IElement[ielements.length * 4];
                for (int i= 0; i < ielements.length * 4; i += 4) {
!                 e_t3[i]= IElementHelper.narrow(new DElement().tie());
                  e_t3[i].noeuds(
                    new INoeud[] {
--- 303,307 ----
                IElement[] e_t3= new IElement[ielements.length * 4];
                for (int i= 0; i < ielements.length * 4; i += 4) {
!                 e_t3[i]= UsineLib.findUsine().creeEfElement();
                  e_t3[i].noeuds(
                    new INoeud[] {
***************
*** 282,286 ****
                  e_t3[i].type(LTypeElement.T3);
                  e_t3[i].numero(3);
!                 e_t3[i + 1]= IElementHelper.narrow(new DElement().tie());
                  e_t3[i
                    + 1].noeuds(
--- 311,315 ----
                  e_t3[i].type(LTypeElement.T3);
                  e_t3[i].numero(3);
!                 e_t3[i + 1]= UsineLib.findUsine().creeEfElement();
                  e_t3[i
                    + 1].noeuds(
***************
*** 291,295 ****
                  e_t3[i + 1].type(LTypeElement.T3);
                  e_t3[i + 1].numero(3);
!                 e_t3[i + 2]= IElementHelper.narrow(new DElement().tie());
                  e_t3[i
                    + 2].noeuds(
--- 320,324 ----
                  e_t3[i + 1].type(LTypeElement.T3);
                  e_t3[i + 1].numero(3);
!                 e_t3[i + 2]= UsineLib.findUsine().creeEfElement();
                  e_t3[i
                    + 2].noeuds(
***************
*** 300,304 ****
                  e_t3[i + 2].type(LTypeElement.T3);
                  e_t3[i + 2].numero(3);
!                 e_t3[i + 3]= IElementHelper.narrow(new DElement().tie());
                  e_t3[i
                    + 3].noeuds(
--- 329,333 ----
                  e_t3[i + 2].type(LTypeElement.T3);
                  e_t3[i + 2].numero(3);
!                 e_t3[i + 3]= UsineLib.findUsine().creeEfElement();
                  e_t3[i
                    + 3].noeuds(