[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer MvVisuPanel.java,1.1,1.2 MvFindDialog.java,1.1,1.2 MvActLoad.java,1.1,1.2 MvActLoadDefault.java,1.5,1.6 mv_en.fr_txt,1.1,1.2

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

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

Modified Files:
	MvVisuPanel.java MvFindDialog.java MvActLoad.java 
	MvActLoadDefault.java mv_en.fr_txt 
Log Message:


Index: MvActLoad.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActLoad.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MvActLoad.java	12 Feb 2004 16:15:20 -0000	1.1
--- MvActLoad.java	11 Jun 2004 16:39:45 -0000	1.2
***************
*** 26,30 ****
     * Si _f est null, ouvre un file chooser pour choisir le fichier.
     * Sinon, essaie de charger le fichier demander
     */
!   public void load(File _f,MvControllerSrc _s);
  }
--- 26,31 ----
     * Si _f est null, ouvre un file chooser pour choisir le fichier.
     * Sinon, essaie de charger le fichier demander
+    * @return le fichier reellement ouvert
     */
!   public File load(File _f,MvControllerSrc _s);
  }

Index: mv_en.fr_txt
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/mv_en.fr_txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mv_en.fr_txt	1 Jun 2004 11:27:42 -0000	1.1
--- mv_en.fr_txt	11 Jun 2004 16:39:45 -0000	1.2
***************
*** 29,31 ****
  Nombre total de noeuds sur les frontières=Number of nodes on the frontiers
  Nombre de noeuds=Number of nodes
! Nombre d'éléments=Number of Elements
\ No newline at end of file
--- 29,31 ----
  Nombre total de noeuds sur les frontières=Number of nodes on the frontiers
  Nombre de noeuds=Number of nodes
! Nombre d'éléments=Number of Elements

Index: MvActLoadDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActLoadDefault.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MvActLoadDefault.java	1 Jun 2004 11:27:42 -0000	1.5
--- MvActLoadDefault.java	11 Jun 2004 16:39:45 -0000	1.6
***************
*** 28,31 ****
--- 28,32 ----
  import org.fudaa.dodico.reflux.io.CorEleBthFileFormat;
  import org.fudaa.dodico.reflux.io.INPFileFormat;
+ import org.fudaa.dodico.rubar.io.RubarDATFileFormat;
  import org.fudaa.dodico.telemac.io.SerafinFileFormat;
  import org.fudaa.dodico.telemac.io.SerafinInterface;
***************
*** 49,58 ****
        INPFileFormat.getInstance(), DunesFileFormat.getInstance(),
        CorEleBthFileFormat.getInstance(), SerafinFileFormat.getInstance(),
!       TrigridFileFormat.getInstance()           }));
  
    /**
     * *
     */
!   public void load(File _f, final MvControllerSrc _s) {
      File file = _f;
      FileFormat ft = null;
--- 50,59 ----
        INPFileFormat.getInstance(), DunesFileFormat.getInstance(),
        CorEleBthFileFormat.getInstance(), SerafinFileFormat.getInstance(),
!       TrigridFileFormat.getInstance(), RubarDATFileFormat.INSTANCE()}));
  
    /**
     * *
     */
!   public File load(File _f, final MvControllerSrc _s) {
      File file = _f;
      FileFormat ft = null;
***************
*** 97,116 ****
      }
      else {
-       System.out.println("guess format");
        ft = guessFormat(file.getName(), FT_LIST);
-       if(ft==null) System.out.println("non trouvé");
      }
      if ((file != null) && (ft != null)) {
-       System.out.println("grid loaded ?");
        loadFileAct(_s, file, (FileFormatGridVersion) ft.getLastVersionInstance());
      }
    }
  
    private void loadFileAct(final MvControllerSrc _s, final File _file,
        final FileFormatGridVersion _v) {
      if (_file.exists()) {
!       BuTask op = new BuTaskOperation(null,MvResource.getS("Lecture")) {
          public void act() {
            ProgressionInterface prog_ = _s.getParent().createProgression(this);
            FileOperationSynthese s = _v.readGrid(_file, prog_);
            EfGridSource src = (EfGridSource) s.getSource();
--- 98,122 ----
      }
      else {
        ft = guessFormat(file.getName(), FT_LIST);
      }
+     
      if ((file != null) && (ft != null)) {
        loadFileAct(_s, file, (FileFormatGridVersion) ft.getLastVersionInstance());
+       return file;
      }
+     return null;
    }
  
    private void loadFileAct(final MvControllerSrc _s, final File _file,
        final FileFormatGridVersion _v) {
+     if(_v==null){
+       System.err.println("pas de lecture");
+     }
      if (_file.exists()) {
!       BuTask op = new BuTaskOperation(null, MvResource.getS("Lecture")) {
! 
          public void act() {
            ProgressionInterface prog_ = _s.getParent().createProgression(this);
+           System.out.println("LECTURE");
            FileOperationSynthese s = _v.readGrid(_file, prog_);
            EfGridSource src = (EfGridSource) s.getSource();
***************
*** 124,128 ****
              }
            }
-           System.out.println("grid loaded");
            _s.setLoaded(s);
          }
--- 130,133 ----

Index: MvVisuPanel.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvVisuPanel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MvVisuPanel.java	1 Jun 2004 11:27:42 -0000	1.1
--- MvVisuPanel.java	11 Jun 2004 16:39:45 -0000	1.2
***************
*** 204,210 ****
      if (getGridGroup() != null)
        return;
!     MvGridLayerGroup cqGrid= new MvGridLayerGroup(_m, _ptModel, _eltModel);
!     cqGrid.setName("gpGrid");
!     gcDonnees_.add(cqGrid);
    }
    /**
--- 204,213 ----
      if (getGridGroup() != null)
        return;
!     addCqGroupeMaillage(new MvGridLayerGroup(_m, _ptModel, _eltModel));
!   }
!   
!   protected final void addCqGroupeMaillage(MvGridLayerGroup _g){
!     _g.setName("gpGrid");
!     gcDonnees_.add(_g);
    }
    /**
***************
*** 639,643 ****
        MvLayer l= (MvLayer)getCalqueActif();
        if ((l != null) && (!l.isSelectionPointEmpty())) {
!         getCqNumber().setSelectedPoint(l.getPtIdx());
        }
      } else if ("DISPLAY_INDEX_ALL_POINT".equals(com)) {
--- 642,646 ----
        MvLayer l= (MvLayer)getCalqueActif();
        if ((l != null) && (!l.isSelectionPointEmpty())) {
!         getCqNumber().setSelectedPoint(l.getSelectedPtIdx());
        }
      } else if ("DISPLAY_INDEX_ALL_POINT".equals(com)) {
***************
*** 658,662 ****
        MvLayer l= (MvLayer)getCalqueActif();
        if ((l != null) && (!l.isSelectionElementEmpty())) {
!         getCqElementNumber().setSelectedElement(l.getElementIdx());
        }
      } else if ("DISPLAY_INDEX_ALL_ELEMENT".equals(com)) {
--- 661,665 ----
        MvLayer l= (MvLayer)getCalqueActif();
        if ((l != null) && (!l.isSelectionElementEmpty())) {
!         getCqElementNumber().setSelectedElement(l.getSelectedElementIdx());
        }
      } else if ("DISPLAY_INDEX_ALL_ELEMENT".equals(com)) {

Index: MvFindDialog.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvFindDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MvFindDialog.java	1 Jun 2004 11:27:42 -0000	1.1
--- MvFindDialog.java	11 Jun 2004 16:39:45 -0000	1.2
***************
*** 147,151 ****
        GrBoite b=act_[i].getZoomOnSelected();
        if(b!=null)
!       visu_.getVueCalque().changeRepere(this, b);
      }
      if((cbEdit_.isEnabled()) && (cbEdit_.isSelected())){
--- 147,151 ----
        GrBoite b=act_[i].getZoomOnSelected();
        if(b!=null)
!       visu_.getVueCalque().changeRepere(this, b,0,0);
      }
      if((cbEdit_.isEnabled()) && (cbEdit_.isSelected())){