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

[Fudaa-cvs-commit] fudaa_devel/aide/src/prepro/template/doc_pdf - New directory

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

Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/template/doc_pdf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24256/doc_pdf

Log Message:
Directory /cvsroot/fudaa/fudaa_devel/aide/src/prepro/template/doc_pdf added to the repository

[Fudaa-cvs-commit] fudaa_devel/aide/src/prepro build.xml,1.3,1.4

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

Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23340

Modified Files:
	build.xml 
Log Message:


Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.xml	12 Feb 2004 16:41:21 -0000	1.3
--- build.xml	4 Mar 2004 12:14:36 -0000	1.4
***************
*** 1,166 ****
  <project name="prepro" default="build" basedir=".">
  
!   <!-- =================================================================== -->
!   <!-- Initialize the environment                                          -->
!   <!-- =================================================================== -->
  
! <target name=".initialisation">
!    <property name="project.dir" location="${basedir}"/>
!    <tstamp>
!    <format property="lastUpdate" locale="fr" pattern="yyyy-MM-dd "/>
!    </tstamp>
!    <property name="html.dir" location="html"/>
!     <property name="dist.dir" location="dist"/>
!     <property name="dist.web.dir" location="${dist.dir}/web"/>
!     <property name="dist.devel.dir" location="${dist.web.dir}/devel/"/>
!         
!    <property name="src.dir" location="src"/>
!    <property name="src.web.dir" location="src_web"/>
!    <property name="src.devel.dir" location="src_devel"/>
!       
!    <property name="init.ext" value=".xml"/>
!    <property name="dest.ext" value=".html"/>
!    <property name="tmp.ext" value=".tmp"/>
!       <property name="filelist" value="file.lst"/>
!    <property name="task.dir" location="template/task"/>
!    <property name="template.xsl" location="template/sort-menu.xsl"/>
!    <property name="xhtml2fo.xsl" location="template/fo/xhtml2fo.xsl"/>
!    <property name="base.xsl" location="template/template.xsl"/>
!    <property name="style.css" location="template/style.css"/>
  
!    <patternset id="sort.files" includes="**/alphabetique${dest.ext}"/>
!    <patternset id="style.files" includes="**/*${init.ext}" excludes="**/*.inc.xml,**/pdf/*.xml"/>
!    <patternset id="pdf.files" includes="**/pdf/*.xml"/>
!       <patternset id="xhtmlfo.files" includes="**/pdf/*.html"/>
!    
!    <patternset id="resources.files" includes="**/images/**" excludes="**/${filelist}"/>
  
!    <dependset>
!    <srcfileset	dir="${src.dir}" includes="**/*.dtd"/>
!    <srcfileset	dir="${basedir}/template/" includes="**/*.*" excludes="**/*.css"/>
!    <srcfilelist	dir="${basedir}" files="build.xml"/>
!    <targetfileset	dir="${html.dir}" includes="**/*${dest.ext},**/*.pdf" />
!    <targetfileset	dir="${dist.dir}" includes="**/*${dest.ext},**/*.pdf" />
! </dependset>
! </target>
  
! <target name="filelist" depends=".initialisation">
! <javac srcdir="${task.dir}" destdir="${task.dir}"
             includes="FileList.java" debug="on"/>
!     <taskdef  classname="FileList" name="fileList" classpath="${task.dir}"/>
!     <fileList file="${filelist}" includes="*.xml" excludes="*.inc.xml">
!     <dirset dir="${src.dir}" includes="?*/**" excludes="**/images/**,**/common/**,**/pdf/**"/>
!     </fileList>
! </target>
  
  
- <target name="pdf" depends=".initialisation">
-     <style destdir="${html.dir}" basedir="${src.dir}"
-       style="${base.xsl}" extension="${dest.ext}" force="true">    
-         <patternset refid="pdf.files"/>
-       </style>
-   <replace dir="${html.dir}" token='&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;'>
-   <patternset refid="xhtmlfo.files"/>
-   </replace>
-   
-     <style destdir="${html.dir}" basedir="${html.dir}"
-       style="${xhtml2fo.xsl}" extension=".fo" force="true">    
-         <patternset refid="xhtmlfo.files"/>
-       </style>  
-       
- </target>
  
  
! <target name="build_aide" depends="filelist">
!    <mkdir dir="${html.dir}"/>
!       <copy todir="${html.dir}">
!       <fileset dir="${src.dir}">
!         <patternset refid="resources.files"/>
!       </fileset>
!       </copy>
!       <copy file="${style.css}" todir="${html.dir}" />
!       
!    <style destdir="${html.dir}" basedir="${src.dir}"
        style="${base.xsl}" extension="${dest.ext}">
!               <patternset refid="style.files"/>    
!       <param name="lastUpdate" expression="${lastUpdate}"/>
!       <param name="destExt" expression="${dest.ext}"/>
!       </style>
!       <replace dir="${html.dir}" token='&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;'>
!   <patternset refid="sort.files"/>
! </replace>
!     <style destdir="${html.dir}" basedir="${html.dir}"
!       style="${template.xsl}" extension="${tmp.ext}">    
!         <patternset refid="sort.files"/>
!       </style>
!            <move todir="${html.dir}">
!       <fileset dir="${html.dir}">
!       <include name="**/**${tmp.ext}"/>
!       </fileset>
!       <mapper type="glob" from="*${tmp.ext}" to="*${dest.ext}"/>
!       </move>
! </target>
  
! <target name="build_devel" depends=".initialisation" description="Construit le dossier dist/web/devel">
! <mkdir dir="${dist.devel.dir}"/>
! <copy file="${style.css}" todir="${dist.devel.dir}" />
!       <copy todir="${dist.devel.dir}">
!       <fileset dir="${src.devel.dir}">
!         <patternset refid="resources.files"/>
!       </fileset>
!       </copy>
! <style destdir="${dist.devel.dir}" basedir="${src.devel.dir}"
        style="${base.xsl}" extension="${dest.ext}">
!               <patternset refid="style.files"/>    
!       <param name="lastUpdate" expression="${lastUpdate}"/>
!       <param name="destExt" expression="${dest.ext}"/>
!       </style>
! </target>
  
  
! <target name="build_web" depends="build_aide" description="Construit le dossier html et dist et genere les fichiers html">
! <mkdir dir="${dist.web.dir}"/>
! <copy todir="${dist.web.dir}/doc">
! <fileset dir="${html.dir}"/>
! </copy>
! <copy file="${style.css}" todir="${dist.web.dir}" />
!       <copy todir="${dist.web.dir}">
!       <fileset dir="${src.web.dir}">
!         <patternset refid="resources.files"/>
!       </fileset>
!       </copy>
! <style destdir="${dist.web.dir}" basedir="${src.web.dir}"
        style="${base.xsl}" extension="${dest.ext}">
!               <patternset refid="style.files"/>    
!       <param name="lastUpdate" expression="${lastUpdate}"/>
!       <param name="destExt" expression="${dest.ext}"/>
!       </style>
! </target>
! <target name="build" depends="build_aide,build_web,build_devel">
  
! </target>
  
      <target name="valideHtml" depends="build"
    description="valide les fichiers html dans le dossier ${dist.dir}">
!     <xmlvalidate	failonerror="no" lenient="false"  warn="yes"
                    classname="org.apache.xerces.parsers.SAXParser">
!         <fileset	dir="${dist.dir}" includes="**/*.html"/>
!         <dtd publicId="-//W3C//DTD XHTML 1.0 Strict//EN" location="template/dtd/xhtml1-strict.dtd"/>
!     </xmlvalidate>
!   </target>
  
  
! <target name="clean" description="Efface les dossiers html et dist" depends=".initialisation">
! <delete  dir="${html.dir}"/>
! <delete  dir="${dist.dir}"/>
! </target>
  
! <target name="buildDist" depends="build" description="Creer les archives pour la doc et pour le site dans dist/">
! <zip destfile="${dist.web.dir}/prepro_doc.zip">
! <zipfileset dir="${dist.web.dir}/doc" prefix="fudaa_prepro"/>
! </zip>
! <tar tarfile="${dist.dir}/prepro_web.tar.bz2"  compression="bzip2">
! <tarfileset dir="${dist.web.dir}" prefix="prepro_web"/>
! </tar>
! </target>
!     </project>
\ No newline at end of file
--- 1,188 ----
  <project name="prepro" default="build" basedir=".">
  
!     <!-- =================================================================== -->
!     <!-- Initialize the environment                                          -->
!     <!-- =================================================================== -->
  
!     <target name=".initialisation">
!         <property name="project.dir" location="${basedir}"/>
!         <tstamp>
!             <format property="lastUpdate" locale="fr" pattern="yyyy-MM-dd "/>
!         </tstamp>
!         <property name="html.dir" location="html"/>
!         <property name="dist.dir" location="dist"/>
!         <property name="dist.web.dir" location="${dist.dir}/web"/>
!         <property name="dist.devel.dir" location="${dist.web.dir}/devel/"/>
  
!         <property name="src.dir" location="src"/>
!         <property name="src.web.dir" location="src_web"/>
!         <property name="src.devel.dir" location="src_devel"/>
  
!         <property name="init.ext" value=".xml"/>
!         <property name="dest.ext" value=".html"/>
!         <property name="tmp.ext" value=".tmp"/>
!         <property name="filelist" value="file.lst"/>
!         <property name="task.dir" location="template/task"/>
!         <property name="template.xsl" location="template/sort-menu.xsl"/>
  
!         <property name="base.xsl" location="template/template.xsl"/>
!         <property name="style.css" location="template/style.css"/>
! 
!         <patternset id="sort.files" includes="**/alphabetique${dest.ext}"/>
!         <patternset id="style.files"
!                     includes="**/*${init.ext}"
!                     excludes="**/*.inc.xml,**/pdf/*.xml"
!          />
!         <patternset id="print.files" includes="**/pdf/*.xml"/>
! 
!         <patternset id="resources.files"
!                     includes="**/images/**"
!                     excludes="**/${filelist}"
!          />
! 
!         <dependset>
!             <srcfileset	dir="${src.dir}" includes="**/*.dtd"/>
!             <srcfileset dir="${basedir}/template/"
!                         includes="**/*.*"
!                         excludes="**/*.css"
!              />
!             <srcfilelist	dir="${basedir}" files="build.xml"/>
!             <targetfileset	dir="${html.dir}" includes="**/*${dest.ext}" />
!             <targetfileset	dir="${dist.dir}" includes="**/*${dest.ext}" />
!         </dependset>
!     </target>
! 
!     <target name="filelist" depends=".initialisation">
!         <javac srcdir="${task.dir}" destdir="${task.dir}"
             includes="FileList.java" debug="on"/>
!         <taskdef  classname="FileList" name="fileList" classpath="${task.dir}"/>
!         <fileList file="${filelist}" includes="*.xml" excludes="*.inc.xml">
!             <dirset dir="${src.dir}"
!                     includes="?*/**"
!                     excludes="**/images/**,**/common/**,**/pdf/**"
!              />
!         </fileList>
!     </target>
  
  
  
  
!     <target name="build_aide" depends="filelist">
!         <mkdir dir="${html.dir}"/>
!         <copy todir="${html.dir}">
!             <fileset dir="${src.dir}">
!                 <patternset refid="resources.files"/>
!             </fileset>
!         </copy>
!         <copy file="${style.css}" todir="${html.dir}" />
! 
!         <style destdir="${html.dir}" basedir="${src.dir}"
        style="${base.xsl}" extension="${dest.ext}">
!             <patternset refid="style.files"/>
!             <param name="lastUpdate" expression="${lastUpdate}"/>
!             <param name="destExt" expression="${dest.ext}"/>
!         </style>
!         <replace dir="${html.dir}"
!                  token='&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;'>
!             <patternset refid="sort.files"/>
!         </replace>
!         <style destdir="${html.dir}" basedir="${html.dir}"
!       style="${template.xsl}" extension="${tmp.ext}">
!             <patternset refid="sort.files"/>
!         </style>
!         <move todir="${html.dir}">
!             <fileset dir="${html.dir}">
!                 <include name="**/**${tmp.ext}"/>
!             </fileset>
!             <mapper type="glob" from="*${tmp.ext}" to="*${dest.ext}"/>
!         </move>
!     </target>
  
!     <target name="build_devel"
!             depends=".initialisation"
!             description="Construit le dossier dist/web/devel"
!      >
!         <mkdir dir="${dist.devel.dir}"/>
!         <copy file="${style.css}" todir="${dist.devel.dir}" />
!         <copy todir="${dist.devel.dir}">
!             <fileset dir="${src.devel.dir}">
!                 <patternset refid="resources.files"/>
!             </fileset>
!         </copy>
!         <style destdir="${dist.devel.dir}" basedir="${src.devel.dir}"
        style="${base.xsl}" extension="${dest.ext}">
!             <patternset refid="style.files"/>
!             <param name="lastUpdate" expression="${lastUpdate}"/>
!             <param name="destExt" expression="${dest.ext}"/>
!         </style>
!     </target>
  
  
!     <target name="build_web"
!             depends="build_aide"
!             description="Construit le dossier html et dist et genere les fichiers html"
!      >
!         <mkdir dir="${dist.web.dir}"/>
!         <copy todir="${dist.web.dir}/doc">
!             <fileset dir="${html.dir}"/>
!         </copy>
!         <copy file="${style.css}" todir="${dist.web.dir}" />
!         <copy todir="${dist.web.dir}">
!             <fileset dir="${src.web.dir}">
!                 <patternset refid="resources.files"/>
!             </fileset>
!         </copy>
!         <style destdir="${dist.web.dir}" basedir="${src.web.dir}"
        style="${base.xsl}" extension="${dest.ext}">
!             <patternset refid="style.files"/>
!             <param name="lastUpdate" expression="${lastUpdate}"/>
!             <param name="destExt" expression="${dest.ext}"/>
!         </style>
!     </target>
!     <target name="build" depends="build_aide,build_web,build_devel,print">
  
!     </target>
  
      <target name="valideHtml" depends="build"
    description="valide les fichiers html dans le dossier ${dist.dir}">
!         <xmlvalidate	failonerror="no" lenient="false"  warn="yes"
                    classname="org.apache.xerces.parsers.SAXParser">
!             <fileset	dir="${dist.dir}" includes="**/*.html"/>
!             <dtd publicId="-//W3C//DTD XHTML 1.0 Strict//EN"
!                  location="template/dtd/xhtml1-strict.dtd"
!              />
!         </xmlvalidate>
!     </target>
  
  
!     <target name="clean"
!             description="Efface les dossiers html et dist"
!             depends=".initialisation"
!      >
!         <delete  dir="${html.dir}"/>
!         <delete  dir="${dist.dir}"/>
!     </target>
  
!     <target name="buildDist"
!             depends="build"
!             description="Creer les archives pour la doc et pour le site dans dist/"
!      >
!         <zip destfile="${dist.web.dir}/prepro_doc.zip">
!             <zipfileset dir="${dist.web.dir}/doc" prefix="fudaa_prepro"/>
!         </zip>
!         <tar tarfile="${dist.dir}/prepro_web.tar.bz2"  compression="bzip2">
!             <tarfileset dir="${dist.web.dir}" prefix="prepro_web"/>
!         </tar>
!     </target>
! 
!     <target name="print" depends=".initialisation">
!         <style destdir="${html.dir}" basedir="${src.dir}"
!       style="${base.xsl}" extension="${dest.ext}" force="true">
!             <patternset refid="print.files"/>
!         </style>
!         <copy todir="${html.dir}/pdf">
!             <fileset dir="template/doc_pdf" includes="*.pdf"/>
!         </copy>
!     </target>
! 
! </project>
\ No newline at end of file

[Fudaa-cvs-commit] fudaa_devel/fudaa build.xml,1.11,1.12

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21884

Modified Files:
	build.xml 
Log Message:


Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** build.xml	12 Feb 2004 16:41:22 -0000	1.11
--- build.xml	4 Mar 2004 12:06:48 -0000	1.12
***************
*** 13,222 ****
  <project name="fudaa" default="build" basedir=".">
  
! <!--=========================================================================-->
! <!-- Initialisation des variables de base                                    -->
! <!--=========================================================================-->
! <target name=".initialisation01" >
!   <tstamp>
!     <format property="DATE" pattern="yyyy-MM-dd"/>
!   </tstamp>
!   <property name="fudaa.src.dir" location="src"/>
[...1626 lines suppressed...]
! <replacefilter token="deprecated-list.html"
!                value="deprecated-list_${projet}.html"
!  />
! <replacefilter token="help-doc.html" value="help-doc_${projet}.html"/>
! <replacefilter token="index-all.html" value="index-all_${projet}.html"/>
! <replacefilter token="overview-frame.html"
!                value="overview-frame_${projet}.html"
!  />
! <replacefilter token="overview-summary.html"
!                value="overview-summary_${projet}.html"
!  />
! <replacefilter token="overview-tree.html" value="overview-tree_${projet}.html"/>
! <replacefilter token="serialized-form.html"
!                value="serialized-form_${projet}.html"
!  />
! <replacefilter token="index-files" value="index-files_${projet}"/>
! <replacefilter token="@INDEX@" value="index.html"/>
! </replace>
  </target>
  

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

[<jm_...@us...>]

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

Modified Files:
	Hydraulique1dProjet.java 
Log Message:
Debut de la lecture de fichier optyca optimisé vis à vis de la RAM et par le
menu Fichier/Ouvrir.


Index: Hydraulique1dProjet.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Hydraulique1dProjet.java	5 Feb 2004 18:26:37 -0000	1.7
--- Hydraulique1dProjet.java	20 Feb 2004 19:30:23 -0000	1.8
***************
*** 75,81 ****
      enregistreSous(true);
    }
!   public boolean ouvrir(String nomFichier) {
      try {
!       if (nomFichier == null) {
          File fichier= chooseFile();
          if (fichier == null)
--- 75,81 ----
      enregistreSous(true);
    }
!   public boolean ouvrir(File fichier) {
      try {
! /*      if (nomFichier == null) {
          File fichier= chooseFile();
          if (fichier == null)
***************
*** 86,93 ****
        } else {
          fichier_= new File(nomFichier);
!       }
        DataInputStream FluxLu=
          new DataInputStream(
!           new BufferedInputStream(new FileInputStream(nomFichier)));
        // initialisation d'étude1d
        String versionEtude=
--- 86,94 ----
        } else {
          fichier_= new File(nomFichier);
!       }*/
!       fichier_= fichier;
        DataInputStream FluxLu=
          new DataInputStream(
!           new BufferedInputStream(new FileInputStream(fichier_)));
        // initialisation d'étude1d
        String versionEtude=

[Fudaa-cvs-commit] /fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret MascaretImplementation.java,1.13,1.14

[<jm_...@us...>]

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

Modified Files:
	MascaretImplementation.java 
Log Message:
Debut de la lecture de fichier optyca optimisé vis à vis de la RAM et par le
menu Fichier/Ouvrir.


Index: MascaretImplementation.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MascaretImplementation.java	5 Feb 2004 18:26:37 -0000	1.13
--- MascaretImplementation.java	20 Feb 2004 19:22:31 -0000	1.14
***************
*** 14,17 ****
--- 14,18 ----
  import java.awt.event.ActionEvent;
  import java.awt.print.PrinterJob;
+ import javax.swing.filechooser.FileFilter;
  import javax.swing.JComponent;
  import javax.swing.JFrame;
***************
*** 30,33 ****
--- 31,35 ----
  import org.fudaa.dodico.corba.hydraulique1d.IReseau;
  import org.fudaa.dodico.corba.hydraulique1d.IResultatsGeneraux;
+ import org.fudaa.dodico.corba.hydraulique1d.IResultatsTemporelSpatial;
  import org.fudaa.dodico.corba.hydraulique1d.casier.IGeometrieCasier;
  import org.fudaa.dodico.corba.mascaret.ICalculMascaret;
***************
*** 39,46 ****
--- 41,50 ----
  import org.fudaa.dodico.hydraulique1d.CGlobal;
  import org.fudaa.dodico.mascaret.CConversionHydraulique1d;
+ import org.fudaa.dodico.mascaret.DResultatsMascaret;
  import org.fudaa.dodico.objet.CDodico;
  import org.fudaa.ebli.impression.EbliFillePrevisualisation;
  import org.fudaa.ebli.impression.EbliMiseEnPageDialog;
  import org.fudaa.ebli.impression.EbliPageable;
+ import org.fudaa.ebli.filechooser.EbliFileChooser;
  import org.fudaa.ebli.ressource.EbliResource;
  import org.fudaa.fudaa.commun.FudaaBrowserControl;
***************
*** 60,63 ****
--- 64,68 ----
  import org.fudaa.fudaa.hydraulique1d.Hydraulique1dProjet;
  import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
+ import org.fudaa.fudaa.hydraulique1d.ihmhelper.Hydraulique1dIHM_GraphesResultats;
  import org.fudaa.fudaa.hydraulique1d.ihmhelper.Hydraulique1dIHMRepository;
  import org.fudaa.fudaa.hydraulique1d.reseau.Hydraulique1dReseauFrame;
***************
*** 76,79 ****
--- 81,86 ----
  import com.memoire.bu.BuDialogMessage;
  import com.memoire.bu.BuDialogWarning;
+ import com.memoire.bu.BuFileChooser;
+ import com.memoire.bu.BuFileFilter;
  import com.memoire.bu.BuHelpFrame;
  import com.memoire.bu.BuInformationsDocument;
***************
*** 454,458 ****
          resultatsGeneraux();
        } else if (action.equals("GRAPHES_RESULTATS")) {
!         graphesResultats();
        } else if (action.equals("VISU_COND_INIT")) {
          visuConditionsInitiales();
--- 461,465 ----
          resultatsGeneraux();
        } else if (action.equals("GRAPHES_RESULTATS")) {
!         graphesResultats(null);
        } else if (action.equals("VISU_COND_INIT")) {
          visuConditionsInitiales();
***************
*** 977,988 ****
    }
    protected void ouvrir(String arg) {
!     fermer();
      IUsine usine= CDodico.findUsine();
-     usine.setEventMuet(true);
      //NOTE: pour eviter d'envoyer des evt
      IEtude1d ietude1dTmp = usine.creeHydraulique1dEtude1d();
      projet_.setEtude1d(ietude1dTmp);
      projet_.setIhmRepository(ihmP_);
!     if (!projet_.ouvrir(arg)) {
        projet_.setEtude1d(ietude1d_);
        return;
--- 984,1033 ----
    }
    protected void ouvrir(String arg) {
!     File fichier;
!     if (arg == null) {
!       BuFileFilter[] fileFilters = new BuFileFilter[2];
!       fileFilters[0] = new BuFileFilter("opt", "Résultat calcul au format optyca");
!       fileFilters[1] = new BuFileFilter("masc", "Etude Fudaa-Mascaret");
!       fichier = ouvrirFileChooser("Ouvrir", fileFilters, false);
!       if (fichier == null)
!         return;
!       fermer();
!       // fichier optyca
!       if (getFileFilter() == fileFilters[0]) {
!         try {
! /*          IResultatsTemporelSpatial res =
!               CConversionHydraulique1d.
!               convertirResultatsOpt2ResultatsTemporelSpatial(
!               DResultatsMascaret.litResultatsOPT(fichier, 1000000000));
!           graphesResultats(res);*/
!           DResultatsMascaret.litResultatsTemporelSpatial(fichier, 1000000000, DResultatsMascaret.OPTYCA);
!         }
!         catch (IOException ex) {
!           System.out.println("Problème lecture optyca"+ex.getLocalizedMessage());
!           ex.printStackTrace();
!         }
! 
!         return;
!       } else { // Etude Fudaa-Mascaret
!         getMainMenuBar().addRecentFile(fichier.getAbsolutePath(), "mascaret");
!       }
! 
!     } else {
!       fermer();
!       fichier = new File(arg);
!     }
! 
! 
! 
! 
! 
! 
      IUsine usine= CDodico.findUsine();
      //NOTE: pour eviter d'envoyer des evt
+     usine.setEventMuet(true);
      IEtude1d ietude1dTmp = usine.creeHydraulique1dEtude1d();
      projet_.setEtude1d(ietude1dTmp);
      projet_.setIhmRepository(ihmP_);
!     if (!projet_.ouvrir(fichier)) {
        projet_.setEtude1d(ietude1d_);
        return;
***************
*** 1020,1023 ****
--- 1065,1099 ----
      usine.setEventMuet(false);
    }
+   private BuFileChooser fileChooser_;
+   protected File ouvrirFileChooser(
+       String _titre,
+       BuFileFilter[] _filtres,
+       boolean _saveDialog) {
+    fileChooser_= new EbliFileChooser(true);
+    fileChooser_.setFileHidingEnabled(true);
+    fileChooser_.setMultiSelectionEnabled(false);
+    fileChooser_.setDialogTitle(_titre);
+    if (_filtres != null) {
+      for (int i = 0; i < _filtres.length; i++) {
+        fileChooser_.addChoosableFileFilter(_filtres[i]);
+      }
+    }
+    int returnVal=
+      _saveDialog
+        ? fileChooser_.showSaveDialog(getFrame())
+        : fileChooser_.showOpenDialog(getFrame());
+    if (returnVal == BuFileChooser.APPROVE_OPTION) {
+      File f= fileChooser_.getSelectedFile();
+      return f;
+    } else
+      return null;
+   }
+   protected FileFilter getFileFilter() {
+     if (fileChooser_ != null) {
+       return fileChooser_.getFileFilter();
+     }
+     return null;
+   }
+ 
    protected void fermer() {
      if (FudaaParamChangeLog.CHANGE_LOG.isDirty()) {
***************
*** 1270,1275 ****
      ihmP_.RESULTATS_GENERAUX().editer();
    }
!   protected void graphesResultats() {
!     ihmP_.GRAPHES_RESULTATS().editer();
    }
    protected void visuConditionsInitiales() {
--- 1346,1351 ----
      ihmP_.RESULTATS_GENERAUX().editer();
    }
!   protected void graphesResultats(IResultatsTemporelSpatial res) {
!     ihmP_.GRAPHES_RESULTATS().editer(res);
    }
    protected void visuConditionsInitiales() {

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

[<jm_...@us...>]

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

Modified Files:
	Hydraulique1dIHM_GraphesResultats.java 
Log Message:
Debut de la lecture de fichier optyca optimisé vis à vis de la RAM et par le
menu Fichier/Ouvrir.


Index: Hydraulique1dIHM_GraphesResultats.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_GraphesResultats.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Hydraulique1dIHM_GraphesResultats.java	25 Nov 2003 10:13:47 -0000	1.5
--- Hydraulique1dIHM_GraphesResultats.java	20 Feb 2004 19:21:46 -0000	1.6
***************
*** 8,24 ****
   */
  package org.fudaa.fudaa.hydraulique1d.ihmhelper;
! import org.fudaa.fudaa.commun.*;
! import org.fudaa.dodico.corba.hydraulique1d.*;
! import org.fudaa.dodico.corba.evenement.*;
! import org.fudaa.dodico.corba.objet.*;
! import com.memoire.bu.*;
! import org.fudaa.ebli.ressource.*;
! import org.fudaa.fudaa.hydraulique1d.*;
! import org.fudaa.fudaa.hydraulique1d.tableau.*;
! import org.fudaa.fudaa.hydraulique1d.editor.*;
! import java.awt.event.*;
! import javax.swing.*;
! import java.beans.*;
! import java.util.*;
  /******************************************************************************/
  /*                                                                            */
--- 8,19 ----
   */
  package org.fudaa.fudaa.hydraulique1d.ihmhelper;
! import java.io.File;
! import javax.swing.JComponent;
! import org.fudaa.dodico.corba.hydraulique1d.IEtude1d;
! import org.fudaa.dodico.corba.hydraulique1d.IResultatsTemporelSpatial;
! import org.fudaa.fudaa.hydraulique1d.Hydraulique1dBaseApplication;
! import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
! import org.fudaa.fudaa.hydraulique1d.editor.Hydraulique1dGraphesResultatsEditor;
! import com.memoire.bu.BuAssistant;
  /******************************************************************************/
  /*                                                                            */
***************
*** 36,39 ****
--- 31,37 ----
    }
    public void editer() {
+     editer(null);
+   }
+   public void editer(IResultatsTemporelSpatial res) {
      if (edit_ == null) {
        edit_= new Hydraulique1dGraphesResultatsEditor();
***************
*** 44,59 ****
          ass.addEmitters(edit_);
      }
!     edit_.setObject(etude_.donneesHydro());
!     edit_.setObject(etude_.reseau());
!     if (etude_.reseau().casiers().length > 0) {
!       edit_.setResultatsCasier(
!         etude_.resultatsGeneraux().resultatsTemporelCasier());
!       edit_.setResultatsLiaison(
!         etude_.resultatsGeneraux().resultatsTemporelLiaison());
      } else {
!       edit_.setResultatsCasier(null);
!       edit_.setResultatsLiaison(null);
      }
-     edit_.setObject(etude_.resultatsGeneraux().resultatsTemporelSpatial());
      edit_.show();
    }
--- 42,62 ----
          ass.addEmitters(edit_);
      }
!     if (res == null) {
!       edit_.setObject(etude_.donneesHydro());
!       edit_.setObject(etude_.reseau());
!       if (etude_.reseau().casiers().length > 0) {
!         edit_.setResultatsCasier(
!             etude_.resultatsGeneraux().resultatsTemporelCasier());
!         edit_.setResultatsLiaison(
!             etude_.resultatsGeneraux().resultatsTemporelLiaison());
!       }
!       else {
!         edit_.setResultatsCasier(null);
!         edit_.setResultatsLiaison(null);
!       }
!       edit_.setObject(etude_.resultatsGeneraux().resultatsTemporelSpatial());
      } else {
!       edit_.setObject(res);
      }
      edit_.show();
    }

[Fudaa-cvs-commit] /fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor Hydraulique1dGraphesResultatsEditor.java,1.8,1.9

[<jm_...@us...>]

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

Modified Files:
	Hydraulique1dGraphesResultatsEditor.java 
Log Message:
Debut de la lecture de fichier optyca optimisé vis à vis de la RAM et par le
menu Fichier/Ouvrir.


Index: Hydraulique1dGraphesResultatsEditor.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Hydraulique1dGraphesResultatsEditor.java	11 Dec 2003 12:43:17 -0000	1.8
--- Hydraulique1dGraphesResultatsEditor.java	20 Feb 2004 19:21:46 -0000	1.9
***************
*** 201,213 ****
        return delegueImpression_.getDefaultEbliPageFormat();
      }
!   
      public int getNumberOfPages() {
        return 1;
      }
!   
      public PageFormat getPageFormat(int _i) throws IndexOutOfBoundsException {
        return delegueImpression_.getPageFormat(_i);
      }
!   
      public Printable getPrintable(int _i) throws IndexOutOfBoundsException {
        return delegueImpression_.getPrintable(_i);
--- 201,213 ----
        return delegueImpression_.getDefaultEbliPageFormat();
      }
! 
      public int getNumberOfPages() {
        return 1;
      }
! 
      public PageFormat getPageFormat(int _i) throws IndexOutOfBoundsException {
        return delegueImpression_.getPageFormat(_i);
      }
! 
      public Printable getPrintable(int _i) throws IndexOutOfBoundsException {
        return delegueImpression_.getPrintable(_i);
***************
*** 342,346 ****
    }
    protected void enableLaisse() {
!     if ((donnneHyd_.laisses() == null) || (donnneHyd_.laisses().length == 0)) {
        cbLaisse_.setEnabled(false);
        cbLaisse_.setSelected(false);
--- 342,346 ----
    }
    protected void enableLaisse() {
!     if ((donnneHyd_ == null) || (donnneHyd_.laisses() == null) || (donnneHyd_.laisses().length == 0)) {
        cbLaisse_.setEnabled(false);
        cbLaisse_.setSelected(false);
***************
*** 458,477 ****
      int[] indicesVar,
      int[] indicesPasTps) {
-     int nbSec= resBief.abscissesSections().length;
      int nbCourbe= indicesVar.length * indicesPasTps.length;
!     double[][] res= new double[nbCourbe + 1][nbSec];
      // l'abscisse : les sections
      res[0]= resBief.abscissesSections();
      // les ordonnées
      double[][][] vals= resBief.valeursVariables();
!     for (int i= 0; i < nbSec; i++) {
!       int indiceCourbe= 1;
!       for (int j= 0; j < indicesVar.length; j++) {
!         for (int k= 0; k < indicesPasTps.length; k++) {
!           //int iVar = indicesVar[j]; inutile
!           int iPasTps= indicesPasTps[k];
!           res[indiceCourbe][i]= vals[indicesVar[j]][indicesPasTps[k]][i];
!           indiceCourbe++;
!         }
        }
      }
--- 458,472 ----
      int[] indicesVar,
      int[] indicesPasTps) {
      int nbCourbe= indicesVar.length * indicesPasTps.length;
!     double[][] res= new double[nbCourbe + 1][];
      // l'abscisse : les sections
      res[0]= resBief.abscissesSections();
      // les ordonnées
      double[][][] vals= resBief.valeursVariables();
!     int indiceCourbe= 1;
!     for (int j= 0; j < indicesVar.length; j++) {
!       for (int k= 0; k < indicesPasTps.length; k++) {
!         res[indiceCourbe]= vals[indicesVar[j]][indicesPasTps[k]];
!         indiceCourbe++;
        }
      }

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

[<jm_...@us...>]

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

Modified Files:
	DResultatsMascaret.java 
Log Message:
Debut de la lecture de fichier optyca optimisé vis à vis de la RAM et par le
menu Fichier/Ouvrir.


Index: DResultatsMascaret.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/DResultatsMascaret.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DResultatsMascaret.java	25 Nov 2003 10:11:42 -0000	1.5
--- DResultatsMascaret.java	20 Feb 2004 19:20:18 -0000	1.6
***************
*** 28,35 ****
--- 28,38 ----
    extends DResultats
    implements IResultatsMascaretOperations {
+   public final static int RUBENS=0;
+   public final static int OPTYCA=1;
    private static boolean DEBUG= "yes".equals(System.getProperty("fudaa.debug"));
    private SResultatsLIS resultsLIS_;
    private SResultatsLIS resultsDAMOC_;
    private SResultatsOPT resultsOPT_;
+   private SResultatsTemporelSpatial resultatsTemporelSpatial_;
    private SResultatsRUB resultsRUB_;
    private SResultatsEcran resultsEcran_;
***************
*** 334,337 ****
--- 337,520 ----
      }
    }
+   //******************** les résultats temporels et spatials ******************
+   public SResultatsTemporelSpatial resultatsTemporelSpatial() {
+     return resultatsTemporelSpatial_;
+   }
+   public void resultatsTemporelSpatial(SResultatsTemporelSpatial _resultatsTemporelSpatial) {
+     resultatsTemporelSpatial_= _resultatsTemporelSpatial;
+   }
+   public static SResultatsTemporelSpatial litResultatsTemporelSpatial(File fichier, double tailleMax, int format)
+      throws IOException {
+     SResultatsTemporelSpatial results= new SResultatsTemporelSpatial();
+     long tailleMaxOctet= Math.round(tailleMax * 1024);
+     long tailleFichier= fichier.length();
+     if (tailleFichier > tailleMaxOctet) {
+       System.out.println(
+           "Fichier "
+           + fichier.getName()
+           + " trop volumineux : "
+           + (tailleFichier / 1024)
+           + "Ko");
+       return results;
+     }
+     System.out.println("Lecture de " + fichier.getName());
+     switch (format) {
+       case RUBENS:
+         return litResultatsTemporelSpatialRubens(fichier);
+       case OPTYCA:
+         return litResultatsTemporelSpatialOptyca(fichier);
+       default: throw new IllegalArgumentException("format argument :"+format);
+     }
+   }
+   public static SResultatsTemporelSpatial litResultatsTemporelSpatialRubens(File fichier)
+      throws IOException {
+ 
+    return null;
+ 
+   }
+   public static SResultatsTemporelSpatial litResultatsTemporelSpatialOptyca(File fichier)
+      throws IOException {
+ 
+     SResultatsTemporelSpatial results = new SResultatsTemporelSpatial();
+ 
+     BufferedReader fluxLu= new BufferedReader(new FileReader(fichier));
+     String uneChaine;
+     System.out.println("Début 1ere passe");
+     int nbLigne=0;
+     while (!(uneChaine= fluxLu.readLine()).equals("[variables]")) {nbLigne++;}
+     Vector lesVariables= new Vector();
+     while (!(uneChaine= fluxLu.readLine()).equals("[resultats]")) {
+       nbLigne++;
+       StringTokenizer st= new StringTokenizer(uneChaine, ";");
+       SResultatsVariable laVariable= new SResultatsVariable();
+       laVariable.nomLong= st.nextToken().replace('"', ' ').trim();
+       laVariable.nomCourt= st.nextToken().replace('"', ' ').trim();
+       laVariable.unite= st.nextToken().replace('"', ' ').trim();
+       laVariable.nbDecimal=
+           Integer.parseInt(st.nextToken().replace('"', ' ').trim());
+       lesVariables.addElement(laVariable);
+     }
+     int nbVariable = lesVariables.size();
+     results.variables= new SResultatsVariable[nbVariable];
+     lesVariables.copyInto(results.variables);
+     lesVariables = null;
+ 
+     Vector nbSectionParBief = new Vector();
+     int nbPasTemps = 0;
+     int nbBief = 0;
+     boolean resultatSpatial = true;
+ 
+     double tPre= Double.NEGATIVE_INFINITY;
+     double t;
+     String codeBiefPre= "";
+     String codeBief;
+     String codeSection;
+     int compteurPasTps=0;
+     int compteurSection=0;
+     int compteurBief=0;
+     while ((uneChaine= fluxLu.readLine()) != null) {
+       nbLigne++;
+       compteurSection++;
+       // interprétation de la ligne
+       StringTokenizer st= new StringTokenizer(uneChaine, ";\"");
+       t= Double.parseDouble(st.nextToken());
+       codeBief= st.nextToken();
+       System.out.println("st.countTokens() - nbVariable = "+(st.countTokens() - nbVariable));
+       resultatSpatial = (st.countTokens() > nbVariable);
+ 
+       if (tPre != t) {
+         // changement de pas de temps => changement de bief
+         compteurPasTps++;
+         nbSectionParBief.add(new Integer(compteurSection));
+         compteurBief++;
+         nbBief=compteurBief;
+         compteurSection=0;
+         compteurBief = 0;
+         nbSectionParBief = new Vector();
+       } else if (!codeBief.equals(codeBiefPre)) { // changement de bief
+         nbSectionParBief.add(new Integer(compteurSection));
+         compteurBief++;
+         compteurSection=0;
+       }
+       tPre= t;
+       codeBiefPre= codeBief;
+     }
+     fluxLu.close();
+     compteurSection++;
+     nbSectionParBief.add(new Integer(compteurSection));
+     nbPasTemps = compteurPasTps;
+     System.out.println("Fin première passe");
+     System.out.println("nbPasTemps="+nbPasTemps);
+     System.out.println("nbBief="+nbBief);
+     System.out.println("nbSectionParBief="+nbSectionParBief);
+     System.out.println("nbVariable="+nbVariable);
+     System.out.println("resultatSpatial="+resultatSpatial);
+     // allocation
+     results.pasTemps = new double[nbPasTemps];
+     results.resultatsBiefs = new SResultatsTemporelSpatialBief[nbBief];
+     for (int i = 0; i < nbBief; i++) {
+       results.resultatsBiefs[i] = new SResultatsTemporelSpatialBief();
+       int nbSection = ((Integer)nbSectionParBief.get(i)).intValue();
+       results.resultatsBiefs[i].abscissesSections = new double[nbSection];
+       results.resultatsBiefs[i].valeursVariables = new double[nbVariable][nbPasTemps][nbSection];
+     }
+ 
+     System.out.println("Début deuxième passe");
+     fluxLu= new BufferedReader(new FileReader(fichier));
+     nbLigne =0;
+     while (!(uneChaine= fluxLu.readLine()).equals("[variables]")) {
+       nbLigne++;
+     }
+     while (!(uneChaine= fluxLu.readLine()).equals("[resultats]")) {
+       nbLigne++;
+     }
+ 
+     compteurPasTps=-1;
+     compteurSection=-1;
+     compteurBief=-1;
+     tPre= Double.NEGATIVE_INFINITY;
+     double absc;
+     codeBiefPre= "";
+     while ((uneChaine= fluxLu.readLine()) != null) {
+       nbLigne++;
+       compteurSection++;
+       // interprétation de la ligne
+       StringTokenizer st= new StringTokenizer(uneChaine, ";\"");
+       t= Double.parseDouble(st.nextToken());
+       codeBief= st.nextToken();
+       if (tPre != t) {
+         // changement de pas de temps
+         compteurPasTps++;
+         compteurBief++;
+         compteurSection=0;
+         compteurBief = 0;
+       } else if (!codeBief.equals(codeBiefPre)) {
+         // changement de bief
+         compteurBief++;
+         compteurSection=0;
+       }
+       if (resultatSpatial) {
+         codeSection = st.nextToken();
+         absc = Double.parseDouble(st.nextToken());
+       } else {
+         codeSection="";
+         absc=0;
+       }
+       results.pasTemps[compteurPasTps] =t;
+       results.resultatsBiefs[compteurBief].abscissesSections[compteurSection] = absc;
+       for (int i= 0; i < nbVariable; i++) {
+         try {
+           double val = Double.parseDouble(st.nextToken());
+           results.resultatsBiefs[compteurBief].valeursVariables[i][compteurPasTps][compteurSection]=val;
+         } catch (NumberFormatException ex) {
+           results.resultatsBiefs[compteurBief].valeursVariables[i][compteurPasTps][compteurSection]= Double.POSITIVE_INFINITY;
+         }
+       }
+       tPre= t;
+       codeBiefPre= codeBief;
+     }
+     return results;
+   }
+   //******************** FIN les résultats temporels et spatials ******************
    //************************ REP ***********************************
    public SParametresREP resultatsREP() {
***************
*** 461,465 ****
          System.out.println("lecture simple fait en : "+( System.currentTimeMillis()-orig)+" millisec");
          System.out.println();
!   
          orig = System.currentTimeMillis();
          res = litFichier(fichier, 30, true);
--- 644,648 ----
          System.out.println("lecture simple fait en : "+( System.currentTimeMillis()-orig)+" millisec");
          System.out.println();
! 
          orig = System.currentTimeMillis();
          res = litFichier(fichier, 30, true);

[Fudaa-cvs-commit] /fudaa_devel/dodico/idl/code mascaret.idl,1.9,1.10

[<jm_...@us...>]

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

Modified Files:
	mascaret.idl 
Log Message:
Debut de la lecture de fichier optyca optimisé vis à vis de la RAM et par le
menu Fichier/Ouvrir.


Index: mascaret.idl
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/idl/code/mascaret.idl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mascaret.idl	5 Feb 2004 18:26:36 -0000	1.9
--- mascaret.idl	20 Feb 2004 19:20:17 -0000	1.10
***************
*** 775,780 ****
        VSResultatsVariable variables;       // listes des variables definit en plus du temps, code bief, code section, abscisse
        VSResultatPasTemps resultatsPasTemps; // les resultats par pas de temps
      };
! //--------- FIN CONTENU DU FICHIER LIGNE D'EAU INITIALE FORMAT OPTYCA -------------------
  //++++++++++++++++++++++++++++++++ Listing  : LIS +++++++++++++++++++++++++++++++++++++++
      struct SResultatsLIS {
--- 775,794 ----
        VSResultatsVariable variables;       // listes des variables definit en plus du temps, code bief, code section, abscisse
        VSResultatPasTemps resultatsPasTemps; // les resultats par pas de temps
+ 
      };
! 
!     struct SResultatsTemporelSpatialBief {
!       vvvreel valeursVariables; // valeursVariables[iVariable][iPasTemps][iSection]
!       vreel   abscissesSections;
!     };
!     typedef sequence <SResultatsTemporelSpatialBief> VSResultatsTemporelSpatialBief;
! 
!     struct SResultatsTemporelSpatial {
!       VSResultatsVariable variables;       // listes des variables definit en plus du temps, code bief, code section, abscisse
!       vreel pasTemps;
!       VSResultatsTemporelSpatialBief resultatsBiefs;
!     };
! 
! //--------- FIN CONTENU DU FICHIER FORMAT OPTYCA ------------------------------
  //++++++++++++++++++++++++++++++++ Listing  : LIS +++++++++++++++++++++++++++++++++++++++
      struct SResultatsLIS {
***************
*** 821,824 ****
--- 835,842 ----
      // Fichier Resultat du calcul format optyca
      attribute SResultatsOPT resultatsOPT;
+ 
+     // Fichier Resultats temporel et spatial du calcul
+     attribute SResultatsTemporelSpatial resultatsTemporelSpatial;
+ 
      // Fichier Resultat du calcul format Rubens (binaire lidoNP ou ASCII lidoP)
      attribute SResultatsRUB  resultatsRUB;

[Fudaa-cvs-commit] /fudaa_devel/dodico/src/org/fudaa/dodico/mascaret CConversionHydraulique1d.java,1.12,1.13

[<jm_...@us...>]

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

Modified Files:
	CConversionHydraulique1d.java 
Log Message:
Correction bug des apport de débit dans les casiers


Index: CConversionHydraulique1d.java
===================================================================
RCS file: /cvsroot/fudaa//fudaa_devel/dodico/src/org/fudaa/dodico/mascaret/CConversionHydraulique1d.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CConversionHydraulique1d.java	5 Feb 2004 18:26:37 -0000	1.12
--- CConversionHydraulique1d.java	13 Feb 2004 16:42:45 -0000	1.13
***************
*** 942,945 ****
--- 942,972 ----
        }
      }
+     Vector apportCasier = new Vector();
+     class NumLoiNumCasier {
+       int numCasier;
+       int numLoi;
+     }
+     ICasier[] icasiers= ireseau.casiers();
+     for (int i = 0; i < icasiers.length; i++) {
+       ICasier ic = icasiers[i];
+       if (ic.loiRattachee() != null)  {
+         NumLoiNumCasier numLoiCasier = new NumLoiNumCasier();
+         numLoiCasier.numCasier = i+1;
+         numLoiCasier.numLoi = idonneesHydrau.getIndiceLoi(ic.loiRattachee())+1;
+         apportCasier.add(numLoiCasier);
+       }
+     }
+     if (apportCasier.size() > 0)  {
+       int taille = apportCasier.size();
+       paramMas.apportCasier= new SParametresApportCasier();
+       paramMas.apportCasier.nbApportPluie = taille;
+       paramMas.apportCasier.numCasier = new int[taille];
+       paramMas.apportCasier.numLoi = new int[taille];
+       for (int i= 0; i < taille; i++) {
+         NumLoiNumCasier numLoiCasier =(NumLoiNumCasier)apportCasier.get(i);
+         paramMas.apportCasier.numCasier[i]=numLoiCasier.numCasier;
+         paramMas.apportCasier.numLoi[i]=numLoiCasier.numLoi;
+       }
+     }
      if (QApport.size() > 0) {
        paramMas.debitsApports= new SParametresQApport();

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

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

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

Modified Files:
	VecteurDoubleMNTPoint.java 
Log Message:
Correction appel erronée a methode inexistante


Index: VecteurDoubleMNTPoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/VecteurDoubleMNTPoint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VecteurDoubleMNTPoint.java	25 Nov 2003 10:11:44 -0000	1.4
--- VecteurDoubleMNTPoint.java	12 Feb 2004 16:56:38 -0000	1.5
***************
*** 52,56 ****
        return false;
      }
!     _p.setLocation(
        vecteur_.elementAt(i),
        vecteur_.elementAt(i + 1),
--- 52,56 ----
        return false;
      }
!     _p.setXYZ(
        vecteur_.elementAt(i),
        vecteur_.elementAt(i + 1),

[Fudaa-cvs-commit] fudaa_devel/dodico build.xml,1.11,1.12

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

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

Modified Files:
	build.xml 
Log Message:
Maj


Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** build.xml	19 Dec 2003 12:12:00 -0000	1.11
--- build.xml	12 Feb 2004 16:41:22 -0000	1.12
***************
*** 56,59 ****
--- 56,60 ----
    <property name="build.compiler.pedantic" value="false"/>
    <property name="build.compiler.target" value="1.3"/>
+   <property name="build.compiler.source" value="1.3"/>
    <property name="build.compiler.nowarn" value="off"/>
    <property name="build.compiler.debug" value="off"/>
***************
*** 472,476 ****
  ---DODICO: verifications des dependances dans ${dodico.classes.dir} ----
  </echo>
!   <depend srcdir="${dodico.src.dir}:${ctulu.classes.dir}"
    destdir="${dodico.classes.dir}" cache="${java.io.tmpdir}/dodicodepcache"/>
    <echo>
--- 473,478 ----
  ---DODICO: verifications des dependances dans ${dodico.classes.dir} ----
  </echo>
!   <depend srcdir="${dodico.src.dir}:${ctulu.classes.dir}" closure="yes"
!   classpath="${dodico.classpath}"
    destdir="${dodico.classes.dir}" cache="${java.io.tmpdir}/dodicodepcache"/>
    <echo>
***************
*** 481,484 ****
--- 483,487 ----
      classpath="${dodico.classpath}"
      target="${build.compiler.target}"
+     source="${build.compiler.source}"
      failonerror="${build.compiler.failonerror}"
      debug="${build.compiler.debug}"
***************
*** 550,553 ****
--- 553,557 ----
      destdir="${dodico.classes.dir}"
      target="${build.compiler.target}"
+     source="${build.compiler.source}"
      failonerror="${build.compiler.failonerror}"
      classpath="${dodico.classpath}"

[Fudaa-cvs-commit] fudaa_devel/ctulu build.xml,1.6,1.7

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

Update of /cvsroot/fudaa/fudaa_devel/ctulu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8750/ctulu

Modified Files:
	build.xml 
Log Message:
Maj


Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** build.xml	19 Dec 2003 12:12:00 -0000	1.6
--- build.xml	12 Feb 2004 16:41:21 -0000	1.7
***************
*** 43,46 ****
--- 43,47 ----
    <property name="build.compiler.pedantic" value="false"/>
    <property name="build.compiler.target" value="1.3"/>
+   <property name="build.compiler.source" value="1.3"/>
    <property name="build.compiler.nowarn" value="off"/>
    <property name="build.compiler.debug" value="off"/>
***************
*** 240,243 ****
--- 241,246 ----
  </echo>
    <depend srcdir="${ctulu.src.dir}" destdir="${ctulu.classes.dir}"
+   closure="yes"
+   classpath="${ctulu.classpath}"
    cache="${java.io.tmpdir}/ctuludepcache"/>
    <!-- compilation-->
***************
*** 249,252 ****
--- 252,256 ----
    classpath="${ctulu.classpath}"
    target="${build.compiler.target}"
+   source="${build.compiler.source}"
    failonerror="${build.compiler.failonerror}"
    debug="${build.compiler.debug}"
***************
*** 308,311 ****
--- 312,316 ----
      classpath="${ctulu.classpath}"
      target="${build.compiler.target}" failonerror="${build.compiler.failonerror}"
+     source="${build.compiler.source}"
      debug="${build.compiler.debug}"  depend="${build.compiler.depend}"
      optimize="${build.compiler.optimize}" deprecation="${build.compiler.deprecation}"

[Fudaa-cvs-commit] fudaa_devel/ctulu/src/com/memoire/bu BuCommonImplementation.java,1.3,1.4

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

Update of /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/bu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8750/ctulu/src/com/memoire/bu

Modified Files:
	BuCommonImplementation.java 
Log Message:
Maj


Index: BuCommonImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ctulu/src/com/memoire/bu/BuCommonImplementation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BuCommonImplementation.java	6 Oct 2003 07:34:15 -0000	1.3
--- BuCommonImplementation.java	12 Feb 2004 16:41:21 -0000	1.4
***************
*** 521,525 ****
  	  _url=_url.substring(0,i)+"-"+ll+_url.substring(i);
        }
!       System.err.println("URL = "+_url);
        displayURL(_url);
      }
--- 521,525 ----
  	  _url=_url.substring(0,i)+"-"+ll+_url.substring(i);
        }
! //      System.err.println("URL = "+_url);
        displayURL(_url);
      }
***************
*** 566,570 ****
      }
  
!     System.err.println("PARAM = "+param);
      contextHelp(param);
    }
--- 566,570 ----
      }
  
! //    System.err.println("PARAM = "+param);
      contextHelp(param);
    }
***************
*** 632,640 ****
  		if(!"".equals(ancre)) param+="#"+ancre;
  	      }
! 	      else
! 		System.err.println("NOT NAMED = "+focus);
  	    }
  
! 	    System.err.println("PARAM = "+param);
  	    param="("+param+")";
  
--- 632,640 ----
  		if(!"".equals(ancre)) param+="#"+ancre;
  	      }
! //	      else
! //		System.err.println("NOT NAMED = "+focus);
  	    }
  
! 	   // System.err.println("PARAM = "+param);
  	    param="("+param+")";
  

[Fudaa-cvs-commit] fudaa_devel/fudaa build.xml,1.10,1.11

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8750/fudaa

Modified Files:
	build.xml 
Log Message:
Maj


Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** build.xml	19 Dec 2003 12:12:00 -0000	1.10
--- build.xml	12 Feb 2004 16:41:22 -0000	1.11
***************
*** 61,64 ****
--- 61,65 ----
    <property name="build.compiler.pedantic" value="false"/>
    <property name="build.compiler.target" value="1.3"/>
+   <property name="build.compiler.source" value="1.3"/>
    <property name="build.compiler.nowarn" value="off"/>
    <property name="build.compiler.debug" value="off"/>
***************
*** 343,346 ****
--- 344,349 ----
    destdir="${fudaa.classes.dir}"
    cache="${java.io.tmpdir}/fudaadepcache"
+   closure="yes"
+   classpath="${fudaa.classpath}"
    />
    <echo>
***************
*** 351,354 ****
--- 354,358 ----
      classpath="${fudaa.classpath}"
      target="${build.compiler.target}"
+     source="${build.compiler.source}"
      failonerror="${build.compiler.failonerror}"
      debug="${build.compiler.debug}"
***************
*** 363,366 ****
--- 367,371 ----
      classpath="${fudaa.classpath}"
      target="${build.compiler.target}"
+     source="${build.compiler.source}"
      failonerror="${build.compiler.failonerror}"
      debug="${build.compiler.debug}"
***************
*** 397,400 ****
--- 402,406 ----
      classpath="${fudaa.classpath}"
      target="${build.compiler.target}"
+     source="${build.compiler.source}"
      failonerror="${build.compiler.failonerror}"
      debug="${build.compiler.debug}"
***************
*** 413,423 ****
  <!-- la variable classe doit etre passee en parametre                        -->
  <!--=========================================================================-->
! <target name="java" if="classe" depends="build"
! description="Lance java pour la classe org.fudaa.fudaa.${classe}">
  <echo>
  ---FUDAA:lancement de org.fudaa.fudaa.${classe}---
    </echo>
! <java classname="org.fudaa.fudaa.${classe}" classpath="${fudaa.classpath}"
! failonerror="true" fork="true" maxmemory="${java.maxmemory}" dir="../"/>
  </target>
  
--- 419,431 ----
  <!-- la variable classe doit etre passee en parametre                        -->
  <!--=========================================================================-->
! <target name="java" if="class" depends=".initialisation"
! description="Lance java pour la classe org.fudaa.fudaa.${class}">
  <echo>
  ---FUDAA:lancement de org.fudaa.fudaa.${classe}---
    </echo>
! <java classname="org.fudaa.fudaa.${class}" classpath="${fudaa.classpath}"
! failonerror="true" fork="true" maxmemory="${java.maxmemory}">
! <sysproperty key="DEBUG" value="true"/>
! </java>
  </target>
  
***************
*** 531,534 ****
--- 539,543 ----
      <zipfileset src="${ctulu.lib.dir}/jsci.jar" includes="**/**"/>
      <zipfileset src="${ctulu.lib.dir}/vrml97.jar" includes="**/**"/>
+     <zipfileset src="${ctulu.lib.dir}/trove.jar" includes="**/**"/>
    </jar>
  </target>

[Fudaa-cvs-commit] fudaa_devel/aide/src/prepro build.xml,1.2,1.3

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

Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8750/aide/src/prepro

Modified Files:
	build.xml 
Log Message:
Maj


Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	12 Feb 2004 15:19:36 -0000	1.2
--- build.xml	12 Feb 2004 16:41:21 -0000	1.3
***************
*** 25,34 ****
     <property name="task.dir" location="template/task"/>
     <property name="template.xsl" location="template/sort-menu.xsl"/>
     <property name="base.xsl" location="template/template.xsl"/>
     <property name="style.css" location="template/style.css"/>
  
     <patternset id="sort.files" includes="**/alphabetique${dest.ext}"/>
!    <patternset id="style.files" includes="**/*${init.ext}" excludes="**/*.inc.xml,**/pdf.xml"/>
!    <patternset id="pdf.files" includes="**/pdf.xml"/>
     
     <patternset id="resources.files" includes="**/images/**" excludes="**/${filelist}"/>
--- 25,36 ----
     <property name="task.dir" location="template/task"/>
     <property name="template.xsl" location="template/sort-menu.xsl"/>
+    <property name="xhtml2fo.xsl" location="template/fo/xhtml2fo.xsl"/>
     <property name="base.xsl" location="template/template.xsl"/>
     <property name="style.css" location="template/style.css"/>
  
     <patternset id="sort.files" includes="**/alphabetique${dest.ext}"/>
!    <patternset id="style.files" includes="**/*${init.ext}" excludes="**/*.inc.xml,**/pdf/*.xml"/>
!    <patternset id="pdf.files" includes="**/pdf/*.xml"/>
!       <patternset id="xhtmlfo.files" includes="**/pdf/*.html"/>
     
     <patternset id="resources.files" includes="**/images/**" excludes="**/${filelist}"/>
***************
*** 48,60 ****
      <taskdef  classname="FileList" name="fileList" classpath="${task.dir}"/>
      <fileList file="${filelist}" includes="*.xml" excludes="*.inc.xml">
!     <dirset dir="${src.dir}" includes="?*/**" excludes="**/images/**,**/common/**"/>
      </fileList>
  </target>
  
  
! <target name="pdf" depends="build">
  
  
- </target>
  <target name="build_aide" depends="filelist">
     <mkdir dir="${html.dir}"/>
--- 50,75 ----
      <taskdef  classname="FileList" name="fileList" classpath="${task.dir}"/>
      <fileList file="${filelist}" includes="*.xml" excludes="*.inc.xml">
!     <dirset dir="${src.dir}" includes="?*/**" excludes="**/images/**,**/common/**,**/pdf/**"/>
      </fileList>
  </target>
  
  
! <target name="pdf" depends=".initialisation">
!     <style destdir="${html.dir}" basedir="${src.dir}"
!       style="${base.xsl}" extension="${dest.ext}" force="true">    
!         <patternset refid="pdf.files"/>
!       </style>
!   <replace dir="${html.dir}" token='&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"&gt;'>
!   <patternset refid="xhtmlfo.files"/>
!   </replace>
!   
!     <style destdir="${html.dir}" basedir="${html.dir}"
!       style="${xhtml2fo.xsl}" extension=".fo" force="true">    
!         <patternset refid="xhtmlfo.files"/>
!       </style>  
!       
! </target>
  
  
  <target name="build_aide" depends="filelist">
     <mkdir dir="${html.dir}"/>

[Fudaa-cvs-commit] fudaa_devel/aide/src/prepro/src_web/images fudaa.jpg,NONE,1.1

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

Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src_web/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8750/aide/src/prepro/src_web/images

Added Files:
	fudaa.jpg 
Log Message:
Maj


--- NEW FILE: fudaa.jpg ---
(This appears to be a binary file; contents omitted.)

[Fudaa-cvs-commit] fudaa_devel/ebli build.xml,1.7,1.8

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

Update of /cvsroot/fudaa/fudaa_devel/ebli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8750/ebli

Modified Files:
	build.xml 
Log Message:
Maj


Index: build.xml
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** build.xml	19 Dec 2003 12:12:00 -0000	1.7
--- build.xml	12 Feb 2004 16:41:22 -0000	1.8
***************
*** 53,56 ****
--- 53,57 ----
    <property name="build.compiler.pedantic" value="false"/>
    <property name="build.compiler.target" value="1.3"/>
+   <property name="build.compiler.source" value="1.3"/>
    <property name="build.compiler.nowarn" value="off"/>
    <property name="build.compiler.debug" value="off"/>
***************
*** 264,268 ****
    </echo>
    <depend srcdir="${ebli.src.dir}:${ctulu.classes.dir}"
!   destdir="${ebli.classes.dir}" cache="${java.io.tmpdir}/eblidepcache"/>
    <echo>
  ---EBLI: compilation des classes de ${ebli.src.dir} ----
--- 265,270 ----
    </echo>
    <depend srcdir="${ebli.src.dir}:${ctulu.classes.dir}"
!   classpath="${ebli.classpath}"
!   closure="yes" destdir="${ebli.classes.dir}" cache="${java.io.tmpdir}/eblidepcache"/>
    <echo>
  ---EBLI: compilation des classes de ${ebli.src.dir} ----
***************
*** 273,276 ****
--- 275,279 ----
      classpath="${ebli.classpath}"
      target="${build.compiler.target}"
+     source="${build.compiler.source}"
      failonerror="${build.compiler.failonerror}"
      debug="${build.compiler.debug}"
***************
*** 308,311 ****
--- 311,315 ----
      classpath="${ebli.classpath}"
      target="${build.compiler.target}"
+     source="${build.compiler.source}"
      failonerror="${build.compiler.failonerror}"
      debug="${build.compiler.debug}"

[Fudaa-cvs-commit] fudaa_devel/fudaa/etc prepro.ico,NONE,1.1 prepro.jpg,NONE,1.1 prepro.png,NONE,1.1 prepro.xcf,NONE,1.1 prepro_banner.png,NONE,1.1

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/etc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8750/fudaa/etc

Added Files:
	prepro.ico prepro.jpg prepro.png prepro.xcf prepro_banner.png 
Log Message:
Maj


--- NEW FILE: prepro.ico ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prepro.jpg ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prepro.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prepro.xcf ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: prepro_banner.png ---
(This appears to be a binary file; contents omitted.)

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle MvControlAngle.java,NONE,1.1 MvControlArea.java,NONE,1.1 MvControlElementOrientation.java,NONE,1.1 MvControlElementResult.java,NONE,1.1 MvControlItemUI.java,NONE,1.1 MvControlNodeResult.java,NONE,1.1 MvControlOverstressed.java,NONE,1.1 MvControlPanel.java,NONE,1.1 MvControlResult.java,NONE,1.1

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

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

Added Files:
	MvControlAngle.java MvControlArea.java 
	MvControlElementOrientation.java MvControlElementResult.java 
	MvControlItemUI.java MvControlNodeResult.java 
	MvControlOverstressed.java MvControlPanel.java 
	MvControlResult.java 
Log Message:
Mesh viewer : un editeur/controleur de maillage


--- NEW FILE: MvControlAngle.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvControlArea.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvControlElementOrientation.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvControlElementResult.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvControlItemUI.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvControlNodeResult.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvControlOverstressed.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvControlPanel.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvControlResult.java ---
(This appears to be a binary file; contents omitted.)

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer MvCheckElementLayer.java,NONE,1.1 MvCheckElementModel.java,NONE,1.1 MvCheckElementModelDefault.java,NONE,1.1 MvCheckLayerGroup.java,NONE,1.1 MvCheckNodeLayer.java,NONE,1.1 MvCheckNodeModel.java,NONE,1.1 MvCheckNodeModelDefault.java,NONE,1.1 MvElementLayer.java,NONE,1.1 MvElementModel.java,NONE,1.1 MvElementModelDefault.java,NONE,1.1 MvElementNumberLayer.java,NONE,1.1 MvElementNumberModel.java,NONE,1.1 MvElementNumberModelDefault.java,NONE,1.1 MvFrontierModel.java,NONE,1.1 MvGridLayerGroup.java,NONE,1.1 MvInfoDelegate.java,NONE,1.1 MvInfoDelegateAbstract.java,NONE,1.1 MvLayer.java,NONE,1.1 MvLayerGroup.java,NONE,1.1 MvNodeLayer.java,NONE,1.1 MvNodeModel.java,NONE,1.1 MvNodeModelDefault.java,NONE,1.1 MvNodeNumberLayer.java,NONE,1.1 MvNodeNumberModel.java,NONE,1.1 MvNodeNumberModelDefault.java,NONE,1.1 MvPanelInfo.java,NONE,1.1

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

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

Added Files:
	MvCheckElementLayer.java MvCheckElementModel.java 
	MvCheckElementModelDefault.java MvCheckLayerGroup.java 
	MvCheckNodeLayer.java MvCheckNodeModel.java 
	MvCheckNodeModelDefault.java MvElementLayer.java 
	MvElementModel.java MvElementModelDefault.java 
	MvElementNumberLayer.java MvElementNumberModel.java 
	MvElementNumberModelDefault.java MvFrontierModel.java 
	MvGridLayerGroup.java MvInfoDelegate.java 
	MvInfoDelegateAbstract.java MvLayer.java MvLayerGroup.java 
	MvNodeLayer.java MvNodeModel.java MvNodeModelDefault.java 
	MvNodeNumberLayer.java MvNodeNumberModel.java 
	MvNodeNumberModelDefault.java MvPanelInfo.java 
Log Message:
Mesh viewer : un editeur/controleur de maillage


--- NEW FILE: MvCheckElementLayer.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvCheckElementModel.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvCheckElementModelDefault.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvCheckLayerGroup.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvCheckNodeLayer.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvCheckNodeModel.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvCheckNodeModelDefault.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvElementLayer.java ---
/*
 *  @file         TrCalquePolygone.java
 *  @creation     13 nov. 2003
 *  @modification $Date: 2004/02/12 16:27:40 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.fudaa.meshviewer.layer;
import gnu.trove.TIntHashSet;

import org.fudaa.ctulu.CtuluLib;

import org.fudaa.dodico.ef.EfElement;
import org.fudaa.dodico.ef.EfGrid;
import org.fudaa.dodico.ef.EfNode;

import org.fudaa.ebli.calque.ZCalquePolygone;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrPolygone;

import org.fudaa.fudaa.ressource.FudaaResource;
import org.fudaa.fudaa.tr.TrResource;
/**
 * @author deniger
 * @version $Id: MvElementLayer.java,v 1.1 2004/02/12 16:27:40 deniger Exp $
 */
public class MvElementLayer extends ZCalquePolygone implements MvLayer {
  /**
   * 
   */
  public MvElementLayer() {
    super();
  }
  /**
   * @param _modele
   */
  public MvElementLayer(MvElementModel _modele) {
    super(_modele);
  }
  /**
   *
   */
  public int[] getPtIdx() {
    if (!isSelectionEmpty()) {
      TIntHashSet r= new TIntHashSet();
      int max= selection_.getMaxIndex();
      MvElementModel m= (MvElementModel)modele_;
      for (int i= selection_.getMinIndex(); i <= max; i++) {
        if (selection_.isSelected(i)) {
          m.fillWithPtIdx(i, r);
        }
      }
      return r.toArray();
    }
    return null;
  }
  /**
   *
   */
  public int[] getElementIdx() {
    return selection_ == null ? null : selection_.getSelectedIndex();
  }
  /**
   *
   */
  public boolean isSelectionElementEmpty() {
    return isSelectionEmpty();
  }
  /**
   *
   */
  public boolean isSelectionPointEmpty() {
    return isSelectionEmpty();
  }
  /**
   *
   */
  public GrBoite getZoomOnSelected() {
    if (isSelectionEmpty())
      return null;
    int m= selection_.getMaxIndex();
    if (m > modele_.getNombre())
      m= modele_.getNombre() - 1;
    GrBoite r= new GrBoite();
    GrBoite temp= new GrBoite();
    GrPolygone poly= new GrPolygone();
    for (int i= selection_.getMinIndex(); i <= m; i++) {
      if (selection_.isSelected(i)) {
        modele_.polygone(poly, i);
        poly.boite(temp);
        r.ajuste(temp);
      }
    }
    double coef= 1.1;
    r.e.x= r.e.x * coef;
    r.e.y= r.e.y * coef;
    r.o.x= r.o.x / coef;
    r.o.y= r.o.y / coef;
    return r;
  }

  /**
   *
   */
  public void fillWithInfo(MvPanelInfo.InfoData _m) {
    if (!isSelectionEmpty()) {
      ((MvElementModel)modele_).fillWithInfo(_m, selection_);

    }
  }
}

--- NEW FILE: MvElementModel.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvElementModelDefault.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvElementNumberLayer.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvElementNumberModel.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvElementNumberModelDefault.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvFrontierModel.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvGridLayerGroup.java ---
/*
 *  @file         TrMaillage.java
 *  @creation     30 juin 2003
 *  @modification $Date: 2004/02/12 16:27:40 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.fudaa.meshviewer.layer;
import gnu.trove.TIntHashSet;
import gnu.trove.TIntObjectHashMap;

import java.awt.Graphics;

import org.fudaa.ctulu.CtuluLib;

import org.fudaa.dodico.ef.EfElement;
import org.fudaa.dodico.ef.EfFrontier;
import org.fudaa.dodico.ef.EfGrid;
import org.fudaa.dodico.ef.EfNode;

import org.fudaa.ebli.calque.ContextuelDelegator;
import org.fudaa.ebli.calque.ZModeleDonnees;
import org.fudaa.ebli.calque.ZModeleLongPolygone;
import org.fudaa.ebli.calque.ZModelePoint;
import org.fudaa.ebli.calque.ZModelePolygone;
import org.fudaa.ebli.commun.EbliListeSelection;
import org.fudaa.ebli.commun.EbliListeSelectionInterface;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrPoint;
import org.fudaa.ebli.geometrie.GrPolygone;

import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData;
import org.fudaa.fudaa.ressource.FudaaResource;
/**
 * @author deniger
 * @version $Id: MvGridLayerGroup.java,v 1.1 2004/02/12 16:27:40 deniger Exp $
 */
public class MvGridLayerGroup extends MvLayerGroup {
  EfGrid mail_;
  MvNodeLayer cqPt_;
  MvElementLayer cqPoly_;

  public MvGridLayerGroup(EfGrid _maill) {
    this(_maill, null);
  }

  public MvGridLayerGroup(EfGrid _maill, MvInfoDelegate _d) {
    this(
      _maill,
      new MvNodeModelDefault(_maill, _d),
      new MvElementModelDefault(_maill, _d));
  }
  public MvGridLayerGroup(
    EfGrid _maill,
    MvNodeModel _ptModel,
    MvElementModel _eltModel) {
    setTitle(FudaaResource.getS("Maillage"));
    setName("cqMaillage");
    setDestructible(false);
    mail_= _maill;
    cqPt_= new MvNodeLayer(_ptModel);
    cqPt_.setName("cqPts");
    cqPt_.setTitle(FudaaResource.getS("Noeuds"));
    cqPt_.setDestructible(false);
    add(cqPt_);
    cqPoly_= new MvElementLayer(_eltModel);
    cqPoly_.setDestructible(false);
    cqPoly_.setName("cqPolygon");
    cqPoly_.setTitle(FudaaResource.getS("Eléments"));
    add(cqPoly_);
  }

  public MvElementLayer getPolygonLayer() {
    return cqPoly_;
  }
  public MvNodeLayer getPointLayer() {
    return cqPt_;
  }

  public void setGrid(EfGrid _g) {
    if (_g != mail_) {
      mail_= _g;
      ((MvElementModel)cqPoly_.modele()).setGrid(_g);
      ((MvNodeModel)cqPt_.modele()).setGrid(_g);
    }

  }
  /**
   *
   */
  public GrBoite getDomaine() {
    GrBoite b= new GrBoite();
    EfNode pt= mail_.getMinPoint();
    b.o= new GrPoint(pt.getX(), pt.getY(), pt.getZ());
    pt= mail_.getMaxPoint();
    b.e= new GrPoint(pt.getX(), pt.getY(), pt.getZ());
    return b;
  }
  public int getNbPointsForElt(int _indexElt) {
    return mail_.getElement(_indexElt).getPtNb();
  }
  public static void initGrPoint(EfNode _pt, GrPoint _ptToinit) {
    _ptToinit.x= _pt.getX();
    _ptToinit.y= _pt.getY();
    _ptToinit.z= _pt.getZ();
  }
  public static void initGrPolygone(
    EfGrid _ma,
    EfElement _pt,
    GrPolygone _ptToinit) {
    int n= _pt.getPtNb();
    if (_ptToinit.nombre() != n) {
      _ptToinit.sommets.setSize(n);
    }
    GrPoint grpt;
    EfNode hpt;
    for (int i= 0; i < n; i++) {
      hpt= _ma.getPt(_pt.getPtIndex(i));
      grpt= _ptToinit.sommets.renvoie(i);
      if (grpt != null)
        initGrPoint(hpt, grpt);
      else {
        grpt= new GrPoint(hpt.getX(), hpt.getY(), hpt.getZ());
        _ptToinit.sommets.remplace(grpt, i);
      }
    }
  }
  public void paintComponent(Graphics _g) {
    if ((!cqPoly_.isVisible())
      || (!cqPt_.isSelectionEmpty())
      || (cqPt_.getPaletteCouleur() != null))
      super.paintComponent(_g);
    else {
      cqPoly_.paintComponent(_g);
    }
  }
  /**
   *
   */
  public boolean point(GrPoint _p, int _i) {
    initGrPoint(mail_.getPt(_i), _p);
    return true;
  }
  /**
   *
   */
  public boolean polygone(GrPolygone _poly, int _i) {
    initGrPolygone(this.mail_, mail_.getElement(_i), _poly);
    return true;
  }
  /**
   *
   */
  public ZModeleDonnees modeleDonnees() {
    return cqPt_.modeleDonnees();
  }
  /**
   *
   */
  public EbliListeSelection selection(GrPoint _pt, int _tolerance) {
    return cqPt_.selection(_pt, _tolerance);
  }
  /**
   *
   */
  public EbliListeSelection selection(GrPolygone _poly) {
    return cqPt_.selection(_poly);
  }
  public final void clearSelection() {
    cqPoly_.clearSelection();
    cqPt_.clearSelection();
  }
  private boolean polyOldValue= true;
  /**
   *
   */
  public void setRapide(boolean _v) {
    if (rapide_ != _v) {
      boolean vp= rapide_;
      rapide_= _v;
      cqPt_.setRapide(_v);
      //      cqBord_.setRapide(_v);
      if (_v) {
        polyOldValue= cqPoly_.isVisible();
        cqPoly_.setVisible(false);
      } else
        cqPoly_.setVisible(polyOldValue);
      firePropertyChange("ajustement", vp, rapide_);
    }
  }
  /**
   *
   */
  public void fillWithInfo(InfoData _m) {
    _m.setTitle(FudaaResource.getS("Maillage"));
    _m.put(
      FudaaResource.getS("Nombre de noeuds"),
      CtuluLib.getString(mail_.getPtsNb()));
    _m.put(
      FudaaResource.getS("Nombre d'éléments"),
      CtuluLib.getString(mail_.getEltNb()));
    EfFrontier fr= mail_.getFrontiers();
    if (fr != null) {
      _m.put(
        FudaaResource.getS("Nombre de frontières"),
        CtuluLib.getString(fr.getNbFrontier()));
      _m.put(
        FudaaResource.getS("Nombre total de noeuds sur les frontières"),
        CtuluLib.getString(fr.getNbTotalPt()));
    }
  }

}

--- NEW FILE: MvInfoDelegate.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvInfoDelegateAbstract.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvLayer.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvLayerGroup.java ---
/*
 *  @file         TrGroupeCalque.java
 *  @creation     6 nov. 2003
 *  @modification $Date: 2004/02/12 16:27:40 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
package org.fudaa.fudaa.meshviewer.layer;
import org.fudaa.ebli.calque.BGroupeCalque;
import org.fudaa.ebli.calque.ZSelectionListener;
import org.fudaa.ebli.geometrie.GrBoite;

import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData;
/**
 * @author deniger
 * @version $Id: MvLayerGroup.java,v 1.1 2004/02/12 16:27:40 deniger Exp $
 */
public class MvLayerGroup extends BGroupeCalque implements MvLayer{
  /**
   * 
   */
  public MvLayerGroup() {
    super();
  }
  /**
   *
   */
  public int[] getPtIdx() {
    return null;
  }

  /**
   *
   */
  public boolean isSelectionPointEmpty() {
    return true;
  }

  /**
   *
   */
  public int[] getElementIdx() {
    return null;
  }

  /**
   *
   */
  public boolean isSelectionElementEmpty() {
    return true;
  }


  /**
   *
   */
  public GrBoite getZoomOnSelected() {
    return null;
  }

  /**
   *
   */
  public void addSelectionListener(ZSelectionListener _l) {}


  /**
   *
   */
  public void removeSelectionListener(ZSelectionListener _l) {}

  /**
   *
   */
  public void fillWithInfo(InfoData _m) {}

}

--- NEW FILE: MvNodeLayer.java ---
/*
 *  @file         TrCalquePoint.java
 *  @creation     13 nov. 2003
 *  @modification $Date: 2004/02/12 16:27:40 $
 *  @license      GNU General Public License 2
 *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
 *  @mail         de...@fu...
 */
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
 * @version $Id: MvNodeLayer.java,v 1.1 2004/02/12 16:27:40 deniger Exp $
 */
public class MvNodeLayer extends ZCalquePoint implements MvLayer {
  /**
   * @param _modele
   */
  public MvNodeLayer(MvNodeModel _modele) {
    super(_modele);
  }
  /**
   *
   */
  public int[] getPtIdx() {
    if (!isSelectionEmpty()) {
      return selection_.getSelectedIndex();
    }
    return null;
  }
  /**
   *
   */
  public int[] getElementIdx() {
    return null;
  }
  /**
   *
   */
  public boolean isSelectionElementEmpty() {
    return true;
  }
  /**
   *
   */
  public boolean isSelectionPointEmpty() {
    return isSelectionEmpty();
  }
  
  /**
   *
   */
  public GrBoite getZoomOnSelected() {
    if (isSelectionEmpty())
      return null;
    int m= selection_.getMaxIndex();
    if (m > modele_.getNombre())
      m= modele_.getNombre() - 1;
    GrBoite r= new GrBoite();
    GrPoint p= new GrPoint();
    for (int i= selection_.getMinIndex(); i <= m; i++) {
      if (selection_.isSelected(i)) {
        modele_.point(p, i);
        r.ajuste(p);
      }
    }
    double coef= 1.1;
    r.e.x= r.e.x * coef;
    r.e.y= r.e.y * coef;
    r.o.x= r.o.x / coef;
    r.o.y= r.o.y / coef;
    return r;
  }
  /**
   *
   */
  public void fillWithInfo(MvPanelInfo.InfoData _m) {
    if(!isSelectionEmpty()){
      ((MvNodeModel)modele_).fillWithInfo(_m, selection_);
      
    }
  }
}

--- NEW FILE: MvNodeModel.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvNodeModelDefault.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvNodeNumberLayer.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvNodeNumberModel.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvNodeNumberModelDefault.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvPanelInfo.java ---
(This appears to be a binary file; contents omitted.)

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/modify MvModifyInterpolateZ.java,NONE,1.1 MvModifyItemUI.java,NONE,1.1 MvModifyPanel.java,NONE,1.1

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

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

Added Files:
	MvModifyInterpolateZ.java MvModifyItemUI.java 
	MvModifyPanel.java 
Log Message:
Mesh viewer : un editeur/controleur de maillage


--- NEW FILE: MvModifyInterpolateZ.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvModifyItemUI.java ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: MvModifyPanel.java ---
(This appears to be a binary file; contents omitted.)

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle - New directory

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

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

Log Message:
Directory /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle added to the repository

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/modify - New directory

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

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

Log Message:
Directory /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/modify added to the repository

[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer - New directory

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

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

Log Message:
Directory /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer added to the repository