fudaa-cvs-commit Mailing List for Fudaa (Page 26)

https://gitlab.com/fudaa

Brought to you by: bmarchan, deniger, gpoissonnier, hadouxad

fudaa-cvs-commit — Mailing list for CVS commit messages

You can subscribe to this list here.

2003	_Jan	_Feb (89)	_Mar (219)	_Apr (82)	_May (33)	_Jun (11)	_Jul (129)	_Aug (357)	_Sep (34)	_Oct (37)	_Nov (42)	_Dec (182)
2004	_Jan (59)	_Feb (74)	_Mar (196)	_Apr (205)	_May (109)	_Jun (268)	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 .. 24 25 26 27 28 .. 86 > >> (Page 26 of 86)

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/dunes DResultatsDunes.java,1.5,1.6 DTestDunes.java,1.1,1.2

From: Frederic D. <de...@us...> - 2004-03-22 10:26:27

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

Modified Files:
	DResultatsDunes.java DTestDunes.java 
Log Message:
Correction bogue SMaillage

Index: DResultatsDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DResultatsDunes.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DResultatsDunes.java	19 Mar 2004 17:40:17 -0000	1.5
--- DResultatsDunes.java	22 Mar 2004 10:16:10 -0000	1.6
***************
*** 149,159 ****
            System.err.println("Dunes_out Decalage en ligne : " + (i + 1));
          int nbNdsEle= fout.intField(1);
!         SNoeud[] nds= new SNoeud[nbNdsEle];
!         for (j= 0; j < nbNdsEle; j++)
!           nds[j]= noeuds[fout.intField(j + 2) - 1];
          if (nbNdsEle == 3)
!           elements[i]= new SElement(nds, LTypeElement.T3);
          else
!           elements[i]= new SElement(nds, LTypeElement.T6);
        }
        fout.close();
--- 149,163 ----
            System.err.println("Dunes_out Decalage en ligne : " + (i + 1));
          int nbNdsEle= fout.intField(1);
!         //SNoeud[] nds= new SNoeud[nbNdsEle];
!         int[] idx=new int[nbNdsEle];
!         for (j= 0; j < nbNdsEle; j++){
!           //nds[j]= noeuds[fout.intField(j + 2) - 1];
!           idx[j]=fout.intField(j + 2) - 1;
!         }
!           
          if (nbNdsEle == 3)
!           elements[i]= new SElement(idx, LTypeElement.T3);
          else
!           elements[i]= new SElement(idx, LTypeElement.T6);
        }
        fout.close();
***************
*** 163,173 ****
        CDodico.exception(DResultatsDunes.class, ex);
      }
-     //DEBUG FRED
-     SElement el=r.elements[0];
-     System.out.println("Dunes");
-     System.out.println(el.noeuds[2].point.x+" "+el.noeuds[2].point.y+" "+el.noeuds[2].point.z);
-     System.out.println("egal true? "+(el.noeuds[2]==noeuds[5422]));
-     System.out.println("egal true? "+(el.noeuds[0]==noeuds[3120]));
-     System.out.println("Dunes FIN");
      return r;
    }
--- 167,170 ----

Index: DTestDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DTestDunes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DTestDunes.java	19 Mar 2004 17:40:17 -0000	1.1
--- DTestDunes.java	22 Mar 2004 10:16:11 -0000	1.2
***************
*** 39,46 ****
      SNoeud n3=new SNoeud(new SPoint(7,8,9));
      SElement el=new SElement();
!     el.noeuds=new SNoeud[3];
      el.noeuds[0]=n1;
      el.noeuds[1]=n2;
!     el.noeuds[2]=n3;
      SMaillage s=new SMaillage();
      s.elements=new SElement[1];
--- 39,50 ----
      SNoeud n3=new SNoeud(new SPoint(7,8,9));
      SElement el=new SElement();
!     /*el.noeuds=new SNoeud[3];
      el.noeuds[0]=n1;
      el.noeuds[1]=n2;
!     el.noeuds[2]=n3;*/
!     el.noeudsIdx=new int[3];
!     el.noeudsIdx[0]=0;
!     el.noeudsIdx[1]=1;
!     el.noeudsIdx[2]=2;
      SMaillage s=new SMaillage();
      s.elements=new SElement[1];

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr TrExplorer.java,1.2,1.3 TrVisuPanel.java,1.1,1.2

From: Frederic D. <de...@us...> - 2004-03-19 17:50:46

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

Modified Files:
	TrExplorer.java TrVisuPanel.java 
Log Message:
Correction bogue

Index: TrExplorer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrExplorer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TrExplorer.java	12 Mar 2004 10:17:01 -0000	1.2
--- TrExplorer.java	19 Mar 2004 17:40:24 -0000	1.3
***************
*** 10,22 ****
  
  import java.awt.event.ActionEvent;
- import java.awt.event.ActionListener;
- import java.io.File;
  import java.util.Observable;
  import java.util.Observer;
  
  import com.memoire.bu.BuActionEnabler;
- import com.memoire.bu.BuDynamicMenu;
  import com.memoire.bu.BuExplorer;
- import com.memoire.bu.BuMenu;
  import com.memoire.bu.BuMenuItem;
  import com.memoire.bu.BuResource;
--- 10,18 ----

Index: TrVisuPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrVisuPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrVisuPanel.java	12 Feb 2004 16:15:21 -0000	1.1
--- TrVisuPanel.java	19 Mar 2004 17:40:24 -0000	1.2
***************
*** 38,42 ****
  import org.fudaa.dodico.commun.DodicoCommandManager;
  import org.fudaa.dodico.ef.EfGrid;
- 
  import org.fudaa.ebli.calque.BArbreCalque;
  import org.fudaa.ebli.calque.BArbreCalqueModel;
--- 38,41 ----
***************
*** 49,53 ****
  import org.fudaa.ebli.calque.action.EbliPaletteAction;
  import org.fudaa.ebli.palette.BSelecteurReduitFonteNewVersion;
- 
  import org.fudaa.fudaa.commun.FudaaCommonImplementation;
  import org.fudaa.fudaa.meshviewer.layer.MvElementModel;
--- 48,51 ----
***************
*** 58,66 ****
  import org.fudaa.fudaa.meshviewer.layer.MvLayer;
  import org.fudaa.fudaa.meshviewer.layer.MvLayerGroup;
- import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo;
  import org.fudaa.fudaa.meshviewer.layer.MvNodeModel;
  import org.fudaa.fudaa.meshviewer.layer.MvNodeModelDefault;
  import org.fudaa.fudaa.meshviewer.layer.MvNodeNumberLayer;
  import org.fudaa.fudaa.meshviewer.layer.MvNodeNumberModelDefault;
  import org.fudaa.fudaa.tr.data.TrBcBoundaryLayerAbstract;
  import org.fudaa.fudaa.tr.data.TrBcBoundaryLegendLayer;
--- 56,64 ----
  import org.fudaa.fudaa.meshviewer.layer.MvLayer;
  import org.fudaa.fudaa.meshviewer.layer.MvLayerGroup;
  import org.fudaa.fudaa.meshviewer.layer.MvNodeModel;
  import org.fudaa.fudaa.meshviewer.layer.MvNodeModelDefault;
  import org.fudaa.fudaa.meshviewer.layer.MvNodeNumberLayer;
  import org.fudaa.fudaa.meshviewer.layer.MvNodeNumberModelDefault;
+ import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo;
  import org.fudaa.fudaa.tr.data.TrBcBoundaryLayerAbstract;
  import org.fudaa.fudaa.tr.data.TrBcBoundaryLegendLayer;
***************
*** 72,75 ****
--- 70,74 ----
  import org.fudaa.fudaa.tr.data.TrFindDialog;
  import org.fudaa.fudaa.tr.data.TrInfoSenderDelegate;
+ import org.fudaa.fudaa.tr.data.TrLayerMulti;
  
  /**
***************
*** 89,92 ****
--- 88,94 ----
    protected TrFindDialog findDialog_;
    protected MvPanelInfo pnInfo_;
+   /**
+    * @param _impl l'implementation parente
+    */
    public TrVisuPanel(FudaaCommonImplementation _impl) {
      super(null, true, true, true);
***************
*** 124,130 ****
--- 126,140 ----
    }
  
+   /**
+    *  Met a jour le composant d'information
+    */
    public void updateInfoComponent() {
      pnInfo_.updateState();
    }
+   /**
+    * Met a jour l'association calque/action
+    * @param _c le calque en question
+    * @param _act les actions associees a ce calque
+    */
    public void addCalqueActions(BCalque _c, EbliActionInterface[] _act) {
      if (calqueActions_ == null)
***************
*** 146,158 ****
--- 156,181 ----
      updateTrLayerMenu();
    }
+   /**
+    * @return l'impl parente
+    */
    public FudaaCommonImplementation getImpl() {
      return impl_;
    }
+   /**
+    * @return le calque legende
+    */
    public TrBcBoundaryLegendLayer getCqLegend() {
      return (TrBcBoundaryLegendLayer)gcDonnees_.getCalqueParNom("cqLegende");
    }
+   /**
+    * @return le manager des commandes pour le undo/redo
+    */
    public DodicoCommandManager getCmdMng() {
      return mng_;
    }
+   /**
+    * Met a jour un arbre avec le modele de ce panneau : A améliorer
+    * @param _cq l'arbre calque a mettre a jour
+    */
    public void refreshArbreCalque(BArbreCalque _cq) {
      BArbreCalqueModel arbre= getArbreCalqueModel();
***************
*** 161,165 ****
    }
  
!   public final void addCqMaillage(EfGrid _m, TrInfoSenderDelegate _d) {
      MvNodeModelDefault pt= new MvNodeModelDefault(_m);
      pt.setDelegate(_d);
--- 184,193 ----
    }
  
!   /**
!    * Ajoute le groupe de calque maillage
!    * @param _m le maillage
!    * @param _d le delegue pour la mise a jour des infos
!    */
!   protected final void addCqMaillage(EfGrid _m, TrInfoSenderDelegate _d) {
      MvNodeModelDefault pt= new MvNodeModelDefault(_m);
      pt.setDelegate(_d);
***************
*** 168,172 ****
      addCqMaillage(_m, pt, elt);
    }
!   public final void addCqMaillage(
      EfGrid _m,
      MvNodeModel _ptModel,
--- 196,205 ----
      addCqMaillage(_m, pt, elt);
    }
!   /**
!    * @param _m le maillage
!    * @param _ptModel le modele a utiliser pour les points
!    * @param _eltModel le modele a utiliser pour les elements
!    */
!   protected final void addCqMaillage(
      EfGrid _m,
      MvNodeModel _ptModel,
***************
*** 178,191 ****
      gcDonnees_.add(cqGrid);
    }
    public abstract void editGridPoint();
    public abstract void editGridPoly();
    public abstract void editBcPoint();
    public boolean isGridPointEditable() {
      return false;
    }
    public boolean isGridElementEditable() {
      return false;
    }
!   public final void addCqInfos(EfGrid _g) {
      if (getCqInfos() != null)
        return;
--- 211,245 ----
      gcDonnees_.add(cqGrid);
    }
+   /**
+    * Action appelee pour editer un point du maillage
+    */
    public abstract void editGridPoint();
+   /**
+    *  Action appelee pour editer un polygone
+    */
    public abstract void editGridPoly();
+   /**
+    * Action appelee pour editer un point de bord
+    */
    public abstract void editBcPoint();
+   /**
+    * Doit renvoyer true si les points du maillage sont editables
+    * @return false par defaut
+    */
    public boolean isGridPointEditable() {
      return false;
    }
+   /**
+    * Doit renvoyer true si les elements sont editables
+    * @return false par defaut
+    */ 
    public boolean isGridElementEditable() {
      return false;
    }
!   /**
!    * Ajoute les calques d'informations : numero des points et des elements
!    * @param _g le maillage associe
!    */
!   protected final void addCqInfos(EfGrid _g) {
      if (getCqInfos() != null)
        return;
***************
*** 202,205 ****
--- 256,262 ----
      gcDonnees_.add(gr);
    }
+   /**
+    * Action appelee pour mettre a jour les calques d'infos et les mettre en premier
+    */
    public final void updateInfosLayer() {
      MvLayerGroup l= getCqInfos();
***************
*** 207,213 ****
--- 264,277 ----
        gcDonnees_.enPremier(l);
    }
+   /**
+    * @return le groupe de calque d'info
+    */
    public MvLayerGroup getCqInfos() {
      return (MvLayerGroup)gcDonnees_.getCalqueParNom("gpInfo");
    }
+   /**
+    * @param _g le maillage associee
+    * @param _c le groupe de calque de dest
+    */
    private final void addCqNumber(EfGrid _g, BGroupeCalque _c) {
      if (getCqNumber() == null) {
***************
*** 226,235 ****
--- 290,308 ----
      }
    }
+   /**
+    *  @return le calque affichant les numeros des points
+    */
    public final MvNodeNumberLayer getCqNumber() {
      return (MvNodeNumberLayer)gcDonnees_.getCalqueParNom("cqPtNumber");
    }
+   /**
+    *  @return le calque affichant les numeros des elements
+    */
    public final MvElementNumberLayer getCqElementNumber() {
      return (MvElementNumberLayer)gcDonnees_.getCalqueParNom("cqEltNumber");
    }
+   /**
+    * @param b le nouveau groupe des calques des conditions limites
+    */
    public final void addCqCL(TrBcLayerGroup b) {
      if (getBoundaryGroup() != null)
***************
*** 239,257 ****
--- 312,368 ----
      gcDonnees_.enDernier(getGridGroup());
    }
+   
+   /**
+    * @param _l le nouveau groupe des calques des solutions initiales
+    */
+   public final void addSiLayer(MvLayerGroup _l){
+     if(getSiLayer()!=null){
+       gcDonnees_.detruire(getSiLayer());
+     }
+     _l.setName("gpSi");
+     gcDonnees_.add(_l);
+     gcDonnees_.enDernier(_l);
+   }
+   
+   /**
+    * @return le groupe de calque pour les solutions initiales
+    */
+   public final MvLayerGroup getSiLayer(){
+     return (MvLayerGroup)gcDonnees_. getCalqueParNom("gpSi");
+   }
+   /**
+    * @return le groupes des calques conditions limites
+    */
    public TrBcLayerGroup getBoundaryGroup() {
      return (TrBcLayerGroup)gcDonnees_.getCalqueParNom("gpCl");
    }
+   /**
+    * @return le groupe maillage
+    */
    public MvGridLayerGroup getGridGroup() {
      return (MvGridLayerGroup)gcDonnees_.getCalqueParNom("gpGrid");
    }
+   /**
+    * @return la calque points limites
+    */
    public TrBcPointLayer getBcPointLayer() {
      return getBoundaryGroup().getBcPointLayer();
    }
+   /**
+    * @return le groupe bords limites
+    */
    public TrBcBoundaryLayerAbstract getBcBoundaryLayer() {
      return getBoundaryGroup().getBcBoundaryLayer();
    }
+   /**
+    * @return la fenetre de l'implementation parente.
+    */
    public Frame getFrame() {
      return getImpl().getFrame();
    }
+   /**
+    * Remplit un menu avec les actions associees aux calques.
+    * @param _projectMenu le menu a remplir
+    */
    public void fillWithAllLayersAction(JMenu _projectMenu) {
      if (calqueActions_ != null) {
***************
*** 290,318 ****
      }
    }
!   //  protected TrCalque[] getAllCalquesDonnees() {
!   //    Component[] c= getDonneesCalque().getComponents();
!   //    ArrayList l= new ArrayList(c.length);
!   //    for (int i= c.length - 1; i >= 0; i--) {
!   //      if (c[i] instanceof TrGroupeCalque) {
!   //        Component[] cs= ((BGroupeCalque)c[i]).getComponents();
!   //        for (int j= cs.length - 1; j >= 0; j--) {
!   //          if (cs[j] instanceof TrCalque)
!   //            l.add(cs[j]);
!   //        }
!   //      } else if (c[i] instanceof TrCalque)
!   //        l.add(c[i]);
!   //    }
!   //    TrCalque[] r= new TrCalque[l.size()];
!   //    l.toArray(r);
!   //    return r;
!   //  }
    public void fillMenuWithCalqueActions(JPopupMenu _m, BCalque _c) {
      if (calqueActions_ != null)
        fillMenuWith(_m, (EbliActionInterface[])calqueActions_.get(_c));
    }
    public void fillMenuWithCalqueActions(JMenu _m, BCalque _c) {
      if (calqueActions_ != null)
        fillMenuWith(_m, (EbliActionInterface[])calqueActions_.get(_c));
    }
    protected static void setActionEnable(Action[] _ac, boolean _b) {
      if ((_ac != null) && (_ac.length > 0)) {
--- 401,426 ----
      }
    }
!   /**
!    * Rempli le menu popup avec les actions du calque en question
!    * @param _m le menu a remplir
!    * @param _c le calque dont les actions seront ajoutees au menu
!    */
    public void fillMenuWithCalqueActions(JPopupMenu _m, BCalque _c) {
      if (calqueActions_ != null)
        fillMenuWith(_m, (EbliActionInterface[])calqueActions_.get(_c));
    }
+   /**
+    * Rempli le menu avec les actions du calque en question
+    * @param _m le menu a remplir
+    * @param _c le calque dont les actions seront ajoutees au menu
+    */
    public void fillMenuWithCalqueActions(JMenu _m, BCalque _c) {
      if (calqueActions_ != null)
        fillMenuWith(_m, (EbliActionInterface[])calqueActions_.get(_c));
    }
+   /**
+    * @param _ac les actions dont l'etat "enable" sera modifie
+    * @param _b la nouvelle valeur
+    */
    protected static void setActionEnable(Action[] _ac, boolean _b) {
      if ((_ac != null) && (_ac.length > 0)) {
***************
*** 329,333 ****
    }
    /**
!    *
     */
    public void valueChanged(TreeSelectionEvent _evt) {
--- 437,441 ----
    }
    /**
!    * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent)
     */
    public void valueChanged(TreeSelectionEvent _evt) {
***************
*** 337,342 ****
    }
  
    /**
!    *
     */
    public void redo() {
--- 445,451 ----
    }
  
+ 
    /**
!    *  L'action refaire
     */
    public void redo() {
***************
*** 344,348 ****
    }
    /**
!    *
     */
    public void undo() {
--- 453,457 ----
    }
    /**
!    * L'action defaire.
     */
    public void undo() {
***************
*** 350,353 ****
--- 459,466 ----
    }
  
+   /**
+    * Met a jour le menu "layer" et les actions du calque actif
+    * @param b la nouvelle valeur
+    */
    protected void setSelected(boolean b) {
      if (layerMenu_ != null)
***************
*** 360,364 ****
    }
  
!   protected void setUndoActif(boolean _b) {
      impl_.getUndoCmdListener().setActive(mng_, _b);
    }
--- 473,481 ----
    }
  
!   /**
!    * Active le listener des commandes pour undo/redo 
!    * @param _b la nouvelle valeur
!    */
!   private void setUndoActif(boolean _b) {
      impl_.getUndoCmdListener().setActive(mng_, _b);
    }
***************
*** 368,372 ****
    }
    /**
!    *
     */
    public BuPopupMenu getCmdsContextuelles() {
--- 485,489 ----
    }
    /**
!    * @see org.fudaa.ebli.calque.BCalqueContextuelListener#getCmdsContextuelles()
     */
    public BuPopupMenu getCmdsContextuelles() {
***************
*** 389,392 ****
--- 506,512 ----
      return r;
    }
+   /**
+    * Met a jour le menu de la frame 
+    */
    protected void fillTrLayerMenu() {
      fillWithAllLayersAction(layerMenu_);
***************
*** 415,425 ****
    }
  
    public BuMenu getLayerMenu() {
      return layerMenu_;
    }
! 
    public final JMenu getPointNumberDisplayMenu() {
      return new DisplayMenu();
    }
    public final JMenu getElementNumberDisplayMenu() {
      return new DisplayElementMenu();
--- 535,553 ----
    }
  
+   /**
+    * @return le menu principal
+    */
    public BuMenu getLayerMenu() {
      return layerMenu_;
    }
!   /**
!    * @return le menu pour l'affichage des numero
!    */
    public final JMenu getPointNumberDisplayMenu() {
      return new DisplayMenu();
    }
+   /**
+    * @return le menu pour l'affichage des numero
+    */
    public final JMenu getElementNumberDisplayMenu() {
      return new DisplayElementMenu();
***************
*** 430,433 ****
--- 558,564 ----
      JMenuItem clearPt_;
      JCheckBoxMenuItem boundaryIdxPt_;
+     /**
+      * Numero des points
+      */
      public DisplayMenu() {
        super(TrResource.getS("Numéros des points"), "DISPLAY_POINTS_INDEX");
***************
*** 490,493 ****
--- 621,627 ----
      JMenuItem allElt_;
      JMenuItem clearElt_;
+     /**
+      * Numero des elements
+      */
      public DisplayElementMenu() {
        super(TrResource.getS("Numéros des éléments"), "DISPLAY_ELEMENTS_INDEX");
***************
*** 531,537 ****
        addElt_.setEnabled(act);
      }
!     /**
!      *
!      */
      protected boolean isActive() {
        return true;
--- 665,669 ----
        addElt_.setEnabled(act);
      }
! 
      protected boolean isActive() {
        return true;
***************
*** 553,558 ****
        _c.setForeground(fg);
    }
    /**
!    *
     */
    public void actionPerformed(ActionEvent e) {
--- 685,691 ----
        _c.setForeground(fg);
    }
+ 
    /**
!    * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
     */
    public void actionPerformed(ActionEvent e) {

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data TrPalierSurface.java,NONE,1.1 TrSolutionInitModel.java,NONE,1.1 TrSolutionInitLayer.java,NONE,1.1 TrNodeData.java,NONE,1.1 TrSolutionInitModelDefault.java,NONE,1.1 TrBcPointLayer.java,1.5,1.6 TrInfoSenderDelegate.java,1.1,1.2

From: Frederic D. <de...@us...> - 2004-03-19 17:50:46

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

Modified Files:
	TrBcPointLayer.java TrInfoSenderDelegate.java 
Added Files:
	TrPalierSurface.java TrSolutionInitModel.java 
	TrSolutionInitLayer.java TrNodeData.java 
	TrSolutionInitModelDefault.java 
Log Message:
Correction bogue

--- NEW FILE: TrSolutionInitModelDefault.java ---
/*
 *  @file         TrSolutionInitModelDefault.java
 *  @creation     18 mars 2004
 *  @modification $Date: 2004/03/19 17:40:24 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.fudaa.tr.data;

import org.fudaa.dodico.ef.EfGrid;
import org.fudaa.dodico.h2d.reflux.H2dRefluxSolutionInitialeInterface;
import org.fudaa.dodico.h2d.type.H2dVariableType;
import org.fudaa.ebli.calque.ZModeleDonneesListener;
import org.fudaa.ebli.commun.EbliListeSelectionInterface;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.fudaa.meshviewer.layer.MvInfoDelegate;
import org.fudaa.fudaa.meshviewer.layer.MvInfoDelegateAbstract;
import org.fudaa.fudaa.meshviewer.layer.MvNodeModelDefault;
import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo;
import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData;


/**
 * @author Fred Deniger
 * @version $Id: TrSolutionInitModelDefault.java,v 1.1 2004/03/19 17:40:24 deniger Exp $
 */
public class TrSolutionInitModelDefault extends MvNodeModelDefault implements TrSolutionInitModel {

  H2dRefluxSolutionInitialeInterface si_;
  H2dVariableType[]                  vs_;

  /**
   * @param _g le maillage en question
   * @param _si les solutions initiales a visualiser
   * @param _delegate le delegue pour fournir les infos
   */
  public TrSolutionInitModelDefault(EfGrid _g, H2dRefluxSolutionInitialeInterface _si, 
  TrInfoSenderDelegate _delegate) {
    super(_g, _delegate);
    si_ = _si;
  }

  /**
   * @see org.fudaa.fudaa.tr.data.TrSolutionInitModel#getNodeData()
   */
  public TrNodeData getNodeData() {
    return null;
  }
  
  

  /**
   * @see org.fudaa.fudaa.meshviewer.layer.MvNodeModel#fillWithInfo(org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData,
   *      org.fudaa.ebli.commun.EbliListeSelectionInterface)
   */
  public void fillWithInfo(InfoData _m, EbliListeSelectionInterface _l) {
    MvInfoDelegateAbstract d=(MvInfoDelegateAbstract)getDelegate();
    if(d==null) return;
    if ((_l != null) && (_l.isOnlyOnIndexSelected())) {
      if (vs_ == null) vs_ = si_.getVariables();
      if (vs_ != null) {
        int idx = _l.getMaxIndex();
        int m = vs_.length;
        d.fillWithXYZPointInfo(_m,idx);
        for (int i = 0; i < m; i++) {
          _m.put(vs_[i].getNom(), MvPanelInfo.TWO_DIGITS_FORMAT.format(si_.getSolutionInitiale(
              vs_[i], idx)));
        }
      }
    }
  }

  /**
   * @see org.fudaa.fudaa.meshviewer.layer.MvNodeModel#setGrid(org.fudaa.dodico.ef.EfGrid)
   */
  public void setGrid(EfGrid _g) {
    super.setGrid(_g);
  }

  /**
   * @see org.fudaa.ebli.calque.ZModelePoint#point(org.fudaa.ebli.geometrie.GrPoint, int)
   */
  public boolean point(GrPoint _p, int _i) {
    return super.point(_p, _i);
  }

  /**
   * @see org.fudaa.ebli.calque.ZModeleDonnees#getDomaine()
   */
  public GrBoite getDomaine() {
    return super.getDomaine();
  }

  /**
   * @see org.fudaa.ebli.calque.ZModeleDonnees#getNombre()
   */
  public int getNombre() {
    return super.getNombre();
  }

  /**
   * @see org.fudaa.ebli.calque.ZModeleDonnees#getObject(int)
   */
  public Object getObject(int _ind) {
    return null;
  }

  /**
   * @see org.fudaa.ebli.calque.ZModeleDonnees#setListener(org.fudaa.ebli.calque.ZModeleDonneesListener)
   */
  public void setListener(ZModeleDonneesListener _l) {
  }
}

--- NEW FILE: TrSolutionInitModel.java ---
/*
 *  @file         TrSolutionInitModel.java
 *  @creation     18 mars 2004
 *  @modification $Date: 2004/03/19 17:40:24 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.fudaa.tr.data;

import org.fudaa.fudaa.meshviewer.layer.MvNodeModel;


/**
 * @author Fred Deniger
 * @version $Id: TrSolutionInitModel.java,v 1.1 2004/03/19 17:40:24 deniger Exp $
 */
public interface TrSolutionInitModel extends MvNodeModel{
  
  public TrNodeData getNodeData();
}

Index: TrBcPointLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcPointLayer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TrBcPointLayer.java	12 Feb 2004 16:15:21 -0000	1.5
--- TrBcPointLayer.java	19 Mar 2004 17:40:24 -0000	1.6
***************
*** 10,24 ****
  import gnu.trove.TIntHashSet;
  import gnu.trove.TIntObjectIterator;
  import java.awt.Color;
  import java.awt.Graphics;
- import java.util.Map;
  
  import javax.swing.Icon;
! import org.fudaa.dodico.commun.DodicoCommandManager;
! import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface;
! import org.fudaa.ebli.calque.ZCalqueAffichageDonneesMultiSpecial;
! import org.fudaa.ebli.calque.ZCalqueAffichageDonneesMulti;
  import org.fudaa.ebli.calque.ZModeleDonnees;
- import org.fudaa.ebli.calque.action.EbliActionInterface;
  import org.fudaa.ebli.commun.EbliListeSelection;
  import org.fudaa.ebli.commun.EbliListeSelectionMulti;
--- 10,20 ----
  import gnu.trove.TIntHashSet;
  import gnu.trove.TIntObjectIterator;
+ 
  import java.awt.Color;
  import java.awt.Graphics;
  
  import javax.swing.Icon;
! 
  import org.fudaa.ebli.calque.ZModeleDonnees;
  import org.fudaa.ebli.commun.EbliListeSelection;
  import org.fudaa.ebli.commun.EbliListeSelectionMulti;
***************
*** 28,35 ****
  import org.fudaa.ebli.geometrie.GrPolygone;
  import org.fudaa.ebli.trace.TraceIcone;
! import org.fudaa.fudaa.commun.FudaaCommonImplementation;
! import org.fudaa.fudaa.meshviewer.layer.*;
! import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData;
! import org.fudaa.fudaa.tr.TrFilleVisu;
  import org.fudaa.fudaa.tr.TrResource;
  /**
--- 24,29 ----
  import org.fudaa.ebli.geometrie.GrPolygone;
  import org.fudaa.ebli.trace.TraceIcone;
! import org.fudaa.fudaa.meshviewer.layer.MvLayer;
! import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo;
  import org.fudaa.fudaa.tr.TrResource;
  /**

--- NEW FILE: TrSolutionInitLayer.java ---
/*
 *  @file         TrSolutionInitLayer.java
 *  @creation     18 mars 2004
 *  @modification $Date: 2004/03/19 17:40:24 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.fudaa.tr.data;

import java.awt.Graphics;

import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer;


/**
 * @author Fred Deniger
 * @version $Id: TrSolutionInitLayer.java,v 1.1 2004/03/19 17:40:24 deniger Exp $
 */
public class TrSolutionInitLayer  extends MvNodeLayer{
  
  boolean paintInonde_;


  /**
   * @param _m le modele du calque
   */
  public TrSolutionInitLayer(TrSolutionInitModel _m) {
    super(_m);
  }
  
  
  /**
   * @see javax.swing.JComponent#paintComponent(java.awt.Graphics)
   */
  public void paintComponent(Graphics _g) {
    
    //on ne dessine que les selections
    super.paintSpecificComponent(_g,true);
  }

}

Index: TrInfoSenderDelegate.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrInfoSenderDelegate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrInfoSenderDelegate.java	12 Feb 2004 16:15:21 -0000	1.1
--- TrInfoSenderDelegate.java	19 Mar 2004 17:40:24 -0000	1.2
***************
*** 9,18 ****
  package org.fudaa.fudaa.tr.data;
  import org.fudaa.ctulu.CtuluLib;
- 
  import org.fudaa.dodico.ef.EfLib;
- 
  import org.fudaa.ebli.commun.EbliListeSelectionInterface;
  import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
- 
  import org.fudaa.fudaa.meshviewer.layer.MvInfoDelegateAbstract;
  import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData;
--- 9,15 ----
***************
*** 25,31 ****
  public abstract class TrInfoSenderDelegate extends MvInfoDelegateAbstract {
  
-   /**
-    *
-    */
    public void fillWithBoundaryBlockInfo(
      InfoData _m,
--- 22,25 ----

--- NEW FILE: TrPalierSurface.java ---
/*
 *  @file         TrPalierSurface.java
 *  @creation     19 mars 2004
 *  @modification $Date: 2004/03/19 17:40:24 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.fudaa.tr.data;

import java.awt.Color;

import org.fudaa.ebli.geometrie.GrPoint;


/**
 * Un classe permettant de remplir des triangles selon la valeur en chaque point 
 * et un palier.
 * @author Fred Deniger
 * @version $Id: TrPalierSurface.java,v 1.1 2004/03/19 17:40:24 deniger Exp $
 */
public class TrPalierSurface {
  double palier_;
  Color palierColor_;

  /**
   * 
   */
  public TrPalierSurface() {
    super();
  }
  /**
   * @return Returns the palier.
   */
  public double getPalier() {
    return palier_;
  }

  /**
   * @param _palier The palier to set.
   */
  public void setPalier(double _palier) {
    palier_ = _palier;
  }

  /**
   * @return Returns the palierColor.
   */
  public Color getPalierColor() {
    return palierColor_;
  }

  /**
   * @param _palierColor The palierColor to set.
   */
  public void setPalierColor(Color _palierColor) {
    palierColor_ = _palierColor;
  }
  
  /**
   * Remplit le triangle _p1,_p2,_p3 selon les valeurs associees.
   * Si une valeur est supérieure au palier la partie du triangle associée
   * sera remplie.  
   * @param _p1 le point 1
   * @param _p2 le point 2
   * @param _p3 le point 3
   * @param _v1 la valeur au point 1
   * @param _v2 la valeur au point 2
   * @param _v3 la valeur au point 3
   */
  public void paint(GrPoint _p1,GrPoint _p2,GrPoint _p3,double _v1,double _v2,double _v3){
    if( (_v1<=palier_) && (_v2<=palier_) && (_v3<=palier_)){
      return;
    }
    if( (_v1>palier_) && (_v2>palier_) && (_v3>palier_)){
      return;
    }
  }

}

--- NEW FILE: TrNodeData.java ---
/*
 *  @file         TrNodeData.java
 *  @creation     18 mars 2004
 *  @modification $Date: 2004/03/19 17:40:24 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.fudaa.tr.data;


/**
 * @author Fred Deniger
 * @version $Id: TrNodeData.java,v 1.1 2004/03/19 17:40:24 deniger Exp $
 */
public interface TrNodeData {
  
  public String getName();
  public double getValue(int _idxPt);
  public double getMinValue();
  public double getMaxValue();
}

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion FudaaMaillageElement.java,1.5,1.6

From: Frederic D. <de...@us...> - 2004-03-19 17:50:44

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

Modified Files:
	FudaaMaillageElement.java 
Log Message:
Correction bogue

Index: FudaaMaillageElement.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaMaillageElement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FudaaMaillageElement.java	25 Nov 2003 10:13:32 -0000	1.5
--- FudaaMaillageElement.java	19 Mar 2004 17:40:24 -0000	1.6
***************
*** 8,14 ****
   */
  package org.fudaa.fudaa.commun.conversion;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.ebli.geometrie.*;
! import java.util.*;
  /**
   * Une classe de translation des SMaillage <=> GrMaillageElement.
--- 8,21 ----
   */
  package org.fudaa.fudaa.commun.conversion;
! import java.util.Hashtable;
! import java.util.Map;
! 
! import org.fudaa.dodico.corba.geometrie.LTypeElement;
! import org.fudaa.dodico.corba.geometrie.SElement;
! import org.fudaa.dodico.corba.geometrie.SMaillage;
! import org.fudaa.dodico.corba.geometrie.SNoeud;
! import org.fudaa.ebli.geometrie.GrElement;
! import org.fudaa.ebli.geometrie.GrMaillageElement;
! import org.fudaa.ebli.geometrie.GrNoeud;
  /**
   * Une classe de translation des SMaillage <=> GrMaillageElement.
***************
*** 26,30 ****
      GrNoeud[] nds= new GrNoeud[sNds.length];
      GrElement[] els= new GrElement[sEls.length];
!     Hashtable s2Gr= new Hashtable(sNds.length);
      //    List        lSNds=Arrays.asList(sNds);
      // Noeuds
--- 33,42 ----
      GrNoeud[] nds= new GrNoeud[sNds.length];
      GrElement[] els= new GrElement[sEls.length];
!     Map s2Gr= new Hashtable(sNds.length);
!     SElement el=sEls[0];
!     System.out.println(el.noeuds[2].point.x+" "+el.noeuds[2].point.y+" "+el.noeuds[2].point.z);
!     System.out.println("egal true? "+(el.noeuds[2]==sNds[5422]));
!     System.out.println("egal true? "+(el.noeuds[0]==sNds[3120]));
!     System.out.println("egal true? "+(el.noeuds[0].equals(sNds[3120])));
      //    List        lSNds=Arrays.asList(sNds);
      // Noeuds
***************
*** 33,36 ****
--- 45,51 ----
        s2Gr.put(sNds[i], nds[i]);
      }
+     System.out.println("true= "+s2Gr.containsKey(sNds[3120]));
+     System.out.println("true= "+s2Gr.containsKey(el.noeuds[0]));
+     System.out.println("true= "+s2Gr.containsKey(sNds[0]));
      // Elements
      for (int i= 0; i < sEls.length; i++) {
***************
*** 38,43 ****
        GrNoeud[] ndsEl= new GrNoeud[sNdsEl.length];
        int type;
!       for (int j= 0; j < sNdsEl.length; j++)
          ndsEl[j]= (GrNoeud)s2Gr.get(sNdsEl[j]);
        if (sEls[i].type == LTypeElement.L2)
          type= GrElement.L2;
--- 53,65 ----
        GrNoeud[] ndsEl= new GrNoeud[sNdsEl.length];
        int type;
!       for (int j= 0; j < sNdsEl.length; j++){
!         if(!s2Gr.containsKey(sNdsEl[j])){
!           new Throwable(i+" "+j).printStackTrace();
!           return null;
!         }
          ndsEl[j]= (GrNoeud)s2Gr.get(sNdsEl[j]);
+ //        if(ndsEl[j]==null) System.err.println("Noeuds null elt="+i+" pt idx="+j);
+       }
+         
        if (sEls[i].type == LTypeElement.L2)
          type= GrElement.L2;

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux TrRefluxProjectFactory.java,1.9,1.10 TrRefluxVisuPanel.java,1.1,1.2 TrRefluxInfoSenderDefault.java,1.4,1.5

From: Frederic D. <de...@us...> - 2004-03-19 17:50:44

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

Modified Files:
	TrRefluxProjectFactory.java TrRefluxVisuPanel.java 
	TrRefluxInfoSenderDefault.java 
Log Message:
Correction bogue

Index: TrRefluxProjectFactory.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TrRefluxProjectFactory.java	16 Mar 2004 16:47:12 -0000	1.9
--- TrRefluxProjectFactory.java	19 Mar 2004 17:40:23 -0000	1.10
***************
*** 8,13 ****
   */
  package org.fudaa.fudaa.tr.reflux;
- import java.io.File;
  
  import org.fudaa.ctulu.CtuluLib;
  import org.fudaa.dodico.commun.DodicoAnalyze;
--- 8,13 ----
   */
  package org.fudaa.fudaa.tr.reflux;
  
+ import java.io.File;
  import org.fudaa.ctulu.CtuluLib;
  import org.fudaa.dodico.commun.DodicoAnalyze;
***************
*** 36,82 ****
    /**
     * Lit un fichier inp et initialise les parametres
     * @param _f le fichier inp
     * @param _ft le format du fichier inp
     * @param _progress barre de progression
     * @param _ui l'interface utilisateur
!    * @return les parametres 
     */
    public final static TrRefluxParametres createRefluxParametresFromINP(
!     File _f,
!     INPFileFormat.INPVersion _ft,
!     ProgressionInterface _progress,
!     TrImplementation _ui) {
!     FileOperationSynthese synt= _ft.read(_f, _progress);
!     INPInterface inter= (INPInterface)synt.getSource();
!     if (_ui != null)
!       _ui.manageErrorOperationAndIsFatal(synt);
!     if (synt.containsFatalError())
!       return null;
!     if (inter == null)
!       return null;
!     TrRefluxParametres r= new TrRefluxParametres();
!     r.ui_= _ui;
!     r.fINP_= _f;
!     String s= _f.getName();
!     int i= s.indexOf('.');
!     if (i > 0)
!       s= s.substring(0, i);
!     r.title_= s;
!     DodicoAnalyze analyze= new DodicoAnalyze();
!     File siv=new File(_f.getParentFile(),_ft.getSolutionInitiales(inter.getFichiers()));
      //a modifier par la suite pour prendre en compte des si non 2D
!     H2dRefluxSICourant2D si2D=null;
!     if(siv.exists()){
!       synt=H2dRefluxSICourant2D.loadSI(inter.getGrid(), siv, _progress);
!       if(_ui!=null) _ui.manageErrorOperationAndIsFatal(synt);
!       if(!synt.containsFatalError()){
!         si2D = (H2dRefluxSICourant2D)synt.getSource();        
        }
      }
      analyze.setDesc(
!       TrResource.getS("Analyse du fichier")
!         + CtuluLib.ESPACE
!         + _f.getAbsolutePath());
!     r.params_= H2dRefluxParameters.init(inter,si2D, _progress, _ft, analyze);
      if (_ui != null) {
        _ui.manageAnalyzeAndIsFatal(analyze);
--- 36,83 ----
    /**
     * Lit un fichier inp et initialise les parametres
+    * 
     * @param _f le fichier inp
     * @param _ft le format du fichier inp
     * @param _progress barre de progression
     * @param _ui l'interface utilisateur
!    * @return les parametres
     */
    public final static TrRefluxParametres createRefluxParametresFromINP(
!   File _f, 
!   INPFileFormat.INPVersion _ft, 
!   ProgressionInterface _progress, 
!   TrImplementation _ui) {
!     FileOperationSynthese synt = _ft.read(_f, _progress);
!     INPInterface inter = (INPInterface) synt.getSource();
!     if (_ui != null) 
!     _ui.manageErrorOperationAndIsFatal(synt);
!     if (synt.containsFatalError()) 
!     return null;
!     if (inter == null) 
!     return null;
!     TrRefluxParametres r = new TrRefluxParametres();
!     r.ui_ = _ui;
!     r.fINP_ = _f;
!     String s = _f.getName();
!     int i = s.indexOf('.');
!     if (i > 0) 
!     s = s.substring(0, i);
!     r.title_ = s;
!     DodicoAnalyze analyze = new DodicoAnalyze();
!     File siv = new File(_f.getParentFile(), _ft.getSolutionInitiales(inter.getFichiers()));
      //a modifier par la suite pour prendre en compte des si non 2D
!     H2dRefluxSICourant2D si2D = null;
!     if (siv.exists()) {
!       synt = H2dRefluxSICourant2D.loadSI(inter.getGrid(), siv, _progress);
!       if (_ui != null) _ui.manageErrorOperationAndIsFatal(synt);
!       if (!synt.containsFatalError()) {
!         si2D = (H2dRefluxSICourant2D) synt.getSource();
        }
      }
      analyze.setDesc(
!     TrResource.getS("Analyse du fichier")
!     + CtuluLib.ESPACE
!     + _f.getAbsolutePath());
!     r.params_ = H2dRefluxParameters.init(inter, si2D, _progress, _ft, analyze);
      if (_ui != null) {
        _ui.manageAnalyzeAndIsFatal(analyze);
***************
*** 84,89 ****
--- 85,92 ----
      return r;
    }
+ 
    /**
     * Cree un projet reflux a partir d'un fichier inp
+    * 
     * @param _file le fichier inp
     * @param _fileFormat le format
***************
*** 92,96 ****
     * @return un nouveau projet
     */
!   public static TrRefluxProjet createRefluxProjectFromINP(
      File _file,
      INPFileFormat.INPVersion _fileFormat,
--- 95,99 ----
     * @return un nouveau projet
     */
! public static TrRefluxProjet createRefluxProjectFromINP(
      File _file,
      INPFileFormat.INPVersion _fileFormat,
***************
*** 106,112 ****
          TrRefluxXmlProjectReader r=TrRefluxXmlProjectReader.readPrex(prex,_progress,_ui);
          p.setDocument(r.getDoc());
!         /*if(r.getSi()==null){
!           params_.s
!         }*/
        }
        params_.getH2dRefluxParametres().setListener(
--- 109,115 ----
          TrRefluxXmlProjectReader r=TrRefluxXmlProjectReader.readPrex(prex,_progress,_ui);
          p.setDocument(r.getDoc());
!         if(r.getSi()==null){
!           params_.setSolutionInit(r.getSi());
!         }
        }
        params_.getH2dRefluxParametres().setListener(
***************
*** 119,122 ****
--- 122,126 ----
    /**
     * Cree un projet reflux a partir d'un fichier de maillage
+    * 
     * @param _f le fichier de maillage
     * @param _ft le format du fichier de maillage
***************
*** 127,153 ****
     */
    public static TrRefluxProjet createRefluxProjectFromGrid(
!     File _f,
!     FileFormatGridVersion _ft,
!     H2dProjetType _t,
!     ProgressionInterface _op,
!     TrImplementation _ui) {
!     EfGrid g= getValidGrid(_f, _ft, _ui, _op);
!     if (g == null)
!       return null;
!     TrRefluxParametres r= new TrRefluxParametres();
!     r.ui_=_ui;
!     DodicoAnalyze analyze= new DodicoAnalyze();
!     r.params_=
!       H2dRefluxParameters.init(
!         g,
!         _t,
!         _op,
!         INPFileFormat.getInstance().getLastINPVersionImpl(),
!         analyze);
!     TrRefluxProjet rProjet= new TrRefluxProjet(r);
!     r.title_=TrResource.getS("Nouveau");
      r.params_.setListener(new TrRefluxProjectDispatcherListener(rProjet));
      return rProjet;
- 
    }
  
--- 131,156 ----
     */
    public static TrRefluxProjet createRefluxProjectFromGrid(
!   File _f, 
!   FileFormatGridVersion _ft, 
!   H2dProjetType _t, 
!   ProgressionInterface _op, 
!   TrImplementation _ui) {
!     EfGrid g = getValidGrid(_f, _ft, _ui, _op);
!     if (g == null) 
!     return null;
!     TrRefluxParametres r = new TrRefluxParametres();
!     r.ui_ = _ui;
!     DodicoAnalyze analyze = new DodicoAnalyze();
!     r.params_ = 
!     H2dRefluxParameters.init(
!     g, 
!     _t, 
!     _op, 
!     INPFileFormat.getInstance().getLastINPVersionImpl(), 
!     analyze);
!     TrRefluxProjet rProjet = new TrRefluxProjet(r);
!     r.title_ = TrResource.getS("Nouveau");
      r.params_.setListener(new TrRefluxProjectDispatcherListener(rProjet));
      return rProjet;
    }
  
***************
*** 160,176 ****
     */
    public static EfGrid getValidGrid(
!     File _f,
!     FileFormatGridVersion _ft,
!     TrImplementation _ui,
!     ProgressionInterface _op) {
!     if ((_f == null) || (_ft == null))
!       return null;
      _ui.setMainMessage(TrResource.getS("Lecture fichier"));
      _ui.setMainProgression(5);
!     FileOperationSynthese op= _ft.readGrid(_f, _op);
!     if (_ui.manageErrorOperationAndIsFatal(op)) {
!       return null;
      }
!     EfGrid g= ((EfGridSource)op.getSource()).getGrid();
      if ((g.getPtsNb() == 0) || (g.getEltNb() == 0)) {
        _ui.error(TrResource.getS("Maillage vide"));
--- 163,179 ----
     */
    public static EfGrid getValidGrid(
!   File _f, 
!   FileFormatGridVersion _ft, 
!   TrImplementation _ui, 
!   ProgressionInterface _op) {
!     if ((_f == null) || (_ft == null)) 
!     return null;
      _ui.setMainMessage(TrResource.getS("Lecture fichier"));
      _ui.setMainProgression(5);
!     FileOperationSynthese op = _ft.readGrid(_f, _op);
!     if (_ui.manageErrorOperationAndIsFatal(op)) { 
!     return null; 
      }
!     EfGrid g = ((EfGridSource) op.getSource()).getGrid();
      if ((g.getPtsNb() == 0) || (g.getEltNb() == 0)) {
        _ui.error(TrResource.getS("Maillage vide"));
***************
*** 181,185 ****
        _ui.setMainMessage(TrResource.getS("Transformation maillage en T6"));
        _ui.setMainProgression(30);
!       g= EfLib.maillageT3enT6(g,_op, null);
      } else if (g.getEltType() != EfElementType.T6) {
        _ui.error(H2dResource.getS("Seuls les éléments T3 ou T6 sont acceptés"));
--- 184,188 ----
        _ui.setMainMessage(TrResource.getS("Transformation maillage en T6"));
        _ui.setMainProgression(30);
!       g = EfLib.maillageT3enT6(g, _op, null);
      } else if (g.getEltType() != EfElementType.T6) {
        _ui.error(H2dResource.getS("Seuls les éléments T3 ou T6 sont acceptés"));
***************
*** 189,196 ****
      _ui.setMainMessage(TrResource.getS("optimisation maillage"));
      _ui.setMainProgression(50);
!     EfGrid gOptimize= new OLBExec().computeGrid(g, _op, _ui);
      if ((gOptimize == null)
!       || (gOptimize.getPtsNb() == 0)
!       || (gOptimize.getEltNb() == 0)) {
        _ui.error(H2dResource.getS("Maillage vide"));
        _ui.unsetMainMessage();
--- 192,199 ----
      _ui.setMainMessage(TrResource.getS("optimisation maillage"));
      _ui.setMainProgression(50);
!     EfGrid gOptimize = new OLBExec().computeGrid(g, _op, _ui);
      if ((gOptimize == null)
!     || (gOptimize.getPtsNb() == 0)
!     || (gOptimize.getEltNb() == 0)) {
        _ui.error(H2dResource.getS("Maillage vide"));
        _ui.unsetMainMessage();
***************
*** 203,206 ****
--- 206,210 ----
      return gOptimize;
    }
+ 
    /**
     * 

Index: TrRefluxVisuPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxVisuPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrRefluxVisuPanel.java	12 Feb 2004 16:15:21 -0000	1.1
--- TrRefluxVisuPanel.java	19 Mar 2004 17:40:23 -0000	1.2
***************
*** 16,20 ****
  
  import org.fudaa.ctulu.CtuluLib;
! 
  import org.fudaa.dodico.ef.EfLib;
  import org.fudaa.dodico.h2d.H2dBcFrontierInterface;
--- 16,20 ----
  
  import org.fudaa.ctulu.CtuluLib;
! import org.fudaa.dodico.ef.EfGrid;
  import org.fudaa.dodico.ef.EfLib;
  import org.fudaa.dodico.h2d.H2dBcFrontierInterface;
***************
*** 22,35 ****
  import org.fudaa.dodico.h2d.reflux.H2dRefluxBcListener;
  import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager;
  import org.fudaa.dodico.h2d.type.H2dBoundaryType;
  import org.fudaa.dodico.h2d.type.H2dVariableType;
- 
  import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
  import org.fudaa.ebli.calque.action.EbliActionInterface;
  import org.fudaa.ebli.calque.action.EbliSimpleAction;
  import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
- 
  import org.fudaa.fudaa.commun.FudaaCommonImplementation;
! import org.fudaa.fudaa.meshviewer.layer.MvNodeModelDefault;
  import org.fudaa.fudaa.tr.TrResource;
  import org.fudaa.fudaa.tr.TrVisuPanel;
--- 22,34 ----
  import org.fudaa.dodico.h2d.reflux.H2dRefluxBcListener;
  import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager;
+ import org.fudaa.dodico.h2d.reflux.H2dRefluxSolutionInitialeInterface;
  import org.fudaa.dodico.h2d.type.H2dBoundaryType;
  import org.fudaa.dodico.h2d.type.H2dVariableType;
  import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
  import org.fudaa.ebli.calque.action.EbliActionInterface;
  import org.fudaa.ebli.calque.action.EbliSimpleAction;
  import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
  import org.fudaa.fudaa.commun.FudaaCommonImplementation;
! import org.fudaa.fudaa.meshviewer.layer.MvLayerGroup;
  import org.fudaa.fudaa.tr.TrResource;
  import org.fudaa.fudaa.tr.TrVisuPanel;
***************
*** 42,45 ****
--- 41,46 ----
  import org.fudaa.fudaa.tr.data.TrBcPointModel;
  import org.fudaa.fudaa.tr.data.TrBcPointModelDefault;
+ import org.fudaa.fudaa.tr.data.TrSolutionInitLayer;
+ import org.fudaa.fudaa.tr.data.TrSolutionInitModelDefault;
  /**
   * @author deniger
***************
*** 47,83 ****
   */
  public class TrRefluxVisuPanel extends TrVisuPanel {
-   TrRefluxProjet proj_;
-   TrRefluxInfoSenderDefault infoDelegate_;
-   /**
-    * @param _impl
-    */
-   public TrRefluxVisuPanel(
-     FudaaCommonImplementation _impl,
-     TrRefluxProjet _proj) {
-     super(_impl);
-     proj_= _proj;
-     infoDelegate_=
-       new TrRefluxInfoSenderDefault(proj_.getH2dRefluxParametres());
-     addCqInfos(proj_.getH2dRefluxParametres().getMaillage());
-     TrBcBoundaryMiddleLayer cqBord=
-       new TrBcBoundaryMiddleLayer(createBoundaryModel());
-     getCqLegend().ajoute(
-       cqBord,
-       new TrBcBoundaryLegendPanel(
-         cqBord,
-         _proj.getRefluxParametres().getH2dParametres().getBordList()));
-     TrBcLayerGroup cl= new TrBcLayerGroup();
-     cl.addBcBoundaryLayer(cqBord);
-     cl.addBcPointLayer(new TrBcPointLayer(createBoundaryPointModel()));
-     addCqCL(cl);
-     addCqMaillage(
-       proj_.getRefluxParametres().getMaillage(),infoDelegate_);
-     //Actions
-     addCalqueActions(cqBord, this.buildBoundaryAction());
-     addCalqueActions(cl.getBcPointLayer(), this.buildBcPointAction());
-     addCalqueActions(
-       getGridGroup().getPolygonLayer(),
-       this.buildElementAction());
-   }
  
    public class TrRefluxBoundaryMiddleModel
--- 48,51 ----
***************
*** 93,141 ****
        setDelegate(infoDelegate_);
      }
- 
      /**
       *
       */
!     public void bcFrontierStructureChanged(H2dBcFrontierInterface _b) {
        fireChange();
      }
      /**
       *
       */
!     public void bcParametersChanged(H2dBoundary _b, H2dVariableType _t) {}
      /**
       *
       */
!     public void bcPointsParametersChanged(H2dVariableType _t) {}
      /**
       *
       */
!     public void bcBoundaryTypeChanged(H2dBoundary b, H2dBoundaryType _old) {
!       fireChange();
!     }
      /**
       *
       */
!     public void bcPointsNormalChanged() {}
  
    }
! 
!   public final TrBcBoundaryMiddleModel createBoundaryModel() {
!     TrRefluxBoundaryMiddleModel r=
!       new TrRefluxBoundaryMiddleModel(
!         proj_.getRefluxParametres().getRefluxBcMng());
!     r.setDelegate(infoDelegate_);
      return r;
- 
    }
!   public final H2dRefluxBcManager getBcMng() {
!     return proj_.getRefluxParametres().getRefluxBcMng();
    }
!   public final TrBcPointModel createBoundaryPointModel() {
!     TrBcPointModelDefault r=
!       new TrBcPointModelDefault(proj_.getRefluxParametres().getMaillage());
!     r.setDelegate(infoDelegate_);
      return r;
    }
  
    protected void editPtBcPointSegmentLayer() {
--- 61,255 ----
        setDelegate(infoDelegate_);
      }
      /**
       *
       */
!     public void bcBoundaryTypeChanged(H2dBoundary b, H2dBoundaryType _old) {
        fireChange();
      }
+ 
      /**
       *
       */
!     public void bcFrontierStructureChanged(H2dBcFrontierInterface _b) {
!       fireChange();
!     }
      /**
       *
       */
!     public void bcParametersChanged(H2dBoundary _b, H2dVariableType _t) {}
      /**
       *
       */
!     public void bcPointsNormalChanged() {}
      /**
       *
       */
!     public void bcPointsParametersChanged(H2dVariableType _t) {}
  
    }
!   TrRefluxInfoSenderDefault infoDelegate_;
!   TrRefluxProjet proj_;
!   /**
!    * @param _impl
!    * @param _proj
!    */
!   public TrRefluxVisuPanel(
!     FudaaCommonImplementation _impl,
!     TrRefluxProjet _proj) {
!     super(_impl);
!     proj_= _proj;
!     infoDelegate_=
!       new TrRefluxInfoSenderDefault(proj_.getH2dRefluxParametres());
!     addCqInfos(proj_.getH2dRefluxParametres().getMaillage());
!     TrBcBoundaryMiddleLayer cqBord=
!       new TrBcBoundaryMiddleLayer(createBoundaryModel());
!     getCqLegend().ajoute(
!       cqBord,
!       new TrBcBoundaryLegendPanel(
!         cqBord,
!         _proj.getRefluxParametres().getH2dParametres().getBordList()));
!     TrBcLayerGroup cl= new TrBcLayerGroup();
!     cl.addBcBoundaryLayer(cqBord);
!     cl.addBcPointLayer(new TrBcPointLayer(createBoundaryPointModel()));
!     addCqCL(cl);
!     EfGrid g=proj_.getRefluxParametres().getMaillage();
!     addCqMaillage(
!       g,infoDelegate_);
!     H2dRefluxSolutionInitialeInterface si=proj_.getH2dRefluxParametres().getSolutionInitiales();
!     if(si!=null){
!       MvLayerGroup gsi=new MvLayerGroup();
!       gsi.setTitle(TrResource.getS("Solutions initiales"));
!       TrSolutionInitLayer init=new TrSolutionInitLayer(new TrSolutionInitModelDefault(g,si,infoDelegate_));
!       init.setTitle(TrResource.getS("Noeuds"));
!       gsi.add(init);
!       addSiLayer(gsi);
!     }
!     //Actions
!     addCalqueActions(cqBord, this.buildBoundaryAction());
!     addCalqueActions(cl.getBcPointLayer(), this.buildBcPointAction());
!     addCalqueActions(
!       getGridGroup().getPolygonLayer(),
!       this.buildElementAction());
!   }
!   private EbliActionInterface[] buildBcPointAction() {
!     if (CtuluLib.DEBUG)
!       CtuluLib.debug("build bcPointLayer actions");
!     EbliActionInterface[] r= new EbliActionInterface[2];
!     r[0]=
!       new EbliSimpleAction(
!         TrResource.getS("Editer points"),
!         null,
!         "POINTS_EDIT") {
!       public void actionPerformed(ActionEvent arg0) {
!         editBcPoint();
!       }
!     };
!     r[1]=
!       new EbliSimpleAction(
!         TrResource.getS("Editer bords"),
!         null,
!         "POINTS_SEGMENT_EDIT") {
!       public void actionPerformed(ActionEvent arg0) {
!         editPtBcPointSegmentLayer();
!       }
!     };
!     r[1].putValue(
!       Action.SHORT_DESCRIPTION,
!       TrResource.getS(
!         "Les segments dont les points milieux sont sélectionnés seront éditer"));
      return r;
    }
!   private EbliActionInterface[] buildBoundaryAction() {
!     if (CtuluLib.DEBUG)
!       CtuluLib.debug("build bcBoundaryLayer actions");
!     EbliActionInterface[] r= new EbliActionInterface[1];
!     r[0]=
!       new EbliSimpleAction(
!         TrResource.getS("Editer bords"),
!         null,
!         "FRONTIER_EDIT") {
!       public void actionPerformed(ActionEvent arg0) {
!         editBoundaryMiddleLayer();
!       }
!     };
!     return r;
    }
!   private EbliActionInterface[] buildElementAction() {
!     if (CtuluLib.DEBUG)
!       CtuluLib.debug("build bcElement actions");
!     EbliActionInterface[] r= new EbliActionInterface[1];
!     r[0]=
!       new EbliSimpleAction(
!         TrResource.getS("propriétés élémentaires"),
!         null,
!         "ELEMENT_PROP_EDIT") {
!       public void actionPerformed(ActionEvent arg0) {
!         editGridPoly();
!       }
!     };
      return r;
    }
+   protected void editBoundaryFromMiddleIdx(int frontierIdx, int[] _midIdx) {
+     H2dRefluxBcManager.RefluxMiddleFrontier frontier=
+       getBcMng().getRefluxMiddleFrontier(frontierIdx);
+     Set bdType= frontier.getSelectedBoundaryType(_midIdx);
+     if (bdType == null)
+       return;
+     H2dBoundaryType[] bdTypeArray= new H2dBoundaryType[bdType.size()];
+     bdType.toArray(bdTypeArray);
+     H2dVariableType[] vars= H2dRefluxBcManager.getClBordVariables();
+     Map varValue= new TreeMap();
+     for (int j= vars.length - 1; j >= 0; j--) {
+       varValue.put(
+         vars[j],
+         frontier.getCommonValueFromMiddle(_midIdx, vars[j]));
+     }
+     H2dBoundaryType b= null;
+     if ((bdType != null) && (bdTypeArray.length == 1)) {
+       b= bdTypeArray[0];
+     } else {
+       b= H2dBoundaryType.MIXTE;
+       //vToSet= H2dRefluxBcManager.getCommonVariableAvailable(bdTypeArray);
+     }
+     Double normal= frontier.getCommonNormalFromMiddle(_midIdx);
+     Set varToEnableIfMixt= null;
+     if (b == H2dBoundaryType.MIXTE) {
+       varToEnableIfMixt=
+         H2dRefluxBcManager.getCommonVariableAvailable(bdTypeArray);
+     }
+     TrRefluxBoundaryEditor editor=
+       new TrRefluxBoundaryEditor(
+         false,
+         varToEnableIfMixt,
+         varValue,
+         normal,
+         getBcMng().getBoundaryTypeComportMap(),
+         b,
+         proj_.getRefluxParametres().getEvolMng());
+     if (EbliSimpleDialogPanel
+       .isOkResponse(
+         editor.afficheModale(
+           getFrame(),
+           TrResource.getS("Edition des bords")))) {
+       getCmdMng().addCmd(
+         frontier.setValues(
+           _midIdx,
+           editor.getSelectedBoundaryType(),
+           editor.getNewValues(),
+           editor.getCommonNormalValue()));
+     }
+   }
+ 
+   protected void editBoundaryMiddleLayer() {
+     TrBcBoundaryMiddleLayer layer=
+       (TrBcBoundaryMiddleLayer)getBcBoundaryLayer();
+     int i= layer.isSelectionInUniqueBloc();
+     if (i < 0)
+       return;
+     else
+       editBoundaryFromMiddleIdx(
+         i,
+         layer.getLayerSelection().getSelection(i).getSelectedIndex());
+   }
  
    protected void editPtBcPointSegmentLayer() {
***************
*** 159,162 ****
--- 273,291 ----
      editBoundaryFromMiddleIdx(i, select);
    }
+ 
+   public final TrBcBoundaryMiddleModel createBoundaryModel() {
+     TrRefluxBoundaryMiddleModel r=
+       new TrRefluxBoundaryMiddleModel(
+         proj_.getRefluxParametres().getRefluxBcMng());
+     r.setDelegate(infoDelegate_);
+     return r;
+ 
+   }
+   public final TrBcPointModel createBoundaryPointModel() {
+     TrBcPointModelDefault r=
+       new TrBcPointModelDefault(proj_.getRefluxParametres().getMaillage());
+     r.setDelegate(infoDelegate_);
+     return r;
+   }
    public void editBcPoint() {
      TrBcPointLayer layer= getBcPointLayer();
***************
*** 200,265 ****
      }
    }
! 
!   protected void editBoundaryMiddleLayer() {
!     TrBcBoundaryMiddleLayer layer=
!       (TrBcBoundaryMiddleLayer)getBcBoundaryLayer();
!     int i= layer.isSelectionInUniqueBloc();
!     if (i < 0)
!       return;
!     else
!       editBoundaryFromMiddleIdx(
!         i,
!         layer.getLayerSelection().getSelection(i).getSelectedIndex());
!   }
!   protected void editBoundaryFromMiddleIdx(int frontierIdx, int[] _midIdx) {
!     H2dRefluxBcManager.RefluxMiddleFrontier frontier=
!       getBcMng().getRefluxMiddleFrontier(frontierIdx);
!     Set bdType= frontier.getSelectedBoundaryType(_midIdx);
!     if (bdType == null)
!       return;
!     H2dBoundaryType[] bdTypeArray= new H2dBoundaryType[bdType.size()];
!     bdType.toArray(bdTypeArray);
!     H2dVariableType[] vars= H2dRefluxBcManager.getClBordVariables();
!     Map varValue= new TreeMap();
!     for (int j= vars.length - 1; j >= 0; j--) {
!       varValue.put(
!         vars[j],
!         frontier.getCommonValueFromMiddle(_midIdx, vars[j]));
!     }
!     H2dBoundaryType b= null;
!     if ((bdType != null) && (bdTypeArray.length == 1)) {
!       b= bdTypeArray[0];
!     } else {
!       b= H2dBoundaryType.MIXTE;
!       //vToSet= H2dRefluxBcManager.getCommonVariableAvailable(bdTypeArray);
!     }
!     Double normal= frontier.getCommonNormalFromMiddle(_midIdx);
!     Set varToEnableIfMixt= null;
!     if (b == H2dBoundaryType.MIXTE) {
!       varToEnableIfMixt=
!         H2dRefluxBcManager.getCommonVariableAvailable(bdTypeArray);
!     }
!     TrRefluxBoundaryEditor editor=
!       new TrRefluxBoundaryEditor(
!         false,
!         varToEnableIfMixt,
!         varValue,
!         normal,
!         getBcMng().getBoundaryTypeComportMap(),
!         b,
!         proj_.getRefluxParametres().getEvolMng());
!     if (EbliSimpleDialogPanel
!       .isOkResponse(
!         editor.afficheModale(
!           getFrame(),
!           TrResource.getS("Edition des bords")))) {
!       getCmdMng().addCmd(
!         frontier.setValues(
!           _midIdx,
!           editor.getSelectedBoundaryType(),
!           editor.getNewValues(),
!           editor.getCommonNormalValue()));
!     }
!   }
    public void editGridPoly() {
      ZCalqueAffichageDonnees cq= getGridGroup().getPolygonLayer();
--- 329,336 ----
      }
    }
!   /**
!    *
!    */
!   public void editGridPoint() {}
    public void editGridPoly() {
      ZCalqueAffichageDonnees cq= getGridGroup().getPolygonLayer();
***************
*** 279,344 ****
      }
    }
!   private EbliActionInterface[] buildBoundaryAction() {
!     if (CtuluLib.DEBUG)
!       CtuluLib.debug("build bcBoundaryLayer actions");
!     EbliActionInterface[] r= new EbliActionInterface[1];
!     r[0]=
!       new EbliSimpleAction(
!         TrResource.getS("Editer bords"),
!         null,
!         "FRONTIER_EDIT") {
!       public void actionPerformed(ActionEvent arg0) {
!         editBoundaryMiddleLayer();
!       }
!     };
!     return r;
!   }
!   private EbliActionInterface[] buildBcPointAction() {
!     if (CtuluLib.DEBUG)
!       CtuluLib.debug("build bcPointLayer actions");
!     EbliActionInterface[] r= new EbliActionInterface[2];
!     r[0]=
!       new EbliSimpleAction(
!         TrResource.getS("Editer points"),
!         null,
!         "POINTS_EDIT") {
!       public void actionPerformed(ActionEvent arg0) {
!         editBcPoint();
!       }
!     };
!     r[1]=
!       new EbliSimpleAction(
!         TrResource.getS("Editer bords"),
!         null,
!         "POINTS_SEGMENT_EDIT") {
!       public void actionPerformed(ActionEvent arg0) {
!         editPtBcPointSegmentLayer();
!       }
!     };
!     r[1].putValue(
!       Action.SHORT_DESCRIPTION,
!       TrResource.getS(
!         "Les segments dont les points milieux sont sélectionnés seront éditer"));
!     return r;
!   }
!   private EbliActionInterface[] buildElementAction() {
!     if (CtuluLib.DEBUG)
!       CtuluLib.debug("build bcElement actions");
!     EbliActionInterface[] r= new EbliActionInterface[1];
!     r[0]=
!       new EbliSimpleAction(
!         TrResource.getS("propriétés élémentaires"),
!         null,
!         "ELEMENT_PROP_EDIT") {
!       public void actionPerformed(ActionEvent arg0) {
!         editGridPoly();
!       }
!     };
!     return r;
    }
-   /**
-    *
-    */
-   public void editGridPoint() {}
    public boolean isGridElementEditable() {
      return true;
--- 350,356 ----
      }
    }
!   public final H2dRefluxBcManager getBcMng() {
!     return proj_.getRefluxParametres().getRefluxBcMng();
    }
    public boolean isGridElementEditable() {
      return true;

Index: TrRefluxInfoSenderDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxInfoSenderDefault.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TrRefluxInfoSenderDefault.java	12 Feb 2004 16:15:21 -0000	1.4
--- TrRefluxInfoSenderDefault.java	19 Mar 2004 17:40:24 -0000	1.5
***************
*** 13,18 ****
  
  import org.fudaa.ctulu.CtuluLib;
- 
- import org.fudaa.dodico.commun.DodicoLib;
  import org.fudaa.dodico.commun.DodicoPermanentList;
  import org.fudaa.dodico.ef.EfGrid;
--- 13,16 ----
***************
*** 25,31 ****
  import org.fudaa.dodico.h2d.type.H2dBcType;
  import org.fudaa.dodico.h2d.type.H2dVariableType;
- 
- import org.fudaa.ebli.commun.EbliListeSelectionInterface;
- 
  import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData;
  import org.fudaa.fudaa.tr.TrResource;
--- 23,26 ----
***************
*** 46,49 ****
--- 41,47 ----
    }
  
+   /**
+    * @see org.fudaa.fudaa.meshviewer.layer.MvInfoDelegateAbstract#getGrid()
+    */
    public EfGrid getGrid() {
      return params_.getMaillage();
***************
*** 51,55 ****
  
    /**
!    *
     */
    public void fillWithElementInfo(InfoData _receiver, int _idx) {
--- 49,53 ----
  
    /**
!    * @see org.fudaa.fudaa.tr.data.TrInfoSenderDelegate#fillWithElementInfo(org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData, int)
     */
    public void fillWithElementInfo(InfoData _receiver, int _idx) {
***************
*** 75,80 ****
    }
  
    /**
!    *
     */
    public void fillWithBoundaryMiddleInfo(
--- 73,79 ----
    }
  
+ 
    /**
!    * @see org.fudaa.fudaa.tr.data.TrInfoSenderDelegate#fillWithBoundaryMiddleInfo(org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData, int, int)
     */
    public void fillWithBoundaryMiddleInfo(
***************
*** 146,150 ****
  
    /**
!    *
     */
    public void fillWithPointInfo(
--- 145,149 ----
  
    /**
!    * @see org.fudaa.fudaa.meshviewer.layer.MvInfoDelegateAbstract#fillWithPointInfo(org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData, int, int, int, int)
     */
    public void fillWithPointInfo(

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer MvNodeLayer.java,1.1,1.2 MvInfoDelegateAbstract.java,1.1,1.2 MvInfoDelegate.java,1.1,1.2 MvNodeModelDefault.java,1.1,1.2

From: Frederic D. <de...@us...> - 2004-03-19 17:50:43

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

Modified Files:
	MvNodeLayer.java MvInfoDelegateAbstract.java 
	MvInfoDelegate.java MvNodeModelDefault.java 
Log Message:
Correction bogue

Index: MvNodeLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MvNodeLayer.java	12 Feb 2004 16:27:40 -0000	1.1
--- MvNodeLayer.java	19 Mar 2004 17:40:23 -0000	1.2
***************
*** 8,23 ****
   */
  package org.fudaa.fudaa.meshviewer.layer;
- import org.fudaa.ctulu.CtuluLib;
- 
- import org.fudaa.dodico.ef.EfGrid;
- import org.fudaa.dodico.ef.EfNode;
- 
  import org.fudaa.ebli.calque.ZCalquePoint;
  import org.fudaa.ebli.geometrie.GrBoite;
  import org.fudaa.ebli.geometrie.GrPoint;
- 
- import org.fudaa.fudaa.ressource.FudaaResource;
- import org.fudaa.fudaa.tr.TrResource;
- import org.fudaa.fudaa.tr.TrVisuPanel;
  /**
   * @author deniger
--- 8,14 ----
***************
*** 32,36 ****
    }
    /**
!    *
     */
    public int[] getPtIdx() {
--- 23,27 ----
    }
    /**
!    * @return les indices des points sélectionnés
     */
    public int[] getPtIdx() {

Index: MvInfoDelegateAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvInfoDelegateAbstract.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MvInfoDelegateAbstract.java	12 Feb 2004 16:27:40 -0000	1.1
--- MvInfoDelegateAbstract.java	19 Mar 2004 17:40:23 -0000	1.2
***************
*** 45,49 ****
--- 45,61 ----
    }
  
+   /**
+    * @param _m
+    * @param _idx
+    */
    public final void fillWithPointInfo(InfoData _m, int _idx) {
+     fillWithXYZPointInfo(_m,_idx);
+   }
+   
+   /**
+    * @param _m les donnees a mettre a jour
+    * @param _idx l'indices du point
+    */
+   public final void fillWithXYZPointInfo(InfoData _m, int _idx) {
      int[] idx=new int[2];
      int frGlob=getGrid().getFrontiers().getIdxOnFrontier(_idx, idx);
***************
*** 51,54 ****
--- 63,73 ----
    }
  
+   /**
+    * @param _m
+    * @param _idxGlobal
+    * @param _idxGlobOnFr
+    * @param _frIdx
+    * @param _idxLocaloOnFr
+    */
    public void fillWithPointInfo(
      InfoData _m,

Index: MvNodeModelDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeModelDefault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MvNodeModelDefault.java	12 Feb 2004 16:27:40 -0000	1.1
--- MvNodeModelDefault.java	19 Mar 2004 17:40:23 -0000	1.2
***************
*** 9,25 ****
  package org.fudaa.fudaa.meshviewer.layer;
  
- import org.fudaa.ctulu.CtuluLib;
- 
  import org.fudaa.dodico.ef.EfGrid;
  import org.fudaa.dodico.ef.EfNode;
- 
  import org.fudaa.ebli.calque.ZModeleDonnesAbstract;
  import org.fudaa.ebli.commun.EbliListeSelectionInterface;
  import org.fudaa.ebli.geometrie.GrBoite;
  import org.fudaa.ebli.geometrie.GrPoint;
- 
  import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData;
- import org.fudaa.fudaa.ressource.FudaaResource;
  
  public class MvNodeModelDefault
    extends ZModeleDonnesAbstract
--- 9,24 ----
  package org.fudaa.fudaa.meshviewer.layer;
  
  import org.fudaa.dodico.ef.EfGrid;
  import org.fudaa.dodico.ef.EfNode;
  import org.fudaa.ebli.calque.ZModeleDonnesAbstract;
  import org.fudaa.ebli.commun.EbliListeSelectionInterface;
  import org.fudaa.ebli.geometrie.GrBoite;
  import org.fudaa.ebli.geometrie.GrPoint;
  import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData;
  
+ /**
+  * @author Fred Deniger
+  * @version $Id$
+  */
  public class MvNodeModelDefault
    extends ZModeleDonnesAbstract
***************
*** 27,34 ****
--- 26,40 ----
    private EfGrid grid_;
    private MvInfoDelegate delegate_;
+   /**
+    * @param _g le maillage a afficher 
+    */
    public MvNodeModelDefault(EfGrid _g) {
      this(_g, null);
    }
    
+   /**
+    * @param _g le maillage a afficher et le delehue
+    * @param _d
+    */
    public MvNodeModelDefault(EfGrid _g, MvInfoDelegate _d) {
      grid_= _g;
***************
*** 36,39 ****
--- 42,48 ----
    }
  
+   /**
+    * @see org.fudaa.fudaa.meshviewer.layer.MvNodeModel#setGrid(org.fudaa.dodico.ef.EfGrid)
+    */
    public void setGrid(EfGrid _g) {
      grid_= _g;
***************
*** 41,45 ****
  
    /**
!    *
     */
    public MvInfoDelegate getDelegate() {
--- 50,54 ----
  
    /**
!    * @return le delegue pour l'affichage de l'info
     */
    public MvInfoDelegate getDelegate() {
***************
*** 48,52 ****
  
    /**
!    *
     */
    public void setDelegate(MvInfoDelegate _delegate) {
--- 57,61 ----
  
    /**
!    * @param _delegate le nouveau delegue
     */
    public void setDelegate(MvInfoDelegate _delegate) {
***************
*** 54,59 ****
    }
  
    /**
!    *
     */
    public boolean point(GrPoint _p, int _i) {
--- 63,69 ----
    }
  
+ 
    /**
!    * @see org.fudaa.ebli.calque.ZModelePoint#point(org.fudaa.ebli.geometrie.GrPoint, int)
     */
    public boolean point(GrPoint _p, int _i) {
***************
*** 64,69 ****
      return true;
    }
    /**
!    *
     */
    public GrBoite getDomaine() {
--- 74,80 ----
      return true;
    }
+ 
    /**
!    * @see org.fudaa.ebli.calque.ZModeleDonnees#getDomaine()
     */
    public GrBoite getDomaine() {
***************
*** 76,86 ****
    }
    /**
!    *
     */
    public int getNombre() {
      return grid_.getPtsNb();
    }
    /**
!    *
     */
    public Object getObject(int _ind) {
--- 87,98 ----
    }
    /**
!    * @see org.fudaa.ebli.calque.ZModeleDonnees#getNombre()
     */
    public int getNombre() {
      return grid_.getPtsNb();
    }
+ 
    /**
!    * @see org.fudaa.ebli.calque.ZModeleDonnees#getObject(int)
     */
    public Object getObject(int _ind) {
***************
*** 88,92 ****
    }
    /**
!    *
     */
    public void fillWithInfo(
--- 100,104 ----
    }
    /**
!    * @see org.fudaa.fudaa.meshviewer.layer.MvNodeModel#fillWithInfo(org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData, org.fudaa.ebli.commun.EbliListeSelectionInterface)
     */
    public void fillWithInfo(

Index: MvInfoDelegate.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvInfoDelegate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MvInfoDelegate.java	12 Feb 2004 16:27:40 -0000	1.1
--- MvInfoDelegate.java	19 Mar 2004 17:40:23 -0000	1.2
***************
*** 16,20 ****
--- 16,28 ----
   */
  public interface MvInfoDelegate {
+   /**
+    * @param _m
+    * @param _selection
+    */
    public void fillWithPointInfo(MvPanelInfo.InfoData _m,EbliListeSelectionInterface _selection);
+   /**
+    * @param _m
+    * @param _selection
+    */
    public void fillWithElementInfo(MvPanelInfo.InfoData _m,EbliListeSelectionInterface _selection);

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/vag VagImplementation.java,1.9,1.10 VagMaillage.java,1.4,1.5 Vag.java,1.5,1.6

From: Frederic D. <de...@us...> - 2004-03-19 17:50:43

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

Modified Files:
	VagImplementation.java VagMaillage.java Vag.java 
Log Message:
Correction bogue

Index: VagMaillage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagMaillage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VagMaillage.java	25 Nov 2003 10:14:34 -0000	1.4
--- VagMaillage.java	19 Mar 2004 17:40:23 -0000	1.5
***************
*** 182,185 ****
--- 182,186 ----
              IResultatsDunesHelper.narrow(
                duCal_.resultats(VagImplementation.CONNEXION_DUNES));
+           SMaillage m=duRes_.maillage();
            maillage_= FudaaMaillageElement.s2Gr(duRes_.maillage());
            VagMaillage.this.setProgression(100);
***************
*** 189,193 ****
            mp.setMessage("");
            VagMaillage.this.setProgression(0);
!           duRes_.maillage(null);
          }
        };
--- 190,195 ----
            mp.setMessage("");
            VagMaillage.this.setProgression(0);
!           //duRes_.maillage(null);
!           
          }
        };

Index: VagImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/VagImplementation.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** VagImplementation.java	12 Dec 2003 11:45:36 -0000	1.9
--- VagImplementation.java	19 Mar 2004 17:40:23 -0000	1.10
***************
*** 1556,1559 ****
--- 1556,1562 ----
      CONNEXION_DUNES= r.CONNEXION;
    }
+   /**
+    * @see org.fudaa.fudaa.commun.FudaaImplementation#connecter()
+    */
    protected void connecter() {
      if (connecte()) {

Index: Vag.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/vag/Vag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Vag.java	25 Nov 2003 10:14:32 -0000	1.5
--- Vag.java	19 Mar 2004 17:40:23 -0000	1.6
***************
*** 8,20 ****
   */
  package org.fudaa.fudaa.vag;
! import java.awt.*;
! import java.io.*;
! import java.net.InetAddress;
! import org.fudaa.fudaa.commun.*;
! import org.fudaa.dodico.corba.vag.*;
! import org.fudaa.dodico.corba.dunes.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.vag.*;
! import org.fudaa.dodico.dunes.*;
  /**
   * L'application cliente Vag.
--- 8,12 ----
   */
  package org.fudaa.fudaa.vag;
! import org.fudaa.fudaa.commun.Fudaa;
  /**
   * L'application cliente Vag.

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/commun FudaaDialogNewProject.java,1.9,1.10

From: Frederic D. <de...@us...> - 2004-03-19 17:50:43

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

Modified Files:
	FudaaDialogNewProject.java 
Log Message:
Correction bogue

Index: FudaaDialogNewProject.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaDialogNewProject.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FudaaDialogNewProject.java	12 Dec 2003 10:58:40 -0000	1.9
--- FudaaDialogNewProject.java	19 Mar 2004 17:40:23 -0000	1.10
***************
*** 10,17 ****
--- 10,19 ----
  import java.awt.Component;
  import java.awt.Container;
+ import java.awt.Dimension;
  import java.awt.FlowLayout;
  import java.awt.Frame;
  import java.awt.GridLayout;
  import java.awt.Insets;
+ import java.awt.Toolkit;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
***************
*** 27,32 ****
  import javax.swing.border.EmptyBorder;
  
- import org.fudaa.ctulu.CtuluLib;
- 
  import com.memoire.bu.BuBorderLayout;
  import com.memoire.bu.BuButton;
--- 29,32 ----
***************
*** 36,41 ****
  import com.memoire.bu.BuResource;
  
  import org.fudaa.ebli.filechooser.EbliFileChooser;
- 
  import org.fudaa.fudaa.ressource.FudaaResource;
  /**
--- 36,41 ----
  import com.memoire.bu.BuResource;
  
+ import org.fudaa.ctulu.CtuluLib;
  import org.fudaa.ebli.filechooser.EbliFileChooser;
  import org.fudaa.fudaa.ressource.FudaaResource;
  /**
***************
*** 136,141 ****
      pack();
      setResizable(false);
!     if (_parent instanceof Component)
!       super.setLocationRelativeTo(_parent);
    }
    // Methodes publiques
--- 136,146 ----
      pack();
      setResizable(false);
!     if (_parent instanceof Component){
!       Dimension dParent= Toolkit.getDefaultToolkit().getScreenSize();
!       Dimension dThis= getPreferredSize();
!       setLocation((dParent.width - dThis.width) / 2,(dParent.height - dThis.height) / 2);
! //      super.setLocationRelativeTo(_parent);
!     }
! 
    }
    // Methodes publiques

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico FudaaDodicoSelectionServeur.java,1.4,1.5

From: Frederic D. <de...@us...> - 2004-03-19 17:50:23

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

Modified Files:
	FudaaDodicoSelectionServeur.java 
Log Message:
Correction bogue

Index: FudaaDodicoSelectionServeur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSelectionServeur.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FudaaDodicoSelectionServeur.java	25 Nov 2003 10:13:33 -0000	1.4
--- FudaaDodicoSelectionServeur.java	19 Mar 2004 17:40:34 -0000	1.5
***************
*** 100,111 ****
    }
    public void findServers() {
!     String[] servernames= CDodico.findServerNames(interface_, 4000);
!     String[] personnames= CDodico.findServerNames("::objet::IPersonne", 4000);
      if (servernames.length == 0) {
!       servernames= CDodico.findServerNames("::objet::IActivateur", 4000);
        for (int i= 0; i < servernames.length; i++) {
          IActivateur activateur=
            IActivateurHelper.narrow(
!             CDodico.findServerByName(servernames[i], 4000));
          activateur.active(interface_);
          activateur.active("::objet::IPersonne");
--- 100,111 ----
    }
    public void findServers() {
!     String[] servernames= CDodico.findServerNames(interface_, 7000);
!     String[] personnames= CDodico.findServerNames("::objet::IPersonne", 7000);
      if (servernames.length == 0) {
!       servernames= CDodico.findServerNames("::objet::IActivateur", 7000);
        for (int i= 0; i < servernames.length; i++) {
          IActivateur activateur=
            IActivateurHelper.narrow(
!             CDodico.findServerByName(servernames[i], 7000));
          activateur.active(interface_);
          activateur.active("::objet::IPersonne");

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet FudaaProjet.java,1.5,1.6

From: Frederic D. <de...@us...> - 2004-03-19 17:50:23

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

Modified Files:
	FudaaProjet.java 
Log Message:
Correction bogue

Index: FudaaProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FudaaProjet.java	12 Dec 2003 10:58:41 -0000	1.5
--- FudaaProjet.java	19 Mar 2004 17:40:25 -0000	1.6
***************
*** 1373,1376 ****
--- 1373,1377 ----
    public synchronized void ouvrir(String filename) {
      if ((filename == null) || ("".equals(filename))) {
+       System.out.println("ouverture 0");
        ouvrir();
        return;
***************
*** 1393,1396 ****
--- 1394,1398 ----
      if (dirOpen_ != null)
        chooser.setCurrentDirectory(new File(dirOpen_));
+     System.out.println("ouverture");
      int returnVal= chooser.showOpenDialog(parent);
      String filename= null;

[Fudaa-cvs-commit] fudaa_devel/dodico/idl/general geometrie.idl,1.10,1.11

From: Frederic D. <de...@us...> - 2004-03-19 17:50:13

Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/general
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21604/idl/general

Modified Files:
	geometrie.idl 
Log Message:
Correction bogue

Index: geometrie.idl
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/idl/general/geometrie.idl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** geometrie.idl	7 Aug 2003 08:45:57 -0000	1.10
--- geometrie.idl	19 Mar 2004 17:40:17 -0000	1.11
***************
*** 16,20 ****
  
  /**
!  * @version      $Revision$ $Date$ by $Author$
   * @author       Desnoix Guillaume 
   */
--- 16,20 ----
  
  /**
!  * @version      $Id$
   * @author       Desnoix Guillaume 
   */

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/objet RequeteServeurDodicoTUI.java,1.5,1.6

From: Frederic D. <de...@us...> - 2004-03-19 17:50:13

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

Modified Files:
	RequeteServeurDodicoTUI.java 
Log Message:
Correction bogue

Index: RequeteServeurDodicoTUI.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/RequeteServeurDodicoTUI.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RequeteServeurDodicoTUI.java	25 Nov 2003 10:11:46 -0000	1.5
--- RequeteServeurDodicoTUI.java	19 Mar 2004 17:40:17 -0000	1.6
***************
*** 8,15 ****
   */
  package org.fudaa.dodico.objet;
! import java.io.*;
! import java.net.*;
! import java.text.*;
! import java.util.*;
  /**
   * Une classe cliente pour interroger les serveurs Dodico
--- 8,14 ----
   */
  package org.fudaa.dodico.objet;
! import java.io.IOException;
! import java.io.InputStreamReader;
! import java.io.LineNumberReader;
  /**
   * Une classe cliente pour interroger les serveurs Dodico

[Fudaa-cvs-commit] fudaa_devel/dodico/idl/code dunes.idl,1.3,1.4

From: Frederic D. <de...@us...> - 2004-03-19 17:50:08

Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21604/idl/code

Modified Files:
	dunes.idl 
Log Message:
Correction bogue

Index: dunes.idl
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/idl/code/dunes.idl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dunes.idl	1 Apr 2003 08:33:40 -0000	1.3
--- dunes.idl	19 Mar 2004 17:40:18 -0000	1.4
***************
*** 35,43 ****
      rien setFichier(in chaine f);
    };
  
    interface ICalculDunes : ::calcul::ICalcul, ::calcul::IProgression
    {
      attribute ::geometrie::LTypeElement typeElementDunes;
- 
      /**
       * Prise en compte des polylignes lors du maillage: toujours vrai.
--- 35,48 ----
      rien setFichier(in chaine f);
    };
+   
+     interface ITestDunes : ::objet::IObjet
+   {
+     //Pour tester
+     ::geometrie::SMaillage getTestMaillage();
+   };
  
    interface ICalculDunes : ::calcul::ICalcul, ::calcul::IProgression
    {
      attribute ::geometrie::LTypeElement typeElementDunes;
      /**
       * Prise en compte des polylignes lors du maillage: toujours vrai.

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/commun DodicoPreferences.java,1.6,1.7 DodicoPreferencesPanel.java,1.4,1.5

From: Frederic D. <de...@us...> - 2004-03-19 17:50:08

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

Modified Files:
	DodicoPreferences.java DodicoPreferencesPanel.java 
Log Message:
Correction bogue

Index: DodicoPreferencesPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoPreferencesPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DodicoPreferencesPanel.java	25 Nov 2003 10:11:25 -0000	1.4
--- DodicoPreferencesPanel.java	19 Mar 2004 17:40:18 -0000	1.5
***************
*** 8,14 ****
--- 8,18 ----
   */
  package org.fudaa.dodico.commun;
+ 
  import javax.swing.JFrame;
+ import javax.swing.event.DocumentEvent;
+ import javax.swing.event.DocumentListener;
  import javax.swing.event.InternalFrameAdapter;
  import javax.swing.event.InternalFrameEvent;
+ 
  import com.memoire.bu.BuAbstractPreferencesPanel;
  import com.memoire.bu.BuGridLayout;
***************
*** 17,29 ****
  import com.memoire.bu.BuTextField;
  /**
!  * Un panel d'edition pour les preferences des serveurs Dodico. Permet de
!  *spécifier l'adresse du serveur, les numeros de ports utilises, le masque de
!  *sous-reseau... Il sera possible de specifier la connexion automatique au
!  *serveur local.
!  *
!  * @version   $Id$
!  * @author    Fred Deniger
   */
! public class DodicoPreferencesPanel extends BuAbstractPreferencesPanel {
    /** L'adresse de la machine locale. */
    BuTextField localAddr_;
--- 21,33 ----
  import com.memoire.bu.BuTextField;
  /**
!  * Un panel d'edition pour les preferences des serveurs Dodico. Permet de spécifier l'adresse du
!  * serveur, les numeros de ports utilises, le masque de sous-reseau... Il sera possible de
!  * specifier la connexion automatique au serveur local.
!  * 
!  * @version $Id$
!  * @author Fred Deniger
   */
! public class DodicoPreferencesPanel extends BuAbstractPreferencesPanel implements DocumentListener {
! 
    /** L'adresse de la machine locale. */
    BuTextField localAddr_;
***************
*** 36,42 ****
    /** Le numero de port UDP */
    BuTextField UDPPort_;
    /**
!    * TODO 
!    * Valide la connexion locale automatique 
     */
    //BuCheckBox connexionLocale_;
--- 40,46 ----
    /** Le numero de port UDP */
    BuTextField UDPPort_;
+ 
    /**
!    * TODO Valide la connexion locale automatique
     */
    //BuCheckBox connexionLocale_;
***************
*** 46,49 ****
--- 50,54 ----
      initPanel();
    }
+ 
    /** Relit le fichier des prefs et met a jour l'affichage. */
    public void cancelPreferences() {
***************
*** 51,69 ****
      updateComponents();
    }
    private BuTextField createIntegerField(String _s) {
!     BuTextField r= BuTextField.createIntegerField();
      r.setToolTipText(DodicoResource.getS(_s));
      return r;
    }
    private BuLabel createLabel(String _s) {
!     BuLabel r= new BuLabel(DodicoResource.getS(_s));
      r.setVerticalTextPosition(BuLabel.CENTER);
      return r;
    }
    private BuTextField createTextField(String _s) {
!     BuTextField r= new BuTextField();
      r.setToolTipText(DodicoResource.getS(_s));
      return r;
    }
    // Methodes privees
    /** Enregistrement dans la hastables des preferences editees par ce panel */
--- 56,79 ----
      updateComponents();
    }
+ 
    private BuTextField createIntegerField(String _s) {
!     BuTextField r = BuTextField.createIntegerField();
      r.setToolTipText(DodicoResource.getS(_s));
      return r;
    }
+ 
    private BuLabel createLabel(String _s) {
!     BuLabel r = new BuLabel(DodicoResource.getS(_s));
      r.setVerticalTextPosition(BuLabel.CENTER);
      return r;
    }
+ 
    private BuTextField createTextField(String _s) {
!     BuTextField r = new BuTextField();
!     r.getDocument().addDocumentListener(this);
      r.setToolTipText(DodicoResource.getS(_s));
      return r;
    }
+ 
    // Methodes privees
    /** Enregistrement dans la hastables des preferences editees par ce panel */
***************
*** 76,137 ****
      //    putCONNEXION_LOCAL(connexionLocale_.isSelected());
    }
    /**
!    * @return   Title
     */
    public String getTitle() {
      return DodicoResource.getS("Serveur de calcul");
    }
    /** Construction du panel */
    private final void initPanel() {
      setLayout(new BuGridLayout(2, 5, 5));
      /*
!     BuLabel cl  = createTextField("Connexion locale par défaut"));
!     //Pour l'instant
!     cl.setEnabled(false);
!     add(cl);
!     connexionLocale_ = new BuCheckBox();
!     connexionLocale_.setEnabled(false);
!     connexionLocale_.setToolTipText("Si activé, le serveur local sera automatiquement choisi"));
!     add(connexionLocale_); */
!     /* add(createLabel("Adresse locale"));
!     localAddr_ = createTextField("L'adresse locale de la machine");
!     add(localAddr_); */
      add(createLabel("Adresse du serveur principal"));
!     nsAddr_= createTextField("L'adresse IP du serveur principal");
      add(nsAddr_);
      add(createLabel("Port TCP"));
!     TCPPort_= createIntegerField("Le port TCP (réception et envoi)");
      add(TCPPort_);
      add(createLabel("Adresse UDP"));
!     udpAddr_=
!       createTextField("L'adresse sur laquelle les datagrammes d'informations seront envoyés par le protocole UDP");
      add(udpAddr_);
      add(createLabel("Port UDP"));
!     UDPPort_= createIntegerField("Le port UDP (réception et envoi)");
      add(UDPPort_);
      updateComponents();
    }
    /**
     * les preferences sont-elles applicables
!    *
!    * @return   PreferencesApplyable
     */
    public boolean isPreferencesApplyable() {
      return false;
    }
    /**
     * Renvoie true si les preferences peuvent etre annulees.
!    *
!    * @return   PreferencesCancelable
     */
    public boolean isPreferencesCancelable() {
      return true;
    }
    /**
!    * @return   PreferencesValidable
     */
    public boolean isPreferencesValidable() {
      return true;
    }
    /** Maj des champs de ce panel a partir des preferences. */
    private void updateComponents() {
--- 86,152 ----
      //    putCONNEXION_LOCAL(connexionLocale_.isSelected());
    }
+ 
    /**
!    * @return Title
     */
    public String getTitle() {
      return DodicoResource.getS("Serveur de calcul");
    }
+ 
    /** Construction du panel */
    private final void initPanel() {
      setLayout(new BuGridLayout(2, 5, 5));
      /*
!      * BuLabel cl = createTextField("Connexion locale par défaut")); //Pour l'instant
!      * cl.setEnabled(false); add(cl); connexionLocale_ = new BuCheckBox();
!      * connexionLocale_.setEnabled(false); connexionLocale_.setToolTipText("Si activé, le serveur
!      * local sera automatiquement choisi"));
!      */
!     /*
!      * add(createLabel("Adresse locale")); localAddr_ = createTextField("L'adresse locale de la
!      * machine");
!      */
      add(createLabel("Adresse du serveur principal"));
!     nsAddr_ = createTextField("L'adresse IP du serveur principal");
      add(nsAddr_);
      add(createLabel("Port TCP"));
!     TCPPort_ = createIntegerField("Le port TCP (réception et envoi)");
      add(TCPPort_);
      add(createLabel("Adresse UDP"));
!     udpAddr_ = 
!     createTextField("L'adresse sur laquelle les datagrammes d'informations seront envoyés par le protocole UDP");
      add(udpAddr_);
      add(createLabel("Port UDP"));
!     UDPPort_ = createIntegerField("Le port UDP (réception et envoi)");
      add(UDPPort_);
      updateComponents();
+     setDirty(false);
    }
+ 
    /**
     * les preferences sont-elles applicables
!    * 
!    * @return PreferencesApplyable
     */
    public boolean isPreferencesApplyable() {
      return false;
    }
+ 
    /**
     * Renvoie true si les preferences peuvent etre annulees.
!    * 
!    * @return PreferencesCancelable
     */
    public boolean isPreferencesCancelable() {
      return true;
    }
+ 
    /**
!    * @return PreferencesValidable
     */
    public boolean isPreferencesValidable() {
      return true;
    }
+ 
    /** Maj des champs de ce panel a partir des preferences. */
    private void updateComponents() {
***************
*** 143,228 ****
      //    connexionLocale_.setSelected(getCONNEXION_LOCAL());
    }
    /** Maj a jour la hastable des preferences et le fichier. */
    public void validatePreferences() {
      fillTable();
      DodicoPreferences.DODICO.writeIniFile();
    }
    /**
!    * Renvoie, a partir des preferences, du type de connexion par defaut. Si true la
!    * connexion sera par defaut local.
!    *
!    * @return   le type de connexion ( valeur par defaut true).
     */
    public final static boolean getCONNEXION_LOCAL() {
      return DodicoPreferences.DODICO.getBooleanProperty(
!       "dodico.local.connexion",
!       true);
    }
    /**
!    * Renvoie, a partir des preferences, l'adresse locale de la machine de
!    * l'utilisateur.
!    *
!    * @return   l'adresse local ( "127.0.0.1" par defaut).
     */
    public final static String getLOCAL_ADDR() {
      return DodicoPreferences.DODICO.getStringProperty(
!       "dodico.local.addr",
!       "127.0.0.1");
    }
    /**
     * Renvoie, a partir des preferences, l'adresse du serveur de calcul.
!    *
!    * @return   l'adresse du serveur ( "171.17.250.82" par defaut).
     */
    public final static String getNS_ADDR() {
      return DodicoPreferences.DODICO.getStringProperty(
!       "dodico.ns.addr",
!       "172.17.250.82");
    }
    /**
     * Renvoie, a partir des preferences, le port TCP du diffuseur.
!    *
!    * @return   le port TCP lu dans les preferences ( defaut =14001).
     */
    public final static int getTCP_PORT() {
      return DodicoPreferences.DODICO.getIntegerProperty(
!       "dodico.tcp.port",
!       14001);
    }
    /**
!    * Renvoie, a partir des preferences, l'adresse IP pour la diffusion UDP.
!    * Elle correspond au masque de sous-reseau.
!    *
!    * @return   l'adresse du sous-reseau ( par defaut "172.17.0.0").
     */
    public final static String getUDP_ADDR() {
      return DodicoPreferences.DODICO.getStringProperty(
!       "dodico.udp.addr",
!       "172.17.0.0");
    }
    /**
     * Renvoie, a partir des preferences, le port UDP du diffuseur.
!    *
!    * @return   le port UDP lu dans les preferences ( defaut =14001).
     */
    public final static int getUDP_PORT() {
      return DodicoPreferences.DODICO.getIntegerProperty(
!       "dodico.udp.port",
!       14001);
    }
    /**
!   * Permet d'editer le panneau de preferences.
!   *
!   * @param args
!   */
    public static void main(String[] args) {
!     final JFrame frame=
!       new JFrame(DodicoResource.getS("Preferences des serveurs"));
      frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
!     BuPreferencesFrame iframe= new BuPreferencesFrame();
      iframe.addInternalFrameListener(new InternalFrameAdapter() {
        public void internalFrameClosed(InternalFrameEvent _e) {
!         if (frame != null)
!           frame.dispose();
        }
      });
--- 158,252 ----
      //    connexionLocale_.setSelected(getCONNEXION_LOCAL());
    }
+ 
    /** Maj a jour la hastable des preferences et le fichier. */
    public void validatePreferences() {
      fillTable();
      DodicoPreferences.DODICO.writeIniFile();
+     setDirty(false);
    }
+ 
    /**
!    * Renvoie, a partir des preferences, du type de connexion par defaut. Si true la connexion sera
!    * par defaut local.
!    * 
!    * @return le type de connexion ( valeur par defaut true).
     */
    public final static boolean getCONNEXION_LOCAL() {
      return DodicoPreferences.DODICO.getBooleanProperty(
!     "dodico.local.connexion", 
!     true);
    }
+ 
    /**
!    * Renvoie, a partir des preferences, l'adresse locale de la machine de l'utilisateur.
!    * 
!    * @return l'adresse local ( "127.0.0.1" par defaut).
     */
    public final static String getLOCAL_ADDR() {
      return DodicoPreferences.DODICO.getStringProperty(
!     "dodico.local.addr", 
!     "127.0.0.1");
    }
+ 
    /**
     * Renvoie, a partir des preferences, l'adresse du serveur de calcul.
!    * 
!    * @return l'adresse du serveur ( "171.17.250.82" par defaut).
     */
    public final static String getNS_ADDR() {
      return DodicoPreferences.DODICO.getStringProperty(
!     "dodico.ns.addr", 
!     "172.17.250.82");
    }
+ 
    /**
     * Renvoie, a partir des preferences, le port TCP du diffuseur.
!    * 
!    * @return le port TCP lu dans les preferences ( defaut =14001).
     */
    public final static int getTCP_PORT() {
      return DodicoPreferences.DODICO.getIntegerProperty(
!     "dodico.tcp.port", 
!     14001);
    }
+ 
    /**
!    * Renvoie, a partir des preferences, l'adresse IP pour la diffusion UDP. Elle correspond au
!    * masque de sous-reseau.
!    * 
!    * @return l'adresse du sous-reseau ( par defaut "172.17.0.0").
     */
    public final static String getUDP_ADDR() {
      return DodicoPreferences.DODICO.getStringProperty(
!     "dodico.udp.addr", 
!     "172.17.0.0");
    }
+ 
    /**
     * Renvoie, a partir des preferences, le port UDP du diffuseur.
!    * 
!    * @return le port UDP lu dans les preferences ( defaut =14001).
     */
    public final static int getUDP_PORT() {
      return DodicoPreferences.DODICO.getIntegerProperty(
!     "dodico.udp.port", 
!     14001);
    }
+ 
    /**
!    * Permet d'editer le panneau de preferences.
!    * 
!    * @param args
!    */
    public static void main(String[] args) {
!     final JFrame frame = 
!     new JFrame(DodicoResource.getS("Preferences des serveurs"));
      frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
!     BuPreferencesFrame iframe = new BuPreferencesFrame();
      iframe.addInternalFrameListener(new InternalFrameAdapter() {
+ 
        public void internalFrameClosed(InternalFrameEvent _e) {
!         if (frame != null) 
!         frame.dispose();
        }
      });
***************
*** 235,244 ****
      iframe.show();
      frame.pack();
      frame.show();
    }
    /**
!    * Mise a jour du type de connexion. Si true, le serveur local sera
!    * automatiquement choisi.
!    *
     * @param _b
     */
--- 259,269 ----
      iframe.show();
      frame.pack();
+     frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
      frame.show();
    }
+ 
    /**
!    * Mise a jour du type de connexion. Si true, le serveur local sera automatiquement choisi.
!    * 
     * @param _b
     */
***************
*** 246,273 ****
      DodicoPreferences.DODICO.putBooleanProperty("dodico.local.connexion", _b);
    }
    /**
     * Mise a jour de l'adresse locale dans les preferences ( il faut effectuer la commande
     * preferences.writeIniFile ensuite pour mettre a jour le fichier )
!    *
     * @param _addr
     */
    public final static void putLOCAL_ADDR(String _addr) {
!     if (_addr != null)
!       DodicoPreferences.DODICO.putStringProperty("dodico.local.addr", _addr);
    }
    /**
     * Mise a jour de l'adresse du serveur dans les preferences ( il faut effectuer la commande
     * writeIniFile ensuite pour mettre a jour le fichier )
!    *
     * @param _addr
     */
    public final static void putNS_ADDR(String _addr) {
!     if (_addr != null)
!       DodicoPreferences.DODICO.putStringProperty("dodico.ns.addr", _addr);
    }
    /**
!    * Mise a jour du port tcp dans les preferences ( il faut effectuer la commande
!    * writeIniFile ensuite pour mettre a jour le fichier )
!    *
     * @param _n
     */
--- 271,301 ----
      DodicoPreferences.DODICO.putBooleanProperty("dodico.local.connexion", _b);
    }
+ 
    /**
     * Mise a jour de l'adresse locale dans les preferences ( il faut effectuer la commande
     * preferences.writeIniFile ensuite pour mettre a jour le fichier )
!    * 
     * @param _addr
     */
    public final static void putLOCAL_ADDR(String _addr) {
!     if (_addr != null) 
!     DodicoPreferences.DODICO.putStringProperty("dodico.local.addr", _addr);
    }
+ 
    /**
     * Mise a jour de l'adresse du serveur dans les preferences ( il faut effectuer la commande
     * writeIniFile ensuite pour mettre a jour le fichier )
!    * 
     * @param _addr
     */
    public final static void putNS_ADDR(String _addr) {
!     if (_addr != null) 
!     DodicoPreferences.DODICO.putStringProperty("dodico.ns.addr", _addr);
    }
+ 
    /**
!    * Mise a jour du port tcp dans les preferences ( il faut effectuer la commande writeIniFile
!    * ensuite pour mettre a jour le fichier )
!    * 
     * @param _n
     */
***************
*** 275,292 ****
      DodicoPreferences.DODICO.putIntegerProperty("dodico.tcp.port", _n);
    }
    /**
!    * Mise a jour de l'adresse UDP dans les preferences ( il faut effectuer la commande
!    * writeIniFile ensuite pour mettre a jour le fichier )
!    *
     * @param _addr
     */
    public final static void putUDP_ADDR(String _addr) {
!     if (_addr != null)
!       DodicoPreferences.DODICO.putStringProperty("dodico.udp.addr", _addr);
    }
    /**
!    * Mise a jour du port udp dans les preferences ( il faut effectuer la commande
!    * writeIniFile ensuite pour mettre a jour le fichier )
!    *
     * @param _n
     */
--- 303,322 ----
      DodicoPreferences.DODICO.putIntegerProperty("dodico.tcp.port", _n);
    }
+ 
    /**
!    * Mise a jour de l'adresse UDP dans les preferences ( il faut effectuer la commande writeIniFile
!    * ensuite pour mettre a jour le fichier )
!    * 
     * @param _addr
     */
    public final static void putUDP_ADDR(String _addr) {
!     if (_addr != null) 
!     DodicoPreferences.DODICO.putStringProperty("dodico.udp.addr", _addr);
    }
+ 
    /**
!    * Mise a jour du port udp dans les preferences ( il faut effectuer la commande writeIniFile
!    * ensuite pour mettre a jour le fichier )
!    * 
     * @param _n
     */
***************
*** 294,296 ****
--- 324,347 ----
      DodicoPreferences.DODICO.putIntegerProperty("dodico.udp.port", _n);
    }
+   /**
+    * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent)
+    */
+   public void changedUpdate(DocumentEvent _e) {
+     setDirty(true);
+   }
+ 
+   /**
+    * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent)
+    */
+   public void insertUpdate(DocumentEvent _e) {
+     setDirty(true);
+   }
+ 
+   /**
+    * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent)
+    */
+   public void removeUpdate(DocumentEvent _e) {
+     setDirty(true);
+   }
+ 
  }

Index: DodicoPreferences.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoPreferences.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DodicoPreferences.java	25 Nov 2003 10:11:25 -0000	1.6
--- DodicoPreferences.java	19 Mar 2004 17:40:18 -0000	1.7
***************
*** 17,21 ****
    public static final String VALUE_SEPARATOR= ",";
    public static final String KEY_SEPARATOR= ".";
!   private DodicoPreferences() {}
    public static String buildPrefKey(String _deb, String _fin) {
      return buildPrefKey(_deb, _fin, false);
--- 17,21 ----
    public static final String VALUE_SEPARATOR= ",";
    public static final String KEY_SEPARATOR= ".";
!   protected DodicoPreferences() {}
    public static String buildPrefKey(String _deb, String _fin) {
      return buildPrefKey(_deb, _fin, false);

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux H2dRefluxSolutionInitialeInterface.java,1.1,1.2 H2dRefluxSICourant2D.java,1.2,1.3 H2dRefluxParameters.java,1.6,1.7

From: Frederic D. <de...@us...> - 2004-03-19 17:50:07

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21604/src/org/fudaa/dodico/h2d/reflux

Modified Files:
	H2dRefluxSolutionInitialeInterface.java 
	H2dRefluxSICourant2D.java H2dRefluxParameters.java 
Log Message:
Correction bogue

Index: H2dRefluxSICourant2D.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxSICourant2D.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** H2dRefluxSICourant2D.java	16 Mar 2004 16:47:29 -0000	1.2
--- H2dRefluxSICourant2D.java	19 Mar 2004 17:40:17 -0000	1.3
***************
*** 11,15 ****
  import java.io.File;
  import java.util.Arrays;
- 
  import org.fudaa.dodico.commun.ProgressionInterface;
  import org.fudaa.dodico.commun.ProgressionUpdater;
--- 11,14 ----
***************
*** 105,111 ****
      return h_[_idx];
    }
!   
!   public boolean isEquiv(H2dRefluxSICourant2D _d){
!     return Arrays.equals(u_,_d.u_) && Arrays.equals(v_,_d.v_) && Arrays.equals(h_,_d.h_);
    }
  
--- 104,110 ----
      return h_[_idx];
    }
! 
!   public boolean isEquiv(H2dRefluxSICourant2D _d) {
!     return Arrays.equals(u_, _d.u_) && Arrays.equals(v_, _d.v_) && Arrays.equals(h_, _d.h_);
    }
  
***************
*** 210,212 ****
--- 209,219 ----
      _prog);
    }
+ 
+   /**
+    * @see org.fudaa.dodico.h2d.reflux.H2dRefluxSolutionInitialeInterface#getVariables()
+    */
+   public H2dVariableType[] getVariables() {
+     return new H2dVariableType[] { H2dVariableType.VITESSE_U, H2dVariableType.VITESSE_V,
+         H2dVariableType.COTE_EAU};
+   }
  }

Index: H2dRefluxParameters.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxParameters.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** H2dRefluxParameters.java	16 Mar 2004 16:47:29 -0000	1.6
--- H2dRefluxParameters.java	19 Mar 2004 17:40:17 -0000	1.7
***************
*** 407,411 ****
     */
    public void setSolutionInitiales(H2dRefluxSolutionInitialeInterface _solutionInitiales) {
!     if(solutionInitiales_!=_solutionInitiales){
        listener_.InitSolutionsChanged();      
      }
--- 407,411 ----
     */
    public void setSolutionInitiales(H2dRefluxSolutionInitialeInterface _solutionInitiales) {
!     if((listener_!=null) && (solutionInitiales_!=_solutionInitiales)){
        listener_.InitSolutionsChanged();      
      }

Index: H2dRefluxSolutionInitialeInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxSolutionInitialeInterface.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** H2dRefluxSolutionInitialeInterface.java	15 Mar 2004 08:27:58 -0000	1.1
--- H2dRefluxSolutionInitialeInterface.java	19 Mar 2004 17:40:17 -0000	1.2
***************
*** 37,39 ****
--- 37,44 ----
     */
    public double getSolutionInitiale(H2dVariableType _t,int _idx);
+   
+   /**
+    * @return les variables utilisees
+    */
+   public H2dVariableType[] getVariables();
  }

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/dunes DTestDunes.java,NONE,1.1 ServeurTestDunes.java,NONE,1.1 DResultatsDunes.java,1.4,1.5 DCalculDunes.java,1.5,1.6

From: Frederic D. <de...@us...> - 2004-03-19 17:50:07

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

Modified Files:
	DResultatsDunes.java DCalculDunes.java 
Added Files:
	DTestDunes.java ServeurTestDunes.java 
Log Message:
Correction bogue

--- NEW FILE: ServeurTestDunes.java ---
/*
 * @file         ServeurDunes.java
 * @creation     2000-02-16
 * @modification $Date: 2004/03/19 17:40:17 $
 * @license      GNU General Public License 2
 * @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 * @mail         de...@fu...
 */
package org.fudaa.dodico.dunes;
import java.util.Date;

import org.fudaa.dodico.corba.dunes.ITestDunes;
import org.fudaa.dodico.corba.usine.IUsine;
import org.fudaa.dodico.objet.CDodico;
import org.fudaa.dodico.usine.UsineHelper;
/**
 * Lance le serveur du code de calcul <code>dunes</code>.
 *
 * @version      $Revision: 1.1 $ $Date: 2004/03/19 17:40:17 $ by $Author: deniger $
 * @author       Guillaume Desnoix
 */
public class ServeurTestDunes {

  /**
   * @param args
   */
  public static void main(String[] args) {
    String nom=
      (args.length > 0
        ? args[0]
        : CDodico.generateName("::dunes::ITestDunes"));
    IUsine u= UsineHelper.creeUsineLocale();
    u.reconnecte(CDodico.generateName("::usine::IUsine"));
    ITestDunes s= u.creeDunesTestDunes();
    s.reconnecte(nom);
    //CDodico.rebind(nom, s);
    System.out.println("Dunes server running... ");
    System.out.println("Name: " + nom);
    System.out.println("Date: " + new Date());
  }
}

Index: DCalculDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DCalculDunes.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DCalculDunes.java	25 Nov 2003 10:11:30 -0000	1.5
--- DCalculDunes.java	19 Mar 2004 17:40:17 -0000	1.6
***************
*** 8,23 ****
   */
  package org.fudaa.dodico.dunes;
! import org.fudaa.dodico.corba.objet.IConnexion;
  import org.fudaa.dodico.corba.calcul.SProgression;
  import org.fudaa.dodico.corba.dunes.ICalculDunesOperations;
- import org.fudaa.dodico.corba.dunes.IResultatsDunes;
- import org.fudaa.dodico.corba.dunes.IResultatsDunesHelper;
  import org.fudaa.dodico.corba.dunes.IParametresDunes;
  import org.fudaa.dodico.corba.dunes.IParametresDunesHelper;
  import org.fudaa.dodico.corba.geometrie.LTypeElement;
  import org.fudaa.dodico.objet.CDodico;
- import org.fudaa.dodico.objet.CExec;
- import org.fudaa.dodico.calcul.DCalcul;
- import java.io.*;
  /**
   * Classe d'implantation de l'interface <code>ICalculDunes</code> gerant
--- 8,29 ----
   */
  package org.fudaa.dodico.dunes;
! import java.io.File;
! import java.io.IOException;
! import java.io.InputStreamReader;
! 
! import org.fudaa.dodico.calcul.DCalcul;
  import org.fudaa.dodico.corba.calcul.SProgression;
  import org.fudaa.dodico.corba.dunes.ICalculDunesOperations;
  import org.fudaa.dodico.corba.dunes.IParametresDunes;
  import org.fudaa.dodico.corba.dunes.IParametresDunesHelper;
+ import org.fudaa.dodico.corba.dunes.IResultatsDunes;
+ import org.fudaa.dodico.corba.dunes.IResultatsDunesHelper;
  import org.fudaa.dodico.corba.geometrie.LTypeElement;
+ import org.fudaa.dodico.corba.geometrie.SElement;
+ import org.fudaa.dodico.corba.geometrie.SMaillage;
+ import org.fudaa.dodico.corba.geometrie.SNoeud;
+ import org.fudaa.dodico.corba.geometrie.SPoint;
+ import org.fudaa.dodico.corba.objet.IConnexion;
  import org.fudaa.dodico.objet.CDodico;
  /**
   * Classe d'implantation de l'interface <code>ICalculDunes</code> gerant
***************
*** 121,124 ****
--- 127,132 ----
      optionY_= false;
    }
+   
+   
    /**
     * Modifie la structure decrivant l'avancement du calcul.
***************
*** 280,283 ****
--- 288,293 ----
      optionA_= _optionA;
    }
+   
+ 
    /**
     * Renvoie l'aire maximale autorisee pour les elements. Cette aire peut

Index: DResultatsDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DResultatsDunes.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DResultatsDunes.java	25 Nov 2003 10:11:31 -0000	1.4
--- DResultatsDunes.java	19 Mar 2004 17:40:17 -0000	1.5
***************
*** 163,166 ****
--- 163,173 ----
        CDodico.exception(DResultatsDunes.class, ex);
      }
+     //DEBUG FRED
+     SElement el=r.elements[0];
+     System.out.println("Dunes");
+     System.out.println(el.noeuds[2].point.x+" "+el.noeuds[2].point.y+" "+el.noeuds[2].point.z);
+     System.out.println("egal true? "+(el.noeuds[2]==noeuds[5422]));
+     System.out.println("egal true? "+(el.noeuds[0]==noeuds[3120]));
+     System.out.println("Dunes FIN");
      return r;
    }

--- NEW FILE: DTestDunes.java ---
/*
 *  @file         DTestDunes.java
 *  @creation     19 mars 2004
 *  @modification $Date: 2004/03/19 17:40:17 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.dodico.dunes;

import org.fudaa.dodico.corba.dunes.ITestDunesOperations;
import org.fudaa.dodico.corba.geometrie.LTypeElement;
import org.fudaa.dodico.corba.geometrie.SElement;
import org.fudaa.dodico.corba.geometrie.SMaillage;
import org.fudaa.dodico.corba.geometrie.SNoeud;
import org.fudaa.dodico.corba.geometrie.SPoint;
import org.fudaa.dodico.objet.DObjet;


/**
 * @author Fred Deniger
 * @version $Id: DTestDunes.java,v 1.1 2004/03/19 17:40:17 deniger Exp $
 */
public class DTestDunes extends DObjet implements ITestDunesOperations {

  /**
   * 
   */
  public DTestDunes() {
    super();
  }

  /**
   * @see org.fudaa.dodico.corba.dunes.ITestDunesOperations#getTestMaillage()
   */
  public SMaillage getTestMaillage() {
    SNoeud n1=new SNoeud(new SPoint(1,2,3));
    SNoeud n2=new SNoeud(new SPoint(4,5,6));
    SNoeud n3=new SNoeud(new SPoint(7,8,9));
    SElement el=new SElement();
    el.noeuds=new SNoeud[3];
    el.noeuds[0]=n1;
    el.noeuds[1]=n2;
    el.noeuds[2]=n3;
    SMaillage s=new SMaillage();
    s.elements=new SElement[1];
    s.elements[0]=el;
    s.noeuds=new SNoeud[3];
    s.noeuds[0]=n1;
    s.noeuds[1]=n2;
    s.noeuds[2]=n3;
    s.elements[0].type=LTypeElement.T3;
    return s;
  }
}

[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/calque ZCalquePoint.java,1.12,1.13

From: Frederic D. <de...@us...> - 2004-03-19 17:50:04

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

Modified Files:
	ZCalquePoint.java 
Log Message:
Correction bogue

Index: ZCalquePoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePoint.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ZCalquePoint.java	12 Feb 2004 15:58:50 -0000	1.12
--- ZCalquePoint.java	19 Mar 2004 17:40:13 -0000	1.13
***************
*** 34,37 ****
--- 34,40 ----
      this(null);
    }
+   /**
+    * @param _modele le modele a afficher
+    */
    public ZCalquePoint(ZModelePoint _modele) {
      super();
***************
*** 72,78 ****
    
    /**
!    * @param _g
     */
    public void paintComponent(Graphics _g) {
      //super.paintComponent(_g);
      int nombre= modele_.getNombre();
--- 75,90 ----
    
    /**
!    * @param _g le graphics a modifier
     */
    public void paintComponent(Graphics _g) {
+     paintSpecificComponent(_g,false);
+   }
+   
+   /**
+    * Permet de specificier ce qui doit etre dessiné.
+    * @param _g le graphics a modifier
+    * @param _paintOnlySelection si true seules les selections seront dessinees
+    */
+   protected void paintSpecificComponent(Graphics _g,boolean _paintOnlySelection) {
      //super.paintComponent(_g);
      int nombre= modele_.getNombre();
***************
*** 88,100 ****
      boolean attenue= isAttenue();
      boolean rapide= isRapide();
-     BPaletteCouleur paletteCouleur= getPaletteCouleur();
-     BPaletteIcone paletteIcone= getPaletteIcone();
-     Color foreground= getForeground();
-     Icon icone= getIcone();
-     if (attenue){
-       foreground= attenueCouleur(foreground);
-       icone= attenueIcone(icone);
-     }
      GrPoint p= new GrPoint();
      for (int i= nombre - 1; i >= 0; i--) {
        modele_.point(p, i);
--- 100,113 ----
      boolean attenue= isAttenue();
      boolean rapide= isRapide();
      GrPoint p= new GrPoint();
+     if(!_paintOnlySelection){
+       BPaletteCouleur paletteCouleur= getPaletteCouleur();
+       BPaletteIcone paletteIcone= getPaletteIcone();
+       Color foreground= getForeground();
+       Icon icone= getIcone();
+       if (attenue){
+         foreground= attenueCouleur(foreground);
+         icone= attenueIcone(icone);
+       }
      for (int i= nombre - 1; i >= 0; i--) {
        modele_.point(p, i);
***************
*** 124,127 ****
--- 137,141 ----
        }
      }
+     }
      if ((!rapide) && (!isSelectionEmpty())) {
        initIconeSelection();
***************
*** 148,151 ****
--- 162,166 ----
      }
    }
+   
    public EbliListeSelection selection(GrPolygone _poly) {
      if(!isVisible()) return null;

[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/filechooser EbliFileChooser.java,1.1,1.2

From: Frederic D. <de...@us...> - 2004-03-19 17:50:02

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

Modified Files:
	EbliFileChooser.java 
Log Message:
Correction bogue

Index: EbliFileChooser.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/filechooser/EbliFileChooser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EbliFileChooser.java	12 Dec 2003 10:32:09 -0000	1.1
--- EbliFileChooser.java	19 Mar 2004 17:40:13 -0000	1.2
***************
*** 9,25 ****
  package org.fudaa.ebli.filechooser;
  import java.awt.Component;
! import java.awt.ComponentOrientation;
  import java.awt.Frame;
  import java.io.File;
  import javax.swing.BorderFactory;
  import javax.swing.JDialog;
  import javax.swing.JFrame;
  import javax.swing.SwingUtilities;
  import com.memoire.bu.BuBorderLayout;
  import com.memoire.bu.BuFileChooser;
- import com.memoire.bu.BuLabel;
  import com.memoire.bu.BuPanel;
  import com.memoire.bu.BuPreferences;
- import com.memoire.bu.BuVerticalLayout;
  import com.memoire.fu.FuLib;
  /**
--- 9,27 ----
  package org.fudaa.ebli.filechooser;
  import java.awt.Component;
! import java.awt.Dimension;
  import java.awt.Frame;
+ import java.awt.Point;
+ import java.awt.Toolkit;
  import java.io.File;
+ 
  import javax.swing.BorderFactory;
  import javax.swing.JDialog;
  import javax.swing.JFrame;
  import javax.swing.SwingUtilities;
+ 
  import com.memoire.bu.BuBorderLayout;
  import com.memoire.bu.BuFileChooser;
  import com.memoire.bu.BuPanel;
  import com.memoire.bu.BuPreferences;
  import com.memoire.fu.FuLib;
  /**
***************
*** 60,65 ****
      //    jfc.showOpenDialog(f);
    }
    /**
!    *
     */
    public int showDialog(Frame parent) {
--- 62,70 ----
      //    jfc.showOpenDialog(f);
    }
+ 
+ 
    /**
!    * @param parent
!    * @return
     */
    public int showDialog(Frame parent) {
***************
*** 67,71 ****
      init(dial_);
      rescanCurrentDirectory();
!     dial_.setLocationRelativeTo(parent);
      dial_.show();
      return response_;
--- 72,78 ----
      init(dial_);
      rescanCurrentDirectory();
!     Dimension dParent= Toolkit.getDefaultToolkit().getScreenSize();
!     Dimension dThis= getPreferredSize();
!     dial_.setLocation((dParent.width - dThis.width) / 2,(dParent.height - dThis.height) / 2);
      dial_.show();
      return response_;

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/test TestJStrcuture.java,NONE,1.1

From: Frederic D. <de...@us...> - 2004-03-19 17:45:48

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

Added Files:
	TestJStrcuture.java 
Log Message:
Test pour les structures

--- NEW FILE: TestJStrcuture.java ---
/*
 *  @file         TestJStrcuture.java
 *  @creation     19 mars 2004
 *  @modification $Date: 2004/03/19 17:35:57 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         fud...@li...
 */
package org.fudaa.dodico.test;

import junit.framework.TestCase;

import org.omg.CORBA.Object;

import org.fudaa.dodico.corba.dunes.ITestDunes;
import org.fudaa.dodico.corba.dunes.ITestDunesHelper;
import org.fudaa.dodico.corba.geometrie.SElement;
import org.fudaa.dodico.corba.geometrie.SMaillage;
import org.fudaa.dodico.corba.geometrie.SNoeud;
import org.fudaa.dodico.objet.CDodico;
import org.fudaa.dodico.usine.UsineHelper;


/**
 * @author Fred Deniger
 * @version $Id: TestJStrcuture.java,v 1.1 2004/03/19 17:35:57 deniger Exp $
 */
public class TestJStrcuture extends TestCase {

  /**
   * 
   */
  public TestJStrcuture() {
    super();
  }


  /**
   * Teste maillage
   */
  public void testSMaillage() {
    /*
     * String[] st = CDodico.findServerNames("::dunes::ITestDunes", 7000);
     * DodicoLib.printStringArray(st); if ((st == null) || (st.length==0)) st =
     * CDodico.findServerNames("::dunes::ITestDunes", 7000); DodicoLib.printStringArray(st); if
     * ((st != null) && (st.length>0))
     */
    ITestDunes d = null;
    CDodico.findServerNames("::dunes::ITestDunes", 7000);
    Object o = CDodico.findServerByInterface("::dunes::ITestDunes", 4000);
    if (o == null) 
    o = CDodico.findServerByInterface("::dunes::ITestDunes", 4000);
    if (o == null) 
    o = CDodico.findServerByInterface("::dunes::ITestDunes", 4000);
    if (o != null) 
    d = ITestDunesHelper.narrow(o);
    if (d == null) {
      d = UsineHelper.creeUsineLocale().creeDunesTestDunes();
      System.out.println("Fonctionnement local");
    }
    else System.out.println("Fonctionnement a distance");
    assertNotNull(d);
    SMaillage m = d.getTestMaillage();
    assertEquals(3, m.noeuds.length);
    assertEquals(1, m.elements.length);
    SNoeud s = m.noeuds[0];
    SElement elt=m.elements[0];
    
    //le probleme est ici: devrait etre toujours bon
    //alors qu'en distant cela plante : les noeuds et element
    //sont serialise independemment
    assertTrue(elt.noeuds[0].equals(s));
  }
}

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau Hydraulique1dReseauGridAdapter.java,1.7,1.8

From: Jean-Marc L. <jm_...@us...> - 2004-03-17 17:38:31

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

Modified Files:
	Hydraulique1dReseauGridAdapter.java 
Log Message:


Index: Hydraulique1dReseauGridAdapter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauGridAdapter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Hydraulique1dReseauGridAdapter.java	28 Jan 2004 16:52:50 -0000	1.7
--- Hydraulique1dReseauGridAdapter.java	17 Mar 2004 17:29:02 -0000	1.8
***************
*** 1,93 ****
! /*
!  * @file         Hydraulique1dReseauGridAdapter.java
!  * @creation     2001-25-10
!  * @modification $Date$
!  * @license      GNU General Public License 2
!  * @copyright    (c)1998-2001 EDF/LNHE
!  * @mail         de...@fu...
!  */
! package org.fudaa.fudaa.hydraulique1d.reseau;
! import java.awt.*;
! import java.awt.event.*;
! import javax.swing.*;
! import java.util.Enumeration;
! import com.memoire.dja.*;
! import com.memoire.bu.*;
! import org.fudaa.ebli.controle.*;
! import org.fudaa.ebli.dialog.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.hydraulique1d.singularite.*;
! import org.fudaa.fudaa.hydraulique1d.*;
! import org.fudaa.fudaa.hydraulique1d.editor.*;
! import org.fudaa.fudaa.hydraulique1d.reseau.*;
! import org.fudaa.fudaa.hydraulique1d.ihmhelper.*;
! /**
!  * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe
!  */
! public class Hydraulique1dReseauGridAdapter extends DjaGridAdapter {
!   private IReseau reseau_;
!   public Hydraulique1dReseauGridAdapter(IReseau reseau) {
!     reseau_= reseau;
!   }
!   public void objectRemoved(DjaGridEvent evt) {
!     if (evt.getObject() instanceof Hydraulique1dReseauBiefCourbe) {
!       Hydraulique1dReseauBiefCourbe bief=
!         (Hydraulique1dReseauBiefCourbe)evt.getObject();
!       IBief[] ibiefs= new IBief[1];
!       ibiefs[0]= (IBief)bief.getData("bief");
!       reseau_.supprimeBiefs(ibiefs);
!     } else if (evt.getObject() instanceof Hydraulique1dReseauCasier) {
!       Hydraulique1dReseauCasier casier=
!         (Hydraulique1dReseauCasier)evt.getObject();
!       ICasier[] icasiers= new ICasier[1];
!       icasiers[0]= (ICasier)casier.getData("casier");
!       reseau_.supprimeCasiers(icasiers);
!     } else if (evt.getObject() instanceof Hydraulique1dReseauLiaisonCasier) {
!       Hydraulique1dReseauLiaisonCasier liaison=
!         (Hydraulique1dReseauLiaisonCasier)evt.getObject();
!       ILiaison[] iliaisons= new ILiaison[1];
!       iliaisons[0]= (ILiaison)liaison.getData("liaison");
!       reseau_.supprimeLiaisons(iliaisons);
!     } else if (evt.getObject() instanceof Hydraulique1dReseauExtremLibre) {
!       Hydraulique1dReseauExtremLibre extremLibre =
!         (Hydraulique1dReseauExtremLibre)evt.getObject();
!       reseau_.supprimeExtremite((IExtremite)extremLibre.getData("extremite"));
!     } else if (evt.getObject() instanceof Hydraulique1dReseauSingularite) {
!       Hydraulique1dReseauSingularite sing =
!         (Hydraulique1dReseauSingularite)evt.getObject();
!       ISingularite[] isingularites= new ISingularite[1];
!       isingularites[0]=(ISingularite)sing.getData("singularite");
!       reseau_.supprimeSingularites(isingularites);
!     }
!   }
!   public void objectConnected(DjaGridEvent evt) {
!     if (  (evt.getObject() instanceof Hydraulique1dReseauSingularite)
!        || (evt.getObject() instanceof Hydraulique1dReseauLiaisonCasier) )  {
!       DjaLink lien=(DjaLink)evt.getObject();
!       Hydraulique1dReseauBiefCourbe leBief= null;
!       if (lien.getBeginObject() instanceof Hydraulique1dReseauBiefCourbe) {
!         leBief=(Hydraulique1dReseauBiefCourbe)lien.getBeginObject();
!       } else if (lien.getEndObject() instanceof Hydraulique1dReseauBiefCourbe) {
!         leBief=(Hydraulique1dReseauBiefCourbe)lien.getEndObject();
!       }
!       if (leBief == null) return;
!       Enumeration enum= evt.getGrid().getObjects().elements();
!       int nbLienSurLeBief= 0;
!       while (enum.hasMoreElements()) {
!         Object o= enum.nextElement();
!         if (  (o instanceof Hydraulique1dReseauSingularite)
!            || (o instanceof Hydraulique1dReseauLiaisonCasier) ) {
!           DjaLink l= (DjaLink)o;
!           if ((l.getBeginObject() == leBief)||(l.getEndObject() == leBief)) {
!             nbLienSurLeBief++;
!           }
!         }
!       }
!       if (nbLienSurLeBief == leBief.nbAnchors) {
!         leBief.setNbAnchors(nbLienSurLeBief + 1);
!         leBief.paintAnchors(evt.getGrid().getGraphics());
!       }
!     }
!   }
! }
--- 1,100 ----
! /*
!  * @file         Hydraulique1dReseauGridAdapter.java
!  * @creation     2001-25-10
!  * @modification $Date$
!  * @license      GNU General Public License 2
!  * @copyright    (c)1998-2001 EDF/LNHE
!  * @mail         de...@fu...
!  */
! package org.fudaa.fudaa.hydraulique1d.reseau;
! import java.util.Enumeration;
! 
! import org.fudaa.dodico.corba.hydraulique1d.IBief;
! import org.fudaa.dodico.corba.hydraulique1d.ICasier;
! import org.fudaa.dodico.corba.hydraulique1d.IExtremite;
! import org.fudaa.dodico.corba.hydraulique1d.ILiaison;
! import org.fudaa.dodico.corba.hydraulique1d.INoeud;
! import org.fudaa.dodico.corba.hydraulique1d.IReseau;
! import org.fudaa.dodico.corba.hydraulique1d.ISingularite;
! import com.memoire.dja.DjaGridAdapter;
! import com.memoire.dja.DjaGridEvent;
! import com.memoire.dja.DjaLink;
! /**
!  * @version      $Revision$ $Date$ by $Author$
!  * @author       Jean-Marc Lacombe
!  */
! public class Hydraulique1dReseauGridAdapter extends DjaGridAdapter {
!   private IReseau reseau_;
!   public Hydraulique1dReseauGridAdapter(IReseau reseau) {
!     reseau_= reseau;
!   }
!   public void objectRemoved(DjaGridEvent evt) {
!     if (evt.getObject() instanceof Hydraulique1dReseauBiefCourbe) {
!       Hydraulique1dReseauBiefCourbe bief=
!         (Hydraulique1dReseauBiefCourbe)evt.getObject();
!       IBief[] ibiefs= new IBief[1];
!       ibiefs[0]= (IBief)bief.getData("bief");
!       reseau_.supprimeBiefs(ibiefs);
!     } else if (evt.getObject() instanceof Hydraulique1dReseauCasier) {
!       Hydraulique1dReseauCasier casier=
!         (Hydraulique1dReseauCasier)evt.getObject();
!       ICasier[] icasiers= new ICasier[1];
!       icasiers[0]= (ICasier)casier.getData("casier");
!       reseau_.supprimeCasiers(icasiers);
!     } else if (evt.getObject() instanceof Hydraulique1dReseauLiaisonCasier) {
!       Hydraulique1dReseauLiaisonCasier liaison=
!         (Hydraulique1dReseauLiaisonCasier)evt.getObject();
!       ILiaison[] iliaisons= new ILiaison[1];
!       iliaisons[0]= (ILiaison)liaison.getData("liaison");
!       reseau_.supprimeLiaisons(iliaisons);
!     } else if (evt.getObject() instanceof Hydraulique1dReseauExtremLibre) {
!       Hydraulique1dReseauExtremLibre extremLibre =
!         (Hydraulique1dReseauExtremLibre)evt.getObject();
!       reseau_.supprimeExtremite((IExtremite)extremLibre.getData("extremite"));
!     } else if (evt.getObject() instanceof Hydraulique1dReseauSingularite) {
!       Hydraulique1dReseauSingularite sing =
!         (Hydraulique1dReseauSingularite)evt.getObject();
!       ISingularite[] isingularites= new ISingularite[1];
!       isingularites[0]=(ISingularite)sing.getData("singularite");
!       reseau_.supprimeSingularites(isingularites);
!     } else if (evt.getObject() instanceof Hydraulique1dReseauNoeud) {
!       Hydraulique1dReseauNoeud noeud =
!           (Hydraulique1dReseauNoeud) evt.getObject();
!       INoeud inoeud = (INoeud) noeud.getData("noeud");
!       reseau_.supprimeNoeud(inoeud);
!     }
!   }
!   public void objectConnected(DjaGridEvent evt) {
!     if (  (evt.getObject() instanceof Hydraulique1dReseauSingularite)
!        || (evt.getObject() instanceof Hydraulique1dReseauLiaisonCasier) )  {
!       DjaLink lien=(DjaLink)evt.getObject();
!       Hydraulique1dReseauBiefCourbe leBief= null;
!       if (lien.getBeginObject() instanceof Hydraulique1dReseauBiefCourbe) {
!         leBief=(Hydraulique1dReseauBiefCourbe)lien.getBeginObject();
!       } else if (lien.getEndObject() instanceof Hydraulique1dReseauBiefCourbe) {
!         leBief=(Hydraulique1dReseauBiefCourbe)lien.getEndObject();
!       }
!       if (leBief == null) return;
!       Enumeration enum= evt.getGrid().getObjects().elements();
!       int nbLienSurLeBief= 0;
!       while (enum.hasMoreElements()) {
!         Object o= enum.nextElement();
!         if (  (o instanceof Hydraulique1dReseauSingularite)
!            || (o instanceof Hydraulique1dReseauLiaisonCasier) ) {
!           DjaLink l= (DjaLink)o;
!           if ((l.getBeginObject() == leBief)||(l.getEndObject() == leBief)) {
!             nbLienSurLeBief++;
!           }
!         }
!       }
!       if (nbLienSurLeBief == leBief.nbAnchors) {
!         leBief.setNbAnchors(nbLienSurLeBief + 1);
!         leBief.paintAnchors(evt.getGrid().getGraphics());
!       }
!     }
!     reseau_.initIndiceNumero();
!   }
!   public void objectDisconnected(DjaGridEvent evt) {
!     reseau_.initIndiceNumero();
!   }
! }

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/mascaret ConvH1D_Masc.java,1.3,1.4 EdamoxWriter.java,1.9,1.10 Opthyca1DReader.java,1.1,1.2 Opthyca1DWriter.java,1.1,1.2 Rubens1DNonPermWriter.java,1.1,1.2 Rubens1DPermWriter.java,1.1,1.2 Rubens1DReader.java,1.2,1.3 Trace.java,1.1,1.2

From: Jean-Marc L. <jm_...@us...> - 2004-03-17 17:38:31

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

Modified Files:
	ConvH1D_Masc.java EdamoxWriter.java Opthyca1DReader.java 
	Opthyca1DWriter.java Rubens1DNonPermWriter.java 
	Rubens1DPermWriter.java Rubens1DReader.java Trace.java 
Log Message:


Index: Rubens1DReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/Rubens1DReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Rubens1DReader.java	12 Mar 2004 19:38:24 -0000	1.2
--- Rubens1DReader.java	17 Mar 2004 17:29:01 -0000	1.3
***************
*** 9,23 ****
  package org.fudaa.dodico.mascaret;
  
- import java.io.BufferedInputStream;
  import java.io.File;
- import java.io.FileInputStream;
  import java.io.FileReader;
  import java.io.IOException;
  import java.io.LineNumberReader;
! import java.util.ArrayList;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
- import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
- import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
- import org.fudaa.dodico.fortran.FortranBinaryInputStream;
  import org.fudaa.dodico.hydraulique1d.FichierInvalideException;
  
--- 9,18 ----
  package org.fudaa.dodico.mascaret;
  
  import java.io.File;
  import java.io.FileReader;
  import java.io.IOException;
  import java.io.LineNumberReader;
! 
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
  import org.fudaa.dodico.hydraulique1d.FichierInvalideException;
  
***************
*** 59,61 ****
      }
    }
! }
\ No newline at end of file
--- 54,56 ----
      }
    }
! }

Index: EdamoxWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/EdamoxWriter.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EdamoxWriter.java	12 Mar 2004 19:38:24 -0000	1.9
--- EdamoxWriter.java	17 Mar 2004 17:29:01 -0000	1.10
***************
*** 14,17 ****
--- 14,18 ----
  import java.lang.reflect.Array;
  import java.lang.reflect.Field;
+ 
  import org.fudaa.ctulu.CtuluLib;
  
***************
*** 26,29 ****
--- 27,31 ----
    private static String lineSeparator= CtuluLib.LINE_SEP;
    private static final int IRIEN= Integer.MIN_VALUE;
+   private static boolean inverseFields=false;
    public String getLineSeparator() {
      return lineSeparator;

Index: Rubens1DPermWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/Rubens1DPermWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Rubens1DPermWriter.java	12 Mar 2004 19:38:24 -0000	1.1
--- Rubens1DPermWriter.java	17 Mar 2004 17:29:01 -0000	1.2
***************
*** 1,10 ****
  package org.fudaa.dodico.mascaret;
  
! import java.io.*;
! import java.util.*;
! import java.text.*;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
- import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
  import org.fudaa.dodico.hydraulique1d.FichierInvalideException;
  
--- 1,16 ----
  package org.fudaa.dodico.mascaret;
  
! import java.io.BufferedWriter;
! import java.io.File;
! import java.io.FileWriter;
! import java.io.IOException;
! import java.io.PrintWriter;
! import java.text.DecimalFormat;
! import java.text.SimpleDateFormat;
! import java.util.Date;
! import java.util.Locale;
! 
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
  import org.fudaa.dodico.hydraulique1d.FichierInvalideException;
  
***************
*** 186,188 ****
      }
    }
! }
\ No newline at end of file
--- 192,194 ----
      }
    }
! }

Index: Opthyca1DWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/Opthyca1DWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Opthyca1DWriter.java	12 Mar 2004 19:38:24 -0000	1.1
--- Opthyca1DWriter.java	17 Mar 2004 17:29:01 -0000	1.2
***************
*** 6,10 ****
  import java.io.IOException;
  import java.io.PrintWriter;
! import java.text.*;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
--- 6,12 ----
  import java.io.IOException;
  import java.io.PrintWriter;
! import java.text.DecimalFormat;
! import java.text.DecimalFormatSymbols;
! 
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;

Index: Opthyca1DReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/Opthyca1DReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Opthyca1DReader.java	12 Mar 2004 19:38:24 -0000	1.1
--- Opthyca1DReader.java	17 Mar 2004 17:29:01 -0000	1.2
***************
*** 2,14 ****
  
  import java.io.File;
  import java.io.FileReader;
  import java.io.IOException;
  import java.io.LineNumberReader;
! import java.util.*;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
  import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
  import org.fudaa.dodico.hydraulique1d.FichierInvalideException;
- import java.io.*;
  
  class Opthyca1DReader {
--- 2,16 ----
  
  import java.io.File;
+ import java.io.FileNotFoundException;
  import java.io.FileReader;
  import java.io.IOException;
  import java.io.LineNumberReader;
! import java.util.StringTokenizer;
! import java.util.Vector;
! 
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
  import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
  import org.fudaa.dodico.hydraulique1d.FichierInvalideException;
  
  class Opthyca1DReader {

Index: Rubens1DNonPermWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/Rubens1DNonPermWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Rubens1DNonPermWriter.java	12 Mar 2004 19:38:24 -0000	1.1
--- Rubens1DNonPermWriter.java	17 Mar 2004 17:29:01 -0000	1.2
***************
*** 12,25 ****
  import java.io.File;
  import java.io.FileOutputStream;
- import java.io.FileNotFoundException;
  import java.io.IOException;
  import java.util.ArrayList;
! import java.util.Iterator;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
- import org.fudaa.dodico.corba.mascaret.SResultatsVariable;
  import org.fudaa.dodico.fortran.FortranBinaryOutputStream;
  import org.fudaa.dodico.hydraulique1d.FichierInvalideException;
- import java.util.*;
  
  /**
--- 12,22 ----
  import java.io.File;
  import java.io.FileOutputStream;
  import java.io.IOException;
  import java.util.ArrayList;
! 
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatial;
  import org.fudaa.dodico.corba.mascaret.SResultatsTemporelSpatialBief;
  import org.fudaa.dodico.fortran.FortranBinaryOutputStream;
  import org.fudaa.dodico.hydraulique1d.FichierInvalideException;
  
  /**

Index: Trace.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/Trace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Trace.java	12 Mar 2004 19:38:24 -0000	1.1
--- Trace.java	17 Mar 2004 17:29:01 -0000	1.2
***************
*** 26,29 ****
--- 26,42 ----
      }
    }
+   public static void println(String nomTab, Object[] tab) {
+     if (debug) {
+       if (tab.length > 0) {
+         System.out.print(nomTab + "=[");
+         for (int i = 0; i < (tab.length - 1); i++) {
+           System.out.print(tab[i] + ",");
+         }
+         System.out.println(tab[tab.length - 1] + "]");
+       } else {
+         System.out.println(nomTab + "=[]");
+       }
+     }
+   }
    public static void println(String nomTab, int[] tab) {
      if (debug) {
***************
*** 93,95 ****
    }
  
! }
\ No newline at end of file
--- 106,108 ----
    }
  
! }

Index: ConvH1D_Masc.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/ConvH1D_Masc.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConvH1D_Masc.java	12 Mar 2004 19:38:24 -0000	1.3
--- ConvH1D_Masc.java	17 Mar 2004 17:29:01 -0000	1.4
***************
*** 57,61 ****
          nomFichierSansExtension);
      paramCas.parametresConfluents=
!       convertirParametresConfluents(etude.reseau().noeuds());
      paramCas.parametresPlanimMaillage=
        convertirParametresPlanimMaillage(
--- 57,61 ----
          nomFichierSansExtension);
      paramCas.parametresConfluents=
!       convertirParametresConfluents(etude.reseau().noeudsConnectesBiefs());
      paramCas.parametresPlanimMaillage=
        convertirParametresPlanimMaillage(
***************
*** 230,241 ****
        paramMas.branches.numExtremFin[i]= ireseau.biefs()[i].extrAval().numero();
      }
!     paramMas.noeuds.nb= ireseau.noeuds().length;
      paramMas.noeuds.noeuds= new SNoeud[paramMas.noeuds.nb];
!     for (int i= 0; i < ireseau.noeuds().length; i++) {
        paramMas.noeuds.noeuds[i]= new SNoeud();
        paramMas.noeuds.noeuds[i].num= new int[5];
!       for (int j= 0; j < ireseau.noeuds()[i].extremites().length; j++) {
          paramMas.noeuds.noeuds[i].num[j]=
!           ireseau.noeuds()[i].extremites()[j].numero();
        }
      }
--- 230,241 ----
        paramMas.branches.numExtremFin[i]= ireseau.biefs()[i].extrAval().numero();
      }
!     paramMas.noeuds.nb= ireseau.noeudsConnectesBiefs().length;
      paramMas.noeuds.noeuds= new SNoeud[paramMas.noeuds.nb];
!     for (int i= 0; i < ireseau.noeudsConnectesBiefs().length; i++) {
        paramMas.noeuds.noeuds[i]= new SNoeud();
        paramMas.noeuds.noeuds[i].num= new int[5];
!       for (int j= 0; j < ireseau.noeudsConnectesBiefs()[i].extremites().length; j++) {
          paramMas.noeuds.noeuds[i].num[j]=
!           ireseau.noeudsConnectesBiefs()[i].extremites()[j].numero();
        }
      }

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper Hydraulique1dIHM_Noeud.java,1.4,1.5

From: Jean-Marc L. <jm_...@us...> - 2004-03-17 17:38:30

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

Modified Files:
	Hydraulique1dIHM_Noeud.java 
Log Message:


Index: Hydraulique1dIHM_Noeud.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Noeud.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Hydraulique1dIHM_Noeud.java	25 Nov 2003 10:13:47 -0000	1.4
--- Hydraulique1dIHM_Noeud.java	17 Mar 2004 17:29:02 -0000	1.5
***************
*** 38,42 ****
    public void editer() {
      if (dl != null) {
!       noeTable_.setObjects(etude_.reseau().noeuds());
        dl.activate();
        return;
--- 38,42 ----
    public void editer() {
      if (dl != null) {
!       noeTable_.setObjects(etude_.reseau().noeudsConnectesBiefs());
        dl.activate();
        return;
***************
*** 44,48 ****
      noeTable_= new Hydraulique1dTableauNoeuds(etude_);
      noeTable_.setAutosort(false);
!     noeTable_.setObjects(etude_.reseau().noeuds());
      //**    ph_.NOEUD().addPropertyChangeListener(noeTable_);
      dl= new Hydraulique1dDialogTableau(noeTable_, "Noeuds");
--- 44,48 ----
      noeTable_= new Hydraulique1dTableauNoeuds(etude_);
      noeTable_.setAutosort(false);
!     noeTable_.setObjects(etude_.reseau().noeudsConnectesBiefs());
      //**    ph_.NOEUD().addPropertyChangeListener(noeTable_);
      dl= new Hydraulique1dDialogTableau(noeTable_, "Noeuds");
***************
*** 91,95 ****
        String srcclazz=src.getClass().getName();
        System.err.println(clazz.substring(clazz.lastIndexOf('.')+1)+": "+srcclazz.substring(srcclazz.lastIndexOf('.')+1)+" created"); */
!       noeTable_.setObjects(etude_.reseau().noeuds());
      }
    }
--- 91,95 ----
        String srcclazz=src.getClass().getName();
        System.err.println(clazz.substring(clazz.lastIndexOf('.')+1)+": "+srcclazz.substring(srcclazz.lastIndexOf('.')+1)+" created"); */
!       noeTable_.setObjects(etude_.reseau().noeudsConnectesBiefs());
      }
    }
***************
*** 102,106 ****
        String srcclazz=src.getClass().getName();
        System.err.println(clazz.substring(clazz.lastIndexOf('.')+1)+": "+srcclazz.substring(srcclazz.lastIndexOf('.')+1)+" deleted"); */
!       noeTable_.setObjects(etude_.reseau().noeuds());
      }
    }
--- 102,106 ----
        String srcclazz=src.getClass().getName();
        System.err.println(clazz.substring(clazz.lastIndexOf('.')+1)+": "+srcclazz.substring(srcclazz.lastIndexOf('.')+1)+" deleted"); */
!       noeTable_.setObjects(etude_.reseau().noeudsConnectesBiefs());
      }
    }
***************
*** 113,117 ****
        String srcclazz=src.getClass().getName();
        System.err.println(clazz.substring(clazz.lastIndexOf('.')+1)+": "+srcclazz.substring(srcclazz.lastIndexOf('.')+1)+" modified"); */
!       noeTable_.setObjects(etude_.reseau().noeuds());
      }
    }
--- 113,117 ----
        String srcclazz=src.getClass().getName();
        System.err.println(clazz.substring(clazz.lastIndexOf('.')+1)+": "+srcclazz.substring(srcclazz.lastIndexOf('.')+1)+" modified"); */
!       noeTable_.setObjects(etude_.reseau().noeudsConnectesBiefs());
      }
    }

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/lido CConversionHydraulique1dRZO.java,1.5,1.6

From: Jean-Marc L. <jm_...@us...> - 2004-03-17 17:38:30

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/lido
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27479/dodico/src/org/fudaa/dodico/lido/conversion/lido

Modified Files:
	CConversionHydraulique1dRZO.java 
Log Message:


Index: CConversionHydraulique1dRZO.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/conversion/lido/CConversionHydraulique1dRZO.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CConversionHydraulique1dRZO.java	25 Nov 2003 10:11:42 -0000	1.5
--- CConversionHydraulique1dRZO.java	17 Mar 2004 17:29:00 -0000	1.6
***************
*** 20,24 ****
   *
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Axel von Arnim 
   */
  public class CConversionHydraulique1dRZO {
--- 20,24 ----
   *
   * @version      $Revision$ $Date$ by $Author$
!  * @author       Axel von Arnim
   */
  public class CConversionHydraulique1dRZO {
***************
*** 45,49 ****
      rzo.titreRZO= new String[] { "ETUDE LIDO 2.0 : DEFINITION DU RESEAU", "" };
      IBief[] biefs= etude.reseau().biefs();
!     INoeud[] noeuds= etude.reseau().noeuds();
      IExtremite[] limites= etude.reseau().extremitesLibres();
      rzo.nbBief= biefs.length;
--- 45,49 ----
      rzo.titreRZO= new String[] { "ETUDE LIDO 2.0 : DEFINITION DU RESEAU", "" };
      IBief[] biefs= etude.reseau().biefs();
!     INoeud[] noeuds= etude.reseau().noeudsConnectesBiefs();
      IExtremite[] limites= etude.reseau().extremitesLibres();
      rzo.nbBief= biefs.length;

[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d DReseau.java,1.11,1.12 DSingularite.java,1.5,1.6

From: Jean-Marc L. <jm_...@us...> - 2004-03-17 17:38:29

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

Modified Files:
	DReseau.java DSingularite.java 
Log Message:


Index: DReseau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DReseau.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DReseau.java	5 Feb 2004 18:26:37 -0000	1.11
--- DReseau.java	17 Mar 2004 17:29:00 -0000	1.12
***************
*** 9,12 ****
--- 9,13 ----
  package org.fudaa.dodico.hydraulique1d;
  import java.util.Arrays;
+ import java.util.List;
  import java.util.Vector;
  import org.fudaa.dodico.corba.hydraulique1d.IBarragePrincipal;
***************
*** 45,48 ****
--- 46,51 ----
   */
  public class DReseau extends DHydraulique1d implements IReseauOperations {
+   private transient Vector nouveauxNoeud_=new Vector();
+   private transient Vector nouvellesSing_=new Vector();
    public void initialise(IObjet _o) {
      if (_o instanceof IReseau) {
***************
*** 195,198 ****
--- 198,203 ----
      initNumeroCasier();
      initNumeroLiaison();
+     initNumeroNoeud();
+     initNumeroSing();
    }
    public void initIndiceBief() {
***************
*** 211,214 ****
--- 216,252 ----
      }
    }
+ 
+   public void initNumeroNoeud() {
+     INoeud[] noeudsConnectes = noeudsConnectesBiefs();
+     for (int i = 0; i < noeudsConnectes.length; i++) {
+       noeudsConnectes[i].numero(i+1);
+     }
+     int num = noeudsConnectes.length+1;
+     int nbNouveauxNoeuds = nouveauxNoeud_.size();
+     for (int i = 0; i < nbNouveauxNoeuds; i++) {
+       INoeud inoeud = (INoeud)nouveauxNoeud_.get(i);
+       if (!isContient(noeudsConnectes, inoeud)) {
+         inoeud.numero(num);
+         num++;
+       }
+     }
+   }
+ 
+   public void initNumeroSing() {
+     ISingularite[] singularitesConnectees = singularites();
+     for (int i = 0; i < singularitesConnectees.length; i++) {
+       singularitesConnectees[i].numero(i+1);
+     }
+     int num = singularitesConnectees.length+1;
+     int nbNouvellesSing = nouvellesSing_.size();
+     for (int i = 0; i < nbNouvellesSing; i++) {
+       ISingularite ising = (ISingularite)nouvellesSing_.get(i);
+       if (!isContient(singularitesConnectees, ising)) {
+         ising.numero(num);
+         num++;
+       }
+     }
+   }
+ 
    public IBief creeBief() {
      IBief bief= CDodico.findUsine().creeHydraulique1dBief();
***************
*** 222,226 ****
    }
    public INoeud creeNoeud() {
!     if ((biefs_ == null) || (biefs_.length == 0)) {
        //erreur
        System.err.println("DReseau#creeNoeud: aucun bief défini");
--- 260,264 ----
    }
    public INoeud creeNoeud() {
!  /*   if ((biefs_ == null) || (biefs_.length == 0)) {
        //erreur
        System.err.println("DReseau#creeNoeud: aucun bief défini");
***************
*** 242,286 ****
      }
      if (e != null)
!       noeud= e.creeNoeud();
!     return noeud;
    }
    public IApport creeApport() {
!     return CDodico.findUsine().creeHydraulique1dApport();
    }
    public IPerteCharge creePerteCharge() {
!     return CDodico.findUsine().creeHydraulique1dPerteCharge();
    }
    public ISeuil creeSeuil() {
!     return CDodico.findUsine().creeHydraulique1dSeuilLoi();
    }
    public ISeuilTranscritique creeSeuilTranscritique() {
!     return CDodico.findUsine().creeHydraulique1dSeuilTranscritique();
    }
    public ISeuilNoye creeSeuilNoye() {
!     return CDodico.findUsine().creeHydraulique1dSeuilNoye();
    }
    public ISeuilDenoye creeSeuilDenoye() {
!     return CDodico.findUsine().creeHydraulique1dSeuilDenoye();
    }
    public ISeuilLimniAmont creeSeuilLimniAmont() {
!     return CDodico.findUsine().creeHydraulique1dSeuilLimniAmont();
    }
    public ISeuilTarageAmont creeSeuilTarageAmont() {
!     return CDodico.findUsine().creeHydraulique1dSeuilTarageAmont();
    }
    public ISeuilTarageAval creeSeuilTarageAval() {
!     return CDodico.findUsine().creeHydraulique1dSeuilTarageAval();
    }
    public ISeuilLoi creeSeuilLoi() {
!     return CDodico.findUsine().creeHydraulique1dSeuilLoi();
    }
    public ISeuilGeometrique creeSeuilGeometrique() {
!     return CDodico.findUsine().creeHydraulique1dSeuilGeometrique();
    }
    public ISeuilVanne creeSeuilVanne() {
!     return CDodico.findUsine().creeHydraulique1dSeuilVanne();
    }
    public IDeversoir creeDeversoir() {
!     return CDodico.findUsine().creeHydraulique1dDeversoirComportementZCoefQ();
    }
    public IBarragePrincipal creeBarragePrincipal() {
--- 280,366 ----
      }
      if (e != null)
!       noeud= e.creeNoeud();*/
!     INoeud inoeud = CDodico.findUsine().creeHydraulique1dNoeud();
!     nouveauxNoeud_.add(inoeud);
!     initNumeroNoeud();
!     return inoeud;
    }
    public IApport creeApport() {
!     IApport ising = CDodico.findUsine().creeHydraulique1dApport();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public IPerteCharge creePerteCharge() {
!     IPerteCharge ising = CDodico.findUsine().creeHydraulique1dPerteCharge();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuil creeSeuil() {
!     ISeuil ising = CDodico.findUsine().creeHydraulique1dSeuilLoi();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuilTranscritique creeSeuilTranscritique() {
!     ISeuilTranscritique ising = CDodico.findUsine().creeHydraulique1dSeuilTranscritique();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuilNoye creeSeuilNoye() {
!     ISeuilNoye ising = CDodico.findUsine().creeHydraulique1dSeuilNoye();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuilDenoye creeSeuilDenoye() {
!     ISeuilDenoye ising = CDodico.findUsine().creeHydraulique1dSeuilDenoye();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuilLimniAmont creeSeuilLimniAmont() {
!     ISeuilLimniAmont ising = CDodico.findUsine().creeHydraulique1dSeuilLimniAmont();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuilTarageAmont creeSeuilTarageAmont() {
!     ISeuilTarageAmont ising = CDodico.findUsine().creeHydraulique1dSeuilTarageAmont();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuilTarageAval creeSeuilTarageAval() {
!     ISeuilTarageAval ising = CDodico.findUsine().creeHydraulique1dSeuilTarageAval();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuilLoi creeSeuilLoi() {
!     ISeuilLoi ising = CDodico.findUsine().creeHydraulique1dSeuilLoi();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuilGeometrique creeSeuilGeometrique() {
!     ISeuilGeometrique ising = CDodico.findUsine().creeHydraulique1dSeuilGeometrique();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public ISeuilVanne creeSeuilVanne() {
!     ISeuilVanne ising = CDodico.findUsine().creeHydraulique1dSeuilVanne();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public IDeversoir creeDeversoir() {
!     IDeversoir ising = CDodico.findUsine().creeHydraulique1dDeversoirComportementZCoefQ();
!     nouvellesSing_.add(ising);
!     initNumeroSing();
!     return ising;
    }
    public IBarragePrincipal creeBarragePrincipal() {
***************
*** 313,326 ****
    }
    public void supprimeSingularites(ISingularite[] sings) {
      for (int i= 0; i < biefs_.length; i++) {
        ISingularite[] biefsings= biefs_[i].singularites();
        for (int j= 0; j < biefsings.length; j++) {
!         for (int k= 0; k < sings.length; k++) {
!           if (biefsings[j] == sings[k]) {
!             biefs_[i].supprimeSingularite(biefsings[j]);
!           }
          }
        }
      }
    }
    public void supprimeProfils(IProfil[] profils) {
--- 393,421 ----
    }
    public void supprimeSingularites(ISingularite[] sings) {
+     boolean existeSuppression = false;
+     for (int i = 0; i < sings.length; i++) {
+       boolean supression = supprimeSingularite(sings[i]);
+       if (supression && !existeSuppression) {
+         existeSuppression = true;
+       }
+     }
+     if (existeSuppression) {
+       initNumeroSing();
+     }
+   }
+   private boolean supprimeSingularite(ISingularite sing) {
+     if (sing == null) return false;
      for (int i= 0; i < biefs_.length; i++) {
        ISingularite[] biefsings= biefs_[i].singularites();
        for (int j= 0; j < biefsings.length; j++) {
!         if (biefsings[j] == sing) {
!           biefs_[i].supprimeSingularite(biefsings[j]);
!           nouvellesSing_.remove(sing);
!           return true;
          }
        }
      }
+     DSingularite.supprimeSingularite(sing);
+     return nouvellesSing_.remove(sing);
    }
    public void supprimeProfils(IProfil[] profils) {
***************
*** 341,344 ****
--- 436,458 ----
      }
    }
+   public void supprimeNoeud(INoeud noeud) {
+     if (noeud != null) {
+       INoeud n= null;
+       for (int i= 0; i < biefs_.length; i++) {
+         IBief b= biefs_[i];
+         n= b.extrAmont().noeudRattache();
+         if (n == noeud) {
+           b.extrAmont().noeudRattache(null);
+         }
+         n= b.extrAval().noeudRattache();
+         if (n == noeud) {
+           b.extrAval().noeudRattache(null);
+         }
+       }
+       nouveauxNoeud_.remove(noeud);
+       CDodico.findUsine().supprimeHydraulique1dNoeud(noeud);
+       initNumeroNoeud();
+     }
+   }
    public ILimite creeLimite() {
      if ((biefs_ == null) || (biefs_.length == 0)) {
***************
*** 554,558 ****
      return res;
    }
!   public INoeud[] noeuds() {
      Vector noeuds= new Vector();
      INoeud n= null;
--- 668,672 ----
      return res;
    }
!   public INoeud[] noeudsConnectesBiefs() {
      Vector noeuds= new Vector();
      INoeud n= null;
***************
*** 572,576 ****
    }
    public INoeud getNoeudNumero(int numero) {
!     INoeud[] noeuds= noeuds();
      for (int i= 0; i < noeuds.length; i++) {
        if (noeuds[i].numero() == numero)
--- 686,690 ----
    }
    public INoeud getNoeudNumero(int numero) {
!     INoeud[] noeuds= noeudsConnectesBiefs();
      for (int i= 0; i < noeuds.length; i++) {
        if (noeuds[i].numero() == numero)
***************
*** 877,880 ****
  
    }
! 
  }
--- 991,1001 ----
  
    }
!   private final static boolean isContient(Object[] objets, Object objet) {
!     for (int i = 0; i < objets.length; i++) {
!       if (objets[i] == objet) {
!         return true;
!       }
!     }
!     return false;
!   }
  }

Index: DSingularite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/hydraulique1d/DSingularite.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DSingularite.java	5 Feb 2004 18:26:37 -0000	1.5
--- DSingularite.java	17 Mar 2004 17:29:00 -0000	1.6
***************
*** 107,110 ****
--- 107,111 ----
    }
    public static void supprimeSingularite(ISingularite loi) {
+     System.out.println("supprimeSingularite="+loi.getClass());
      if (loi instanceof IApport)
        CDodico.findUsine().supprimeHydraulique1dApport((IApport)loi);

[Fudaa-cvs-commit] fudaa_devel/dodico/idl/metier hydraulique1d.idl,1.14,1.15

From: Jean-Marc L. <jm_...@us...> - 2004-03-17 17:38:29

Update of /cvsroot/fudaa/fudaa_devel/dodico/idl/metier
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27479/dodico/idl/metier

Modified Files:
	hydraulique1d.idl 
Log Message:


Index: hydraulique1d.idl
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/idl/metier/hydraulique1d.idl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** hydraulique1d.idl	12 Mar 2004 19:47:25 -0000	1.14
--- hydraulique1d.idl	17 Mar 2004 17:29:00 -0000	1.15
***************
*** 104,108 ****
      rien creePoints();
      ILimite creeLimite();
!     INoeud creeNoeud();
    };
  
--- 104,108 ----
      rien creePoints();
      ILimite creeLimite();
! //    INoeud creeNoeud();
    };
  
***************
*** 271,274 ****
--- 271,275 ----
      rien supprimeZonesPlanimetrage(in VIZonePlanimetrage zones);
      rien supprimeExtremite(in IExtremite extremite);
+     rien supprimeNoeud(in INoeud noeud);
      IZonePlanimetrage creeZonePlanimetrage(in entier indiceProfilDebut, in entier indiceProfilFin, in reel taillePas);
      rien initIndiceBief();
***************
*** 298,302 ****
      IExtremite getExtremiteNumero(in entier numero);
      IExtremite getExtremiteContenantLimite(in ILimite limite);
!     VINoeud noeuds();
      INoeud getNoeudNumero(in entier numero);
      VIProfil profils();
--- 299,303 ----
      IExtremite getExtremiteNumero(in entier numero);
      IExtremite getExtremiteContenantLimite(in ILimite limite);
!     VINoeud noeudsConnectesBiefs();
      INoeud getNoeudNumero(in entier numero);
      VIProfil profils();

Flat | Threaded

<< < 1 .. 24 25 26 27 28 .. 86 > >> (Page 26 of 86)

2003	Jan	Feb (89)	Mar (219)	Apr (82)	May (33)	Jun (11)	Jul (129)	Aug (357)	Sep (34)	Oct (37)	Nov (42)	Dec (182)
2004	Jan (59)	Feb (74)	Mar (196)	Apr (205)	May (109)	Jun (268)	Jul	Aug	Sep	Oct	Nov	Dec