fudaa-cvs-commit

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

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

Modified Files:
	TrBcBoundaryBlockLayer.java TrBcBoundaryMiddleLayer.java 
	TrElementNumberLayer.java TrFindComponentBcPoint.java 
	TrPanelInfo.java TrPanelInfoSenderDefault.java 
	TrPointNumberLayer.java 
Log Message:
Maj general


Index: TrBcBoundaryBlockLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockLayer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrBcBoundaryBlockLayer.java	11 Dec 2003 12:50:55 -0000	1.3
--- TrBcBoundaryBlockLayer.java	12 Dec 2003 11:29:41 -0000	1.4
***************
*** 11,32 ****
  import gnu.trove.TIntHashSet;
  import gnu.trove.TIntObjectIterator;
  import java.awt.Color;
  import java.awt.Graphics;
  import java.awt.Graphics2D;
- import java.util.ArrayList;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
  
  import javax.swing.Icon;
! import org.fudaa.dodico.commun.DodicoCommandManager;
! import org.fudaa.dodico.commun.DodicoLib;
! import org.fudaa.dodico.h2d.H2dBoundary;
  import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface;
! import org.fudaa.dodico.h2d.type.H2dBoundaryType;
! import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
! 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;
--- 11,27 ----
  import gnu.trove.TIntHashSet;
  import gnu.trove.TIntObjectIterator;
+ 
  import java.awt.Color;
  import java.awt.Graphics;
  import java.awt.Graphics2D;
  
  import javax.swing.Icon;
! 
! import org.fudaa.ctulu.CtuluLib;
! 
  import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface;
! import org.fudaa.dodico.h2d.H2dBoundary;
! 
  import org.fudaa.ebli.calque.ZModeleDonnees;
  import org.fudaa.ebli.commun.EbliListeSelection;
  import org.fudaa.ebli.commun.EbliListeSelectionMulti;
***************
*** 37,45 ****
  import org.fudaa.ebli.geometrie.GrSegment;
  import org.fudaa.ebli.trace.TraceLigne;
! import org.fudaa.fudaa.commun.FudaaCommonImplementation;
! import org.fudaa.fudaa.commun.FudaaLib;
! import org.fudaa.fudaa.tr.TrFilleVisu;
  import org.fudaa.fudaa.tr.TrResource;
- import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData;
  /**
   * Layer which manage the borders.
--- 32,37 ----
  import org.fudaa.ebli.geometrie.GrSegment;
  import org.fudaa.ebli.trace.TraceLigne;
! 
  import org.fudaa.fudaa.tr.TrResource;
  /**
   * Layer which manage the borders.
***************
*** 416,420 ****
        _m.put(
          TrResource.getS("Nombre de bords sélectionnés"),
!         DodicoLib.getString(selection_.getNbSelectedItem()));
  
      }
--- 408,412 ----
        _m.put(
          TrResource.getS("Nombre de bords sélectionnés"),
!         CtuluLib.getString(selection_.getNbSelectedItem()));
  
      }

Index: TrBcBoundaryMiddleLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleLayer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TrBcBoundaryMiddleLayer.java	11 Dec 2003 12:50:55 -0000	1.3
--- TrBcBoundaryMiddleLayer.java	12 Dec 2003 11:29:41 -0000	1.4
***************
*** 15,21 ****
  import java.awt.Graphics2D;
  
! import javax.swing.Icon;
  
- import org.fudaa.dodico.commun.DodicoLib;
  import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface;
  import org.fudaa.dodico.h2d.H2dLib;
--- 15,20 ----
  import java.awt.Graphics2D;
  
! import org.fudaa.ctulu.CtuluLib;
  
  import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface;
  import org.fudaa.dodico.h2d.H2dLib;
***************
*** 299,309 ****
     *
     */
!   public void fillWithInfo(TrPanelInfo.InfoData _m,TrPanelInfoSender _s) {
!     if(isSelectionEmpty()) return;
!     int i=isSelectionInUniqueBloc();
!     if(i>=0){
!       EbliListeSelection l=selection_.get(i);
!       if(l.isOnlyOnIndexSelected()){
!         _s.fillWithBoundaryMiddleInfo(_m, i, H2dLib.getIdxFromIdxMid(l.getMaxIndex()));        
          return;
        }
--- 298,312 ----
     *
     */
!   public void fillWithInfo(TrPanelInfo.InfoData _m, TrPanelInfoSender _s) {
!     if (isSelectionEmpty())
!       return;
!     int i= isSelectionInUniqueBloc();
!     if (i >= 0) {
!       EbliListeSelection l= selection_.get(i);
!       if (l.isOnlyOnIndexSelected()) {
!         _s.fillWithBoundaryMiddleInfo(
!           _m,
!           i,
!           H2dLib.getIdxFromIdxMid(l.getMaxIndex()));
          return;
        }
***************
*** 311,315 ****
      _m.put(
        TrResource.getS("Nombre de bords sélectionnés"),
!       DodicoLib.getString(selection_.getNbSelectedItem()));
  
    }
--- 314,318 ----
      _m.put(
        TrResource.getS("Nombre de bords sélectionnés"),
!       CtuluLib.getString(selection_.getNbSelectedItem()));
  
    }

Index: TrElementNumberLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrElementNumberLayer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrElementNumberLayer.java	11 Dec 2003 12:50:55 -0000	1.1
--- TrElementNumberLayer.java	12 Dec 2003 11:29:41 -0000	1.2
***************
*** 10,22 ****
  import gnu.trove.TIntHashSet;
  import gnu.trove.TIntIterator;
  import java.awt.Color;
  import java.awt.Font;
  import java.awt.FontMetrics;
  import java.awt.Graphics;
- import java.awt.Graphics2D;
  import java.awt.geom.Rectangle2D;
- import java.util.Map;
  
! import org.fudaa.dodico.commun.DodicoLib;
  import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
  import org.fudaa.ebli.calque.ZModeleDonnees;
--- 10,22 ----
  import gnu.trove.TIntHashSet;
  import gnu.trove.TIntIterator;
+ 
  import java.awt.Color;
  import java.awt.Font;
  import java.awt.FontMetrics;
  import java.awt.Graphics;
  import java.awt.geom.Rectangle2D;
  
! import org.fudaa.ctulu.CtuluLib;
! 
  import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
  import org.fudaa.ebli.calque.ZModeleDonnees;
***************
*** 26,31 ****
  import org.fudaa.ebli.geometrie.GrPoint;
  import org.fudaa.ebli.geometrie.GrPolygone;
  import org.fudaa.fudaa.tr.TrResource;
- import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData;
  /**
   * @author deniger
--- 26,31 ----
  import org.fudaa.ebli.geometrie.GrPoint;
  import org.fudaa.ebli.geometrie.GrPolygone;
+ 
  import org.fudaa.fudaa.tr.TrResource;
  /**
   * @author deniger
***************
*** 147,151 ****
          if (clip.contientXY(pt)) {
            pt.autoApplique(versEcran);
!           String s= DodicoLib.getString(idx + 1);
            Rectangle2D rec= fm.getStringBounds(s, g);
            x= pt.x - rec.getWidth() / 2;
--- 147,151 ----
          if (clip.contientXY(pt)) {
            pt.autoApplique(versEcran);
!           String s= CtuluLib.getString(idx + 1);
            Rectangle2D rec= fm.getStringBounds(s, g);
            x= pt.x - rec.getWidth() / 2;
***************
*** 165,169 ****
          p.centre(pt);
          if (clip.contientXY(pt)) {
!           String s= DodicoLib.getString(i + 1);
            pt.autoApplique(versEcran);
            Rectangle2D rec= fm.getStringBounds(s, g);
--- 165,169 ----
          p.centre(pt);
          if (clip.contientXY(pt)) {
!           String s= CtuluLib.getString(i + 1);
            pt.autoApplique(versEcran);
            Rectangle2D rec= fm.getStringBounds(s, g);

Index: TrFindComponentBcPoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrFindComponentBcPoint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrFindComponentBcPoint.java	11 Dec 2003 12:50:55 -0000	1.1
--- TrFindComponentBcPoint.java	12 Dec 2003 11:29:41 -0000	1.2
***************
*** 12,15 ****
--- 12,18 ----
  import javax.swing.JRadioButton;
  import javax.swing.JTextField;
+ 
+ import org.fudaa.ctulu.CtuluLib;
+ 
  import com.memoire.bu.BuLabel;
  import com.memoire.bu.BuPanel;
***************
*** 38,44 ****
      bg.add(generalData_);
      bt1.setSelected(true);
!     add(new BuLabel(DodicoLib.EMPTY_STRING));
      add(bt1);
!     add(new BuLabel(DodicoLib.EMPTY_STRING));
      add(generalData_);
    }
--- 41,47 ----
      bg.add(generalData_);
      bt1.setSelected(true);
!     add(new BuLabel(CtuluLib.EMPTY_STRING));
      add(bt1);
!     add(new BuLabel(CtuluLib.EMPTY_STRING));
      add(generalData_);
    }

Index: TrPanelInfo.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrPanelInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrPanelInfo.java	11 Dec 2003 12:50:55 -0000	1.1
--- TrPanelInfo.java	12 Dec 2003 11:29:41 -0000	1.2
***************
*** 9,20 ****
  package org.fudaa.fudaa.tr.data;
  import java.awt.Component;
- import java.awt.Container;
  import java.awt.Dimension;
  import java.awt.Font;
- import java.util.Hashtable;
- import java.util.Iterator;
- import java.util.Map;
  import java.util.Vector;
! import javax.swing.DefaultCellEditor;
  import javax.swing.JScrollPane;
  import javax.swing.JTable;
--- 9,16 ----
  package org.fudaa.fudaa.tr.data;
  import java.awt.Component;
  import java.awt.Dimension;
  import java.awt.Font;
  import java.util.Vector;
! 
  import javax.swing.JScrollPane;
  import javax.swing.JTable;
***************
*** 26,31 ****
  import javax.swing.table.TableColumnModel;
  
  import com.memoire.bu.BuBorderLayout;
- import com.memoire.bu.BuLib;
  import com.memoire.bu.BuPanel;
  import com.memoire.bu.BuScrollPane;
--- 22,28 ----
  import javax.swing.table.TableColumnModel;
  
+ import org.fudaa.ctulu.CtuluLib;
+ 
  import com.memoire.bu.BuBorderLayout;
  import com.memoire.bu.BuPanel;
  import com.memoire.bu.BuScrollPane;
***************
*** 37,41 ****
  import org.fudaa.ebli.calque.ZSelectionEvent;
  import org.fudaa.ebli.calque.ZSelectionListener;
! import org.fudaa.fudaa.commun.tableau.FudaaCellRenderer;
  import org.fudaa.fudaa.tr.TrResource;
  /**
--- 34,38 ----
  import org.fudaa.ebli.calque.ZSelectionEvent;
  import org.fudaa.ebli.calque.ZSelectionListener;
! 
  import org.fudaa.fudaa.tr.TrResource;
  /**
***************
*** 106,110 ****
      layer_= newLa;
      tableModel_.clear();
!     txtTitle_.setText(DodicoLib.EMPTY_STRING);
      if (layer_ != null) {
        layer_.fillWithInfo(tableModel_,sender_);
--- 103,107 ----
      layer_= newLa;
      tableModel_.clear();
!     txtTitle_.setText(CtuluLib.EMPTY_STRING);
      if (layer_ != null) {
        layer_.fillWithInfo(tableModel_,sender_);
***************
*** 181,185 ****
      if (isVisible() && (_evt.getSource() == layer_)) {
        if (layer_ != null) {
!         txtTitle_.setText(DodicoLib.EMPTY_STRING);
          tableModel_.clear();
          layer_.fillWithInfo(tableModel_,sender_);
--- 178,182 ----
      if (isVisible() && (_evt.getSource() == layer_)) {
        if (layer_ != null) {
!         txtTitle_.setText(CtuluLib.EMPTY_STRING);
          tableModel_.clear();
          layer_.fillWithInfo(tableModel_,sender_);

Index: TrPanelInfoSenderDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrPanelInfoSenderDefault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrPanelInfoSenderDefault.java	11 Dec 2003 12:50:55 -0000	1.1
--- TrPanelInfoSenderDefault.java	12 Dec 2003 11:29:41 -0000	1.2
***************
*** 8,11 ****
--- 8,13 ----
   */
  package org.fudaa.fudaa.tr.data;
+ import org.fudaa.ctulu.CtuluLib;
+ 
  import org.fudaa.dodico.commun.DodicoLib;
  import org.fudaa.dodico.h2d.H2dElement;
***************
*** 13,16 ****
--- 15,19 ----
  import org.fudaa.dodico.h2d.H2dParameters;
  import org.fudaa.dodico.h2d.H2dPoint;
+ 
  import org.fudaa.fudaa.tr.TrFilleVisu;
  import org.fudaa.fudaa.tr.TrResource;
***************
*** 42,53 ****
        _receiver.put(
          TrResource.getS("Nombre de points séléctionnés"),
!         DodicoLib.getString(n));
        return;
      }
      String title=
!       TrResource.getS("Point n° {0}", DodicoLib.getString(_idx[0] + 1));
      int idxOnFr= getGrid().getFrontiers().getIdxOnFrontier(_idx[0]);
      if (idxOnFr > 0)
!       title += " (" + DodicoLib.getString(idxOnFr + 1) + ")";
      _receiver.setTitle(title);
      H2dPoint p= getGrid().getPt(_idx[0]);
--- 45,56 ----
        _receiver.put(
          TrResource.getS("Nombre de points séléctionnés"),
!       CtuluLib.getString(n));
        return;
      }
      String title=
!       TrResource.getS("Point n° {0}", CtuluLib.getString(_idx[0] + 1));
      int idxOnFr= getGrid().getFrontiers().getIdxOnFrontier(_idx[0]);
      if (idxOnFr > 0)
!       title += " (" + CtuluLib.getString(idxOnFr + 1) + ")";
      _receiver.setTitle(title);
      H2dPoint p= getGrid().getPt(_idx[0]);
***************
*** 67,75 ****
        _receiver.put(
          TrResource.getS("Nombre d'éléments séléctionnés"),
!         DodicoLib.getString(n));
        return;
      }
      _receiver.setTitle(
!       TrResource.getS("Element n° {0}", DodicoLib.getString(_idx[0] + 1)));
      H2dGrid g= getGrid();
      H2dElement el= g.getElement(_idx[0]);
--- 70,78 ----
        _receiver.put(
          TrResource.getS("Nombre d'éléments séléctionnés"),
!         CtuluLib.getString(n));
        return;
      }
      _receiver.setTitle(
!       TrResource.getS("Element n° {0}", CtuluLib.getString(_idx[0] + 1)));
      H2dGrid g= getGrid();
      H2dElement el= g.getElement(_idx[0]);
***************
*** 79,98 ****
        indice= el.getPtIndex(i);
        H2dPoint p= getGrid().getPt(indice);
!       String idx= DodicoLib.getString(i + 1);
        int idxOnFr= getGrid().getFrontiers().getIdxOnFrontier(indice);
        _receiver.put(
          TrResource.getS("Point n° {0}", idx),
!         DodicoLib.getString(el.getPtIndex(i) + 1)
            + (idxOnFr >= 0
!             ? " (" + DodicoLib.getString(idxOnFr + 1) + ")"
!             : DodicoLib.EMPTY_STRING));
        _receiver.put(
          TrResource.getS("Point n° {0}", idx) + " x,y,z",
!          TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getX())
            + ", "
            + TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getY())
            + ", "
!           + TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getZ())
!           );
      }
    }
--- 82,100 ----
        indice= el.getPtIndex(i);
        H2dPoint p= getGrid().getPt(indice);
!       String idx= CtuluLib.getString(i + 1);
        int idxOnFr= getGrid().getFrontiers().getIdxOnFrontier(indice);
        _receiver.put(
          TrResource.getS("Point n° {0}", idx),
!         CtuluLib.getString(el.getPtIndex(i) + 1)
            + (idxOnFr >= 0
!             ? " (" + CtuluLib.getString(idxOnFr + 1) + ")"
!             : CtuluLib.EMPTY_STRING));
        _receiver.put(
          TrResource.getS("Point n° {0}", idx) + " x,y,z",
!         TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getX())
            + ", "
            + TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getY())
            + ", "
!           + TrFilleVisu.TWO_DIGITS_FORMAT.format(p.getZ()));
      }
    }

Index: TrPointNumberLayer.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrPointNumberLayer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrPointNumberLayer.java	11 Dec 2003 12:50:55 -0000	1.1
--- TrPointNumberLayer.java	12 Dec 2003 11:29:41 -0000	1.2
***************
*** 8,11 ****
--- 8,14 ----
   */
  package org.fudaa.fudaa.tr.data;
+ import gnu.trove.TIntHashSet;
+ import gnu.trove.TIntIterator;
+ 
  import java.awt.Color;
  import java.awt.Font;
***************
*** 14,20 ****
  import java.awt.Graphics2D;
  import java.awt.geom.Rectangle2D;
- import java.util.Map;
  
! import org.fudaa.dodico.commun.DodicoLib;
  import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
  import org.fudaa.ebli.calque.ZModeleDonnees;
--- 17,23 ----
  import java.awt.Graphics2D;
  import java.awt.geom.Rectangle2D;
  
! import org.fudaa.ctulu.CtuluLib;
! 
  import org.fudaa.ebli.calque.ZCalqueAffichageDonnees;
  import org.fudaa.ebli.calque.ZModeleDonnees;
***************
*** 24,34 ****
  import org.fudaa.ebli.geometrie.GrPoint;
  import org.fudaa.ebli.geometrie.GrPolygone;
- import org.fudaa.fudaa.tr.TrResource;
- import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData;
  
! import gnu.trove.TIntArrayList;
! import gnu.trove.TIntHashSet;
! import gnu.trove.TIntIntHashMap;
! import gnu.trove.TIntIterator;
  /**
   * @author deniger
--- 27,32 ----
  import org.fudaa.ebli.geometrie.GrPoint;
  import org.fudaa.ebli.geometrie.GrPolygone;
  
! import org.fudaa.fudaa.tr.TrResource;
  /**
   * @author deniger
***************
*** 152,160 ****
              int idxFr= model_.getIdxFrontier(idx);
              if (idxFr >= 0) {
!               s= DodicoLib.getString(idx + 1) + "( " + (idxFr + 1) + " )";
              } else
!               s= DodicoLib.getString(idx + 1);
            } else {
!             s= DodicoLib.getString(idx + 1);
            }
            Rectangle2D rec= fm.getStringBounds(s, g);
--- 150,158 ----
              int idxFr= model_.getIdxFrontier(idx);
              if (idxFr >= 0) {
!               s= CtuluLib.getString(idx + 1) + "( " + (idxFr + 1) + " )";
              } else
!               s= CtuluLib.getString(idx + 1);
            } else {
!             s= CtuluLib.getString(idx + 1);
            }
            Rectangle2D rec= fm.getStringBounds(s, g);
***************
*** 179,187 ****
              int idxFr= model_.getIdxFrontier(idx);
              if (idxFr >= 0) {
!               s= DodicoLib.getString(idx + 1) + "( " + (idxFr + 1) + " )";
              } else
!               s= DodicoLib.getString(idx + 1);
            } else {
!             s= DodicoLib.getString(idx + 1);
            }
            Rectangle2D rec= fm.getStringBounds(s, g);
--- 177,185 ----
              int idxFr= model_.getIdxFrontier(idx);
              if (idxFr >= 0) {
!               s= CtuluLib.getString(idx + 1) + "( " + (idxFr + 1) + " )";
              } else
!               s= CtuluLib.getString(idx + 1);
            } else {
!             s= CtuluLib.getString(idx + 1);
            }
            Rectangle2D rec= fm.getStringBounds(s, g);