Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Frederic D. <de...@us...> - 2004-06-02 15:39:59
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20194/src/prepro/src/images Modified Files: superviseur.sxd vue_ecran.sxd Added Files: vue_ecran_en.png superviseur.en.sxd vue_ecran_en.sxd Log Message: Index: superviseur.sxd =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/images/superviseur.sxd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsEzJYsW and /tmp/cvsYIleUl differ --- NEW FILE: superviseur.en.sxd --- (This appears to be a binary file; contents omitted.) --- NEW FILE: vue_ecran_en.sxd --- (This appears to be a binary file; contents omitted.) Index: vue_ecran.sxd =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/images/vue_ecran.sxd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsaTRme1 and /tmp/cvsmU1UIq differ --- NEW FILE: vue_ecran_en.png --- (This appears to be a binary file; contents omitted.) |
|
From: Frederic D. <de...@us...> - 2004-06-02 15:39:59
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/images/superviseur In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20194/src/prepro/images/superviseur Added Files: menu-dir.en.png vue.en.png panel-ajout-application.en.png menu-applications.en.png menu-telemac.en.png panel-applications.en.png Log Message: --- NEW FILE: panel-applications.en.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: menu-dir.en.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: menu-telemac.en.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: panel-ajout-application.en.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: menu-applications.en.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: vue.en.png --- (This appears to be a binary file; contents omitted.) |
|
From: Frederic D. <de...@us...> - 2004-06-02 15:39:12
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/images/superviseur In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20102/src/prepro/images/superviseur Modified Files: vue.png Log Message: Index: vue.png =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/images/superviseur/vue.png,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs8S3LM3 and /tmp/cvsbmvQ0T differ |
|
From: Frederic D. <de...@us...> - 2004-06-02 15:39:01
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20035/src/prepro/images Modified Files: vue_ecran_desc.png Log Message: Index: vue_ecran_desc.png =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/images/vue_ecran_desc.png,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs3ZaVYk and /tmp/cvsFnpAQ0 differ |
|
From: Frederic D. <de...@us...> - 2004-06-02 15:36:43
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19394/src/prepro/src/common Modified Files: common-telemac-extension.inc.xml common-superviseur.inc.xml common-editeur2D.inc.xml Added Files: common-meshviewer.en.inc.xml common-telemac-extension.en.inc.xml common-superviseur.en.inc.xml common-general.en.inc.xml common-reflux-extension.en.inc.xml common-editeur2D.inc.en.xml common-courbes-temporelles.en.inc.xml preface.en.inc.xml Log Message: anglais --- NEW FILE: common-superviseur.en.inc.xml --- <?xml version="1.0" encoding="iso-8859-1"?> <mediaobject> <imageobject> <objectinfo><title>supervisor screenshot</title></objectinfo> <imagedata align="center" fileref="&url;images/superviseur/vue.en.png" width="754" depth="509"/> </imageobject> <textobject><phrase>supervisor screenshot</phrase></textobject> </mediaobject> <para> The "supervisor" is a file manager with specific actions adapted to the modelling system in use. It can be launched thanks to the button "supervisor" of the main toolbar. </para> <chapter><title>Introduction</title> <para>The top of the supervisor contains the "favorites" manager and displays the current directory. </para> <para>The center of the supervisor contains three columns. The right column lists the folder of the current directory. The files of the current directory are listed in the central column. You can filter and sort the files. Then, a quick preview of the selected file is given in the right column. </para> <para>In the preceding illustration, the current directory is <filename>casTest\telemac\fluvial\tel2d\1\</filename>. This directory has no folder : the left column is empty. The folder <filename>..</filename> allows the user to browse the parent directory. The current directory contains 6 files. The file<filename>cas1.txt</filename> is selected and a preview is given is the right column. </para> <section><title>Contextual Menus</title> <para>The list of folder and the list of files provide contextual menus. To activate a contextual menu, select at least on file (or folder) and right click in the list of files (folders). </para> <para>By default, the contextual menus give basic actions : delete, rename a file.</para> </section> <section><title>Favorite paths</title> <para>You can save some paths : they are listed in the combo box at the top of the supervisor. </para> <para>To add a folder to the favorites, select it in the left column and use the command <quote>Add to favorites</quote>. In the following illustration, the folder <filename>1</filename> will be added to the favorites. </para> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/superviseur/menu-dir.en.png" width="153" depth="184"/> </imageobject> <textobject><phrase>contextual menu</phrase></textobject> </mediaobject> </section> </chapter> <chapter><title>Menu <quote>Application</quote></title> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/superviseur/menu-applications.en.png" width="127" depth="134"/> </imageobject> <textobject><phrase>application menu</phrase></textobject> </mediaobject> <para>This menu allows the user to launch the preprocessor applications and the applications defined by the user. In the preceding illustration, the <quote>essai</quote> application has been defined by the user. </para> </chapter> <chapter><title>Add / edit an extern application</title> <para> If you often use an application, you can add it to the supervisor : a menu item will be added to the "application" menu and to the contextual menus.The menu <quote>Edition>Modify extern softwares</quote> open the following dialog: </para> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/superviseur/panel-applications.en.png" width="486" depth="288"/> </imageobject> <textobject><phrase>Modify the extern softwares</phrase></textobject> </mediaobject> <para> The zone <quote>Your softwares</quote> lists the defined and activated applications: these applications will be added to the menus. The right zone <quote>Available softwares</quote> lists the unactive executables ( not visible in menus).</para> <para>To active or not an application, you can use the arrows. To add an application, use the <quote>plus</quote> icon. To delete an application, unactive the application and use the <quote>minus</quote> icon. You can edit an application by double-clicking it. </para> <section><title>Add/Edit an application</title> <para>The following illustration shows the dialog used to edit an application.</para> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/superviseur/panel-ajout-application.en.png" width="426" depth="199"/> </imageobject> <textobject><phrase>Modify an extern application</phrase></textobject> </mediaobject> <para>The field <quote>Name</quote> is required. You can choose the path of the executable thanks to a filechooser : use the button <quote>...</quote>. If the executable path is not defined, the name will be used as the executable command. You can also select an image for your application ( in gif,jpg or png format). </para> </section> </chapter> --- NEW FILE: common-reflux-extension.en.inc.xml --- <?xml version="1.0" encoding="iso-8859-1"?> <table frame="all"> <title>Files used by the &reflux; system</title> <tgroup cols="2"> <thead> <row> <entry><para>File type</para></entry> <entry><para>extension</para></entry> <entry><para> Note</para></entry> </row> </thead> <tbody> <row> <entry> <para>Inp File</para> </entry> <entry> <para><literal>inp</literal></para> </entry> <entry> <para>The main file for a &reflux; project. It contains all the needed information but the time curves.</para> </entry> </row> <row> <entry> <para>Time curves files</para> </entry> <entry> <para><literal>pnv</literal> or <literal>clv</literal></para> </entry> <entry> <para>Binary files describing the time curves used by a project.</para> </entry> </row> <row> <entry> <para>xpre file</para> </entry> <entry> <para><literal>xpre</literal></para> </entry> <entry> <para>Additional file used by the proprocessor (xml). It contains informations about the author and the about the project's version. It also contains informations about the references used to compute the initial solutions.</para> </entry> </row> <row> <entry> <para>Solutions file</para> </entry> <entry> <para><literal>sov</literal>,<literal>sfv</literal></para> </entry> <entry> <para>Binary file containing the solutions of a simulation. The file <literal>sfv</literal> contain only the results for the last time step.</para> </entry> </row> <row> <entry> <para>Fichier des solutions initiales</para> </entry> <entry> <para><literal>siv</literal></para> </entry> <entry> <para>Fichier binaire contenant les solutions initiales en chaque noeud du projet.</para> </entry> </row> <row> <entry> <para>Fichier cor,ele, bth</para> </entry> <entry> <para><literal>cor</literal>,<literal>ele</literal> et <literal>bth</literal></para> </entry> <entry> <para>Ces fichiers contiennent une géométrie. Ils sont utilisés pour initialiser un projet <literal>Reflux</literal>.</para> </entry> </row> <row> <entry> <para>Fichier Dunes</para> </entry> <entry> <para><literal>geo</literal></para> </entry> <entry> <para>Ces fichiers contiennent une géométrie. Ils sont utilisés pour initialiser un projet <literal>Reflux</literal>.</para> </entry> </row> </tbody> </tgroup> </table> --- NEW FILE: preface.en.inc.xml --- <?xml version="1.0" encoding="UTF-8"?> <bookinfo> <edition> User Documentation for preprocessor V&version; UNDER CONSTRUCTION </edition> <pubdate>&version-date;</pubdate> </bookinfo> <dedication lang="fr"> <title/><para>The <ulink path="http://www.telemac-system.com"> <literal>TELEMAC</literal></ulink> system is the property of <ulink url="http://www.edf.fr"><literal>EDF-DRD</literal></ulink>.</para> <para>The <literal>REFLUX</literal> system is the property of <ulink url="http://www.cetmef.equipement.gouv.fr"><literal>CETMEF</literal></ulink>.</para> <para>The <literal>RUBAR</literal> system is the property of <ulink url="http://www.cemagref.fr"><literal>CEMAGREF</literal></ulink>.</para> </dedication> --- NEW FILE: common-telemac-extension.en.inc.xml --- <?xml version="1.0" encoding="iso-8859-1"?> <para>This table lists the files used by the &telemac; system. If you need more information, you should read the &telemac; documentation</para> <table frame="all"> <title>Files used by the &telemac; system</title> <tgroup cols="2"> <thead> <row> <entry><para>File type</para></entry> <entry><para>extension</para></entry> <entry><para> Note</para></entry> </row> </thead> <tbody> <row> <entry> <para>Steering file</para> </entry> <entry> <para><literal>cas</literal>. Sometimes, no extension is used and the name of the file starts with "cas".</para> </entry> <entry> <para>The main file for a &telemac; project. It contains the keywords of the project and gives the paths for the files to use.</para> </entry> </row> <row> <entry> <para>Geometry file</para> </entry> <entry> <para><literal>ser</literal> ou <literal>res</literal>. Sometimes, no extension is used and the name of the file starts with "geo".</para> </entry> <entry> <para>Binary file containing the geometry of the project. Some nodal parameters can be saved in this file. This file type is also used to give the results of a simulation.</para> </entry> </row> <row> <entry> <para>Boundary conditions file</para> </entry> <entry> <para>?</para> </entry> <entry> <para>A text file which gives the boundary conditions : point number, boundary type codes, prescribed values... </para> </entry> </row> <row> <entry> <para>Open boundary file (telemac 2D)</para> </entry> <entry> <para>?</para> </entry> <entry> <para>A text file describing the "time" curves to use. It gives also the index of the liquid boundary and the parameter to consider. </para> </entry> </row> </tbody> </tgroup> </table> Index: common-superviseur.inc.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/common/common-superviseur.inc.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** common-superviseur.inc.xml 1 Jun 2004 10:57:42 -0000 1.1 --- common-superviseur.inc.xml 2 Jun 2004 15:36:14 -0000 1.2 *************** *** 10,14 **** <para> Le superviseur est un explorateur de fichiers adapté aux systèmes de modélisation hydraulique. ! Il peut être activé par l'intermédiaire du menu <quote>Applications>Superviseur</quote>. </para> <chapter><title>Introduction</title> --- 10,14 ---- <para> Le superviseur est un explorateur de fichiers adapté aux systèmes de modélisation hydraulique. ! Il peut être activé par l'intermédiaire du bouton "supervisor" de la barre d'outils générale. </para> <chapter><title>Introduction</title> *************** *** 25,29 **** liste des répertoires est vide). Le dossier <filename>..</filename> permet d'accéder au dossier parent. Le répertoire courant comporte 6 fichiers affichés dans la liste des fichiers. Le fichier <filename>cas1.txt</filename> ! est sélectionné et est prévisualisé dans la zone de gauche. </para> --- 25,29 ---- liste des répertoires est vide). Le dossier <filename>..</filename> permet d'accéder au dossier parent. Le répertoire courant comporte 6 fichiers affichés dans la liste des fichiers. Le fichier <filename>cas1.txt</filename> ! est sélectionné et est prévisualisé dans la zone de droite. </para> --- NEW FILE: common-general.en.inc.xml --- <?xml version="1.0" encoding="UTF-8"?> <part lang="en"> <title>Introduction</title> <abstract><para>This chapter presents the preprocessor.</para></abstract> <chapter><title>Licence</title> <para>This document is the property of <literal>CETMEF</literal>. It is distributed under the <ulink url='http://www.gnu.org/copyleft/fdl.html'><acronym>GNU</acronym> Free Documentation License</ulink>. The updates for this document are available on <ulink url="http://fudaa.sf.net/prepro/doc/"> http://fudaa.sf.net/prepro/doc</ulink>. </para> <para> The "preprocessor" software is the property of <literal>CETMEF</literal>. It is distributed under the <ulink url="http://www.gnu.org/copyleft/gpl.html"><acronym>GNU</acronym> General Public License</ulink>. </para> <para>NO WARRANTY: </para> <para> BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. </para><para> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. </para> </chapter> <chapter><title>Features</title> <para>The main goal of this software is to provide a set of common preprocessing tools for the systems <literal>Rubar</literal> and <literal>Telemac</literal>. It supplies graphics modules to prepare the hydrodynamic simulation and to analyze (quickly) the results.</para> <para> Initialy, the preprocessor proposes a supervisor. The "supervisor" is a file manager with specific actions adapted to the modelling system in use. The "supervisor" can launch the modelling system's executables and can start graphic interfaces to edit the parameters. The preprocessor consists of 3 applications: </para> <variablelist><title></title> <varlistentry><term>-<emphasis>Mesh editor</emphasis></term> <listitem><para>Used to display meshes and to compute some controls (under development)</para></listitem> </varlistentry> <varlistentry><term>-<emphasis>Hydrodynamic project Editor</emphasis></term> <listitem> <para>It is used to edit a hydrodynamic project:</para> <para>boundary conditions, initial conditions</para> <para>physical and numerical parametres</para> </listitem> </varlistentry> <varlistentry><term>-<emphasis>Postprocessor</emphasis></term> <listitem><para>Results visualization</para></listitem> </varlistentry> </variablelist> </chapter> <chapter><title>Inital configuration</title> <para>When the preprocessor is used for the first time, you have to specify your modelling system. This configuration is used to build some menus and to propose you the correct actions. Thereafter, it's possible to change the default modelling system thanks to preferences frame ( menu <quote>Edition</quote>).</para> <caution><para>If you modify the default modelling system, you have to restart the "preprocessor" to apply the change.</para></caution> </chapter> <chapter><title>Applications overview</title> <para>The 3 applications have a similar behavior. The following screenshot corresponds to the project editor. Only the two internal frames are specifics.</para> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/vue_ecran_desc_en.png" width="769" depth="651"/> </imageobject></mediaobject> <para>The main frame is composed of 3 areas.</para> <section><title>Top area</title> <para> It contains the main menus, the main toolbar and the specific toolbar which depends on the active internal frame.</para> </section> <section><title>Right area</title> <para>It contains the task view and the layers tree. The task view diplays the state of running tasks. The layers tree is tied to a "2 dimensions" editor. It shows the layers organization and allows the user to select a layer.</para></section> <section><title>Center area</title> <para>It displays the internal frames.</para> </section> <section><title>The keyboard shortcuts</title> <itemizedlist> <listitem> <para>Open a project or a file: <quote>Ctrl+O</quote> </para> </listitem> <listitem> <para>Save a project: <quote>Ctrl+S</quote> </para> </listitem> <listitem> <para>Print : <quote>Ctrl+P</quote> </para> </listitem> <listitem> <para>Quit: <quote>Ctrl +Q</quote> </para> </listitem> <listitem> <para>Help: <quote>F1</quote> or <quote>Alt+F1</quote></para> <para>Moreover, some internal frame can use specific shortcuts.</para> </listitem> </itemizedlist> </section> <section><title>Menu <quote>File</quote></title> <para>This first menu contains the following actions : open/save a project, print, import/export.</para> </section> <section><title>Menu <quote>Edition</quote></title> <para>It contains the actions : undo/redo and preferences.</para> </section><section><title>Menu <quote>Windows</quote></title> <para>Thanks to this menu, you can modify the appearance and the disposition of the internal frames.</para></section> <section><title>Menu <quote>Help</quote></title> <para>Action : open the help files (html), check for updates, web site, ...</para></section> <section><title>Filechooser and favorites</title> <para>The filechooser of the preprocessor can save your favorite folders. To add a "favorite" folder , you have to click on the icon <inlinemediaobject> <imageobject> <imagedata align="center" fileref="../../images/plus.jpg" width="14" depth="14"/> </imageobject> </inlinemediaobject> when the target folder is selected. Then, the path will be added to the combo box. To delete a path, you can use the icon <inlinemediaobject> <imageobject> <imagedata align="center" fileref="../../images/editer_favoris.jpg" width="14" depth="14"/> </imageobject> </inlinemediaobject>.</para> <para> <mediaobject> <imageobject> <imagedata align="center" fileref="../../images/file_chooser_en.png" width="414" depth="195"/> </imageobject> </mediaobject> </para></section> </chapter> <chapter><title>"Extern tools"</title> <section><title><quote>Monitor</quote></title> <para>This tool allows a user to monitor several log files concurrently.</para></section> </chapter><chapter><title>log file</title> <para>The "preprocessor" messages are added to a log file. You can see these messages thanks to menu <quote>Edition>Monitor</quote>.</para> <para>If you notify some "anormal" behavior, you should verify the log file. Messages with « ...Exception at .... » content indicate that an error occured. Please, join the file "ts.log" with your bug report (this file is created in the preprocessor installation directory).</para></chapter><chapter><title>Feedback</title> <para>Remarks, features requests, bugs reports, ... are welcome : <ulink url="mailto:de...@us...">mailto:de...@us...</ulink>.</para></chapter> </part> --- NEW FILE: common-courbes-temporelles.en.inc.xml --- <?xml version="1.0" encoding="UTF-8"?> <chapter lang="en"> <title>Curves Editor</title> <mediaobject> <imageobject> <objectinfo><title>Curves editor screenshot</title></objectinfo> <imagedata align="center" fileref="&url;images/editeur-courbes-temp.png" width="532" depth="473"/> </imageobject> <textobject><phrase>Curves editor screenshot</phrase></textobject> </mediaobject> <para>The internal frame contains two parts. </para> <para>The left area lists the name of the loaded curves. You can modify the visibility of a curve thanks to the 'v' column. This area can be resized or hidden : the mouse must be on the vertical bar separating the left area from the center area.</para> <para>The curves are displayed in the center area. </para> <section> <title>Actions</title> <section> <title>Restore the view</title> <para>The button <inlinemediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/loupe-etendue.png" width="26" depth="26"/> </imageobject> <textobject><phrase>Restore icon</phrase></textobject> </inlinemediaobject> of the specific toolbar allows the user to restore the view.</para> </section> <section> <title>Change the color of a curve</title> <para>2 step: <itemizedlist> <listitem> <para>Select a curve in the left area</para></listitem> <listitem> <para>Use <inlinemediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/avant-plan.png" width="21" depth="21"/> </imageobject> <textobject><phrase>foreground color</phrase></textobject> </inlinemediaobject> and validate your choice.</para></listitem> </itemizedlist> </para> </section> </section> </chapter> Index: common-telemac-extension.inc.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/common/common-telemac-extension.inc.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** common-telemac-extension.inc.xml 1 Jun 2004 10:57:42 -0000 1.1 --- common-telemac-extension.inc.xml 2 Jun 2004 15:36:14 -0000 1.2 *************** *** 35,39 **** <entry> <para>Fichier binaire contenant la géométrie du problème. Il peut également contenir de paramètres ! nodaux comme la rugosité.</para> </entry> </row> --- 35,40 ---- <entry> <para>Fichier binaire contenant la géométrie du problème. Il peut également contenir de paramètres ! nodaux comme la rugosité. Ce type de fichier est également utilisé pour les résultats d'une ! simulation.</para> </entry> </row> Index: common-editeur2D.inc.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/common/common-editeur2D.inc.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** common-editeur2D.inc.xml 1 Jun 2004 10:57:42 -0000 1.1 --- common-editeur2D.inc.xml 2 Jun 2004 15:36:14 -0000 1.2 *************** *** 36,40 **** </entry> <entry> ! <para>Contient les noeuds et les polygones de la géométrie. Permet de modifier les paramètres physiques du projet ( les paramètres attachés aux noeuds ou aux éléments).</para> </entry> </row></tbody> --- 36,40 ---- </entry> <entry> ! <para>Contient les noeuds et les éléments de la géométrie. Permet de modifier les paramètres physiques du projet ( les paramètres attachés aux noeuds ou aux éléments).</para> </entry> </row></tbody> --- NEW FILE: common-editeur2D.inc.en.xml --- <?xml version="1.0" encoding="UTF-8"?><section> <title>Layers</title> <para>The graphic datas are organized through layers. Each layer proposes specifics actions adapted to the displayed objects. The selection of a layer is done via the Layers tree.</para> <section><title>Layers tree</title> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/arbre-calque.en.png" width="214" depth="215"/> </imageobject> </mediaobject> <para>This component is on the right column of the main frame.</para> <para>The layers tree displays the organization of the layers. The layers of the top of the tree hide the following ones. For example, the "legend" layer is displayed on the layer "Number of the points". To work with a layer, you have to select it in the layers tree. You can modify the attributes of a layer (visibility, fast view, ...) by using the contextual menu. To modify the attributes of several layers, you can use the menu "Editor 2D>Selected layers".</para> </section> <section><title>Layers organization</title> <para>3 groups are used: </para> <informaltable frame="all"> <tgroup cols="2"> <tbody><row> <entry> <para>Infos</para> </entry> <entry> <para>General informations : legends, number of nodes, number of elements.</para> </entry> </row> <row> <entry> <para>Boundary conditions</para> </entry> <entry> <para>this group allows the user to modify the boundary conditions. It contains the boundary nodes and the boundaries ( group of nodes).</para> </entry> </row> <row> <entry> <para>Grid</para> </entry> <entry> <para>This groups contains the nodes and the elements of the geometry. Some physical parameters can be modified ( parameters linked to a node or to an element).</para> </entry> </row></tbody> </tgroup> </informaltable> </section> </section> <section> <title>Tools and information components</title> <para>Les outils de l'éditeur 2D sont accessibles de 3 manières différentes:</para> <itemizedlist> <listitem> <para>Dans le barre d'outils </para> </listitem> <listitem> <para>Dans le menu Editeur 2D. </para> </listitem> <listitem> <para>Dans le menu contextuel de l'éditeur </para> </listitem> </itemizedlist> <para>Les 2 menus contiennent également les outils spécifiques au système de modélisation.</para> <section><title>Les indicateurs</title> <para>En bas à gauche de l'éditeur, vous pouvez consulter les coordonnées réelles du pointeur de la souris. En bas à droite, la description de l'outil en cours est donnée.</para> </section> <section><title>Déplacer la vue</title> <informaltable frame="all"> <tgroup cols="4"> <tbody><row> <entry> <para>Icône</para> </entry> <entry> <para>Commande</para> </entry> <entry> <para>Commentaire</para> </entry> <entry> <para>Raccourci</para> </entry> </row> <row> <entry> <inlinemediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/loupe-etendue.png" width="26" depth="26"/> </imageobject> </inlinemediaobject> </entry> <entry> <para>Restaurer</para> </entry> <entry> <para>Affiche la vue dans sa configuration initiale : tout le domaine est visible.</para> </entry> <entry> <para>r</para> </entry> </row> <row> <entry> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/main.png" width="21" depth="21"/> </imageobject> </mediaobject> </entry> <entry> <para>Déplacer</para> </entry> <entry> <para>Permet de déplacer la vue avec la souris: cliquez sur la vue et déplacez la souris tout en gardant le doigt appuyé. Pour activer le mode " déplacement", il suffit de taper m ( idem pour le désactiver).</para> </entry> <entry> <para>m</para> </entry> </row> <row> <entry> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/loupe.png" width="21" depth="21"/> </imageobject> </mediaobject> </entry> <entry> <para>Zoom</para> </entry> <entry> <para>Permet de zoomer en avant/arrière. Pour zoomer en avant, il suffit de cliquer sur la vue. Pour zoomer en arrière, vous devez appuyer sur la touche MAJ : "Zoom -" sera écrit dans l'indicateur d'outils ( en bas à droite). Pour agrandir la vue dans une zone précise, il suffit de maintenir le doigt appuyé sur le bouton gauche de la souris et de sélectionner la zone. </para> </entry> <entry> <para>z</para> </entry> </row> <row> <entry> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/repere.png" width="21" depth="21"/> </imageobject> </mediaobject> </entry> <entry> <para>Repère</para> </entry> <entry> <para>Affiche (ou cache) un composant permettant de spécifier les transformations voulues.</para> </entry> <entry> <para/> </entry> </row> <row> <entry> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/navigation.png" width="21" depth="21"/> </imageobject> </mediaobject> </entry> <entry> <para>Navigation</para> </entry> <entry> <para>Affiche (ou cache) un composant de navigation. La vue actuelle est dessinée en rouge alors que le domaine du projet est dessiné en bleu. Les boutons permettent de déplacer, pivoter ou agrandir la vue.</para> </entry> <entry> <para/> </entry> </row></tbody> </tgroup> </informaltable></section><section><title>Modifier l'affichage</title> <informaltable frame="all"> <tgroup cols="3"> <tbody><row> <entry> <para>Icône</para> </entry> <entry> <para>Commande</para> </entry> <entry> <para>Commentaire</para> </entry> </row> <row> <entry> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/avant-plan.png" width="21" depth="21"/> </imageobject> </mediaobject> </entry> <entry> <para>Couleur avant-plan</para> </entry> <entry> <para>Permet de modifier la couleur d'avant-plan du calque sélectionné.</para> </entry> </row> <row> <entry> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/arriere-plan.png" width="21" depth="21"/> </imageobject> </mediaobject> </entry> <entry> <para>Couleur de fond</para> </entry> <entry> <para>Permet de modifier la couleur de fond du calque sélectionné. Pour l'instant aucun calque n'utilise cette fonctionnalité.</para> </entry> </row> <row> <entry> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/police.png" width="21" depth="21"/> </imageobject> </mediaobject> </entry> <entry> <para>Modifier la police</para> </entry> <entry> <para>Modifie la police de caractères du calque sélectionné. </para> </entry> </row> <row> <entry> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/editeur2D/palette.png" width="21" depth="21"/> </imageobject> </mediaobject> </entry> <entry> <para>Palette de couleur</para> </entry> <entry> <para>Modifie la palette de couleur du calque en cours. Cette fonctionnalité est uniquement utilisée par le calque des points : la couleur du point varie en fonction de la hauteur z.</para> </entry> </row></tbody> </tgroup> </informaltable> </section></section> --- NEW FILE: common-meshviewer.en.inc.xml --- <?xml version="1.0" encoding="iso-8859-1"?> <part><title>Mesh Viewer</title> <para>This application allows the user to view a mesh and to check the geometry:</para> <itemizedlist> <listitem> <para>minimal surface</para> </listitem> <listitem> <para>minimum angle</para> </listitem> <listitem> <para>overstressed elements</para> </listitem> </itemizedlist> <para>under development ...</para> </part> |
|
From: Frederic D. <de...@us...> - 2004-06-02 15:36:25
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19394/src/prepro/src/telemac Modified Files: telemac-superviseur.inc.xml telemac.xml Added Files: telemac.en.xml telemac-superviseur.en.inc.xml Log Message: anglais Index: telemac-superviseur.inc.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/telemac/telemac-superviseur.inc.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** telemac-superviseur.inc.xml 1 Jun 2004 11:05:40 -0000 1.1 --- telemac-superviseur.inc.xml 2 Jun 2004 15:36:13 -0000 1.2 *************** *** 1,4 **** <?xml version="1.0" encoding="iso-8859-1"?> ! <part lang="fr"> <title>Superviseur</title> &common-superviseur; --- 1,4 ---- <?xml version="1.0" encoding="iso-8859-1"?> ! <part lang="en"> <title>Superviseur</title> &common-superviseur; *************** *** 90,97 **** <para>Si un fichier cas est sélectionné, cette action permet de choisir et de lancer un exécutable du système <literal>Telemac</literal>.</para> </section> <section><title>Post</title> ! <para>Si un fichier <quote>Serafin</quote> est sélectionné, une fenêtre de post-traitement sera ! ouverte par cette action.</para> </section> </chapter> --- 90,98 ---- <para>Si un fichier cas est sélectionné, cette action permet de choisir et de lancer un exécutable du système <literal>Telemac</literal>.</para> + <note><para>Il est possible de modifier le répertoire des exécutables telemac. Pour cela, utiliser le panneau des préférences (section telemac).</para></note> </section> <section><title>Post</title> ! <para>Si un fichier <quote>Serafin</quote> est sélectionné, l'application postprocessor sera ! lancée grâce à action.</para> </section> </chapter> --- NEW FILE: telemac.en.xml --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book SYSTEM "../../template/book.dtd" [ <!ENTITY url "../../"> <!ENTITY preface-en SYSTEM "../common/preface.en.inc.xml"> <!ENTITY cha-superviseur SYSTEM "telemac-superviseur.inc.xml"> <!ENTITY cha-superviseur-en SYSTEM "telemac-superviseur.en.inc.xml"> <!ENTITY sect-hyd-general SYSTEM "telemac-editeur-hyd-general.inc.xml"> <!ENTITY sect-hyd-2D SYSTEM "telemac-editeur-hyd-2D.inc.xml"> ]> <book lang="en"> <title>Telemac Preprocessor &version;</title> <subtitle>User Documentation (under construction)</subtitle> &preface-en; &common-general-en; &cha-superviseur-en;<!-- <part> <title>Editeur projet hydraulique</title> §-hyd-general; §-hyd-2D; &common-courbes-temp; </part> &common-meshviewer;--> </book> --- NEW FILE: telemac-superviseur.en.inc.xml --- <?xml version="1.0" encoding="iso-8859-1"?> <part lang="en"> <title>Supervisor</title> &common-superviseur-en; <chapter><title>Files extension</title> <para>In order to propose relevant actions, the supervisor tries to guess the file type thanks to the extension of the selected file. Nevertheless, some additional rules are used to respect the &telemac; users'practices. The following table gives the used rules to determine the file type. </para> <table frame="all"> <title>Determination of the file type</title> <tgroup cols="2"> <thead> <row> <entry><para>File type</para></entry> <entry><para>extension</para></entry> <entry><para> Additional rules</para></entry> </row> </thead> <tbody> <row> <entry> <para>Steering file</para> </entry> <entry> <para><literal>cas</literal></para> </entry> <entry> <para>Files which name starts with <quote>cas</quote>.</para> </entry> </row> <row> <entry> <para>Geometry File</para> </entry> <entry> <para><literal>ser</literal> or <literal>res</literal></para> </entry> <entry> <para>Files which name starts with <quote>res</quote> or <quote>geo</quote>.</para> </entry> </row> </tbody> </tgroup> </table> <section><title>file types used by &telemac;</title> &common-telemac-extension-en; </section> <section><title>File types used by other modelling systems</title> <para>You can find, in the following tables, the file types used by other modelling systems.</para> &common-reflux-extension-en; </section> </chapter> <chapter><title><literal>Rubens</literal> and <literal>Matisse</literal></title> <para> The supervisor allows the user to launch <literal>Rubens</literal> or <literal>Matisse</literal> in any folder. First, select a folder in the left column and then use the contextual menu.</para> </chapter> <chapter><title>Available actions</title> <para> To view the actions proposed by the supervisor, select a file and active the contextual menu. In the following illustration, the selected file is a steering file. It's also possible to edit the file or the launch a computation. </para> <mediaobject> <imageobject> <imagedata align="center" fileref="&url;images/superviseur/menu-telemac.en.png" width="203" depth="201"/> </imageobject> <textobject><phrase>Contextual menu for files</phrase></textobject> </mediaobject> <section><title>Open</title> <para>This action allows the user to open the selected file. The application that will be used to edit the file is given between brackets. If the selected file is a steering file, the hydrodynamic project editor is proposed. For a geometry file, the mesh editor will be proposed. By default, the tool <literal>Monitor</literal> will be choosen. </para> </section> <section><title>Create a telemac project</title> <para>This action is enabled if a <literal>serafin</literal> is selected. It allows the user to create a telemac project using the selected file as the geometry file. Then, you have only to choose which kind of telemac soft you want to create (telemac2d, telemac3d, artemis, ..) and the language. </para> </section> <section><title>Execute Telemac soft</title> <para>If a steering file is selected, the user can choose a telemac soft and then launch it.</para> <note><para>It is possible to define the path for the telemac installation directory from the preferences panel (menu <quote>Edition</quote>). </para></note> </section> <section><title>Post</title> <para>If a <quote>Serafin</quote> file is selected, the postprocessor can be launched thanks to this action.</para> </section> </chapter> </part> Index: telemac.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/telemac/telemac.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** telemac.xml 1 Jun 2004 11:05:41 -0000 1.1 --- telemac.xml 2 Jun 2004 15:36:13 -0000 1.2 *************** *** 4,8 **** <!ENTITY url "../../"> <!ENTITY preface SYSTEM "../common/preface.inc.xml"> - <!ENTITY cha-common-general SYSTEM "../common/common-general.inc.xml"> <!ENTITY cha-superviseur SYSTEM "telemac-superviseur.inc.xml"> <!ENTITY sect-hyd-general SYSTEM "telemac-editeur-hyd-general.inc.xml"> --- 4,7 ---- *************** *** 13,17 **** <subtitle>Documentation utilisateur</subtitle> &preface; ! &cha-common-general; &cha-superviseur; <part> --- 12,16 ---- <subtitle>Documentation utilisateur</subtitle> &preface; ! &common-general; &cha-superviseur; <part> |
|
From: Frederic D. <de...@us...> - 2004-06-02 15:36:24
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19394/src/prepro Modified Files: build.xml Log Message: anglais Index: build.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 1 Jun 2004 11:03:22 -0000 1.5 --- build.xml 2 Jun 2004 15:36:14 -0000 1.6 *************** *** 123,130 **** --- 123,172 ---- </style> </target> + <target name="build" depends="build_web,build_devel,print"> </target> + <target name="build_aide" depends=".initialisation" description="aide en plusieurs fichiers dans le rep html"> + <property name=".reflux.dest" location="${html.dir}/reflux" /> + <property name=".reflux.src" location="${src.dir}/reflux" /> + <mkdir dir="${.reflux.dest}" /> + <style destdir="${.reflux.dest}" style="${xmlstyle.dir}/html/chunk.xsl" + extension=".html" force="true" includes="**/*.xml" excludes="**/*.inc.xml" basedir="${.reflux.src}"> + <param name="base.dir" expression="${.reflux.dest}/" /> + <param name="chunk.quietly" expression="1" /> + <param name="toc.section.depth" expression="0" /> + <param name="chunk.section.depth" expression="0" /> + <param name="html.cleanup" expression="1" /> + <param name="html.stylesheet" expression="../../style/aide.css" /> + <param name="section.autolabel" expression="1" /> + <param name="label.from.part" expression="1" /> + <param name="section.label.includes.component.label" expression="1" /> + <param name="admon.graphics" expression="1" /> + <param name="admon.textlabel" expression="0" /> + <param name="admon.graphics.path" expression="../../images/" /> + </style> + <delete file="${.reflux.dest}/reflux.html"/> + <property name=".telemac.dest" location="${html.dir}/telemac" /> + <property name=".telemac.src" location="${src.dir}/telemac" /> + <mkdir dir="${.telemac.dest}" /> + <style destdir="${.telemac.dest}" style="${xmlstyle.dir}/html/chunk.xsl" + extension=".html" force="true" includes="**/*.xml" excludes="**/*.inc.xml" basedir="${.telemac.src}"> + <param name="base.dir" expression="${.telemac.dest}/" /> + <param name="chunk.quietly" expression="1" /> + <param name="toc.section.depth" expression="0" /> + <param name="chunk.section.depth" expression="0" /> + <param name="html.cleanup" expression="1" /> + <param name="html.stylesheet" expression="../../style/aide.css" /> + <param name="section.autolabel" expression="1" /> + <param name="label.from.part" expression="1" /> + <param name="section.label.includes.component.label" expression="1" /> + <param name="admon.graphics" expression="1" /> + <param name="admon.textlabel" expression="0" /> + <param name="admon.graphics.path" expression="../../images/" /> + </style> + <delete file="${.telemac.dest}/telemac.html"/> + </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"> |
|
From: Frederic D. <de...@us...> - 2004-06-02 15:36:24
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/src/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19394/src/prepro/src/images Removed Files: annuler_16.gif Log Message: anglais --- annuler_16.gif DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-02 15:36:23
|
Update of /cvsroot/fudaa/fudaa_devel/aide/src/prepro/template In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19394/src/prepro/template Modified Files: book.dtd Log Message: anglais Index: book.dtd =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/aide/src/prepro/template/book.dtd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** book.dtd 1 Jun 2004 11:07:05 -0000 1.1 --- book.dtd 2 Jun 2004 15:36:13 -0000 1.2 *************** *** 2,11 **** --- 2,16 ---- %docbook; <!ENTITY common-editeur2D SYSTEM "../src/common/common-editeur2D.inc.xml"> + <!ENTITY common-editeur2D-en SYSTEM "../src/common/common-editeur2D.en.inc.xml"> <!ENTITY common-superviseur SYSTEM "../src/common/common-superviseur.inc.xml"> + <!ENTITY common-superviseur-en SYSTEM "../src/common/common-superviseur.en.inc.xml"> <!ENTITY common-meshviewer SYSTEM "../src/common/common-meshviewer.inc.xml"> <!ENTITY common-general SYSTEM "../src/common/common-general.inc.xml"> + <!ENTITY common-general-en SYSTEM "../src/common/common-general.en.inc.xml"> <!ENTITY common-courbes-temp SYSTEM "../src/common/common-courbes-temporelles.inc.xml"> <!ENTITY common-reflux-extension SYSTEM "../src/common/common-reflux-extension.inc.xml"> + <!ENTITY common-reflux-extension-en SYSTEM "../src/common/common-reflux-extension.en.inc.xml"> <!ENTITY common-telemac-extension SYSTEM "../src/common/common-telemac-extension.inc.xml"> + <!ENTITY common-telemac-extension-en SYSTEM "../src/common/common-telemac-extension.en.inc.xml"> <!ENTITY version "0.05"> <!ENTITY version-date "mai 2004"> |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/meshviewer Modified Files: MvActCheckDefault.java MvControllerSrc.java MvActModifyDefault.java MvActView.java MvAct.java MvActCheck.java MvActLoadDefault.java MvParentInterface.java Added Files: MvFindDialog.java MvFindComponent.java MvVisuPanel.java numelements_16.gif MvFindAction.java numnoeuds_16.gif numelements_24.gif MvResource.java numnoeuds_24.gif MvInternalFrame.java MvFindActionDefault.java MvFindComponentDefault.java mv_en.fr_txt Removed Files: Mv.java MvActViewDefault.java MvFrameContentDefault.java MvProgressAdapter.java MvPanelMain.java MvPanelViewer.java MvPanelLayer.java MvTask.java Log Message: --- NEW FILE: numelements_24.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mv_en.fr_txt --- (This appears to be a binary file; contents omitted.) --- MvActViewDefault.java DELETED --- --- MvPanelMain.java DELETED --- --- MvFrameContentDefault.java DELETED --- Index: MvActCheck.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActCheck.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvActCheck.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvActCheck.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 20,24 **** public interface MvActCheck extends MvAct{ ! public void check(EfGridSource _s,MvControllerSrc _src); } --- 20,24 ---- public interface MvActCheck extends MvAct{ ! public void check(MvControllerSrc _src); } --- NEW FILE: MvFindComponentDefault.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: numnoeuds_24.gif --- (This appears to be a binary file; contents omitted.) Index: MvActView.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActView.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvActView.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvActView.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 24,29 **** public interface MvActView extends MvAct{ - public void build(Container _c); - public void init(FileOperationSynthese _s); /** --- 24,27 ---- --- NEW FILE: numelements_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvInternalFrame.java --- /** * @creation 27 mai 2004 * @modification $Date: 2004/06/01 11:27:42 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.fudaa.meshviewer; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.ef.EfGridSourceMutable; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.ebli.calque.ZCalqueAffichageDonnees; import org.fudaa.ebli.calque.ZEbliFilleCalques; import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.meshviewer.controle.MvCheckLayerGroup; import org.fudaa.fudaa.meshviewer.controle.MvControlResult; import org.fudaa.fudaa.meshviewer.layer.MvInfoDelegateAbstract; import org.fudaa.fudaa.ressource.FudaaResource; import org.fudaa.fudaa.tr.common.TrResource; import com.memoire.bu.BuMenu; import com.memoire.bu.BuResource; import com.memoire.bu.BuSelectFindReplaceInterface; import com.memoire.bu.BuTask; import com.memoire.bu.BuUndoRedoInterface; /** * @author Fred Deniger * @version $Id: MvInternalFrame.java,v 1.1 2004/06/01 11:27:42 deniger Exp $ */ public class MvInternalFrame extends ZEbliFilleCalques implements MvActView, MvParentInterface, BuUndoRedoInterface, BuSelectFindReplaceInterface { MvCheckLayerGroup gpCheck_; MvControllerSrc src_; /** * @param _impl l'impl parente * @param _src le source */ public MvInternalFrame(FudaaCommonImplementation _impl, MvControllerSrc _src) { super(new MvVisuPanel(_impl), _impl, null); src_ = _src; } /** * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent _e) { if ("CHECK".equals(_e.getActionCommand())) { check(); } else super.actionPerformed(_e); } private void addMvControlResult(MvControlResult _r) { if (_r.getIdx() != null) { if (gpCheck_ == null) { gpCheck_ = new MvCheckLayerGroup(); gpCheck_.setDestructible(false); gpCheck_.setTitle(FudaaResource.getS("Contröles")); pn_.addCalque(gpCheck_, true); ((MvVisuPanel) pn_).getCqInfos().enPremier(); } ZCalqueAffichageDonnees z = _r.buildLayer(getGrid()); gpCheck_.add(z); gpCheck_.enPremier(z); } } protected void check() { src_.check(); } public ProgressionInterface createProgression(BuTask _t) { return getImpl().createProgressionInterface(_t); } protected void fillSpecificMenu(BuMenu _m) { _m.addMenuItem(TrResource.getS("Contrôle"), "CHECK", BuResource.BU.getIcon("valider"), true, KeyEvent.VK_C, this); super.fillSpecificMenu(_m); } public void find() { getMvVisuPanel().find(); } protected EfGrid getGrid() { return src_.getSource().getGrid(); } protected FudaaCommonImplementation getImpl() { return getMvVisuPanel().getImpl(); } public MvVisuPanel getMvVisuPanel() { return (MvVisuPanel) pn_; } /** * @see org.fudaa.fudaa.meshviewer.MvParentInterface#getParentComponent() */ public Component getParentComponent() { return this; } /** * @see org.fudaa.fudaa.meshviewer.MvPanelViewer#init(org.fudaa.dodico.fichiers.FileOperationSynthese) */ public void init(FileOperationSynthese _s) { MvVisuPanel p = getMvVisuPanel(); if (p.getGridGroup() == null) { MvInfoDelegateAbstract delegate = new MvInfoDelegateAbstract() { public EfGrid getGrid() { return MvInternalFrame.this.getGrid(); } }; EfGrid g = ((EfGridSource) _s.getSource()).getGrid(); p.addCqInfos(g); p.addCqMaillage(g, delegate); pack(); setVisible(true); getImpl().addInternalFrame(this); restaurer(); } } public void redo() { getMvVisuPanel().redo(); } /** * @see org.fudaa.fudaa.meshviewer.MvPanelViewer#refresh(org.fudaa.dodico.ef.EfGridSource, * org.fudaa.dodico.ef.EfGridSourceMutable) */ public void refresh(EfGridSource _srcInit, EfGridSourceMutable _enCours) { if (_enCours != null) { if (_enCours.getGrid() != getGrid()) { getMvVisuPanel().getGridGroup().setGrid(_enCours.getGrid()); pn_.restaurer(); } } } public void replace() {} public void select() {} /** * @see org.fudaa.fudaa.meshviewer.MvParentInterface#setActionRunning(boolean) */ public void setActionRunning(boolean _b) {} /** * @see org.fudaa.fudaa.meshviewer.MvParentInterface#setMessage(java.lang.String) */ public void setMessage(String _s) {} public void setParent(MvParentInterface _c) {} /** * @see org.fudaa.fudaa.meshviewer.MvParentInterface#setProgression(int) */ public void setProgression(int _v) {} public void undo() { getMvVisuPanel().undo(); } public void updateCheck(MvControlResult[] _a) { if ((_a != null) && (pn_ != null)) { for (int i = _a.length - 1; i >= 0; i--) { addMvControlResult(_a[i]); } } } } --- NEW FILE: MvFindComponent.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvFindDialog.java --- (This appears to be a binary file; contents omitted.) Index: MvActModifyDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActModifyDefault.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvActModifyDefault.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvActModifyDefault.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 25,32 **** } - /** - * - */ - public void setParent(MvParentInterface _c) {} } --- 25,28 ---- Index: MvActCheckDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActCheckDefault.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MvActCheckDefault.java 31 Mar 2004 08:17:50 -0000 1.2 --- MvActCheckDefault.java 1 Jun 2004 11:27:42 -0000 1.3 *************** *** 16,22 **** --- 16,25 ---- import com.memoire.bu.BuScrollPane; import com.memoire.bu.BuTable; + import com.memoire.bu.BuTask; + import com.memoire.bu.BuTaskOperation; import com.memoire.bu.BuTextField; import org.fudaa.dodico.commun.DodicoResource; + import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.ef.EfGridSource; *************** *** 33,42 **** public class MvActCheckDefault implements MvActCheck { - MvParentInterface f_; /** * */ ! public void check(final EfGridSource _s, final MvControllerSrc _source) { ! if ((_s == null) || (_s.getGrid() == null)) { new Throwable("grid is null").printStackTrace(); return; --- 36,44 ---- public class MvActCheckDefault implements MvActCheck { /** * */ ! public void check(final MvControllerSrc _source) { ! if ((_source == null) || (_source.getSource().getGrid() == null)) { new Throwable("grid is null").printStackTrace(); return; *************** *** 44,52 **** final MvControlPanel pn= new MvControlPanel(); if (EbliSimpleDialogPanel ! .isOkResponse(pn.afficheModale(f_.getParentComponent()))) { ! new MvTask(f_) { public void act() { ! f_.setActionRunning(true); ! MvControlResult[] r= pn.execute(_s.getGrid(), prog_); if (r != null) { ArrayList descValue= new ArrayList(); --- 46,54 ---- final MvControlPanel pn= new MvControlPanel(); if (EbliSimpleDialogPanel ! .isOkResponse(pn.afficheModale(_source.getParent().getParentComponent()))) { ! new BuTaskOperation(null,MvResource.getS("Contrôle")) { public void act() { ! ProgressionInterface prog_=_source.getParent().createProgression(this); ! MvControlResult[] r= pn.execute(_source.getSource().getGrid(), prog_); if (r != null) { ArrayList descValue= new ArrayList(); *************** *** 77,85 **** new BuScrollPane(new BuTable(values, name)), BuBorderLayout.CENTER); ! d.afficheModale(f_.getParentComponent(),EbliSimpleDialog.OK_OPTION); } } _source.updateCheckResult(r); ! f_.setActionRunning(false); } } --- 79,87 ---- new BuScrollPane(new BuTable(values, name)), BuBorderLayout.CENTER); ! d.afficheModale(_source.getParent().getParentComponent(),EbliSimpleDialog.OK_OPTION); } } _source.updateCheckResult(r); ! _source.getParent().setActionRunning(false); } } *************** *** 88,97 **** } - /** - * - */ - public void setParent(MvParentInterface _c) { - f_= _c; - } } --- 90,93 ---- --- NEW FILE: MvResource.java --- /** * @creation 27 mai 2004 * @modification $Date: 2004/06/01 11:27:42 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.fudaa.meshviewer; import org.fudaa.fudaa.ressource.FudaaResource; import com.memoire.bu.BuResource; /** * @author Fred Deniger * @version $Id: MvResource.java,v 1.1 2004/06/01 11:27:42 deniger Exp $ */ public class MvResource extends FudaaResource { public final static MvResource MV= new MvResource(FudaaResource.FUDAA); protected MvResource(BuResource _parent) { super(_parent); } /** * A "shortcut" to get i18n String (FudaaResource.FUDAA.getString) */ public static String getS(String _s) { return MV.getString(_s); } /** * A "shortcut" to get i18n String (FudaaResource.FUDAA.getString) */ public static String getS(String _s, String _v0) { return MV.getString(_s, _v0); } /** * A "shortcut" to get i18n String (FudaaResource.FUDAA.getString) */ public static String getS(String _s, String _v0, String _v1) { return MV.getString(_s, _v0, _v1); } } --- Mv.java DELETED --- --- NEW FILE: MvFindActionDefault.java --- (This appears to be a binary file; contents omitted.) Index: MvParentInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvParentInterface.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvParentInterface.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvParentInterface.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 12,15 **** --- 12,16 ---- import com.memoire.bu.BuProgressBar; + import com.memoire.bu.BuTask; import com.memoire.bu.BuTaskView; *************** *** 24,28 **** public Component getParentComponent(); public void setActionRunning(boolean _b); ! public ProgressionInterface createProgression(); public void setMessage(String _s); public void setProgression(int _v); --- 25,29 ---- public Component getParentComponent(); public void setActionRunning(boolean _b); ! public ProgressionInterface createProgression(BuTask _t); public void setMessage(String _s); public void setProgression(int _v); Index: MvActLoadDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActLoadDefault.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MvActLoadDefault.java 31 Mar 2004 08:17:50 -0000 1.4 --- MvActLoadDefault.java 1 Jun 2004 11:27:42 -0000 1.5 *************** *** 9,15 **** package org.fudaa.fudaa.meshviewer; - import java.awt.Component; import java.io.File; import java.util.List; import javax.swing.JTextField; import javax.swing.event.DocumentEvent; --- 9,15 ---- package org.fudaa.fudaa.meshviewer; import java.io.File; import java.util.List; + import javax.swing.JTextField; import javax.swing.event.DocumentEvent; *************** *** 17,27 **** import javax.swing.text.BadLocationException; import javax.swing.text.Document; ! import org.fudaa.ctulu.CtuluLib; ! import com.memoire.bu.BuComboBox; ! import com.memoire.bu.BuGridLayout; ! import com.memoire.bu.BuTaskOperation; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; - import org.fudaa.dodico.commun.ProgressionBuAdapter; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dunes.io.DunesFileFormat; --- 17,23 ---- import javax.swing.text.BadLocationException; import javax.swing.text.Document; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dunes.io.DunesFileFormat; *************** *** 36,42 **** import org.fudaa.dodico.trigrid.TrigridFileFormat; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; - import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.ressource.FudaaResource; /** * @author deniger --- 32,42 ---- import org.fudaa.dodico.trigrid.TrigridFileFormat; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.ressource.FudaaResource; + import com.memoire.bu.BuComboBox; + import com.memoire.bu.BuGridLayout; + import com.memoire.bu.BuTask; + import com.memoire.bu.BuTaskOperation; + /** * @author deniger *************** *** 45,61 **** public class MvActLoadDefault implements MvActLoad { ! public static DodicoPermanentList FT_LIST = ! new DodicoPermanentList( ! DodicoLib.sort( ! new FileFormat[] { ! INPFileFormat.getInstance(), ! DunesFileFormat.getInstance(), ! CorEleBthFileFormat.getInstance(), ! SerafinFileFormat.getInstance(), ! TrigridFileFormat.getInstance()})); ! MvParentInterface parent_; /** ! * * */ public void load(File _f, final MvControllerSrc _s) { --- 45,56 ---- public class MvActLoadDefault implements MvActLoad { ! public static DodicoPermanentList FT_LIST = new DodicoPermanentList(DodicoLib ! .sort(new FileFormat[] { ! INPFileFormat.getInstance(), DunesFileFormat.getInstance(), ! CorEleBthFileFormat.getInstance(), SerafinFileFormat.getInstance(), ! TrigridFileFormat.getInstance() })); /** ! * * */ public void load(File _f, final MvControllerSrc _s) { *************** *** 67,72 **** pn.setLayout(new BuGridLayout(1, 5, 5, false, false)); final BuComboBox cb = new BuComboBox(FT_LIST.toArray()); ! JTextField f = ! pn.addLabelFileChooserPanel(FudaaResource.getS("Fichier"), null, false); f.getDocument().addDocumentListener(new DocumentListener() { --- 62,66 ---- pn.setLayout(new BuGridLayout(1, 5, 5, false, false)); final BuComboBox cb = new BuComboBox(FT_LIST.toArray()); ! JTextField f = pn.addLabelFileChooserPanel(FudaaResource.getS("Fichier"), null, false); f.getDocument().addDocumentListener(new DocumentListener() { *************** *** 85,97 **** private void updateCB(Document d) { try { ! cb.setSelectedItem( ! guessFormat( ! new File(d.getText(0, d.getLength())).getName(), ! FT_LIST)); ! } catch (BadLocationException e) {} } }); pn.add(cb); ! int i = pn.afficheModale(parent_.getParentComponent()); if (EbliSimpleDialogPanel.isOkResponse(i)) { String filename = f.getText(); --- 79,91 ---- private void updateCB(Document d) { try { ! cb ! .setSelectedItem(guessFormat(new File(d.getText(0, d.getLength())).getName(), ! FT_LIST)); ! } ! catch (BadLocationException e) {} } }); pn.add(cb); ! int i = pn.afficheModale(_s.getParent().getParentComponent()); if (EbliSimpleDialogPanel.isOkResponse(i)) { String filename = f.getText(); *************** *** 101,137 **** } } ! } else { ft = guessFormat(file.getName(), FT_LIST); } if ((file != null) && (ft != null)) { ! loadFileAct( ! _s, ! file, ! (FileFormatGridVersion) ft.getLastVersionInstance()); } } ! private void loadFileAct( ! final MvControllerSrc _s, ! final File _file, ! final FileFormatGridVersion _v) { if (_file.exists()) { ! MvTask op = new MvTask(parent_) { ! public void act() { FileOperationSynthese s = _v.readGrid(_file, prog_); EfGridSource src = (EfGridSource) s.getSource(); if (src != null) { ! if (_v.getFileFormat().getID() ! == SerafinFileFormat.getInstance().getID()) { SerafinInterface i = (SerafinInterface) src; ! i.getGrid().computeBordFast( ! i.getGrid(), ! i.getPtsFrontiere(), ! prog_); ! } else { src.getGrid().computeBord(prog_); } } _s.setLoaded(s); } --- 95,128 ---- } } ! } ! 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(); if (src != null) { ! if (_v.getFileFormat().getID() == SerafinFileFormat.getInstance().getID()) { SerafinInterface i = (SerafinInterface) src; ! i.getGrid().computeBordFast(i.getGrid(), i.getPtsFrontiere(), prog_); ! } ! else { src.getGrid().computeBord(prog_); } } + System.out.println("grid loaded"); _s.setLoaded(s); } *************** *** 142,162 **** /** - * * - */ - public void setParent(MvParentInterface _c) { - parent_ = _c; - } - - - /** * @param _fileName le nom de fichier * @param _fileFormatList la liste des formats * @return le format correspondant au nom de fichier */ ! public static FileFormat guessFormat( ! String _fileName, ! List _fileFormatList) { ! if ((_fileName == null) || (_fileFormatList == null)) ! return null; int idx = _fileName.indexOf('.'); if ((idx > 0) && (idx < _fileName.length())) { --- 133,142 ---- /** * @param _fileName le nom de fichier * @param _fileFormatList la liste des formats * @return le format correspondant au nom de fichier */ ! public static FileFormat guessFormat(String _fileName, List _fileFormatList) { ! if ((_fileName == null) || (_fileFormatList == null)) return null; int idx = _fileName.indexOf('.'); if ((idx > 0) && (idx < _fileName.length())) { *************** *** 165,184 **** for (int i = _fileFormatList.size() - 1; i >= 0; i--) { temp = (FileFormat) _fileFormatList.get(i); ! if (temp.isExtension(ext)) ! return temp; } - } else if ( - _fileFormatList.contains(SerafinFileFormat.getInstance()) - && (_fileName.startsWith("geo"))) { - return SerafinFileFormat.getInstance(); } return null; } ! /** * @param _fileName le nom du fichier * @return si le nom s'apparent a un fichier serafin */ ! public static boolean isSerafinFile(String _fileName){ int idx = _fileName.indexOf('.'); if ((idx > 0) && (idx < _fileName.length())) { --- 145,161 ---- for (int i = _fileFormatList.size() - 1; i >= 0; i--) { temp = (FileFormat) _fileFormatList.get(i); ! if (temp.isExtension(ext)) return temp; } } + else if (_fileFormatList.contains(SerafinFileFormat.getInstance()) + && (_fileName.startsWith("geo"))) { return SerafinFileFormat.getInstance(); } return null; } ! /** * @param _fileName le nom du fichier * @return si le nom s'apparent a un fichier serafin */ ! public static boolean isSerafinFile(String _fileName) { int idx = _fileName.indexOf('.'); if ((idx > 0) && (idx < _fileName.length())) { *************** *** 186,193 **** return SerafinFileFormat.getInstance().isExtension(ext); } ! if(_fileName.startsWith("geo")) return true; ! if(_fileName.startsWith("res")) return true; return false; } ! } --- 163,170 ---- return SerafinFileFormat.getInstance().isExtension(ext); } ! if (_fileName.startsWith("geo")) return true; ! if (_fileName.startsWith("res")) return true; return false; } ! } \ No newline at end of file Index: MvAct.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvAct.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvAct.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvAct.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 9,13 **** package org.fudaa.fudaa.meshviewer; - import java.awt.Component; /** --- 9,12 ---- *************** *** 16,20 **** */ public interface MvAct { - public void setParent(MvParentInterface _c); } --- 15,18 ---- --- NEW FILE: MvVisuPanel.java --- (This appears to be a binary file; contents omitted.) --- MvPanelLayer.java DELETED --- --- MvPanelViewer.java DELETED --- --- NEW FILE: numnoeuds_16.gif --- (This appears to be a binary file; contents omitted.) Index: MvControllerSrc.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvControllerSrc.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvControllerSrc.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvControllerSrc.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 24,38 **** */ public class MvControllerSrc { ! EfGridSource source_; EfGridSourceMutable gridModified_; ! MvActLoad loader_; ! MvActCheck checker_; ! MvActModify modifier_; ! MvActSave saver_; ! MvActClose close_; ! MvActView viewer_; ! public void setDefaultComponent() { ! loader_= new MvActLoadDefault(); } --- 24,42 ---- */ public class MvControllerSrc { ! ! EfGridSource source_; EfGridSourceMutable gridModified_; ! //MvActLoad loader_; ! MvActCheck checker_; ! MvActModify modifier_; ! //MvActSave saver_; ! //MvActClose close_; ! MvActView viewer_; ! MvParentInterface parent_; ! public void setDefaultComponent() {} ! ! public EfGridSource getSource() { ! return source_; } *************** *** 43,83 **** } public void setParent(MvParentInterface _c) { ! if (loader_ != null) ! loader_.setParent(_c); ! if (checker_ != null) ! checker_.setParent(_c); ! if (modifier_ != null) ! modifier_.setParent(_c); ! if (saver_ != null) ! saver_.setParent(_c); ! if (close_ != null) ! close_.setParent(_c); ! if (viewer_ != null) ! viewer_.setParent(_c); } public void setLoaded(FileOperationSynthese _s) { ! if (_s == null) ! return; ! source_= (EfGridSource)_s.getSource(); ! gridModified_= new EfGridSourceMutable(); ! if (viewer_ != null) ! viewer_.init(_s); } ! public void load() { ! load(null); ! } ! ! public void load(File f) { ! if (loader_ != null) { ! if ((close_ != null) && (!close_.close(this, saver_))) ! return; ! loader_.load(f,this); ! } ! } ! ! public void modify() { --- 47,77 ---- } + public MvParentInterface getParent() { + return parent_; + } + public void setParent(MvParentInterface _c) { ! parent_ = _c; } public void setLoaded(FileOperationSynthese _s) { ! if (_s == null) return; ! System.out.println("loaded"); ! source_ = (EfGridSource) _s.getSource(); ! gridModified_ = new EfGridSourceMutable(); ! if (viewer_ != null) viewer_.init(_s); } ! // public void load() { ! // load(null); ! // } ! // ! // public void load(File f) { ! // if (loader_ != null) { ! // if ((close_ != null) && (!close_.close(this, saver_))) ! // return; ! // loader_.load(f,this); ! // } ! // } public void modify() { *************** *** 90,99 **** public void check() { ! if (source_ == null) ! return; if (checker_ != null) { ! checker_.check( ! ((gridModified_.getGrid() == null) ? source_ : gridModified_), ! this); } } --- 84,90 ---- public void check() { ! if (source_ == null) return; if (checker_ != null) { ! checker_.check(this); } } *************** *** 102,105 **** --- 93,97 ---- viewer_.updateCheck(_r); } + /** * *************** *** 112,122 **** * */ - public MvActClose getClose() { - return close_; - } - - /** - * - */ public EfGridSourceMutable getGridModified() { return gridModified_; --- 104,107 ---- *************** *** 126,136 **** * */ - public MvActLoad getLoader() { - return loader_; - } - - /** - * - */ public MvActModify getModifier() { return modifier_; --- 111,114 ---- *************** *** 140,150 **** * */ - public MvActSave getSaver() { - return saver_; - } - - /** - * - */ public MvActView getViewer() { return viewer_; --- 118,121 ---- *************** *** 155,173 **** */ public void setChecker(MvActCheck _checker) { ! checker_= _checker; ! } ! ! /** ! * ! */ ! public void setClose(MvActClose _close) { ! close_= _close; ! } ! ! /** ! * ! */ ! public void setLoader(MvActLoad _loader) { ! loader_= _loader; } --- 126,130 ---- */ public void setChecker(MvActCheck _checker) { ! checker_ = _checker; } *************** *** 176,187 **** */ public void setModifier(MvActModify _modifier) { ! modifier_= _modifier; ! } ! ! /** ! * ! */ ! public void setSaver(MvActSave _saver) { ! saver_= _saver; } --- 133,137 ---- */ public void setModifier(MvActModify _modifier) { ! modifier_ = _modifier; } *************** *** 190,194 **** */ public void setViewer(MvActView _viewer) { ! viewer_= _viewer; } --- 140,144 ---- */ public void setViewer(MvActView _viewer) { ! viewer_ = _viewer; } --- NEW FILE: MvFindAction.java --- (This appears to be a binary file; contents omitted.) --- MvProgressAdapter.java DELETED --- --- MvTask.java DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:28
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/ressource Modified Files: fudaa_en.fr_txt pause_20.gif Added Files: fudaa-logo.png Removed Files: fudaa-logo.gif Log Message: Index: fudaa_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource/fudaa_en.fr_txt,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** fudaa_en.fr_txt 14 May 2004 10:27:23 -0000 1.15 --- fudaa_en.fr_txt 1 Jun 2004 11:27:45 -0000 1.16 *************** *** 191,209 **** Tabulation=Tabulation Ressource=Resource - Nombre de noeuds=Number of nodes - Nombre d'éléments=Number of Elements Messages à l'ouverture du fichier=Messages for file opening action Général=General Valeur=Value - Numéros des éléments=Numbers of the elements - Numéros des points=Numbers of the points - Maillage=Grid - Eléments=Elements - Noeuds=Nodes - Nombre de noeuds sélectionnés=Number of selected nodes - Noeud n° {0}=Node {0} - Element n° {0}=Element {0} - Nombre de frontières=Number of frontier - Nombre total de noeuds sur les frontières=Number of nodes on the frontiers Vue=View Construction vue=View construction --- 191,197 ---- Index: pause_20.gif =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource/pause_20.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs6bzvna and /tmp/cvsLnmEu3 differ --- NEW FILE: fudaa-logo.png --- (This appears to be a binary file; contents omitted.) --- fudaa-logo.gif DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:27
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/lido Modified Files: LidoImplementation.java Log Message: Index: LidoImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoImplementation.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** LidoImplementation.java 5 May 2004 12:42:41 -0000 1.14 --- LidoImplementation.java 1 Jun 2004 11:27:45 -0000 1.15 *************** *** 28,71 **** import javax.swing.JOptionPane; - import com.memoire.bu.BuApplication; - import com.memoire.bu.BuAssistant; - import com.memoire.bu.BuBorderLayout; - import com.memoire.bu.BuBrowserPreferencesPanel; - import com.memoire.bu.BuColumn; - import com.memoire.bu.BuCommonInterface; - import com.memoire.bu.BuDesktopPreferencesPanel; - import com.memoire.bu.BuDialogConfirmation; - import com.memoire.bu.BuDialogError; - import com.memoire.bu.BuDialogMessage; - import com.memoire.bu.BuDialogWarning; - import com.memoire.bu.BuGlassPaneStop; - import com.memoire.bu.BuGridLayout; - import com.memoire.bu.BuHelpFrame; - import com.memoire.bu.BuInformationsDocument; - import com.memoire.bu.BuInformationsSoftware; - import com.memoire.bu.BuLabel; - import com.memoire.bu.BuLabelMultiLine; - import com.memoire.bu.BuLanguagePreferencesPanel; - import com.memoire.bu.BuLookPreferencesPanel; - import com.memoire.bu.BuMainPanel; - import com.memoire.bu.BuMenu; - import com.memoire.bu.BuMenuBar; - import com.memoire.bu.BuMenuRecentFiles; - import com.memoire.bu.BuPanel; - import com.memoire.bu.BuPicture; - import com.memoire.bu.BuPreferences; - import com.memoire.bu.BuPreferencesFrame; - import com.memoire.bu.BuProgressBar; - import com.memoire.bu.BuResource; - import com.memoire.bu.BuScrollPane; - import com.memoire.bu.BuTaskOperation; - import com.memoire.bu.BuTaskView; - import com.memoire.bu.BuTextField; - import com.memoire.bu.BuToolBar; - import com.memoire.bu.BuUserPreferencesPanel; - import com.memoire.bu.BuVerticalLayout; - import com.memoire.fu.FuLib; - - import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.corba.calcul.SProgression; import org.fudaa.dodico.corba.lido.ICalculLido; --- 28,31 ---- *************** *** 99,103 **** import org.fudaa.ebli.ressource.EbliResource; import org.fudaa.fudaa.commun.FudaaBrowserControl; - import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.commun.FudaaImplementation; import org.fudaa.fudaa.commun.FudaaLib; --- 59,62 ---- *************** *** 106,110 **** import org.fudaa.fudaa.commun.aide.FudaaAstucesDialog; import org.fudaa.fudaa.commun.dodico.FudaaDodicoTacheConnexion; - import org.fudaa.fudaa.commun.dodico.FudaaDodicoSelectionServeur; import org.fudaa.fudaa.commun.projet.FudaaFiltreFichier; import org.fudaa.fudaa.commun.projet.FudaaParamChangeLog; --- 65,68 ---- *************** *** 120,123 **** --- 78,121 ---- import org.fudaa.fudaa.lido.ihmhelper.gestion.LidoParamsHelper; import org.fudaa.fudaa.ressource.FudaaResource; + + import com.memoire.bu.BuApplication; + import com.memoire.bu.BuAssistant; + import com.memoire.bu.BuBorderLayout; + import com.memoire.bu.BuBrowserPreferencesPanel; + import com.memoire.bu.BuColumn; + import com.memoire.bu.BuCommonInterface; + import com.memoire.bu.BuDesktopPreferencesPanel; + import com.memoire.bu.BuDialogConfirmation; + import com.memoire.bu.BuDialogError; + import com.memoire.bu.BuDialogMessage; + import com.memoire.bu.BuDialogWarning; + import com.memoire.bu.BuGlassPaneStop; + import com.memoire.bu.BuGridLayout; + import com.memoire.bu.BuHelpFrame; + import com.memoire.bu.BuInformationsDocument; + import com.memoire.bu.BuInformationsSoftware; + import com.memoire.bu.BuLabel; + import com.memoire.bu.BuLabelMultiLine; + import com.memoire.bu.BuLanguagePreferencesPanel; + import com.memoire.bu.BuLookPreferencesPanel; + import com.memoire.bu.BuMainPanel; + import com.memoire.bu.BuMenu; + import com.memoire.bu.BuMenuBar; + import com.memoire.bu.BuMenuRecentFiles; + import com.memoire.bu.BuPanel; + import com.memoire.bu.BuPicture; + import com.memoire.bu.BuPreferences; + import com.memoire.bu.BuPreferencesFrame; + import com.memoire.bu.BuPreferencesEditorPanel; + import com.memoire.bu.BuProgressBar; + import com.memoire.bu.BuResource; + import com.memoire.bu.BuScrollPane; + import com.memoire.bu.BuTaskOperation; + import com.memoire.bu.BuTaskView; + import com.memoire.bu.BuTextField; + import com.memoire.bu.BuToolBar; + import com.memoire.bu.BuUserPreferencesPanel; + import com.memoire.bu.BuVerticalLayout; + import com.memoire.fu.FuLib; /** * @version $Revision$ $Date$ by $Author$ *************** *** 141,145 **** // private String args [] = new String [2]; private FudaaProjet projet_; - private BuPreferencesFrame preferences_; private FudaaProjetInformationsFrame fProprietes_; //ajout de l'impression --- 139,142 ---- *************** *** 220,224 **** projet_ = null; ts_ = null; - preferences_ = null; BuInformationsSoftware infSoft = getInformationsSoftware(); getApp().setTitle("Lido"); --- 217,220 ---- *************** *** 1402,1407 **** } ! protected void buildPreferences() { ! preferences_ = new BuPreferencesFrame(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); --- 1398,1403 ---- } ! protected BuPreferencesEditorPanel buildPreferences() { ! BuPreferencesEditorPanel preferences_ = new BuPreferencesEditorPanel(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); *************** *** 1412,1415 **** --- 1408,1412 ---- preferences_.addTab(new FudaaAidePreferencesPanel(this, LidoPreferences.LIDO)); preferences_.addTab(new EbliMiseEnPagePreferencesPanel()); + return preferences_; } |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:27
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/tr/reflux Modified Files: TrRefluxImplHelper.java TrRefluxParametres.java TrRefluxAppliManager.java TrRefluxProjectDispatcherListener.java TrRefluxFilleProjet.java TrRefluxProjectFactory.java TrRefluxProjet.java TrRefluxXmlProjectWriter.java TrRefluxSIPlan.java Removed Files: TrRefluxCalculLocalOld.java.save TrRefluxCalculLocal.java.save Log Message: Index: TrRefluxProjectFactory.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectFactory.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TrRefluxProjectFactory.java 5 May 2004 12:42:37 -0000 1.12 --- TrRefluxProjectFactory.java 1 Jun 2004 11:27:42 -0000 1.13 *************** *** 29,33 **** import org.fudaa.dodico.reflux.io.RefluxSolutionInitReader; import org.fudaa.fudaa.tr.common.TrFileFormatManager; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; import org.fudaa.fudaa.tr.common.TrResource; /** --- 29,33 ---- import org.fudaa.dodico.reflux.io.RefluxSolutionInitReader; import org.fudaa.fudaa.tr.common.TrFileFormatManager; ! import org.fudaa.fudaa.tr.common.TrImplementationEditorAbstract; import org.fudaa.fudaa.tr.common.TrResource; /** *************** *** 46,62 **** * @return les parametres */ ! public final static TrRefluxParametres createRefluxParametresFromINP( ! File _f, ! INPFileFormat.INPVersion _ft, ! ProgressionInterface _progress, ! TrImplementationAbstract _ui) { FileOperationSynthese synt = _ft.read(_f, _progress); INPInterface inter = (INPInterface) synt.getSource(); ! if (_ui != null) ! _ui.manageErrorOperationAndIsFatal(synt); ! if (synt.containsFatalError()) ! return null; ! if (inter == null) ! return null; TrRefluxParametres r = new TrRefluxParametres(); r.ui_ = _ui; --- 46,57 ---- * @return les parametres */ ! public final static TrRefluxParametres createRefluxParametresFromINP(File _f, ! INPFileFormat.INPVersion _ft, ProgressionInterface _progress, ! TrImplementationEditorAbstract _ui) { FileOperationSynthese synt = _ft.read(_f, _progress); INPInterface inter = (INPInterface) synt.getSource(); ! if (_ui != null) _ui.manageErrorOperationAndIsFatal(synt); ! if (synt.containsFatalError()) return null; ! if (inter == null) return null; TrRefluxParametres r = new TrRefluxParametres(); r.ui_ = _ui; *************** *** 64,90 **** String s = _f.getName(); int i = s.indexOf('.'); ! if (i > 0) ! s = s.substring(0, i); r.title_ = s; DodicoAnalyze analyze = new DodicoAnalyze(); ! String sifile=_ft.getSolutionInitiales(inter.getFichiers()); H2dRefluxSICourant2D si2D = null; ! if(sifile!=null){ ! File siv = new File(_f.getParentFile(),sifile ); ! //a modifier par la suite pour prendre en compte des si non 2D ! ! if (siv.exists()) { ! if(CtuluLib.DEBUG) CtuluLib.debug("load si data"); ! synt = RefluxSolutionInitReader.loadSI(inter.getGrid(), siv, _progress); ! if (_ui != null) _ui.manageErrorOperationAndIsFatal(synt); ! if (!synt.containsFatalError()) { ! si2D = (H2dRefluxSICourant2D) synt.getSource(); } } ! } ! analyze.setDesc( ! TrResource.getS("Analyse du fichier") ! + CtuluLib.ESPACE ! + _f.getAbsolutePath()); r.params_ = H2dRefluxParameters.init(inter, si2D, _progress, _ft, analyze); if (_ui != null) { --- 59,81 ---- String s = _f.getName(); int i = s.indexOf('.'); ! if (i > 0) s = s.substring(0, i); r.title_ = s; DodicoAnalyze analyze = new DodicoAnalyze(); ! String sifile = _ft.getSolutionInitiales(inter.getFichiers()); H2dRefluxSICourant2D si2D = null; ! if (sifile != null) { ! File siv = new File(_f.getParentFile(), sifile); ! //a modifier par la suite pour prendre en compte des si non 2D ! ! if (siv.exists()) { ! if (CtuluLib.DEBUG) CtuluLib.debug("load si data"); ! synt = RefluxSolutionInitReader.loadSI(inter.getGrid(), siv, _progress); ! if (_ui != null) _ui.manageErrorOperationAndIsFatal(synt); ! if (!synt.containsFatalError()) { ! si2D = (H2dRefluxSICourant2D) synt.getSource(); ! } } } ! analyze.setDesc(TrResource.getS("Analyse du fichier") + CtuluLib.ESPACE + _f.getAbsolutePath()); r.params_ = H2dRefluxParameters.init(inter, si2D, _progress, _ft, analyze); if (_ui != null) { *************** *** 103,126 **** * @return un nouveau projet */ ! public static TrRefluxProjet createRefluxProjectFromINP( ! File _file, ! INPFileFormat.INPVersion _fileFormat, ! ProgressionInterface _progress, ! TrImplementationAbstract _ui) { ! TrRefluxParametres params_ = ! createRefluxParametresFromINP(_file, _fileFormat, _progress, _ui); _progress.setProgression(100); if (params_ != null) { TrRefluxProjet p = new TrRefluxProjet(params_); ! File prex = new File(_file.getParentFile(), params_.getFicNameSansExt() + TrFileFormatManager.REFLUX_XML_EXT); if (CtuluLib.DEBUG) { ! CtuluLib.debug("read .prex"); } if (prex.exists()) { TrRefluxXmlProjectReader r = TrRefluxXmlProjectReader.readPrex(prex, _progress, _ui); ! params_.infos_=r.getDoc(); if (r.getSi() != null) { if (CtuluLib.DEBUG) { ! CtuluLib.debug(".prex contains si"); } r.getSi().setProj(params_); --- 94,115 ---- * @return un nouveau projet */ ! public static TrRefluxProjet createRefluxProjectFromINP(File _file, ! INPFileFormat.INPVersion _fileFormat, ProgressionInterface _progress, ! TrImplementationEditorAbstract _ui) { ! TrRefluxParametres params_ = createRefluxParametresFromINP(_file, _fileFormat, _progress, _ui); _progress.setProgression(100); if (params_ != null) { TrRefluxProjet p = new TrRefluxProjet(params_); ! File prex = new File(_file.getParentFile(), TrFileFormatManager.getXmlName(params_ ! .getFicNameSansExt())); if (CtuluLib.DEBUG) { ! CtuluLib.debug("read " + TrFileFormatManager.XML_EXT); } if (prex.exists()) { TrRefluxXmlProjectReader r = TrRefluxXmlProjectReader.readPrex(prex, _progress, _ui); ! params_.infos_ = r.getDoc(); if (r.getSi() != null) { if (CtuluLib.DEBUG) { ! CtuluLib.debug("contains si"); } r.getSi().setProj(params_); *************** *** 128,136 **** } } ! params_.getH2dRefluxParametres().setListener( ! new TrRefluxProjectDispatcherListener(p)); updateSIData(p); return p; ! } else return null; } --- 117,124 ---- } } ! params_.getH2dRefluxParametres().setListener(new TrRefluxProjectDispatcherListener(p)); updateSIData(p); return p; ! } return null; } *************** *** 146,168 **** * @return un nouveau projet */ ! public static TrRefluxProjet createRefluxProjectFromGrid( ! File _f, ! FileFormatGridVersion _ft, ! H2dProjetType _t, ! ProgressionInterface _op, ! TrImplementationAbstract _ui) { EfGrid g = getValidGrid(_f, _ft, _ui, _op); ! if (g == null) ! return null; TrRefluxParametres r = new TrRefluxParametres(); r.ui_ = _ui; DodicoAnalyze analyze = new DodicoAnalyze(); ! r.params_ = ! H2dRefluxParameters.init( ! g, ! _t, ! _op, ! INPFileFormat.getInstance().getLastINPVersionImpl(), ! analyze); TrRefluxProjet rProjet = new TrRefluxProjet(r); r.title_ = TrResource.getS("Nouveau"); --- 134,146 ---- * @return un nouveau projet */ ! public static TrRefluxProjet createRefluxProjectFromGrid(File _f, FileFormatGridVersion _ft, ! H2dProjetType _t, ProgressionInterface _op, TrImplementationEditorAbstract _ui) { EfGrid g = getValidGrid(_f, _ft, _ui, _op); ! if (g == null) return null; TrRefluxParametres r = new TrRefluxParametres(); r.ui_ = _ui; DodicoAnalyze analyze = new DodicoAnalyze(); ! r.params_ = H2dRefluxParameters.init(g, _t, _op, INPFileFormat.getInstance() ! .getLastINPVersionImpl(), analyze); TrRefluxProjet rProjet = new TrRefluxProjet(r); r.title_ = TrResource.getS("Nouveau"); *************** *** 179,195 **** * @return maillage correctement initialise */ ! public static EfGrid getValidGrid( ! File _f, ! FileFormatGridVersion _ft, ! TrImplementationAbstract _ui, ! ProgressionInterface _op) { ! if ((_f == null) || (_ft == null)) ! return null; _ui.setMainMessage(TrResource.getS("Lecture fichier")); _ui.setMainProgression(5); FileOperationSynthese op = _ft.readGrid(_f, _op); ! if (_ui.manageErrorOperationAndIsFatal(op)) { ! return null; ! } EfGrid g = ((EfGridSource) op.getSource()).getGrid(); if ((g.getPtsNb() == 0) || (g.getEltNb() == 0)) { --- 157,167 ---- * @return maillage correctement initialise */ ! public static EfGrid getValidGrid(File _f, FileFormatGridVersion _ft, ! TrImplementationEditorAbstract _ui, ProgressionInterface _op) { ! if ((_f == null) || (_ft == null)) return null; _ui.setMainMessage(TrResource.getS("Lecture fichier")); _ui.setMainProgression(5); FileOperationSynthese op = _ft.readGrid(_f, _op); ! if (_ui.manageErrorOperationAndIsFatal(op)) { return null; } EfGrid g = ((EfGridSource) op.getSource()).getGrid(); if ((g.getPtsNb() == 0) || (g.getEltNb() == 0)) { *************** *** 202,206 **** _ui.setMainProgression(30); g = EfLib.maillageT3enT6(g, _op, null); ! } else if (g.getEltType() != EfElementType.T6) { _ui.error(H2dResource.getS("Seuls les éléments T3 ou T6 sont acceptés")); _ui.unsetMainMessage(); --- 174,179 ---- _ui.setMainProgression(30); g = EfLib.maillageT3enT6(g, _op, null); ! } ! else if (g.getEltType() != EfElementType.T6) { _ui.error(H2dResource.getS("Seuls les éléments T3 ou T6 sont acceptés")); _ui.unsetMainMessage(); *************** *** 210,216 **** _ui.setMainProgression(50); EfGrid gOptimize = new OLBExec().computeGrid(g, _op, _ui); ! if ((gOptimize == null) ! || (gOptimize.getPtsNb() == 0) ! || (gOptimize.getEltNb() == 0)) { _ui.error(H2dResource.getS("Maillage vide")); _ui.unsetMainMessage(); --- 183,187 ---- _ui.setMainProgression(50); EfGrid gOptimize = new OLBExec().computeGrid(g, _op, _ui); ! if ((gOptimize == null) || (gOptimize.getPtsNb() == 0) || (gOptimize.getEltNb() == 0)) { _ui.error(H2dResource.getS("Maillage vide")); _ui.unsetMainMessage(); *************** *** 245,247 **** } } ! } --- 216,218 ---- } } ! } \ No newline at end of file Index: TrRefluxFilleProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxFilleProjet.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TrRefluxFilleProjet.java 5 May 2004 12:42:37 -0000 1.13 --- TrRefluxFilleProjet.java 1 Jun 2004 11:27:42 -0000 1.14 *************** *** 113,117 **** princ.add(pnEst, BuBorderLayout.EAST); princ.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); ! addTab(BuResource.BU.getString("Projet"), null, princ, null, null); DodicoCommandManager cmd = new DodicoCommandManager(); addTab( --- 113,117 ---- princ.add(pnEst, BuBorderLayout.EAST); princ.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); ! addTab(BuResource.BU.getString("Projet"), null, (FudaaUndoCmdMngContainer)princ, null); DodicoCommandManager cmd = new DodicoCommandManager(); addTab( *************** *** 119,124 **** null, new FDicoEntitePanel(new FDicoEntiteTableModel(proj_, cmd)), ! null, ! cmd); updateState(); } --- 119,123 ---- null, new FDicoEntitePanel(new FDicoEntiteTableModel(proj_, cmd)), ! null); updateState(); } *************** *** 192,196 **** /** ! * * */ public DodicoCommandManager getCmdMng() { --- 191,195 ---- /** ! * @see org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer#getCmdMng() */ public DodicoCommandManager getCmdMng() { *************** *** 199,211 **** /** ! * * */ public void setActive(boolean _b) {} /** * @see org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer#clearCmd(org.fudaa.dodico.commun.DodicoCommandManager) */ ! public void clearCmd(DodicoCommandManager _source) { ! } ! } } --- 198,209 ---- /** ! * @see org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer#setActive(boolean) */ public void setActive(boolean _b) {} + /** * @see org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer#clearCmd(org.fudaa.dodico.commun.DodicoCommandManager) */ ! public void clearCmd(DodicoCommandManager _source) {} } } --- TrRefluxCalculLocal.java.save DELETED --- Index: TrRefluxProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** TrRefluxProjet.java 5 May 2004 12:42:37 -0000 1.24 --- TrRefluxProjet.java 1 Jun 2004 11:27:42 -0000 1.25 *************** *** 47,51 **** import org.fudaa.fudaa.tr.common.TrFilleVisuInterface; import org.fudaa.fudaa.tr.common.TrGrapheFille; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; import org.fudaa.fudaa.tr.common.TrLib; import org.fudaa.fudaa.tr.common.TrParametres; --- 47,52 ---- import org.fudaa.fudaa.tr.common.TrFilleVisuInterface; import org.fudaa.fudaa.tr.common.TrGrapheFille; ! import org.fudaa.fudaa.tr.common.TrImplementationEditorAbstract; ! import org.fudaa.fudaa.tr.common.TrLauncher; import org.fudaa.fudaa.tr.common.TrLib; import org.fudaa.fudaa.tr.common.TrParametres; *************** *** 126,130 **** * @return le lanceur du calcul */ ! public static CalculLauncher launchCalcul(final File _f, final TrImplementationAbstract _impl) { FudaaCalculOp op = new FudaaCalculOp(new RefluxExec()) { --- 127,131 ---- * @return le lanceur du calcul */ ! public static CalculLauncher launchCalcul(final FudaaUI _ui,final File _f, final TrLauncher _impl) { FudaaCalculOp op = new FudaaCalculOp(new RefluxExec()) { *************** *** 146,150 **** } if (out.exists()) { ! _impl.openFileInLogFrame(out); } } --- 147,151 ---- } if (out.exists()) { ! _impl.openLogFrame(out); } } *************** *** 154,158 **** } }; ! op.setImpl(_impl); return op; } --- 155,159 ---- } }; ! op.setImpl(_ui); return op; } *************** *** 162,166 **** TrGrapheFille courbeFille_; TrRefluxFilleProjet fille_; ! TrImplementationAbstract impl_; TrRefluxParametres params_; EbliSimpleAction projectAction_; --- 163,167 ---- TrGrapheFille courbeFille_; TrRefluxFilleProjet fille_; ! TrImplementationEditorAbstract impl_; TrRefluxParametres params_; EbliSimpleAction projectAction_; *************** *** 349,353 **** * @see org.fudaa.fudaa.tr.common.TrProjet#active(org.fudaa.fudaa.tr.TrImplementationAbstract) */ ! public void active(TrImplementationAbstract _impl) { if (impl_ != null) return; --- 350,354 ---- * @see org.fudaa.fudaa.tr.common.TrProjet#active(org.fudaa.fudaa.tr.TrImplementationAbstract) */ ! public void active(TrImplementationEditorAbstract _impl) { if (impl_ != null) return; Index: TrRefluxAppliManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxAppliManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrRefluxAppliManager.java 14 May 2004 10:27:28 -0000 1.4 --- TrRefluxAppliManager.java 1 Jun 2004 11:27:42 -0000 1.5 *************** *** 1,3 **** ! /* * @file TrRefluxAppliManager.java * @creation 11 mars 2004 --- 1,3 ---- ! /** * @file TrRefluxAppliManager.java * @creation 11 mars 2004 *************** *** 13,26 **** import javax.swing.Icon; ! import com.memoire.bu.BuMenuItem; ! import com.memoire.bu.BuPopupMenu; ! import com.memoire.bu.BuResource; ! import org.fudaa.fudaa.commun.exec.FudaaExec; import org.fudaa.fudaa.tr.common.TrApplicationManager; import org.fudaa.fudaa.tr.common.TrExplorer; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; import org.fudaa.fudaa.tr.common.TrResource; /** --- 13,27 ---- import javax.swing.Icon; ! import org.fudaa.fudaa.commun.FudaaUI; import org.fudaa.fudaa.commun.exec.FudaaExec; import org.fudaa.fudaa.tr.common.TrApplicationManager; import org.fudaa.fudaa.tr.common.TrExplorer; ! import org.fudaa.fudaa.tr.common.TrLauncher; import org.fudaa.fudaa.tr.common.TrResource; + import com.memoire.bu.BuMenuItem; + import com.memoire.bu.BuPopupMenu; + import com.memoire.bu.BuResource; + /** *************** *** 43,56 **** /** ! * @see org.fudaa.fudaa.commun.exec.FudaaExec#execInDir(java.io.File) */ ! public void execInDir(File _dir) { } /** ! * @see org.fudaa.fudaa.commun.exec.FudaaExec#execOnFile(java.io.File) */ ! public void execOnFile(File _target) { ! TrRefluxProjet.launchCalcul(_target, getImpl()).execute(); } --- 44,57 ---- /** ! * @see org.fudaa.fudaa.commun.exec.FudaaExec#execInDir(java.io.File, org.fudaa.fudaa.commun.FudaaUI) */ ! public void execInDir(File _dir,FudaaUI _ui) { } /** ! * @see org.fudaa.fudaa.commun.exec.FudaaExec#execOnFile(java.io.File, org.fudaa.fudaa.commun.FudaaUI) */ ! public void execOnFile(File _target,FudaaUI _ui) { ! TrRefluxProjet.launchCalcul(_ui,_target,launcher_ ).execute(); } *************** *** 64,71 **** /** ! * @param _impl */ ! public TrRefluxAppliManager(TrImplementationAbstract _impl) { ! super(_impl); } --- 65,72 ---- /** ! * @param _l */ ! public TrRefluxAppliManager(TrLauncher _l) { ! super(_l); } *************** *** 90,97 **** public void updateMenuFiles(int _nbFileChoosen, File _f) { super.updateMenuFiles(_nbFileChoosen, _f); String n = _f.getName(); ! createProject_.setEnabled((_nbFileChoosen == 1) && (null != getImpl().getFileFormatMng().isGridExtension(n))); launchReflux_.setEnabled((_nbFileChoosen == 1) ! && (getImpl().getFileFormatMng().isRefluxFile(n))); } } --- 91,103 ---- public void updateMenuFiles(int _nbFileChoosen, File _f) { super.updateMenuFiles(_nbFileChoosen, _f); + if(_f==null) { + createProject_.setEnabled(false); + launchReflux_.setEnabled(false); + return; + } String n = _f.getName(); ! createProject_.setEnabled((_nbFileChoosen == 1) && (null != launcher_.getFileFormatManager().isGridExtension(n))); launchReflux_.setEnabled((_nbFileChoosen == 1) ! && (launcher_.getFileFormatManager().isRefluxFile(n))); } } Index: TrRefluxSIPlan.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxSIPlan.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrRefluxSIPlan.java 5 May 2004 12:42:37 -0000 1.3 --- TrRefluxSIPlan.java 1 Jun 2004 11:27:42 -0000 1.4 *************** *** 1,4 **** ! /* ! * @file TrRefluxSIPlan.java * @creation 15 mars 2004 * @modification $Date$ --- 1,3 ---- ! /** * @creation 15 mars 2004 * @modification $Date$ *************** *** 33,40 **** import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.fudaa.meshviewer.MvPointEditor; import org.fudaa.fudaa.meshviewer.layer.MvLayer; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.common.TrXmlProjectWriter; --- 32,40 ---- import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.ebli.geometrie.GrBoite; + import org.fudaa.ebli.geometrie.GrDataBoite; import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.fudaa.meshviewer.MvPointEditor; import org.fudaa.fudaa.meshviewer.layer.MvLayer; ! import org.fudaa.fudaa.tr.common.TrImplementationEditorAbstract; import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.common.TrXmlProjectWriter; *************** *** 211,215 **** if (n != null) { MvPointEditor ed = new MvPointEditor(n); ! if (EbliSimpleDialogPanel.isOkResponse(ed.afficheModale(((TrImplementationAbstract) super.proj_ .getUI()).getFrame()))) { if ((ed.getNodeX() != n.getX()) || (ed.getNodeY() != n.getY()) --- 211,215 ---- if (n != null) { MvPointEditor ed = new MvPointEditor(n); ! if (EbliSimpleDialogPanel.isOkResponse(ed.afficheModale(((TrImplementationEditorAbstract) super.proj_ .getUI()).getFrame()))) { if ((ed.getNodeX() != n.getX()) || (ed.getNodeY() != n.getY()) *************** *** 397,399 **** --- 397,405 ---- } } + /** + * @see org.fudaa.ebli.calque.ZModeleDonnees#getDonneesBoite(org.fudaa.ebli.geometrie.GrDataBoite) + */ + public boolean getDonneesBoite(GrDataBoite _b) { + return false; + } } Index: TrRefluxParametres.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** TrRefluxParametres.java 5 May 2004 12:42:37 -0000 1.21 --- TrRefluxParametres.java 1 Jun 2004 11:27:42 -0000 1.22 *************** *** 41,45 **** import org.fudaa.fudaa.commun.projet.FudaaProjetInformationPanel; import org.fudaa.fudaa.ressource.FudaaResource; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; import org.fudaa.fudaa.tr.common.TrParametres; import org.fudaa.fudaa.tr.common.TrPreferences; --- 41,45 ---- import org.fudaa.fudaa.commun.projet.FudaaProjetInformationPanel; import org.fudaa.fudaa.ressource.FudaaResource; ! import org.fudaa.fudaa.tr.common.TrImplementationEditorAbstract; import org.fudaa.fudaa.tr.common.TrParametres; import org.fudaa.fudaa.tr.common.TrPreferences; *************** *** 187,191 **** private TrRefluxSI solutionInit_; String title_; ! TrImplementationAbstract ui_; boolean isDocModified_; --- 187,191 ---- private TrRefluxSI solutionInit_; String title_; ! TrImplementationEditorAbstract ui_; boolean isDocModified_; *************** *** 200,204 **** * @return l'implementation */ ! public TrImplementationAbstract getImpl(){ return ui_; } --- 200,204 ---- * @return l'implementation */ ! public TrImplementationEditorAbstract getImpl(){ return ui_; } *************** *** 256,260 **** b.append(":").append(CtuluLib.LINE_SEP); for (Iterator it = fileToOverWrite.iterator(); it.hasNext();) { ! b.append((String) it.next()); } b.append(CtuluLib.LINE_SEP).append( --- 256,260 ---- b.append(":").append(CtuluLib.LINE_SEP); for (Iterator it = fileToOverWrite.iterator(); it.hasNext();) { ! b.append((String) it.next()).append(CtuluLib.LINE_SEP); } b.append(CtuluLib.LINE_SEP).append( *************** *** 271,275 **** TrRefluxParametres.this.getINPVersion().write(inp, inter, _prog)); getSI().writeSI(new File(dir, si), _prog); ! TrRefluxXmlProjectWriter w = new TrRefluxXmlProjectWriter(this); w.writeFile(); return true; --- 271,275 ---- TrRefluxParametres.this.getINPVersion().write(inp, inter, _prog)); getSI().writeSI(new File(dir, si), _prog); ! TrRefluxXmlProjectWriter w = new TrRefluxXmlProjectWriter(this,dir,ficSansExt); w.writeFile(); return true; Index: TrRefluxImplHelper.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxImplHelper.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** TrRefluxImplHelper.java 5 May 2004 12:42:37 -0000 1.15 --- TrRefluxImplHelper.java 1 Jun 2004 11:27:42 -0000 1.16 *************** *** 9,12 **** --- 9,13 ---- package org.fudaa.fudaa.tr.reflux; + import java.awt.Component; import java.io.File; *************** *** 17,26 **** import javax.swing.event.CaretListener; - import com.memoire.bu.BuComboBox; - import com.memoire.bu.BuGridLayout; - import com.memoire.bu.BuMainPanel; - import com.memoire.bu.BuMenuItem; - import com.memoire.bu.BuTask; - import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.ProgressionInterface; --- 18,21 ---- *************** *** 34,42 **** import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.ressource.FudaaResource; import org.fudaa.fudaa.tr.common.TrFileFormatManager; import org.fudaa.fudaa.tr.common.TrImplHelperAbstract; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; import org.fudaa.fudaa.tr.common.TrProjet; import org.fudaa.fudaa.tr.common.TrResource; /** * @author deniger --- 29,45 ---- import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.ressource.FudaaResource; + import org.fudaa.fudaa.tr.common.TrApplicationManager; import org.fudaa.fudaa.tr.common.TrFileFormatManager; import org.fudaa.fudaa.tr.common.TrImplHelperAbstract; ! import org.fudaa.fudaa.tr.common.TrImplementationEditorAbstract; ! import org.fudaa.fudaa.tr.common.TrLauncher; import org.fudaa.fudaa.tr.common.TrProjet; import org.fudaa.fudaa.tr.common.TrResource; + + import com.memoire.bu.BuComboBox; + import com.memoire.bu.BuGridLayout; + import com.memoire.bu.BuMainPanel; + import com.memoire.bu.BuMenuItem; + import com.memoire.bu.BuTask; /** * @author deniger *************** *** 45,51 **** public class TrRefluxImplHelper extends TrImplHelperAbstract { ! private class OpenPanel ! extends EbliSimpleDialogPanel ! implements CaretListener { JComboBox cbFormat_; --- 48,52 ---- public class TrRefluxImplHelper extends TrImplHelperAbstract { ! private class OpenPanel extends EbliSimpleDialogPanel implements CaretListener { JComboBox cbFormat_; *************** *** 54,79 **** FileFormat[] fts_; ! public OpenPanel(File _f) { addEmptyBorder(5); setLayout(new BuGridLayout(2, 5, 5)); addLabel(TrResource.getS("Type:")); ! cbProjectType_ = ! new BuComboBox( ! new H2dProjetType[] { ! H2dProjetType.COURANTOLOGIE_2D, ! H2dProjetType.COURANTOLOGIE_2D_LMG}); cbProjectType_.setSelectedIndex(0); add(cbProjectType_); addLabel(TrResource.getS("Fichier contenant le maillage")); ! file_ = ! addLabelFileChooserPanel( ! this, ! null, ! CtuluLib.EMPTY_STRING, ! false, ! true); file_.addCaretListener(this); ! if(_f!=null) file_.setText(_f.getAbsolutePath()); ! fts_ = new TrFileFormatManager().getFormatWithGridSupport(); cbFormat_ = new BuComboBox(fts_); addLabel(TrResource.getS("Format du fichier")); --- 55,71 ---- FileFormat[] fts_; ! public OpenPanel(TrImplementationEditorAbstract _impl,File _f) { addEmptyBorder(5); setLayout(new BuGridLayout(2, 5, 5)); addLabel(TrResource.getS("Type:")); ! cbProjectType_ = new BuComboBox(new H2dProjetType[] { H2dProjetType.COURANTOLOGIE_2D, ! H2dProjetType.COURANTOLOGIE_2D_LMG}); cbProjectType_.setSelectedIndex(0); add(cbProjectType_); addLabel(TrResource.getS("Fichier contenant le maillage")); ! file_ = addLabelFileChooserPanel(this, null, CtuluLib.EMPTY_STRING, false, true); file_.addCaretListener(this); ! if (_f != null) file_.setText(_f.getAbsolutePath()); ! fts_ = TrFileFormatManager.INSTANCE.getFormatWithGridSupport(); cbFormat_ = new BuComboBox(fts_); addLabel(TrResource.getS("Format du fichier")); *************** *** 86,98 **** public void caretUpdate(CaretEvent e) { String s = file_.getText(); ! if (s == null) ! return; int ptIdx = s.lastIndexOf('.'); ! if ((ptIdx <= 0) || ptIdx >= s.length() - 1) ! return; s = s.substring(ptIdx + 1); for (int i = fts_.length - 1; i >= 0; i--) { ! if (fts_[i].isExtension(s)) ! cbFormat_.setSelectedItem(fts_[i]); } } --- 78,87 ---- public void caretUpdate(CaretEvent e) { String s = file_.getText(); ! if (s == null) return; int ptIdx = s.lastIndexOf('.'); ! if ((ptIdx <= 0) || ptIdx >= s.length() - 1) return; s = s.substring(ptIdx + 1); for (int i = fts_.length - 1; i >= 0; i--) { ! if (fts_[i].isExtension(s)) cbFormat_.setSelectedItem(fts_[i]); } } *************** *** 123,130 **** File f = getSelectedFile(); if ((f == null) || (!f.exists())) { ! setErrorText( ! TrResource.getS( ! "Le fichier {0} n'existe pas", ! f == null ? CtuluLib.EMPTY_STRING : f.getAbsolutePath())); return false; } --- 112,117 ---- File f = getSelectedFile(); if ((f == null) || (!f.exists())) { ! setErrorText(TrResource.getS("Le fichier {0} n'existe pas", ! f == null ? CtuluLib.EMPTY_STRING : f.getAbsolutePath())); return false; } *************** *** 133,152 **** } ! public TrRefluxImplHelper(TrImplementationAbstract _impl) { ! super(new TrRefluxAppliManager(_impl)); } ! private TrProjet _ouvrir(ProgressionInterface _op, File _fic, BuTask _bu) { ! getImpl().initTaskView(_bu); if (_fic != null) { _op.setDesc(TrResource.getS("import fichier inp")); ! BuMainPanel mp = getImpl().getMainPanel(); mp.setMessage(TrResource.getS("Ouverture projet")); ! TrRefluxProjet projet = ! TrRefluxProjectFactory.createRefluxProjectFromINP( ! _fic, ! INPFileFormat.getInstance().getLastINPVersionImpl(), ! _op, ! getImpl()); mp.setProgression(60); _op.setDesc(CtuluLib.EMPTY_STRING); --- 120,136 ---- } ! public TrRefluxImplHelper(TrLauncher _r) { ! super(new TrRefluxAppliManager(_r)); } ! private TrProjet _ouvrir(TrImplementationEditorAbstract _impl, ProgressionInterface _op, File _fic, ! BuTask _bu) { ! _impl.initTaskView(_bu); if (_fic != null) { _op.setDesc(TrResource.getS("import fichier inp")); ! BuMainPanel mp = _impl.getMainPanel(); mp.setMessage(TrResource.getS("Ouverture projet")); ! TrRefluxProjet projet = TrRefluxProjectFactory.createRefluxProjectFromINP(_fic, INPFileFormat ! .getInstance().getLastINPVersionImpl(), _op, _impl); mp.setProgression(60); _op.setDesc(CtuluLib.EMPTY_STRING); *************** *** 160,200 **** } ! public TrProjet creer(ProgressionInterface _op, File _f,BuTask _bu) { ! OpenPanel openPn = new OpenPanel(_f); ! if (EbliSimpleDialogPanel ! .isOkResponse( ! openPn.afficheModale( ! getImpl().getFrame(), ! TrResource.getS("Nouveau projet Reflux")))) { ! getImpl().initTaskView(_bu); ! getImpl().setMainMessage(TrResource.getS("Création projet")); File f = openPn.getSelectedFile(); FileFormat format = openPn.getFileFormat(); ! if (format == null) ! return null; ! FileFormatGridVersion v = ! (FileFormatGridVersion) format.getLastVersionInstance(); H2dProjetType t = openPn.getProjectType(); ! if (t == null) ! return null; ! return TrRefluxProjectFactory.createRefluxProjectFromGrid( ! f, ! v, ! t, ! _op, ! getImpl()); } return null; } ! public BuMenuItem[] getMenuItemsOuvrir() { ! BuMenuItem r0 = ! new BuMenuItem( ! FudaaResource.FUDAA.getToolIcon("appli/telemac"), ! TrResource.getS("Projet Télémac")); ! r0.setActionCommand(getImpl().PREF_OUVRIR + FileFormatSoftware.TELEMAC_IS.name); BuMenuItem r = new BuMenuItem(null, TrResource.getS("Projet Dico")); ! r.setActionCommand( ! TrImplementationAbstract.PREF_OUVRIR + TelemacDicoFileFormat.DICO_PROJET_ID); return new BuMenuItem[] { r0, r}; } --- 144,170 ---- } ! public TrProjet creer(TrImplementationEditorAbstract _impl,ProgressionInterface _op, File _f, BuTask _bu) { ! OpenPanel openPn = new OpenPanel(_impl,_f); ! if (EbliSimpleDialogPanel.isOkResponse(openPn.afficheModale(_impl.getFrame(), TrResource ! .getS("Nouveau projet Reflux")))) { ! _impl.initTaskView(_bu); ! _impl.setMainMessage(TrResource.getS("Création projet")); File f = openPn.getSelectedFile(); FileFormat format = openPn.getFileFormat(); ! if (format == null) return null; ! FileFormatGridVersion v = (FileFormatGridVersion) format.getLastVersionInstance(); H2dProjetType t = openPn.getProjectType(); ! if (t == null) return null; ! return TrRefluxProjectFactory.createRefluxProjectFromGrid(f, v, t, _op, _impl); } return null; } ! public BuMenuItem[] getMenuItemsOuvrir(TrImplementationEditorAbstract _impl) { ! BuMenuItem r0 = new BuMenuItem(FudaaResource.FUDAA.getToolIcon("appli/telemac"), TrResource ! .getS("Projet Télémac")); ! r0.setActionCommand(_impl.PREF_OUVRIR + FileFormatSoftware.TELEMAC_IS.name); BuMenuItem r = new BuMenuItem(null, TrResource.getS("Projet Dico")); ! r.setActionCommand(TrImplementationEditorAbstract.PREF_OUVRIR + TelemacDicoFileFormat.DICO_PROJET_ID); return new BuMenuItem[] { r0, r}; } *************** *** 211,220 **** * com.memoire.bu.BuTask) */ ! public TrProjet ouvrir(ProgressionInterface _op, BuTask _bu) { ! final File fic = ! getImpl().ouvrirFileChooser(null, TrResource.getS("fichier inp de Reflux")); ! if (fic != null) { ! return _ouvrir(_op, fic, _bu); ! } return null; } --- 181,187 ---- * com.memoire.bu.BuTask) */ ! public TrProjet ouvrir(TrImplementationEditorAbstract _impl,ProgressionInterface _op, BuTask _bu) { ! final File fic = _impl.ouvrirFileChooser(null, TrResource.getS("fichier inp de Reflux")); ! if (fic != null) { return _ouvrir(_impl,_op, fic, _bu); } return null; } *************** *** 224,231 **** * java.io.File, com.memoire.bu.BuTask) */ ! public TrProjet ouvrir(ProgressionInterface _op, File _f, BuTask _bu) { ! return _ouvrir(_op, _f, _bu); } ! ! } --- 191,197 ---- * java.io.File, com.memoire.bu.BuTask) */ ! public TrProjet ouvrir(TrImplementationEditorAbstract _impl,ProgressionInterface _op, File _f, BuTask _bu) { ! return _ouvrir(_impl,_op, _f, _bu); } ! } \ No newline at end of file Index: TrRefluxXmlProjectWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxXmlProjectWriter.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrRefluxXmlProjectWriter.java 5 May 2004 12:42:37 -0000 1.3 --- TrRefluxXmlProjectWriter.java 1 Jun 2004 11:27:42 -0000 1.4 *************** *** 29,38 **** * @param _p le projet en question */ ! public TrRefluxXmlProjectWriter(TrRefluxParametres _p) { super(); p_ = _p; try { ! out_ = new FileWriter(new File(_p.getDirBase(), _p.getFicNameSansExt() ! + TrFileFormatManager.REFLUX_XML_EXT)); } catch (IOException e) { --- 29,38 ---- * @param _p le projet en question */ ! public TrRefluxXmlProjectWriter(TrRefluxParametres _p,File _dirBase,String _fixSansExt) { super(); p_ = _p; try { ! out_ = new FileWriter(new File(_dirBase, _fixSansExt ! +"."+ TrFileFormatManager.XML_EXT)); } catch (IOException e) { Index: TrRefluxProjectDispatcherListener.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectDispatcherListener.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TrRefluxProjectDispatcherListener.java 5 May 2004 12:42:37 -0000 1.9 --- TrRefluxProjectDispatcherListener.java 1 Jun 2004 11:27:42 -0000 1.10 *************** *** 136,144 **** /** ! * @see org.fudaa.dodico.h2d.H2dEvolutionListener#evolutionUsedChanged(org.fudaa.dodico.h2d.H2dEvolution, ! * int, int) */ ! public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new) { ! super.evolutionUsedChanged(_e, _old, _new); } --- 136,143 ---- /** ! * @see org.fudaa.dodico.h2d.H2dEvolutionListener#evolutionUsedChanged(org.fudaa.dodico.h2d.H2dEvolution, int, int, boolean) */ ! public void evolutionUsedChanged(H2dEvolution _e, int _old, int _new,boolean _isAdjusting) { ! super.evolutionUsedChanged(_e, _old, _new,_isAdjusting); } --- TrRefluxCalculLocalOld.java.save DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:27
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/commun Modified Files: FudaaUI.java FudaaCommandLineParser.java FudaaLib.java FudaaCommonImplementation.java FudaaExplorer.java Fudaa.java Added Files: FudaaTimerActionListenerExplorer.java Log Message: Index: Fudaa.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/Fudaa.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Fudaa.java 14 May 2004 10:27:29 -0000 1.10 --- Fudaa.java 1 Jun 2004 11:27:43 -0000 1.11 *************** *** 32,37 **** public final class Fudaa { ! private final FudaaCommandLineParser FLAGS = new FudaaCommandLineParser(); ! private FudaaSplashScreen SPLASH; private boolean ts; private File toOpen; --- 32,37 ---- public final class Fudaa { ! private final FudaaCommandLineParser flags_ = new FudaaCommandLineParser(); ! private FudaaSplashScreen splash_; private boolean ts; private File toOpen; *************** *** 44,47 **** --- 44,51 ---- } + public FudaaCommandLineParser getFlags() { + return flags_; + } + /** * @param args les argument recu *************** *** 52,64 **** public final void launch(final String[] args, BuInformationsSoftware soft, boolean canOpenAFile) { // Lecture des FLAGS ! String[] r = FLAGS.parse(args); if ((!canOpenAFile && (r.length > 0)) || (canOpenAFile && (r.length > 1))) { System.err.println("The flag " + r[0] + " is unknown"); ! System.err.println("Flags: " + FLAGS.flagTotalText()); System.exit(1); } // Version ! if (FLAGS.version) { System.out.println("Fudaa-" + soft.name + ". " + soft.rights); System.out.println("version " + soft.version + " - " + soft.date); --- 56,68 ---- public final void launch(final String[] args, BuInformationsSoftware soft, boolean canOpenAFile) { // Lecture des FLAGS ! String[] r = flags_.parse(args); if ((!canOpenAFile && (r.length > 0)) || (canOpenAFile && (r.length > 1))) { System.err.println("The flag " + r[0] + " is unknown"); ! System.err.println("Flags: " + flags_.flagTotalText()); System.exit(1); } // Version ! if (flags_.version) { System.out.println("Fudaa-" + soft.name + ". " + soft.rights); System.out.println("version " + soft.version + " - " + soft.date); *************** *** 72,76 **** BuPreferences.BU.applyLanguage(soft.languages); // Affichage de la fenetre stdout/stderr ! if (!FLAGS.no_log) { new FudaaTee(true); ts = true; --- 76,80 ---- BuPreferences.BU.applyLanguage(soft.languages); // Affichage de la fenetre stdout/stderr ! if (!flags_.no_log) { new FudaaTee(true); ts = true; *************** *** 102,111 **** System.out.println("Fudaa-" + soft.name); System.out.println("version " + soft.version + " - " + soft.date); ! System.out.println("Date "+Calendar.getInstance().getTime().toString()); // Splash //il est inutile de charger des classes. Cela encombre la memoire pour rien ! if (!FLAGS.no_splash) { ! SPLASH = new FudaaSplashScreen(soft, 2000, new String[0][0]); ! SPLASH.start(); } } --- 106,115 ---- System.out.println("Fudaa-" + soft.name); System.out.println("version " + soft.version + " - " + soft.date); ! System.out.println("Date " + Calendar.getInstance().getTime().toString()); // Splash //il est inutile de charger des classes. Cela encombre la memoire pour rien ! if (!flags_.no_splash) { ! splash_ = new FudaaSplashScreen(soft, 2000, new String[0][0]); ! splash_.start(); } } *************** *** 118,148 **** */ public final void startApp(FudaaCommonImplementation impl) { ! SPLASH.setProgression(60); BuApplication app = new BuApplication(); app.setImplementation(impl); String s = FudaaResource.getS("Initialisation") + "..."; System.out.println(s); ! if (SPLASH != null) SPLASH.setText(s); ! if (SPLASH != null) SPLASH.setProgression(80); app.init(); impl.setConsoleState(ts); ! if (SPLASH != null) SPLASH.setProgression(100); ! if (SPLASH != null) SPLASH.setVisible(false); ! if (SPLASH != null) SPLASH.dispose(); ! try { ! app.start(); ! } ! catch (Throwable e) { ! ByteArrayOutputStream out = new ByteArrayOutputStream(); ! e.printStackTrace(new PrintStream(out)); ! new BuDialogError(app, impl.getInformationsSoftware(), out.toString()).activate(); ! try { ! out.close(); ! } ! catch (IOException ioe) { ! ioe.printStackTrace(); ! } } if (toOpen != null) impl.cmdOuvrirFile(toOpen); } } \ No newline at end of file --- 122,159 ---- */ public final void startApp(FudaaCommonImplementation impl) { ! if (splash_ != null) splash_.setProgression(60); BuApplication app = new BuApplication(); app.setImplementation(impl); String s = FudaaResource.getS("Initialisation") + "..."; System.out.println(s); ! if (splash_ != null) { ! splash_.setText(s); ! splash_.setProgression(80); ! } app.init(); impl.setConsoleState(ts); ! if (splash_ != null) { ! splash_.setProgression(100); ! ! splash_.setVisible(false); ! splash_.dispose(); } + app.start(); + // try { + // + // } + // catch (Throwable e) { + // ByteArrayOutputStream out = new ByteArrayOutputStream(); + // e.printStackTrace(new PrintStream(out)); + // new BuDialogError(app, impl.getInformationsSoftware(), out.toString()).activate(); + // try { + // out.close(); + // } + // catch (IOException ioe) { + // ioe.printStackTrace(); + // } + // } if (toOpen != null) impl.cmdOuvrirFile(toOpen); } + } \ No newline at end of file Index: FudaaCommonImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaCommonImplementation.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** FudaaCommonImplementation.java 5 May 2004 12:42:39 -0000 1.21 --- FudaaCommonImplementation.java 1 Jun 2004 11:27:43 -0000 1.22 *************** *** 40,43 **** --- 40,45 ---- import com.memoire.bu.BuPreferences; import com.memoire.bu.BuPreferencesFrame; + import com.memoire.bu.BuPreferencesFrameNew; + import com.memoire.bu.BuPreferencesEditorPanel; import com.memoire.bu.BuResource; import com.memoire.bu.BuTask; *************** *** 66,69 **** --- 68,77 ---- /** + * @see org.fudaa.fudaa.commun.FudaaUI#getParentComponent() + */ + public Component getParentComponent() { + return getFrame(); + } + /** * le chemin de l'aide locale */ *************** *** 170,174 **** protected FudaaUndoCmdMngListener cmdListener_; - protected BuPreferencesFrame preferences_; protected EbliFillePrevisualisation previsuFille_; --- 178,181 ---- *************** *** 194,206 **** * Methode a surcharger pour ajouter ces propres panneaux de pref. */ ! protected void buildPreferences() { ! preferences_ = new BuPreferencesFrame(); ! preferences_.addTab(new BuUserPreferencesPanel(this)); ! preferences_.addTab(new BuLanguagePreferencesPanel(this)); ! preferences_.addTab(new BuDesktopPreferencesPanel(this)); ! preferences_.addTab(new BuLookPreferencesPanel(this)); ! preferences_.addTab(new BuBrowserPreferencesPanel(this)); ! preferences_.addTab(new EbliMiseEnPagePreferencesPanel()); ! preferences_.addTab(new FudaaAidePreferencesPanel(this, getApplicationPreferences())); } --- 201,214 ---- * Methode a surcharger pour ajouter ces propres panneaux de pref. */ ! protected BuPreferencesEditorPanel buildPreferences() { ! BuPreferencesEditorPanel r= new BuPreferencesEditorPanel(); ! r.addTab(new BuUserPreferencesPanel(this)); ! r.addTab(new BuLanguagePreferencesPanel(this)); ! r.addTab(new BuDesktopPreferencesPanel(this)); ! r.addTab(new BuLookPreferencesPanel(this)); ! r.addTab(new BuBrowserPreferencesPanel(this)); ! r.addTab(new EbliMiseEnPagePreferencesPanel()); ! r.addTab(new FudaaAidePreferencesPanel(this, getApplicationPreferences())); ! return r; } *************** *** 208,214 **** * Description de la methode */ ! protected final void preferences() { ! if (preferences_ == null) buildPreferences(); ! addInternalFrame(preferences_); } --- 216,223 ---- * Description de la methode */ ! protected BuPreferencesEditorPanel preferences() { ! BuPreferencesEditorPanel r=buildPreferences(); ! addInternalFrame(new BuPreferencesFrameNew(this,r)); ! return r; } *************** *** 672,697 **** * @param _f le fichier a suivre */ ! public void openFileInLogFrame(File _f) { if (tailFrame_ == null) { - openLogFrame(_f); - } - else { - tailFrame_.openFile(_f, false, true); - tailFrame_.show(); - } - } - - /** - * Ouvre le tail en java - */ - public void openLogFrame() { - openLogFrame(null); - } - - private void openLogFrame(final File _f) { - if (tailFrame_ != null) { - tailFrame_.getFrame().show(); - } - else { new BuTaskOperation(this, FudaaResource.getS("Console")) { --- 681,686 ---- * @param _f le fichier a suivre */ ! public void openFileInLogFrame(final File _f) { if (tailFrame_ == null) { new BuTaskOperation(this, FudaaResource.getS("Console")) { *************** *** 716,721 **** --- 705,723 ---- }.start(); } + else { + tailFrame_.openFile(_f, false, true); + tailFrame_.show(); + } } + /** + * Ouvre le tail en java + */ + public void openLogFrame() { + openFileInLogFrame(null); + } + + + protected FollowApp tailFrame_; } \ No newline at end of file Index: FudaaLib.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaLib.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** FudaaLib.java 30 Apr 2004 13:52:13 -0000 1.20 --- FudaaLib.java 1 Jun 2004 11:27:43 -0000 1.21 *************** *** 83,89 **** * <pre> * ! * Exemple : _main : c:\\refonde\\cercle\\rect.prf ! * _file : c:\\users\\dupont\\geom.geo ! * return : ..\\..\\users\\dupont\\geom.geo * * </pre> --- 83,91 ---- * <pre> * ! * ! * Exemple : _main : c:\\refonde\\cercle\\rect.prf ! * _file : c:\\users\\dupont\\geom.geo ! * return : ..\\..\\users\\dupont\\geom.geo ! * * * </pre> *************** *** 234,238 **** --- 236,242 ---- .getInformationsSoftware(), _message) : new BuDialogWarning(null, null, _message); warn.setTitle(_titre); + warn.setModal(true); warn.activate(); + warn.dispose(); } *************** *** 249,253 **** --- 253,259 ---- : new BuDialogError(_impl.getImplementation(), _impl.getInformationsSoftware(), _message); erreur.setTitle(_titre); + erreur.setModal(true); erreur.activate(); + erreur.dispose(); } *************** *** 262,266 **** _impl.getInformationsSoftware(), _message) : new BuDialogConfirmation(null, null, _message); conf.setTitle(_titre); ! return isOkResponse(conf.activate()); } --- 268,275 ---- _impl.getInformationsSoftware(), _message) : new BuDialogConfirmation(null, null, _message); conf.setTitle(_titre); ! conf.setModal(true); ! int r = conf.activate(); ! conf.dispose(); ! return isOkResponse(r); } Index: FudaaUI.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaUI.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FudaaUI.java 30 Apr 2004 13:52:13 -0000 1.6 --- FudaaUI.java 1 Jun 2004 11:27:43 -0000 1.7 *************** *** 9,18 **** package org.fudaa.fudaa.commun; import java.io.File; ! import com.memoire.bu.BuTask; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoUI; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.fichiers.FileOperationSynthese; /** * @author deniger --- 9,21 ---- package org.fudaa.fudaa.commun; + import java.awt.Component; import java.io.File; ! import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoUI; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.fichiers.FileOperationSynthese; + + import com.memoire.bu.BuTask; /** * @author deniger *************** *** 20,23 **** --- 23,31 ---- */ public interface FudaaUI extends DodicoUI { + + /** + * @return + */ + public Component getParentComponent(); /** Index: FudaaCommandLineParser.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaCommandLineParser.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FudaaCommandLineParser.java 30 Apr 2004 13:52:14 -0000 1.9 --- FudaaCommandLineParser.java 1 Jun 2004 11:27:43 -0000 1.10 *************** *** 8,13 **** */ package org.fudaa.fudaa.commun; ! import java.awt.*; ! import java.awt.event.*; import org.fudaa.fudaa.commun.dodico.FudaaDodicoSelectionServeur; --- 8,20 ---- */ package org.fudaa.fudaa.commun; ! import java.awt.BorderLayout; ! import java.awt.Button; ! import java.awt.Dialog; ! import java.awt.Frame; ! import java.awt.Label; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! import java.awt.event.WindowAdapter; ! import java.awt.event.WindowEvent; import org.fudaa.fudaa.commun.dodico.FudaaDodicoSelectionServeur; *************** *** 64,67 **** --- 71,102 ---- } /** + * @return les flag autorisés + */ + public String[] flagTexts() { + return new String[] { + "--no_terminal", + "--no_log", + "--no_corba", + "--corba", + "--no_splash", + "--version" }; + } + /** + * @return les flag sur une seule ligne + */ + public String flagTotalText() { + String[] t= flagTexts(); + String r= ""; + boolean p= true; + for (int i= 0; i < t.length; i++) { + if (!p) + r += ", "; + else + p= false; + r += t[i]; + } + return r; + } + /** * Gere --no_terminal,--no_corba,--no_splash,--corba et --version. * Si --no_corba ou --corba, les champs statiques de la classe *************** *** 73,79 **** boolean no_corba=false; boolean corba=false; ! String[] tmpArgs= new String[args.length]; int passed= 0; ! for (int i= 0; i < args.length; i++) { if ("--no_terminal".equals(args[i])|| ("--no_log".equals(args[i]))) no_log= true; --- 108,114 ---- boolean no_corba=false; boolean corba=false; ! String[] tmpArgs= new String[(args==null?0:args.length)]; int passed= 0; ! for (int i= 0; i < tmpArgs.length; i++) { if ("--no_terminal".equals(args[i])|| ("--no_log".equals(args[i]))) no_log= true; *************** *** 107,137 **** return res; } - /** - * @return les flag autorisés - */ - public String[] flagTexts() { - return new String[] { - "--no_terminal", - "--no_log", - "--no_corba", - "--corba", - "--no_splash", - "--version" }; - } - /** - * @return les flag sur une seule ligne - */ - public String flagTotalText() { - String[] t= flagTexts(); - String r= ""; - boolean p= true; - for (int i= 0; i < t.length; i++) { - if (!p) - r += ", "; - else - p= false; - r += t[i]; - } - return r; - } } --- 142,144 ---- --- NEW FILE: FudaaTimerActionListenerExplorer.java --- /** * @creation 25 mai 2004 * @modification $Date: 2004/06/01 11:27:43 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.fudaa.commun; import java.awt.event.ActionEvent; import com.memoire.bu.BuExplorer; import com.memoire.bu.BuTimerActionListenerAbstract; /** * @author Fred Deniger * @version $Id: FudaaTimerActionListenerExplorer.java,v 1.1 2004/06/01 11:27:43 deniger Exp $ */ public class FudaaTimerActionListenerExplorer extends BuTimerActionListenerAbstract { /** * @param _target */ public FudaaTimerActionListenerExplorer(FudaaExplorer _target) { super(_target); } private FudaaExplorer getExplorer() { Object o = getTarget(); if (o != null) return (FudaaExplorer) o; return null; } /** * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent _e) { FudaaExplorer m = getExplorer(); if (m == null) { //System.out.println("weak ref for "+getClass().getName()+" in garbage!"); return; } m.refresh(); } } Index: FudaaExplorer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaExplorer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FudaaExplorer.java 14 May 2004 10:27:29 -0000 1.1 --- FudaaExplorer.java 1 Jun 2004 11:27:43 -0000 1.2 *************** *** 160,163 **** --- 160,165 ---- app_ = _app; listeners_ = new Vector(1, 1); + pmDirs_ = new BuPopupMenu(BuResource.BU.getString("Répertoires")); + pmFiles_ = new BuPopupMenu(BuResource.BU.getString("Fichiers")); MouseListener mh = new MouseHandler(); *************** *** 237,241 **** miMake_ = pmCurrent_.addMenuItem("Make", "MAKE", false); - pmDirs_ = new BuPopupMenu(BuResource.BU.getString("Répertoires")); pmDirs_.addMenuItem(BuResource.BU.getString("Ouvrir"), "OUVRIR_REPERTOIRE", true); pmDirs_.addSeparator(); --- 239,242 ---- *************** *** 243,247 **** pmDirs_.addMenuItem(BuResource.BU.getString("Détruire..."), "DETRUIRE_REPERTOIRE", true); - pmFiles_ = new BuPopupMenu(BuResource.BU.getString("Fichiers")); miOuvrirFichier_ = pmFiles_.addMenuItem(BuResource.BU.getString("Ouvrir"), "OUVRIR_FICHIER", true); --- 244,247 ---- *************** *** 330,342 **** add(sph, BuBorderLayout.CENTER); - /* - * final BuToggleButton tb=new BuToggleButton("Viewer"); tb.setRequestFocusEnabled(false); - * tb.setMargin(BuInsets.INSETS1111); tb.setFont(getETF()); - * tb.setIcon(BuResource.resizeIcon(BuResource.BU.getIcon("voir"),12)); tb.setSelected(true); - * tb.setHorizontalAlignment(BuToggleButton.RIGHT); tb.addActionListener(new ActionListener() { - * public void actionPerformed(ActionEvent _evt) { sp3.setVisible(tb.isSelected()); - * updateViewer(); //sph.updateSplits(); sph.revalidate(); } }); BuPanel ptb=new BuPanel(new - * FlowLayout(FlowLayout.RIGHT,0,0)); ptb.add(tb); p2.add(ptb); - */ } else { --- 330,333 ---- *************** *** 366,376 **** p1.setPreferredSize(new Dimension(150, 220)); p2.setPreferredSize(new Dimension(150, 220)); ! timer_ = new BuTimer(1000, new ActionListener() { ! ! public void actionPerformed(ActionEvent _evt) { ! refresh(); ! } ! }); setCurrentDirectory(FuFile.ensureFuFile(_path)); --- 357,369 ---- p1.setPreferredSize(new Dimension(150, 220)); p2.setPreferredSize(new Dimension(150, 220)); + timer_ = new BuTimer(1000, new FudaaTimerActionListenerExplorer(this)); ! // timer_ = new BuTimer(1000, new ActionListener() { ! // ! // public void actionPerformed(ActionEvent _evt) { ! // refresh(); ! // timer_=null; ! // } ! // }); setCurrentDirectory(FuFile.ensureFuFile(_path)); *************** *** 675,679 **** } ! private final class FilterCR extends BuAbstractCellRenderer { public FilterCR() { --- 668,672 ---- } ! private final static class FilterCR extends BuAbstractCellRenderer { public FilterCR() { *************** *** 771,775 **** //TMP File[] l = null; ! if (FuLib.isWindows()) l = new File[] { new File("C:\\")}; else l = new File[0]; --- 764,770 ---- //TMP File[] l = null; ! // if (FuLib.isWindows()) l = new File[] { new File("C:\\")}; ! // else l = new File[0]; ! if (FuLib.isWindows()) l = File.listRoots(); else l = new File[0]; *************** *** 965,970 **** setCurrentDirectory(getSelectedDirectory()); } - - public final void openFile() { --- 960,963 ---- *************** *** 1009,1014 **** catch (IOException ex) {} } ! ! protected void addFavorites(){ EbliFavoriteFiles.INSTANCE.addFile(getSelectedDirectory()); } --- 1002,1007 ---- catch (IOException ex) {} } ! ! protected void addFavorites() { EbliFavoriteFiles.INSTANCE.addFile(getSelectedDirectory()); } *************** *** 1094,1101 **** // utils ! private static final Cursor WAIT_CURSOR = Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR); private final void setProgression(int _p) { ! if (app_ != null) app_.getMainPanel().setProgression(_p); } --- 1087,1094 ---- // utils ! private final Cursor WAIT_CURSOR = Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR); private final void setProgression(int _p) { ! if ((app_ != null) && (app_.getMainPanel() != null)) app_.getMainPanel().setProgression(_p); } *************** *** 1454,1502 **** } ! public static void main(String[] _args) { ! BuPreferences.BU.applyLookAndFeel(); ! BuPreferences.BU.applyLanguage(BuPreferences.BU.getLanguages()); ! ! DndIcons.setNoDropIcon(BuResource.BU.getIcon(DndIcons.class.getResource("dnd-nodrop_24.gif"))); ! DndIcons ! .setCanDropIcon(BuResource.BU.getIcon(DndIcons.class.getResource("dnd-candrop_24.gif"))); ! DndIcons ! .setDefaultIcon(BuResource.BU.getIcon(DndIcons.class.getResource("dnd-default_24.gif"))); ! DndIcons.put(String.class, BuResource.BU.getIcon("texte")); ! DndIcons.put(URL.class, BuResource.BU.getIcon("signet")); ! ! if (_args.length == 0) _args = new String[] ! //{ "." }; ! { FuLib.getSystemProperty("user.dir")}; ! ! for (int i = 0; i < _args.length; i++) { ! if (_args[i].equals("--ram")) { ! FuFile.setRamMode(true); ! continue; ! } ! ! final FuFile p = FuFile.createFile(FuLib.expandedPath(_args[i])); ! final JFrame f = new JFrame(BuResource.BU.getString("Explorateur")); ! final FudaaExplorer e = new FudaaExplorer(p); ! ! BuRegistry.register(f); ! e.setBorder(BuBorders.EMPTY2222); ! f.getContentPane().add(e); ! f.setLocation(140, 35); ! f.pack(); ! f.invalidate(); ! f.validate(); ! f.show(); ! e.repaint(); ! ! f.addWindowListener(new WindowAdapter() { ! public void windowClosing(WindowEvent _evt) { ! f.hide(); ! f.dispose(); ! BuRegistry.unregister(f); ! } ! }); ! } } } --- 1447,1461 ---- } ! /** ! * @see java.lang.Object#finalize() ! */ ! protected void finalize() throws Throwable { ! pmDirs_.removeAll(); ! pmFiles_.removeAll(); ! pmDirs_.setInvoker(null); ! pmFiles_.setInvoker(null); ! if (timer_ != null) timer_.stop(); ! super.finalize(); } } |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:27
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/taucomac Modified Files: TaucomacImplementation.java Log Message: Index: TaucomacImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacImplementation.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TaucomacImplementation.java 5 May 2004 12:42:41 -0000 1.9 --- TaucomacImplementation.java 1 Jun 2004 11:27:45 -0000 1.10 *************** *** 41,44 **** --- 41,45 ---- import com.memoire.bu.BuPreferences; import com.memoire.bu.BuPreferencesFrame; + import com.memoire.bu.BuPreferencesEditorPanel; import com.memoire.bu.BuPrinter; import com.memoire.bu.BuResource; *************** *** 101,105 **** protected JFrame ts_; protected BuAssistant assistant_; - protected BuPreferencesFrame preferences_; protected BuHelpFrame aide_; protected BuTaskView taches_; --- 102,105 ---- *************** *** 149,153 **** fp_= null; projet_= null; - preferences_= null; aide_= null; try { --- 149,152 ---- *************** *** 765,770 **** } catch (PropertyVetoException e) {} } ! protected void buildPreferences() { ! preferences_= new BuPreferencesFrame(); preferences_.addTab(new BuLookPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); --- 764,769 ---- } catch (PropertyVetoException e) {} } ! protected BuPreferencesEditorPanel buildPreferences() { ! BuPreferencesEditorPanel preferences_= new BuPreferencesEditorPanel(); preferences_.addTab(new BuLookPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); *************** *** 777,781 **** preferences_.addTab(new TaucomacPreferencesPanel(this)); //preferences_.addTab(new VolumePreferencesPanel (this)); ! preferences_.addInternalFrameListener(this); } protected void parametre() { --- 776,780 ---- preferences_.addTab(new TaucomacPreferencesPanel(this)); //preferences_.addTab(new VolumePreferencesPanel (this)); ! return preferences_; } protected void parametre() { |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:25
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/dimduc Modified Files: DimducImplementation.java Log Message: Index: DimducImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducImplementation.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DimducImplementation.java 5 May 2004 12:42:45 -0000 1.11 --- DimducImplementation.java 1 Jun 2004 11:27:44 -0000 1.12 *************** *** 153,160 **** * Description du champ */ - protected BuPreferencesFrame preferences_; - /** - * Description du champ - */ protected BuInternalFrame frame; /** --- 153,156 ---- *************** *** 267,271 **** public void init() { super.init(); - preferences_ = null; aide_ = null; try { --- 263,266 ---- *************** *** 933,938 **** * Description de la methode */ ! protected void buildPreferences() { ! preferences_ = new BuPreferencesFrame(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuLanguagePreferencesPanel(this)); --- 928,933 ---- * Description de la methode */ ! protected BuPreferencesEditorPanel buildPreferences() { ! BuPreferencesEditorPanel preferences_ = new BuPreferencesEditorPanel(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuLanguagePreferencesPanel(this)); *************** *** 942,945 **** --- 937,941 ---- preferences_.addTab(new EbliMiseEnPagePreferencesPanel()); preferences_.addTab(new FudaaAidePreferencesPanel(this, getApplicationPreferences())); + return preferences_; } |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:25
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/fdico Modified Files: FDicoParams.java FDicoEntiteTableModel.java FDicoEntiteFileTableModelInterface.java FDicoFilleProjet.java FDicoEntitePanel.java FDicoProjet.java FDicoTableEditorChooser.java FDicoProjectPanel.java Log Message: Index: FDicoTableEditorChooser.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoTableEditorChooser.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FDicoTableEditorChooser.java 5 May 2004 12:42:38 -0000 1.3 --- FDicoTableEditorChooser.java 1 Jun 2004 11:27:44 -0000 1.4 *************** *** 343,347 **** _actChoiceEditor(_data); } else { ! BuTextField txt= new BuTextField(); txt.setCharValidator(null); editor_= new DicoDefaultEditor(txt); --- 343,347 ---- _actChoiceEditor(_data); } else { ! BuTextField txt= new BuTextField(10); txt.setCharValidator(null); editor_= new DicoDefaultEditor(txt); *************** *** 352,356 **** _actChoiceEditor(_data); } else { ! BuTextField txt= new BuTextField(); txt.setCharValidator(BuCharValidator.INTEGER); editor_= new DicoDefaultEditor(txt); --- 352,356 ---- _actChoiceEditor(_data); } else { ! BuTextField txt= new BuTextField(10); txt.setCharValidator(BuCharValidator.INTEGER); editor_= new DicoDefaultEditor(txt); *************** *** 363,367 **** } public void visitReel(DicoDataType.Reel _data) { ! BuTextField txt= new BuTextField(); txt.setCharValidator(DICO_DOUBLE_CHAR_VALIDATOR); editor_= new DicoDefaultEditor(txt); --- 363,367 ---- } public void visitReel(DicoDataType.Reel _data) { ! BuTextField txt= new BuTextField(10); txt.setCharValidator(DICO_DOUBLE_CHAR_VALIDATOR); editor_= new DicoDefaultEditor(txt); Index: FDicoEntiteTableModel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntiteTableModel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FDicoEntiteTableModel.java 12 Feb 2004 16:15:19 -0000 1.1 --- FDicoEntiteTableModel.java 1 Jun 2004 11:27:44 -0000 1.2 *************** *** 96,100 **** } if (cmdMng_ == null) ! projet_.getDicoParams().removeValues(_ents, _max); else { cmdMng_.addCmd( --- 96,100 ---- } if (cmdMng_ == null) ! projet_.getDicoParams().removeValuesAndGenerateCommand(_ents, _max); else { cmdMng_.addCmd( *************** *** 180,184 **** */ public boolean isCellEditable(int rowIndex, int columnIndex) { ! return FDicoTableColumnIdentifier.getIdentifer(columnIndex).isEditable( rowIndex, this); --- 180,184 ---- */ public boolean isCellEditable(int rowIndex, int columnIndex) { ! return (getEntite(rowIndex).isModifiable()) && FDicoTableColumnIdentifier.getIdentifer(columnIndex).isEditable( rowIndex, this); *************** *** 199,203 **** } if (cmdMng_ == null) ! projet_.getDicoParams().setValue(e, (String)_aValue); else { cmdMng_.addCmd( --- 199,203 ---- } if (cmdMng_ == null) ! projet_.getDicoParams().setValueAndGenerateCommand(e, (String)_aValue); else { cmdMng_.addCmd( Index: FDicoEntitePanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntitePanel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FDicoEntitePanel.java 5 May 2004 12:42:38 -0000 1.3 --- FDicoEntitePanel.java 1 Jun 2004 11:27:44 -0000 1.4 *************** *** 1,3 **** ! /* * @file TrDicoEntitePanel.java * @creation 13 mai 2003 --- 1,3 ---- ! /** * @file TrDicoEntitePanel.java * @creation 13 mai 2003 *************** *** 670,675 **** table_.scrollRectToVisible(table_.getCellRect(lead, 0, true)); ent = tableModel_.getEntite(lead); ! actionDefaultSelected_.setEnabled(true); ! actionEditerSelected_.setEnabled(true); } else { actionDefaultSelected_.setEnabled(false); --- 670,675 ---- table_.scrollRectToVisible(table_.getCellRect(lead, 0, true)); ent = tableModel_.getEntite(lead); ! actionDefaultSelected_.setEnabled(!ent.isRequired()); ! actionEditerSelected_.setEnabled(ent.isModifiable()); } else { actionDefaultSelected_.setEnabled(false); Index: FDicoProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FDicoProjet.java 31 Mar 2004 08:17:48 -0000 1.3 --- FDicoProjet.java 1 Jun 2004 11:27:44 -0000 1.4 *************** *** 204,208 **** * @return le panneau projet */ ! protected FDicoFilleProjet getProjetFille(){ return entiteFille_; } --- 204,208 ---- * @return le panneau projet */ ! public FDicoFilleProjet getProjetFille(){ return entiteFille_; } Index: FDicoEntiteFileTableModelInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntiteFileTableModelInterface.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FDicoEntiteFileTableModelInterface.java 5 May 2004 12:42:38 -0000 1.2 --- FDicoEntiteFileTableModelInterface.java 1 Jun 2004 11:27:44 -0000 1.3 *************** *** 20,23 **** --- 20,24 ---- public void setCmdMng(DodicoCommandManager _manager); public int indexOf(DicoEntite e); + public void editer(int i); public DicoEntite getEntite(int row); public void remove(int[] _row); Index: FDicoFilleProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFilleProjet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FDicoFilleProjet.java 31 Mar 2004 08:17:48 -0000 1.3 --- FDicoFilleProjet.java 1 Jun 2004 11:27:44 -0000 1.4 *************** *** 61,66 **** null, projPane, ! FDicoResource.getS("Les fichiers du projet"), ! projPane.getCmdMng()); DodicoCommandManager cmd = new DodicoCommandManager(); pnEnt_ = new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd), _leftUp); --- 61,65 ---- null, projPane, ! FDicoResource.getS("Les fichiers du projet")); DodicoCommandManager cmd = new DodicoCommandManager(); pnEnt_ = new FDicoEntitePanel(new FDicoEntiteTableModel(_proj, cmd), _leftUp); *************** *** 69,74 **** null, pnEnt_, ! FDicoResource.getS("Mot-clés"), ! cmd); projet_ = _proj; } --- 68,72 ---- null, pnEnt_, ! FDicoResource.getS("Mot-clés")); projet_ = _proj; } Index: FDicoProjectPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjectPanel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FDicoProjectPanel.java 5 May 2004 12:42:38 -0000 1.3 --- FDicoProjectPanel.java 1 Jun 2004 11:27:44 -0000 1.4 *************** *** 31,34 **** --- 31,35 ---- import javax.swing.JTextField; import javax.swing.KeyStroke; + import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; *************** *** 89,92 **** --- 90,94 ---- proj.getDicoParams().addModelListener(this); table_= new BuTable(model_); + table_.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); table_.addMouseListener(this); table_.getSelectionModel().addListSelectionListener(this); *************** *** 229,234 **** // } } else if ("EDITER".equals(_evt.getActionCommand())) { ! int r= table_.getSelectedRow(); ! ((FDicoParams.EntiteFileTableModel)table_.getModel()).editer(r); } } --- 231,235 ---- // } } else if ("EDITER".equals(_evt.getActionCommand())) { ! model_.editer(table_.getSelectedRow()); } } *************** *** 441,447 **** */ public void valueChanged(ListSelectionEvent e) { ! boolean b=!table_.getSelectionModel().isSelectionEmpty(); ! actionDefaultSelected_.setEnabled(b); ! actionEditerSelected_.setEnabled(b); } --- 442,456 ---- */ public void valueChanged(ListSelectionEvent e) { ! boolean isKeywordSelected=!table_.getSelectionModel().isSelectionEmpty(); ! if(!isKeywordSelected){ ! actionDefaultSelected_.setEnabled(false); ! actionEditerSelected_.setEnabled(false); ! } ! else{ ! ! DicoEntite kw=model_.getEntite(table_.getSelectedRow()); ! actionDefaultSelected_.setEnabled(!kw.isRequired()); ! actionEditerSelected_.setEnabled(kw.isModifiable()); ! } } Index: FDicoParams.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoParams.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FDicoParams.java 5 May 2004 12:42:38 -0000 1.3 --- FDicoParams.java 1 Jun 2004 11:27:44 -0000 1.4 *************** *** 1,11 **** /* ! * @file TrDicoEntiteValuesDefault.java ! * @creation 19 mai 2003 ! * @modification $Date$ ! * @license GNU General Public License 2 ! * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne ! * @mail de...@fu... */ package org.fudaa.fudaa.fdico; import java.io.File; [...1510 lines suppressed...] public boolean isValueSetFor(DicoEntite _ent) { return dicoParams_.isValueSetFor(_ent); ! } ! ! /** ! * ! */ public boolean isValueValideFor(DicoEntite _ent) { return dicoParams_.isValueValideFor(_ent); ! } ! ! /** ! * ! */ public void removeModelListener(DicoParamsListener _l) { dicoParams_.removeModelListener(_l); } ! ! } \ No newline at end of file |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:25
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/tr/post Modified Files: TrIsoModel.java TrIsoLayer.java TrPostSourceActivator.java TrPostVisuPanel.java Log Message: Index: TrIsoModel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrIsoModel.java 14 May 2004 10:27:22 -0000 1.3 --- TrIsoModel.java 1 Jun 2004 11:27:44 -0000 1.4 *************** *** 16,19 **** --- 16,20 ---- import org.fudaa.dodico.ef.EfNode; import org.fudaa.ebli.commun.EbliListeSelectionInterface; + import org.fudaa.ebli.geometrie.GrDataBoite; import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.fudaa.meshviewer.layer.MvElementModelDefault; *************** *** 164,167 **** --- 165,172 ---- } + /** + * @param _variable l'index de la variable + * @param _time l'index du pas de temps + */ public final void setVAndT(int _variable,int _time){ if((_variable!=oldIdx_) || (_time!=tIdx_)){ *************** *** 180,182 **** --- 185,198 ---- } + /** + * @see org.fudaa.ebli.calque.ZModeleDonnees#getDonneesBoite(org.fudaa.ebli.geometrie.GrDataBoite) + */ + public boolean getDonneesBoite(GrDataBoite _b) { + _b.setDataTime(true); + _b.setMax(getMaxVal()); + _b.setMin(getMinVal()); + _b.setMaxTime(getMaxValForThisStep()); + _b.setMinTime(getMinValForThisStep()); + return true; + } } Index: TrPostSourceActivator.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/TrPostSourceActivator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrPostSourceActivator.java 14 May 2004 10:27:22 -0000 1.3 --- TrPostSourceActivator.java 1 Jun 2004 11:27:44 -0000 1.4 *************** *** 11,22 **** import java.io.File; - import javax.swing.JInternalFrame; import javax.swing.JLabel; import javax.swing.JTextField; import javax.swing.SwingUtilities; ! ! import com.memoire.bu.BuGridLayout; ! import com.memoire.bu.BuLabelMultiLine; ! import com.memoire.bu.BuTaskOperation; import org.fudaa.ctulu.CtuluLib; --- 11,18 ---- import java.io.File; import javax.swing.JLabel; import javax.swing.JTextField; import javax.swing.SwingUtilities; ! import javax.swing.WindowConstants; import org.fudaa.ctulu.CtuluLib; *************** *** 35,44 **** import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.meshviewer.MvActLoadDefault; import org.fudaa.fudaa.tr.common.TrFileFormatManager; - import org.fudaa.fudaa.tr.common.TrImplementationAbstract; import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.data.TrNodeData; import org.fudaa.fudaa.tr.data.TrNodeDataDefault; /** --- 31,43 ---- import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.meshviewer.MvActLoadDefault; + import org.fudaa.fudaa.tr.common.TrCommonImplementation; import org.fudaa.fudaa.tr.common.TrFileFormatManager; import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.data.TrNodeData; import org.fudaa.fudaa.tr.data.TrNodeDataDefault; + import com.memoire.bu.BuGridLayout; + import com.memoire.bu.BuLabelMultiLine; + import com.memoire.bu.BuTaskOperation; /** *************** *** 59,75 **** * @param _impl l'impl parente */ ! protected static void afficheFrame(TrPostSource _s, final TrImplementationAbstract _impl) { final TrPostVisuPanel v = new TrPostVisuPanel(_impl, new TrPostSourceController(_s)); ! final TrPostFille f = new TrPostFille(v) { ! public void dispose() { ! super.dispose(); ! if(v!=null){ v.srcCont_=null;} ! setContentPane(new JLabel()); ! } ! }; f.setTitle(_s.getTitle()); f.setClosable(true); ! f.setDefaultCloseOperation(JInternalFrame.DISPOSE_ON_CLOSE); ! // f.addInternalFrameListener(new SpecialInternalFrameListener(_impl)); //Dans le thread swing SwingUtilities.invokeLater(new Runnable() { --- 58,67 ---- * @param _impl l'impl parente */ ! protected static void afficheFrame(TrPostSource _s, final TrCommonImplementation _impl) { final TrPostVisuPanel v = new TrPostVisuPanel(_impl, new TrPostSourceController(_s)); ! final TrPostFille f = new TrPostFille(v); f.setTitle(_s.getTitle()); f.setClosable(true); ! f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); //Dans le thread swing SwingUtilities.invokeLater(new Runnable() { *************** *** 89,93 **** } - /** * @param _f le fichier a ouvrir --- 81,84 ---- *************** *** 95,99 **** */ ! public static void activeSerafin(final File _f, final TrImplementationAbstract _impl) { new BuTaskOperation(_impl, CtuluLib.ESPACE) { --- 86,90 ---- */ ! public static void activeSerafin(final File _f, final TrCommonImplementation _impl) { new BuTaskOperation(_impl, CtuluLib.ESPACE) { *************** *** 113,128 **** * @param _impl l'impl parent */ ! public static void active(File _f, TrImplementationAbstract _impl) { ! TrFileFormatManager mng = _impl.getFileFormatMng(); String name = _f.getName(); ! if (mng.isRefluxFile(name)) ! activeINP(_f, _impl); ! else if (name.endsWith(INPFileFormat.getSolution2DExtension())) ! activeINP(_f, _impl); ! else if (name.endsWith(TrFileFormatManager.REFLUX_XML_EXT)) ! activeINP(_f, _impl); //mettre serafin en dernier car le test est tres large .... ! else if (MvActLoadDefault.isSerafinFile(name)) ! activeSerafin(_f, _impl); } --- 104,115 ---- * @param _impl l'impl parent */ ! public static void active(File _f, TrCommonImplementation _impl) { ! TrFileFormatManager mng = TrFileFormatManager.INSTANCE; String name = _f.getName(); ! if (mng.isRefluxFile(name)) activeINP(_f, _impl); ! else if (name.endsWith(INPFileFormat.getSolution2DExtension())) activeINP(_f, _impl); ! else if (name.endsWith(TrFileFormatManager.XML_EXT)) activeINP(_f, _impl); //mettre serafin en dernier car le test est tres large .... ! else if (MvActLoadDefault.isSerafinFile(name)) activeSerafin(_f, _impl); } *************** *** 133,137 **** * @param _impl l'impl parent */ ! public static void activeINP(final File _f, final TrImplementationAbstract _impl) { INPChooseFile pn = new INPChooseFile(_f); if (EbliSimpleDialogPanel.isOkResponse(pn.afficheModale(_impl.getFrame()))) { --- 120,124 ---- * @param _impl l'impl parent */ ! public static void activeINP(final File _f, final TrCommonImplementation _impl) { INPChooseFile pn = new INPChooseFile(_f); if (EbliSimpleDialogPanel.isOkResponse(pn.afficheModale(_impl.getFrame()))) { *************** *** 145,149 **** * @param _impl l'impl parente */ ! public static void activeINP(final File _f, final File _sov, final TrImplementationAbstract _impl) { new BuTaskOperation(_impl, CtuluLib.ESPACE) { --- 132,136 ---- * @param _impl l'impl parente */ ! public static void activeINP(final File _f, final File _sov, final TrCommonImplementation _impl) { new BuTaskOperation(_impl, CtuluLib.ESPACE) { *************** *** 157,161 **** } - /** * @param _f le fichier serafin --- 144,147 ---- *************** *** 164,172 **** * @return le source post */ ! public static TrPostSource activeSerafinAction(final File _f, ! final FudaaCommonImplementation _impl, ! ProgressionInterface _inter) { ! FileOperationSynthese s = SerafinFileFormat.getInstance().getLastVersionImpl().read( ! _f, _inter); if (_impl.manageErrorOperationAndIsFatal(s)) return null; SerafinInterface ser = (SerafinInterface) s.getSource(); --- 150,156 ---- * @return le source post */ ! public static TrPostSource activeSerafinAction(final File _f, ! final FudaaCommonImplementation _impl, ProgressionInterface _inter) { ! FileOperationSynthese s = SerafinFileFormat.getInstance().getLastVersionImpl().read(_f, _inter); if (_impl.manageErrorOperationAndIsFatal(s)) return null; SerafinInterface ser = (SerafinInterface) s.getSource(); *************** *** 201,212 **** * @return le source */ ! public static TrPostSource activeINPAction(final File _inpOrxinp, final File _sovFile, ! final FudaaCommonImplementation _impl, ! ProgressionInterface _inter) { File inpFile = _inpOrxinp; ! if (_inpOrxinp.getName().endsWith(TrFileFormatManager.REFLUX_XML_EXT)) { inpFile = new File(_inpOrxinp.getParentFile(), CtuluLib.getFileName(DodicoLib ! .getSansExtension(_inpOrxinp ! .getName()), INPFileFormat.getInstance().getExtensions()[0])); } if (!inpFile.exists()) { --- 185,194 ---- * @return le source */ ! public static TrPostSource activeINPAction(final File _inpOrxinp, final File _sovFile, ! final FudaaCommonImplementation _impl, ProgressionInterface _inter) { File inpFile = _inpOrxinp; ! if (_inpOrxinp.getName().endsWith(TrFileFormatManager.XML_EXT)) { inpFile = new File(_inpOrxinp.getParentFile(), CtuluLib.getFileName(DodicoLib ! .getSansExtension(_inpOrxinp.getName()), INPFileFormat.getInstance().getExtensions()[0])); } if (!inpFile.exists()) { *************** *** 215,221 **** } INPFileFormat.INPVersion v = (INPFileFormat.INPVersion) INPFileFormat.getInstance() ! .getLastVersionImpl(); ! FileOperationSynthese s = v.read( ! inpFile, _inter); if (_impl.manageErrorOperationAndIsFatal(s)) return null; INPInterface inp = (INPInterface) s.getSource(); --- 197,202 ---- } INPFileFormat.INPVersion v = (INPFileFormat.INPVersion) INPFileFormat.getInstance() ! .getLastVersionImpl(); ! FileOperationSynthese s = v.read(inpFile, _inter); if (_impl.manageErrorOperationAndIsFatal(s)) return null; INPInterface inp = (INPInterface) s.getSource(); *************** *** 241,247 **** variable_[idx++] = H2dVariableType.HAUTEUR_EAU.getNom(); variable_[idx++] = TrResource.getS("Norme"); ! int[] placement = new int[] { ! 2, 3, 4, 6, 7 ! }; int uidx = 3; int vidx = 4; --- 222,226 ---- variable_[idx++] = H2dVariableType.HAUTEUR_EAU.getNom(); variable_[idx++] = TrResource.getS("Norme"); ! int[] placement = new int[] { 2, 3, 4, 6, 7}; int uidx = 3; int vidx = 4; *************** *** 267,273 **** } } ! if(CtuluLib.DEBUG) CtuluLib.debug("lecture TERMINEE"); ! return new TrPostSourceDefault(inpFile, _inpOrxinp.getAbsolutePath(), g, timeStep_, variable_, ! datas_); } --- 246,252 ---- } } ! if (CtuluLib.DEBUG) CtuluLib.debug("lecture TERMINEE"); ! return new TrPostSourceDefault(inpFile, _inpOrxinp.getAbsolutePath(), g, timeStep_, variable_, ! datas_); } *************** *** 285,291 **** String fic = DodicoLib.getSansExtension(inpOrSov.getName()); File inp = new File(inpOrSov.getParentFile(), CtuluLib.getFileName(fic, INPFileFormat ! .getINPExtension())); File sov = new File(inpOrSov.getParentFile(), CtuluLib.getFileName(fic, INPFileFormat ! .getSolution2DExtension())); init(inp.getAbsolutePath(), sov.getAbsolutePath()); } --- 264,270 ---- String fic = DodicoLib.getSansExtension(inpOrSov.getName()); File inp = new File(inpOrSov.getParentFile(), CtuluLib.getFileName(fic, INPFileFormat ! .getINPExtension())); File sov = new File(inpOrSov.getParentFile(), CtuluLib.getFileName(fic, INPFileFormat ! .getSolution2DExtension())); init(inp.getAbsolutePath(), sov.getAbsolutePath()); } *************** *** 305,309 **** addLabel(CtuluLib.EMPTY_STRING); add(new BuLabelMultiLine(TrResource ! .getS("Choisir le fichier sov et le fichier inp correspondant"))); inpField_ = addLabelFileChooserPanel(s + INPFileFormat.getINPExtension(), _inp); sovField_ = addLabelFileChooserPanel(s + INPFileFormat.getSolution2DExtension(), _sov); --- 284,288 ---- addLabel(CtuluLib.EMPTY_STRING); add(new BuLabelMultiLine(TrResource ! .getS("Choisir le fichier sov et le fichier inp correspondant"))); inpField_ = addLabelFileChooserPanel(s + INPFileFormat.getINPExtension(), _inp); sovField_ = addLabelFileChooserPanel(s + INPFileFormat.getSolution2DExtension(), _sov); *************** *** 324,329 **** } - - /** * @see org.fudaa.ebli.dialog.EbliSimpleDialogPanel#valide() --- 303,306 ---- *************** *** 334,339 **** if (!inp_.exists() || !sov_.exists()) { StringBuffer b = new StringBuffer(); ! if (!inp_.exists()) ! b.append(TrResource.getS("Le fichier {0} n'existe pas", inp_.getAbsolutePath())); if (!sov_.exists()) { if (b.length() > 0) b.append(CtuluLib.LINE_SEP); --- 311,316 ---- if (!inp_.exists() || !sov_.exists()) { StringBuffer b = new StringBuffer(); ! if (!inp_.exists()) ! b.append(TrResource.getS("Le fichier {0} n'existe pas", inp_.getAbsolutePath())); if (!sov_.exists()) { if (b.length() > 0) b.append(CtuluLib.LINE_SEP); *************** *** 344,349 **** } return true; } } ! } --- 321,327 ---- } return true; + } } ! } \ No newline at end of file Index: TrIsoLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/TrIsoLayer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrIsoLayer.java 14 May 2004 10:27:22 -0000 1.4 --- TrIsoLayer.java 1 Jun 2004 11:27:44 -0000 1.5 *************** *** 14,25 **** import java.util.Map; - import org.fudaa.ebli.calque.BCalqueLegende; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrMorphisme; import org.fudaa.ebli.geometrie.GrPolygone; import org.fudaa.ebli.palette.BPalettePlage; ! import org.fudaa.ebli.trace.*; import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer; - import org.fudaa.fudaa.refonde.commun.BPaletteCouleurPlage; import org.fudaa.fudaa.refonde.commun.ZModeleChangeEvent; import org.fudaa.fudaa.refonde.commun.ZModeleChangeListener; --- 14,23 ---- import java.util.Map; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrMorphisme; import org.fudaa.ebli.geometrie.GrPolygone; import org.fudaa.ebli.palette.BPalettePlage; ! import org.fudaa.ebli.trace.TraceIsoSurfacesAvecPlages; import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer; import org.fudaa.fudaa.refonde.commun.ZModeleChangeEvent; import org.fudaa.fudaa.refonde.commun.ZModeleChangeListener; *************** *** 81,90 **** public void timeUpdated() { ! if (updateWithT_) { ! updateLegende(); ! } ! else { ! paletteCouleur_.setTitre(getM().getT()); ! } repaint(); } --- 79,85 ---- public void timeUpdated() { ! paletteCouleur_.setSousTitre(getM().getT()); ! updateLegendeTitre(); ! repaint(); } Index: TrPostVisuPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/post/TrPostVisuPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrPostVisuPanel.java 5 May 2004 12:42:37 -0000 1.2 --- TrPostVisuPanel.java 1 Jun 2004 11:27:44 -0000 1.3 *************** *** 210,212 **** --- 210,223 ---- } + /** + * @see java.lang.Object#finalize() + */ + protected void finalize() throws Throwable { + super.finalize(); + isoLayer_=null; + isoModel_=null; + anim_=null; + timeSelect_=null; + varSelect_=null; + } } |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:24
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lidometier In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/lidometier Modified Files: LidoImplementation.java Log Message: Index: LidoImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lidometier/LidoImplementation.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** LidoImplementation.java 30 Apr 2004 13:52:18 -0000 1.10 --- LidoImplementation.java 1 Jun 2004 11:27:44 -0000 1.11 *************** *** 1281,1286 **** //* } } ! protected void buildPreferences() { ! preferences_= new BuPreferencesFrame(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); --- 1281,1286 ---- //* } } ! protected BuPreferencesEditorPanel buildPreferences() { ! BuPreferencesEditorPanel preferences_= new BuPreferencesEditorPanel(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); *************** *** 1290,1293 **** --- 1290,1294 ---- //* preferences_.addTab(new Hydraulique1dPreferencesPanel(this)); preferences_.addTab(new LidoPreferencesPanel(this)); + return preferences_; } private void reseau() { |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:24
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/tr/data Modified Files: TrFilleVisu.java TrSiPlanLayer.java TrVisuPanel.java Added Files: MvFindComponentBcPoint.java MvFindActionBcPoint.java Removed Files: TrFindActionBcPoint.java TrBcBoundaryLegendLayer.java TrFindComponent.java TrFindDialog.java TrFindComponentDefault.java TrFindComponentBcPoint.java TrFindActionDefault.java TrFindAction.java Log Message: Index: TrFilleVisu.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrFilleVisu.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrFilleVisu.java 5 May 2004 12:42:39 -0000 1.1 --- TrFilleVisu.java 1 Jun 2004 11:27:43 -0000 1.2 *************** *** 17,20 **** --- 17,21 ---- import com.memoire.bu.BuUndoRedoInterface; + import org.fudaa.dodico.commun.DodicoCommandManager; import org.fudaa.ebli.calque.BArbreCalque; import org.fudaa.ebli.calque.BArbreCalqueModel; *************** *** 160,162 **** --- 161,182 ---- } + /** + * @see org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer#clearCmd(org.fudaa.dodico.commun.DodicoCommandManager) + */ + public void clearCmd(DodicoCommandManager _source) { + getVisuPanel().clearCmd(_source); + } + /** + * @see org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer#getCmdMng() + */ + public DodicoCommandManager getCmdMng() { + return getVisuPanel().getCmdMng(); + } + /** + * @see org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer#setActive(boolean) + */ + public void setActive(boolean _b) { + getVisuPanel().setActive(_b); + + } } --- TrFindComponent.java DELETED --- --- TrFindComponentDefault.java DELETED --- --- TrFindComponentBcPoint.java DELETED --- --- TrFindDialog.java DELETED --- Index: TrVisuPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanel.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrVisuPanel.java 5 May 2004 12:42:39 -0000 1.1 --- TrVisuPanel.java 1 Jun 2004 11:27:43 -0000 1.2 *************** *** 9,70 **** package org.fudaa.fudaa.tr.data; - import java.awt.Color; - import java.awt.Component; - import java.awt.Frame; - import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; import java.util.ArrayList; - import java.util.Iterator; import java.util.List; - import java.util.Map; - import java.util.TreeMap; - import javax.swing.Action; - import javax.swing.ActionMap; - import javax.swing.InputMap; - import javax.swing.JCheckBoxMenuItem; - import javax.swing.JColorChooser; - import javax.swing.JComponent; - import javax.swing.JMenu; - import javax.swing.JMenuItem; - import javax.swing.JPopupMenu; - import javax.swing.KeyStroke; - import javax.swing.event.TreeSelectionEvent; - - import com.memoire.bu.BuDialogMessage; - import com.memoire.bu.BuDynamicMenu; - import com.memoire.bu.BuMenu; - import com.memoire.bu.BuPopupMenu; - import com.memoire.bu.BuResource; - - import org.fudaa.dodico.commun.DodicoCommandManager; - import org.fudaa.dodico.ef.EfGrid; - import org.fudaa.ebli.calque.BArbreCalque; - import org.fudaa.ebli.calque.BArbreCalqueModel; - import org.fudaa.ebli.calque.BCalque; - import org.fudaa.ebli.calque.BGroupeCalque; - import org.fudaa.ebli.calque.ZCalqueAffichage; - import org.fudaa.ebli.calque.ZEbliCalquesPanel; - import org.fudaa.ebli.calque.action.EbliActionInterface; - import org.fudaa.ebli.calque.action.EbliComponentFactory; - import org.fudaa.ebli.calque.action.EbliPaletteAction; - import org.fudaa.ebli.palette.BSelecteurReduitFonteNewVersion; import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.meshviewer.layer.MvElementLayer; - import org.fudaa.fudaa.meshviewer.layer.MvElementModel; - import org.fudaa.fudaa.meshviewer.layer.MvElementModelDefault; - import org.fudaa.fudaa.meshviewer.layer.MvElementNumberLayer; - import org.fudaa.fudaa.meshviewer.layer.MvElementNumberModelDefault; - import org.fudaa.fudaa.meshviewer.layer.MvGridLayerGroup; - import org.fudaa.fudaa.meshviewer.layer.MvInfoDelegate; - import org.fudaa.fudaa.meshviewer.layer.MvLayer; import org.fudaa.fudaa.meshviewer.layer.MvLayerGroup; import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer; ! import org.fudaa.fudaa.meshviewer.layer.MvNodeModel; ! import org.fudaa.fudaa.meshviewer.layer.MvNodeModelDefault; ! import org.fudaa.fudaa.meshviewer.layer.MvNodeNumberLayer; ! import org.fudaa.fudaa.meshviewer.layer.MvNodeNumberModelDefault; ! import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo; ! import org.fudaa.fudaa.tr.common.TrResource; /** --- 9,25 ---- package org.fudaa.fudaa.tr.data; import java.util.ArrayList; import java.util.List; import org.fudaa.fudaa.commun.FudaaCommonImplementation; + import org.fudaa.fudaa.meshviewer.MvFindAction; + import org.fudaa.fudaa.meshviewer.MvFindActionDefault; + import org.fudaa.fudaa.meshviewer.MvFindDialog; + import org.fudaa.fudaa.meshviewer.MvVisuPanel; import org.fudaa.fudaa.meshviewer.layer.MvElementLayer; import org.fudaa.fudaa.meshviewer.layer.MvLayerGroup; import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer; ! ! import com.memoire.bu.BuMenu; /** *************** *** 73,143 **** */ public abstract class TrVisuPanel ! extends ZEbliCalquesPanel ! implements ActionListener { ! private Map calqueActions_; ! protected FudaaCommonImplementation impl_; ! private DodicoCommandManager mng_; ! protected BuMenu layerMenu_; ! private BuMenu contextTools_; ! private BuMenu ptDisplayTools_; ! private BuMenu eltDisplayTools_; ! protected TrFindDialog findDialog_; ! protected MvPanelInfo pnInfo_; /** * @param _impl l'implementation parente */ public TrVisuPanel(FudaaCommonImplementation _impl) { ! super(null, true, true, true); impl_= _impl; - mng_= new DodicoCommandManager(); - setModeVisible(true); - getVueCalque().setBackground(Color.white); - EbliActionInterface[] temp= standardActionGroup_; - standardActionGroup_= new EbliActionInterface[temp.length + 1]; - System.arraycopy(temp, 0, standardActionGroup_, 0, temp.length); - pnInfo_= new MvPanelInfo(getArbreCalqueModel()); - EbliPaletteAction plAction= - new EbliPaletteAction( - TrResource.getS("Information"), - BuResource.BU.getIcon("commentaire"), - pnInfo_, - "INFOS") { - public void updateBeforeShow() { - BCalque cq= getCalqueActif(); - if (cq != null) - ((MvPanelInfo)getPaletteContent()).updateState(); - } - }; - plAction.setPaletteResizable(true); - standardActionGroup_[temp.length]= plAction; - KeyStroke ks= KeyStroke.getKeyStroke('i'); - plAction.putValue(Action.ACCELERATOR_KEY, ks); - InputMap thisMap= - getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); - ActionMap m= getActionMap(); - thisMap.put(ks, "INFOS"); - m.put("INFOS", plAction); - setFormatSuiviSouris(MvPanelInfo.TWO_DIGITS_FORMAT); - } /** ! * Met a jour le composant d'information */ ! public void updateInfoComponent() { ! pnInfo_.updateState(); } /** ! * Met a jour l'association calque/action ! * @param _c le calque en question ! * @param _act les actions associees a ce calque */ ! public void addCalqueActions(BCalque _c, EbliActionInterface[] _act) { ! if (calqueActions_ == null) ! calqueActions_= new TreeMap(BCalque.createComparator()); ! for (int i= _act.length - 1; i >= 0; i--) { ! if (_act[i] != null) ! _act[i].setEnabled(false); ! } ! calqueActions_.put(_c, _act); } protected void buildFindDialog() { --- 28,53 ---- */ public abstract class TrVisuPanel ! extends MvVisuPanel { ! /** * @param _impl l'implementation parente */ public TrVisuPanel(FudaaCommonImplementation _impl) { ! super(_impl); impl_= _impl; + } + /** ! * @see org.fudaa.fudaa.meshviewer.MvVisuPanel#setSelected(boolean) */ ! protected void setSelected(boolean _b) { ! super.setSelected(_b); } /** ! * @see org.fudaa.fudaa.meshviewer.MvVisuPanel#initLayerMenu(java.lang.String) */ ! protected BuMenu initLayerMenu(String _title) { ! return super.initLayerMenu(_title); } protected void buildFindDialog() { *************** *** 145,216 **** MvNodeLayer lay=getGridGroup().getPointLayer(); if(lay!=null) ! l.add(new TrFindActionDefault(this, lay)); MvElementLayer layEl=getGridGroup().getPolygonLayer(); if(layEl!=null) ! l.add(new TrFindActionDefault(this, layEl)); TrBcPointLayer laybc=getBcPointLayer(); if(laybc!=null) ! l.add(new TrFindActionBcPoint(this, laybc)); ! TrFindAction[] ac=new TrFindAction[l.size()]; l.toArray(ac); ! findDialog_= new TrFindDialog(this, ac); ! } ! protected void majCalqueActions() { ! updateTrLayerMenu(); ! } ! /** ! * @return l'impl parente ! */ ! public FudaaCommonImplementation getImpl() { ! return impl_; ! } ! /** ! * @return le calque legende ! */ ! public TrBcBoundaryLegendLayer getCqLegend() { ! return (TrBcBoundaryLegendLayer)gcDonnees_.getCalqueParNom("cqLegende"); ! } ! /** ! * @return le manager des commandes pour le undo/redo ! */ ! public DodicoCommandManager getCmdMng() { ! return mng_; ! } ! /** ! * Met a jour un arbre avec le modele de ce panneau : A améliorer ! * @param _cq l'arbre calque a mettre a jour ! */ ! public void refreshArbreCalque(BArbreCalque _cq) { ! BArbreCalqueModel arbre= getArbreCalqueModel(); ! _cq.setModel(arbre); ! _cq.refresh(); ! } ! ! /** ! * Ajoute le groupe de calque maillage ! * @param _m le maillage ! * @param _d le delegue pour la mise a jour des infos ! */ ! protected final void addCqMaillage(EfGrid _m, MvInfoDelegate _d) { ! MvNodeModelDefault pt= new MvNodeModelDefault(_m); ! pt.setDelegate(_d); ! MvElementModelDefault elt= new MvElementModelDefault(_m); ! elt.setDelegate(_d); ! addCqMaillage(_m, pt, elt); ! } ! /** ! * @param _m le maillage ! * @param _ptModel le modele a utiliser pour les points ! * @param _eltModel le modele a utiliser pour les elements ! */ ! protected final void addCqMaillage( ! EfGrid _m, ! MvNodeModel _ptModel, ! MvElementModel _eltModel) { ! if (getGridGroup() != null) ! return; ! MvGridLayerGroup cqGrid= new MvGridLayerGroup(_m, _ptModel, _eltModel); ! cqGrid.setName("gpGrid"); ! gcDonnees_.add(cqGrid); } /** --- 55,68 ---- MvNodeLayer lay=getGridGroup().getPointLayer(); if(lay!=null) ! l.add(new MvFindActionDefault(this, lay)); MvElementLayer layEl=getGridGroup().getPolygonLayer(); if(layEl!=null) ! l.add(new MvFindActionDefault(this, layEl)); TrBcPointLayer laybc=getBcPointLayer(); if(laybc!=null) ! l.add(new MvFindActionBcPoint(this, laybc)); ! MvFindAction[] ac=new MvFindAction[l.size()]; l.toArray(ac); ! findDialog_= new MvFindDialog(this, ac); } /** *************** *** 240,308 **** return false; } ! /** ! * Ajoute les calques d'informations : numero des points et des elements ! * @param _g le maillage associe ! */ ! protected final void addCqInfos(EfGrid _g) { ! if (getCqInfos() != null) ! return; ! MvLayerGroup gr= new MvLayerGroup(); ! gr.setName("gpInfo"); ! gr.setTitle(TrResource.getS("infos")); ! TrBcBoundaryLegendLayer l= new TrBcBoundaryLegendLayer(); ! l.setDestructible(false); ! l.setTitle(TrResource.getS("Légende")); ! l.setName("cqLegende"); ! gr.add(l); ! addCqNumber(_g, gr); ! addCqElementNumber(_g, gr); ! gcDonnees_.add(gr); ! } ! /** ! * Action appelee pour mettre a jour les calques d'infos et les mettre en premier ! */ ! public final void updateInfosLayer() { ! MvLayerGroup l= getCqInfos(); ! if (l != null) ! gcDonnees_.enPremier(l); ! } ! /** ! * @return le groupe de calque d'info ! */ ! public MvLayerGroup getCqInfos() { ! return (MvLayerGroup)gcDonnees_.getCalqueParNom("gpInfo"); ! } ! /** ! * @param _g le maillage associee ! * @param _c le groupe de calque de dest ! */ ! private final void addCqNumber(EfGrid _g, BGroupeCalque _c) { ! if (getCqNumber() == null) { ! MvNodeNumberLayer pt= ! new MvNodeNumberLayer(new MvNodeNumberModelDefault(_g)); ! pt.setName("cqPtNumber"); ! _c.add(pt); ! } ! } ! private final void addCqElementNumber(EfGrid _g, BGroupeCalque _c) { ! if (getCqNumber() == null) { ! MvElementNumberLayer pt= ! new MvElementNumberLayer(new MvElementNumberModelDefault(_g)); ! pt.setName("cqEltNumber"); ! _c.add(pt); ! } ! } ! /** ! * @return le calque affichant les numeros des points ! */ ! public final MvNodeNumberLayer getCqNumber() { ! return (MvNodeNumberLayer)gcDonnees_.getCalqueParNom("cqPtNumber"); ! } ! /** ! * @return le calque affichant les numeros des elements ! */ ! public final MvElementNumberLayer getCqElementNumber() { ! return (MvElementNumberLayer)gcDonnees_.getCalqueParNom("cqEltNumber"); ! } /** * @param b le nouveau groupe des calques des conditions limites --- 92,96 ---- return false; } ! /** * @param b le nouveau groupe des calques des conditions limites *************** *** 340,349 **** return (TrBcLayerGroup)gcDonnees_.getCalqueParNom("gpCl"); } ! /** ! * @return le groupe maillage ! */ ! public MvGridLayerGroup getGridGroup() { ! return (MvGridLayerGroup)gcDonnees_.getCalqueParNom("gpGrid"); ! } /** * @return la calque points limites --- 128,132 ---- return (TrBcLayerGroup)gcDonnees_.getCalqueParNom("gpCl"); } ! /** * @return la calque points limites *************** *** 359,745 **** return getBoundaryGroup().getBcBoundaryLayer(); } - /** - * @return la fenetre de l'implementation parente. - */ - public Frame getFrame() { - return getImpl().getFrame(); - } - /** - * Remplit un menu avec les actions associees aux calques. - * @param _projectMenu le menu a remplir - */ - public void fillWithAllLayersAction(JMenu _projectMenu) { - if (calqueActions_ != null) { - for (Iterator it= calqueActions_.entrySet().iterator(); it.hasNext();) { - Map.Entry e= (Map.Entry)it.next(); - EbliActionInterface[] ac= (EbliActionInterface[])e.getValue(); - if ((ac != null) && (ac.length > 0)) { - BCalque cq= (BCalque)e.getKey(); - BuMenu m= new BuMenu(cq.getTitle(), cq.getName()); - fillMenuWith(m, ac); - _projectMenu.add(m); - } - } - } - } - protected void fillMenuWith(JPopupMenu _m, EbliActionInterface[] _ac) { - if (_ac == null) - return; - int nAc= _ac.length; - for (int j= 0; j < nAc; j++) { - if (_ac[j] == null) - _m.addSeparator(); - else - _m.add(_ac[j].buildMenuItem(EbliComponentFactory.INSTANCE)); - } - } - protected void fillMenuWith(JMenu _m, EbliActionInterface[] _ac) { - if (_ac == null) - return; - int nAc= _ac.length; - for (int j= 0; j < nAc; j++) { - if (_ac[j] == null) - _m.addSeparator(); - else - _m.add(_ac[j].buildMenuItem(EbliComponentFactory.INSTANCE)); - } - } - /** - * Rempli le menu popup avec les actions du calque en question - * @param _m le menu a remplir - * @param _c le calque dont les actions seront ajoutees au menu - */ - public void fillMenuWithCalqueActions(JPopupMenu _m, BCalque _c) { - if (calqueActions_ != null) - fillMenuWith(_m, (EbliActionInterface[])calqueActions_.get(_c)); - } - /** - * Rempli le menu avec les actions du calque en question - * @param _m le menu a remplir - * @param _c le calque dont les actions seront ajoutees au menu - */ - public void fillMenuWithCalqueActions(JMenu _m, BCalque _c) { - if (calqueActions_ != null) - fillMenuWith(_m, (EbliActionInterface[])calqueActions_.get(_c)); - } - /** - * @param _ac les actions dont l'etat "enable" sera modifie - * @param _b la nouvelle valeur - */ - protected static void setActionEnable(Action[] _ac, boolean _b) { - if ((_ac != null) && (_ac.length > 0)) { - for (int i= _ac.length - 1; i >= 0; i--) { - if (_ac[i] != null) - _ac[i].setEnabled(_b); - } - } - } - private void setCalqueActionActif(BCalque c, boolean _b) { - if ((calqueActions_ != null) && (c != null)) { - setActionEnable((EbliActionInterface[])calqueActions_.get(c), _b); - } - } - /** - * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent) - */ - public void valueChanged(TreeSelectionEvent _evt) { - setCalqueActionActif(getCalqueActif(), false); - super.valueChanged(_evt); - setCalqueActionActif(getCalqueActif(), true); - } - - - /** - * L'action refaire - */ - public void redo() { - mng_.redo(); - } - /** - * L'action defaire. - */ - public void undo() { - mng_.undo(); - } - - /** - * Met a jour le menu "layer" et les actions du calque actif - * @param b la nouvelle valeur - */ - protected void setSelected(boolean b) { - if (layerMenu_ != null) - layerMenu_.setEnabled(b); - BCalque cq= getCalqueActif(); - if (cq != null) { - setCalqueActionActif(cq, b); - } - } - - - private void buildTools() { - contextTools_= new BuMenu(TrResource.TR.getString("Outils"), "TOOLS"); - fillMenuWithToolsActions(contextTools_); - } - /** - * @see org.fudaa.ebli.calque.BCalqueContextuelListener#getCmdsContextuelles() - */ - public BuPopupMenu getCmdsContextuelles() { - BCalque cqActif= getCalqueActif(); - BuPopupMenu r= new BuPopupMenu(); - if (cqActif != null) { - fillMenuWithCalqueActions(r, cqActif); - } - if (contextTools_ == null) - buildTools(); - r.add(contextTools_); - if (ptDisplayTools_ == null) { - ptDisplayTools_= new DisplayMenu(); - } - r.add(ptDisplayTools_); - if (eltDisplayTools_ == null) { - eltDisplayTools_= new DisplayElementMenu(); - } - r.add(eltDisplayTools_); - return r; - } - /** - * Met a jour le menu de la frame - */ - protected void fillTrLayerMenu() { - fillWithAllLayersAction(layerMenu_); - } - - private final void buildTrLayerMenu() { - super.fillSpecificMenu(layerMenu_); - layerMenu_.addSeparator(); - layerMenu_.add(getPointNumberDisplayMenu()); - layerMenu_.add(getElementNumberDisplayMenu()); - fillTrLayerMenu(); - } - protected void updateTrLayerMenu() { - if (layerMenu_ != null) { - layerMenu_.removeAll(); - buildTrLayerMenu(); - } - } - - protected BuMenu initLayerMenu(String _title) { - if (layerMenu_ == null) { - layerMenu_= new BuMenu(_title, "LAYER"); - buildTrLayerMenu(); - } - return layerMenu_; - } - - /** - * @return le menu principal - */ - public BuMenu getLayerMenu() { - return layerMenu_; - } - /** - * @return le menu pour l'affichage des numero - */ - public final JMenu getPointNumberDisplayMenu() { - return new DisplayMenu(); - } - /** - * @return le menu pour l'affichage des numero - */ - public final JMenu getElementNumberDisplayMenu() { - return new DisplayElementMenu(); - } - private class DisplayMenu extends BuDynamicMenu { - JMenuItem addPt_; - JMenuItem allPt_; - JMenuItem clearPt_; - JCheckBoxMenuItem boundaryIdxPt_; - /** - * Numero des points - */ - public DisplayMenu() { - super(TrResource.getS("Numéros des points"), "DISPLAY_POINTS_INDEX"); - setIcon(TrResource.TR.getIcon("numnoeuds")); - } - /** - * - */ - protected void build() { - if (addPt_ == null) { - addPt_= - addMenuItem( - TrResource.getS("Afficher les numéros des points sélectionnés"), - "DISPLAY_INDEX_SELECTED_POINT"); - addPt_.addActionListener(TrVisuPanel.this); - allPt_= - addMenuItem( - TrResource.getS("Afficher tous les numéros"), - "DISPLAY_INDEX_ALL_POINT"); - allPt_.addActionListener(TrVisuPanel.this); - clearPt_= - addMenuItem( - TrResource.getS("Ne plus afficher les numéros"), - "DISPLAY_NONE_INDEX_POINT"); - clearPt_.addActionListener(TrVisuPanel.this); - boundaryIdxPt_= - addCheckBox( - TrResource.getS("Afficher les numéros sur la frontière"), - "DISPLAY_BOUNDARY_INDEX_POINT", - true, - false); - boundaryIdxPt_.addActionListener(TrVisuPanel.this); - addSeparator(); - addMenuItem( - TrResource.getS("Modifier la fonte"), - "DISPLAY_INDEX_PT_FONT").addActionListener( - TrVisuPanel.this); - addMenuItem( - TrResource.getS("Modifier la couleur"), - "DISPLAY_INDEX_PT_COLOR").addActionListener( - TrVisuPanel.this); - } - MvNodeNumberLayer pt= TrVisuPanel.this.getCqNumber(); - allPt_.setEnabled(!pt.isAll()); - boundaryIdxPt_.setSelected(pt.isFrontierIdxShown()); - clearPt_.setEnabled(!pt.isPtToDisplayEmpty()); - MvLayer layer= (MvLayer)TrVisuPanel.this.getCalqueActif(); - boolean act= ((layer != null) && (!layer.isSelectionPointEmpty())); - addPt_.setEnabled(act); - } - /** - * - */ - protected boolean isActive() { - return true; - } - } - private class DisplayElementMenu extends BuDynamicMenu { - JMenuItem addElt_; - JMenuItem allElt_; - JMenuItem clearElt_; - /** - * Numero des elements - */ - public DisplayElementMenu() { - super(TrResource.getS("Numéros des éléments"), "DISPLAY_ELEMENTS_INDEX"); - setIcon(TrResource.TR.getIcon("numelements")); - } - /** - * - */ - protected void build() { - if (addElt_ == null) { - addElt_= - addMenuItem( - TrResource.getS("Afficher les numéros des éléments sélectionnés"), - "DISPLAY_INDEX_SELECTED_ELEMENT"); - addElt_.addActionListener(TrVisuPanel.this); - allElt_= - addMenuItem( - TrResource.getS("Afficher tous les numéros"), - "DISPLAY_INDEX_ALL_ELEMENT"); - allElt_.addActionListener(TrVisuPanel.this); - clearElt_= - addMenuItem( - TrResource.getS("Ne plus afficher les numéros"), - "DISPLAY_NONE_INDEX_ELEMENT"); - clearElt_.addActionListener(TrVisuPanel.this); - addSeparator(); - addMenuItem( - TrResource.getS("Modifier la fonte"), - "DISPLAY_INDEX_ELEMENT_FONT").addActionListener( - TrVisuPanel.this); - addMenuItem( - TrResource.getS("Modifier la couleur"), - "DISPLAY_INDEX_ELEMENT_COLOR").addActionListener( - TrVisuPanel.this); - } - MvElementNumberLayer pt= TrVisuPanel.this.getCqElementNumber(); - allElt_.setEnabled(!pt.isAll()); - clearElt_.setEnabled(!pt.isPtToDisplayEmpty()); - MvLayer layer= (MvLayer)TrVisuPanel.this.getCalqueActif(); - boolean act= ((layer != null) && (!layer.isSelectionElementEmpty())); - addElt_.setEnabled(act); - } - - protected boolean isActive() { - return true; - } - } - private void fontChange(String _titre, Component _c) { - BSelecteurReduitFonteNewVersion s= - new BSelecteurReduitFonteNewVersion(_c.getFont()); - s.setTarget(_c); - BuDialogMessage m= new BuDialogMessage(null, null, s); - m.setTitle(_titre); - m.setModal(false); - m.activate(); - } - private void colorChange(String _titre, ZCalqueAffichage _c) { - Color fg= - JColorChooser.showDialog(TrVisuPanel.this, _titre, _c.getForeground()); - if (fg != null) - _c.setForeground(fg); - } - - /** - * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) - */ - public void actionPerformed(ActionEvent e) { - String com= e.getActionCommand(); - if ("DISPLAY_INDEX_SELECTED_POINT".equals(com)) { - MvLayer l= (MvLayer)getCalqueActif(); - if ((l != null) && (!l.isSelectionPointEmpty())) { - getCqNumber().setSelectedPoint(l.getPtIdx()); - } - } else if ("DISPLAY_INDEX_ALL_POINT".equals(com)) { - getCqNumber().setAll(true); - } else if ("DISPLAY_NONE_INDEX_POINT".equals(com)) { - getCqNumber().clearPtIdxShow(); - } else if ("DISPLAY_BOUNDARY_INDEX_POINT".equals(com)) { - getCqNumber().changeFrontierIdxShownState(); - } else if ("DISPLAY_INDEX_PT_FONT".equals(com)) { - fontChange( - TrResource.getS("Numéros des points: Modifier la fonte"), - getCqNumber()); - } else if ("DISPLAY_INDEX_PT_COLOR".equals(com)) { - colorChange( - TrResource.getS("Numéros des points: Modifier la couleur"), - getCqNumber()); - } else if ("DISPLAY_INDEX_SELECTED_ELEMENT".equals(com)) { - MvLayer l= (MvLayer)getCalqueActif(); - if ((l != null) && (!l.isSelectionElementEmpty())) { - getCqElementNumber().setSelectedElement(l.getElementIdx()); - } - } else if ("DISPLAY_INDEX_ALL_ELEMENT".equals(com)) { - getCqElementNumber().setAll(true); - } else if ("DISPLAY_NONE_INDEX_ELEMENT".equals(com)) { - getCqElementNumber().clearEltIdxShow(); - } else if ("DISPLAY_INDEX_ELEMENT_FONT".equals(com)) { - fontChange( - TrResource.getS("Numéros des éléments: Modifier la fonte"), - getCqElementNumber()); - } else if ("DISPLAY_INDEX_ELEMENT_COLOR".equals(com)) { - colorChange( - TrResource.getS("Numéros des éléments: Modifier la couleur"), - getCqElementNumber()); - } - } - /** - * - */ - public void find() { - if (findDialog_ == null) - buildFindDialog(); - findDialog_.affiche(getFrame()); - } - /** - * - */ - public void replace() {} - /** - * - */ - public void select() {} } --- 142,145 ---- --- TrFindAction.java DELETED --- Index: TrSiPlanLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiPlanLayer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrSiPlanLayer.java 5 May 2004 12:42:39 -0000 1.2 --- TrSiPlanLayer.java 1 Jun 2004 11:27:43 -0000 1.3 *************** *** 10,13 **** --- 10,14 ---- import java.awt.Color; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.ebli.calque.ZCalquePoint; *************** *** 16,20 **** import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.ebli.trace.TraceIcone; - import org.fudaa.fudaa.meshviewer.MvPanelViewer; import org.fudaa.fudaa.meshviewer.layer.MvLayer; import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo; --- 17,20 ---- --- NEW FILE: MvFindActionBcPoint.java --- (This appears to be a binary file; contents omitted.) --- TrFindActionBcPoint.java DELETED --- --- TrBcBoundaryLegendLayer.java DELETED --- --- TrFindActionDefault.java DELETED --- --- NEW FILE: MvFindComponentBcPoint.java --- (This appears to be a binary file; contents omitted.) |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:23
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/hiswa Modified Files: HiswaImplementation.java Log Message: Index: HiswaImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaImplementation.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** HiswaImplementation.java 5 May 2004 12:42:38 -0000 1.9 --- HiswaImplementation.java 1 Jun 2004 11:27:44 -0000 1.10 *************** *** 29,61 **** import javax.vecmath.Vector3f; - import com.memoire.bu.BuAssistant; - import com.memoire.bu.BuBrowserControl; - import com.memoire.bu.BuBrowserPreferencesPanel; - import com.memoire.bu.BuColumn; - import com.memoire.bu.BuDesktop; - import com.memoire.bu.BuDesktopPreferencesPanel; - import com.memoire.bu.BuDialogConfirmation; - import com.memoire.bu.BuDialogError; - import com.memoire.bu.BuDialogMessage; - import com.memoire.bu.BuHelpFrame; - import com.memoire.bu.BuInformationsDocument; - import com.memoire.bu.BuInformationsSoftware; - import com.memoire.bu.BuLanguagePreferencesPanel; - import com.memoire.bu.BuLookPreferencesPanel; - import com.memoire.bu.BuMainPanel; - import com.memoire.bu.BuMenu; - import com.memoire.bu.BuMenuBar; - import com.memoire.bu.BuPreferences; - import com.memoire.bu.BuPreferencesFrame; - import com.memoire.bu.BuPrinter; - import com.memoire.bu.BuResource; - import com.memoire.bu.BuScrollPane; - import com.memoire.bu.BuTaskOperation; - import com.memoire.bu.BuTaskView; - import com.memoire.bu.BuToolBar; - import com.memoire.bu.BuUserPreferencesPanel; - import com.memoire.fu.FuLib; - - import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.corba.hiswa.ICalculHiswa; import org.fudaa.dodico.corba.hiswa.ICalculHiswaHelper; --- 29,32 ---- *************** *** 92,103 **** import org.fudaa.ebli.volume.VolumePreferencesPanel; import org.fudaa.ebli.volume.common.ParametresVolumes; - import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.commun.FudaaImplementation; import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.commun.dodico.FudaaDodicoTacheConnexion; - import org.fudaa.fudaa.commun.dodico.FudaaDodicoSelectionServeur; import org.fudaa.fudaa.commun.projet.FudaaFiltreFichier; import org.fudaa.fudaa.commun.projet.FudaaProjet; ! import org.fudaa.fudaa.ressource.FudaaResource; /** * L'implementation du client Hiswa. --- 63,100 ---- import org.fudaa.ebli.volume.VolumePreferencesPanel; import org.fudaa.ebli.volume.common.ParametresVolumes; import org.fudaa.fudaa.commun.FudaaImplementation; import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.commun.dodico.FudaaDodicoTacheConnexion; import org.fudaa.fudaa.commun.projet.FudaaFiltreFichier; import org.fudaa.fudaa.commun.projet.FudaaProjet; ! ! import com.memoire.bu.BuAssistant; ! import com.memoire.bu.BuBrowserControl; ! import com.memoire.bu.BuBrowserPreferencesPanel; ! import com.memoire.bu.BuColumn; ! import com.memoire.bu.BuDesktop; ! import com.memoire.bu.BuDesktopPreferencesPanel; ! import com.memoire.bu.BuDialogConfirmation; ! import com.memoire.bu.BuDialogError; ! import com.memoire.bu.BuDialogMessage; ! import com.memoire.bu.BuHelpFrame; ! import com.memoire.bu.BuInformationsDocument; ! import com.memoire.bu.BuInformationsSoftware; ! import com.memoire.bu.BuLanguagePreferencesPanel; ! import com.memoire.bu.BuLookPreferencesPanel; ! import com.memoire.bu.BuMainPanel; ! import com.memoire.bu.BuMenu; ! import com.memoire.bu.BuMenuBar; ! import com.memoire.bu.BuPreferences; ! import com.memoire.bu.BuPreferencesFrame; ! import com.memoire.bu.BuPreferencesEditorPanel; ! import com.memoire.bu.BuPrinter; ! import com.memoire.bu.BuResource; ! import com.memoire.bu.BuScrollPane; ! import com.memoire.bu.BuTaskOperation; ! import com.memoire.bu.BuTaskView; ! import com.memoire.bu.BuToolBar; ! import com.memoire.bu.BuUserPreferencesPanel; ! import com.memoire.fu.FuLib; /** * L'implementation du client Hiswa. *************** *** 134,138 **** private BParametresGouraud paramsGouraud_; private HiswaAssistant assistant_; - private BuPreferencesFrame preferences_; private BuHelpFrame aide_; private BuTaskView taches_; --- 131,134 ---- *************** *** 231,235 **** resYapod_= null; fEditeur_= null; - preferences_= null; gc_= null; leg_= null; --- 227,230 ---- *************** *** 1306,1311 **** setTitle("Hiswa " + isHiswa_.version); } ! protected void buildPreferences() { ! preferences_= new BuPreferencesFrame(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuLanguagePreferencesPanel(this)); --- 1301,1306 ---- setTitle("Hiswa " + isHiswa_.version); } ! protected BuPreferencesEditorPanel buildPreferences() { ! BuPreferencesEditorPanel preferences_= new BuPreferencesEditorPanel(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuLanguagePreferencesPanel(this)); *************** *** 1316,1319 **** --- 1311,1315 ---- preferences_.addTab(new HiswaPreferencesPanel(this)); preferences_.addTab(new VolumePreferencesPanel(this)); + return preferences_; } private void parametre() { |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:22
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/commun/exec Modified Files: FudaaGlobalExecManager.java FudaaExecManagerPanel.java FudaaEditorExterne.java FudaaExecPanel.java FudaaExec.java FudaaAppliManagerImpl.java Log Message: Index: FudaaEditorExterne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorExterne.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FudaaEditorExterne.java 5 May 2004 12:42:34 -0000 1.6 --- FudaaEditorExterne.java 1 Jun 2004 11:27:42 -0000 1.7 *************** *** 21,25 **** public synchronized void edit(File _f) { if (_f != null) { ! execOnFile(_f); } } --- 21,25 ---- public synchronized void edit(File _f) { if (_f != null) { ! execOnFile(_f,null); } } Index: FudaaGlobalExecManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaGlobalExecManager.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FudaaGlobalExecManager.java 5 May 2004 12:42:34 -0000 1.3 --- FudaaGlobalExecManager.java 1 Jun 2004 11:27:42 -0000 1.4 *************** *** 24,33 **** protected ArrayList execs_; - public static final FudaaGlobalExecManager INSTANCE = new FudaaGlobalExecManager(); /** * */ ! private FudaaGlobalExecManager() { loadList(); } --- 24,32 ---- protected ArrayList execs_; /** * */ ! public FudaaGlobalExecManager() { loadList(); } Index: FudaaExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExec.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FudaaExec.java 12 Mar 2004 10:17:01 -0000 1.8 --- FudaaExec.java 1 Jun 2004 11:27:42 -0000 1.9 *************** *** 20,23 **** --- 20,31 ---- import javax.swing.Icon; + import org.fudaa.ctulu.CtuluLib; + import org.fudaa.dodico.commun.DodicoLib; + import org.fudaa.dodico.commun.DodicoPreferences; + import org.fudaa.dodico.objet.CExec; + import org.fudaa.fudaa.commun.FudaaPreferences; + import org.fudaa.fudaa.commun.FudaaUI; + import org.fudaa.fudaa.ressource.FudaaResource; + import com.memoire.bu.BuEmptyIcon; import com.memoire.bu.BuIcon; *************** *** 26,35 **** import com.memoire.bu.BuResource; import com.memoire.fu.FuLib; - - import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.commun.DodicoLib; - import org.fudaa.dodico.commun.DodicoPreferences; - import org.fudaa.dodico.objet.CExec; - import org.fudaa.fudaa.ressource.FudaaResource; /** * @author deniger --- 34,37 ---- *************** *** 56,60 **** */ public final void actionPerformed(ActionEvent _e) { ! execInDir(new File(FuLib.getUserHome())); } } --- 58,62 ---- */ public final void actionPerformed(ActionEvent _e) { ! execInDir(new File(FuLib.getUserHome()),null); } } *************** *** 66,70 **** public final static String KEY_PREFIXE = "ext.executable"; public final static String NAME = "name"; ! public final static BuPreferences PREF = BuPreferences.BU; public static boolean containsIdName(List _ex, String _idToCheck) { --- 68,72 ---- public final static String KEY_PREFIXE = "ext.executable"; public final static String NAME = "name"; ! public final static BuPreferences PREF = FudaaPreferences.FUDAA; public static boolean containsIdName(List _ex, String _idToCheck) { *************** *** 78,82 **** } ! public static BuIcon getIcon(String _p) { if (_p.startsWith(INTERN_PREFIX)) { return FudaaResource.FUDAA.getToolIcon( --- 80,85 ---- } ! public static Icon getIcon(String _p) { ! if(_p==null) return EMPTY_TOOL_ICON; if (_p.startsWith(INTERN_PREFIX)) { return FudaaResource.FUDAA.getToolIcon( *************** *** 102,106 **** int n = _ex.length - 1; for (int i = n; i >= 0; i--) { ! if (_ex[i].getIDName().equals(_idName)) return i; } --- 105,109 ---- int n = _ex.length - 1; for (int i = n; i >= 0; i--) { ! if ((_ex[i]!=null) && (_ex[i].getIDName().equals(_idName))) return i; } *************** *** 168,173 **** if (execCommand_ == null) execCommand_ = idName_; ! setIconURL(_iconUrl); ! setShownName(_idName); } --- 171,177 ---- if (execCommand_ == null) execCommand_ = idName_; ! iconURL_=_iconUrl; ! icon_ = getIcon(iconURL_); ! shownName_=_idName; } *************** *** 175,178 **** --- 179,188 ---- if (action_ != null) action_.updateExec(); } + + protected void execNotFound(){ + FudaaExecPanel pn = new FudaaExecPanel(this); + pn.setErrorText(FudaaResource.getS("Exécutable non trouvé")); + pn.afficheModale(BuLib.HELPER, BuResource.BU.getString("Erreur")); + } protected final void exec(CExec _exec) { *************** *** 180,186 **** _exec.exec(); } catch (RuntimeException _io) { ! FudaaExecPanel pn = new FudaaExecPanel(this); ! pn.setErrorText(FudaaResource.getS("Exécutable non trouvé")); ! pn.afficheModale(BuLib.HELPER, BuResource.BU.getString("Erreur")); } } --- 190,195 ---- _exec.exec(); } catch (RuntimeException _io) { ! execNotFound(); ! } } *************** *** 229,233 **** } ArrayList a = new ArrayList(3 + n); ! StringTokenizer st = new StringTokenizer(execCommand_, CtuluLib.ESPACE); while (st.hasMoreTokens()) { a.add(st.nextToken()); --- 238,243 ---- } ArrayList a = new ArrayList(3 + n); ! StringTokenizer st = new StringTokenizer(getExecCommand(), CtuluLib.ESPACE); ! if(CtuluLib.DEBUG) CtuluLib.debug("exec command "+getExecCommand()); while (st.hasMoreTokens()) { a.add(st.nextToken()); *************** *** 236,239 **** --- 246,250 ---- a.add(_args[i]); } + CExec ex = new CExec(DodicoLib.enTableau(a)); ex.setCatchExceptions(false); *************** *** 267,271 **** * @param _dir le repertoire dans lequel l'exe doit se lancer */ ! public void execInDir(File _dir) { if ((_dir != null) && (_dir.exists()) && (_dir.isDirectory())) { if (CtuluLib.DEBUG) --- 278,282 ---- * @param _dir le repertoire dans lequel l'exe doit se lancer */ ! public void execInDir(File _dir,FudaaUI _parent) { if ((_dir != null) && (_dir.exists()) && (_dir.isDirectory())) { if (CtuluLib.DEBUG) *************** *** 275,279 **** } ! public void execOnFile(File _target) { exec(createExecutant(getParamForFile(_target), _target.getParentFile())); } --- 286,290 ---- } ! public void execOnFile(File _target,FudaaUI _parent) { exec(createExecutant(getParamForFile(_target), _target.getParentFile())); } *************** *** 381,385 **** } ! public final void setIconURL(String _iconURL) { if ((_iconURL == null) || (_iconURL.length() == 0)) { iconURL_ = CtuluLib.EMPTY_STRING; --- 392,396 ---- } ! public void setIconURL(String _iconURL) { if ((_iconURL == null) || (_iconURL.length() == 0)) { iconURL_ = CtuluLib.EMPTY_STRING; Index: FudaaExecManagerPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecManagerPanel.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FudaaExecManagerPanel.java 5 May 2004 12:42:34 -0000 1.8 --- FudaaExecManagerPanel.java 1 Jun 2004 11:27:42 -0000 1.9 *************** *** 55,59 **** public FudaaExecManagerPanel(FudaaAppliManagerImpl _mng) { mng_ = _mng; ! List bibliotheque = FudaaGlobalExecManager.INSTANCE.getAllExe(); List myAppli = new ArrayList(_mng.getFudaaExecList()); for (int i = myAppli.size() - 1; i >= 0; i--) { --- 55,59 ---- public FudaaExecManagerPanel(FudaaAppliManagerImpl _mng) { mng_ = _mng; ! List bibliotheque = _mng.getExecMng().getAllExe(); List myAppli = new ArrayList(_mng.getFudaaExecList()); for (int i = myAppli.size() - 1; i >= 0; i--) { *************** *** 181,185 **** m.fillList(l); mApp.fillList(l); ! FudaaGlobalExecManager.INSTANCE.setNewValues(l); mng_.setNewValues(ex); } --- 181,185 ---- m.fillList(l); mApp.fillList(l); ! mng_.getExecMng().setNewValues(l); mng_.setNewValues(ex); } *************** *** 253,257 **** */ public void cancel() { ! FudaaGlobalExecManager.INSTANCE.reloadFromPref(); } } --- 253,257 ---- */ public void cancel() { ! mng_.getExecMng().reloadFromPref(); } } Index: FudaaAppliManagerImpl.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaAppliManagerImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FudaaAppliManagerImpl.java 5 May 2004 12:42:34 -0000 1.3 --- FudaaAppliManagerImpl.java 1 Jun 2004 11:27:42 -0000 1.4 *************** *** 1,3 **** ! /* * @file FudaaAppliExecManager.java * @creation 2 juin 2003 --- 1,3 ---- ! /** * @file FudaaAppliExecManager.java * @creation 2 juin 2003 *************** *** 9,28 **** package org.fudaa.fudaa.commun.exec; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; - import com.memoire.bu.BuCommonImplementation; - import com.memoire.bu.BuMenu; - import com.memoire.bu.BuMenuItem; - import com.memoire.bu.BuPreferences; - import com.memoire.bu.BuResource; - import org.fudaa.ctulu.CtuluLib; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.commun.FudaaPreferences; import org.fudaa.fudaa.ressource.FudaaResource; /** * Classe permettant de gerer les executables exterieures pour une application précise.Les --- 9,29 ---- package org.fudaa.fudaa.commun.exec; + import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.List; + import java.util.Observable; import java.util.StringTokenizer; import org.fudaa.ctulu.CtuluLib; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.commun.FudaaPreferences; import org.fudaa.fudaa.ressource.FudaaResource; + + import com.memoire.bu.BuMenu; + import com.memoire.bu.BuMenuItem; + import com.memoire.bu.BuPreferences; + import com.memoire.bu.BuResource; /** * Classe permettant de gerer les executables exterieures pour une application précise.Les *************** *** 33,68 **** * @version $Id$ */ ! public class FudaaAppliManagerImpl implements ActionListener { ! protected BuCommonImplementation impl_; ! BuPreferences prefAppli_; ! List actions_; /** * La cle preference pour la liste des executables */ ! private final static String LIST_EXE_PREF = "executable.list"; ! private String prefForList_; /** * @param _prefAppli les preferences contenant la liste ! * @param _impl l'implementation */ ! public FudaaAppliManagerImpl( ! BuPreferences _prefAppli, ! BuCommonImplementation _impl) { ! this(_prefAppli, _impl, null); } /** * @param _prefAppli les preferences stockant les exe ! * @param _impl l'impl parente * @param _prefForList */ ! public FudaaAppliManagerImpl( ! BuPreferences _prefAppli, ! BuCommonImplementation _impl, String _prefForList) { prefAppli_ = _prefAppli; - impl_ = _impl; prefForList_ = _prefForList; if (prefForList_ == null) prefForList_ = CtuluLib.EMPTY_STRING; --- 34,64 ---- * @version $Id$ */ ! public class FudaaAppliManagerImpl extends Observable { ! BuPreferences prefAppli_; ! List actions_; /** * La cle preference pour la liste des executables */ ! private final static String LIST_EXE_PREF = "executable.list"; ! private String prefForList_; ! private FudaaGlobalExecManager execMng_; /** * @param _prefAppli les preferences contenant la liste ! * @param _f la frame parente */ ! public FudaaAppliManagerImpl(BuPreferences _prefAppli) { ! this(_prefAppli, null); } /** * @param _prefAppli les preferences stockant les exe ! * @param _parent l'impl parente * @param _prefForList */ ! public FudaaAppliManagerImpl(BuPreferences _prefAppli, String _prefForList) { prefAppli_ = _prefAppli; prefForList_ = _prefForList; if (prefForList_ == null) prefForList_ = CtuluLib.EMPTY_STRING; *************** *** 71,75 **** private String getKeyForList() { ! return prefForList_ == CtuluLib.EMPTY_STRING? LIST_EXE_PREF : prefForList_ + "." + LIST_EXE_PREF; } --- 67,72 ---- private String getKeyForList() { ! return prefForList_ == CtuluLib.EMPTY_STRING ? LIST_EXE_PREF : prefForList_ + "." ! + LIST_EXE_PREF; } *************** *** 92,97 **** int n = tk.countTokens(); actions_ = new ArrayList(n); for (int i = 0; i < n; i++) { ! actions_.add(FudaaGlobalExecManager.INSTANCE.getFudaaExec(tk.nextToken())); } } --- 89,95 ---- int n = tk.countTokens(); actions_ = new ArrayList(n); + if (execMng_ == null) execMng_ = new FudaaGlobalExecManager(); for (int i = 0; i < n; i++) { ! actions_.add(execMng_.getFudaaExec(tk.nextToken())); } } *************** *** 100,108 **** /** - * Methode appelee lorsque les preferences ont ete modifiees - */ - public void prefChanged() {} - - /** * @param _i l'indice de l'exe * @return L'exe demandé --- 98,101 ---- *************** *** 119,125 **** } - /** ! * @param _e l'exe * @return l'item permettant de lancer l'exe _e. */ --- 112,117 ---- } /** ! * @param _e l'exe * @return l'item permettant de lancer l'exe _e. */ *************** *** 133,137 **** } - /** * Ajoute au menu _m toutes les actions concernant les applications --- 125,128 ---- *************** *** 139,158 **** * @param _m le menu qui recoit les actions */ ! public void createMenuItems(BuMenu _m) { int n = getActionsNb(); BuMenuItem it; for (int i = 0; i < n; i++) { it = new BuMenuItem(); ! it.setAction(FudaaAppliManagerImpl.this.getExec(i).getAction()); _m.add(it); } - if (n > 0) - _m.addSeparator(); - BuMenuItem menuMod = - new BuMenuItem( - FudaaResource.getS("Modifier les applications externes")); - menuMod.setActionCommand("MANAGER"); - menuMod.addActionListener(FudaaAppliManagerImpl.this); - _m.add(menuMod); } --- 130,143 ---- * @param _m le menu qui recoit les actions */ ! public void createMenuItems(BuMenu _m, Component _parent) { int n = getActionsNb(); BuMenuItem it; for (int i = 0; i < n; i++) { it = new BuMenuItem(); ! FudaaExec e=FudaaAppliManagerImpl.this.getExec(i); ! if(e!=null) ! it.setAction(e.getAction()); _m.add(it); } } *************** *** 164,187 **** } - - /** - * Gere la modification des actions - * @param e l'action - */ - public void actionPerformed(ActionEvent e) { - if ("MANAGER".equals(e.getActionCommand())) { - createPanel().afficheModale( - impl_.getFrame(), - FudaaResource.getS("Modifier")); - } else if ("MANAGER_EDITEUR".equals(e.getActionCommand())) { - FudaaEditorPanel pn = new FudaaEditorPanel(); - int i = - pn.afficheModale(impl_.getFrame(), BuResource.BU.getString("Editeur")); - if (EbliSimpleDialogPanel.isOkResponse(i)) { - FudaaPreferences.FUDAA.writeIniFile(); - } - } - } - /** * @param _news --- 149,152 ---- *************** *** 198,212 **** } } ! if(b.length()==0) prefAppli_.removeProperty(getKeyForList()); ! else ! prefAppli_.putStringProperty(getKeyForList(), b.toString()); reload(); ! prefChanged(); } ! else{ prefAppli_.removeProperty(getKeyForList()); ! actions_=null; ! prefChanged(); } } ! } --- 163,185 ---- } } ! if (b.length() == 0) prefAppli_.removeProperty(getKeyForList()); ! else prefAppli_.putStringProperty(getKeyForList(), b.toString()); reload(); ! setChanged(); } ! else { prefAppli_.removeProperty(getKeyForList()); ! actions_ = null; ! setChanged(); } + notifyObservers(); } ! ! /** ! * @return Returns the execMng. ! */ ! public FudaaGlobalExecManager getExecMng() { ! if (execMng_ == null) execMng_ = new FudaaGlobalExecManager(); ! return execMng_; ! } ! } \ No newline at end of file Index: FudaaExecPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecPanel.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** FudaaExecPanel.java 14 May 2004 10:27:30 -0000 1.11 --- FudaaExecPanel.java 1 Jun 2004 11:27:42 -0000 1.12 *************** *** 97,101 **** void setIconUrl(String iconURL) { iconURL_= iconURL; ! BuIcon ic= FudaaExec.getIcon(iconURL_); if (ic != null) { iconButton_.setToolTipText(iconURL_); --- 97,101 ---- void setIconUrl(String iconURL) { iconURL_= iconURL; ! Icon ic= FudaaExec.getIcon(iconURL_); if (ic != null) { iconButton_.setToolTipText(iconURL_); |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:22
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/sinavi Modified Files: SinaviImplementation.java Log Message: Index: SinaviImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviImplementation.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SinaviImplementation.java 30 Apr 2004 13:52:12 -0000 1.8 --- SinaviImplementation.java 1 Jun 2004 11:27:42 -0000 1.9 *************** *** 28,31 **** --- 28,32 ---- import com.memoire.bu.BuPreferences; import com.memoire.bu.BuPreferencesFrame; + import com.memoire.bu.BuPreferencesEditorPanel; import com.memoire.bu.BuPrinter; import com.memoire.bu.BuResource; *************** *** 178,182 **** * fenêtre affichant les préférences de Sinavi */ - protected BuPreferencesFrame preferences_; /** * fenêtre affichant l'aide --- 179,182 ---- *************** *** 252,256 **** super.init(); sinavifilleparametres_= null; - preferences_= null; aide_= null; sinavireseauframe_= null; --- 252,255 ---- *************** *** 512,520 **** * Création ou affichage de la fenetre pour les préférences. */ ! protected void buildPreferences() { ! preferences_= new BuPreferencesFrame(); preferences_.addTab(new BuBrowserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); preferences_.addTab(new BuLanguagePreferencesPanel(this)); } /** --- 511,520 ---- * Création ou affichage de la fenetre pour les préférences. */ ! protected BuPreferencesEditorPanel buildPreferences() { ! BuPreferencesEditorPanel preferences_= new BuPreferencesEditorPanel(); preferences_.addTab(new BuBrowserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); preferences_.addTab(new BuLanguagePreferencesPanel(this)); + return preferences_; } /** |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:28:21
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/meshviewer/layer Modified Files: MvNodeModelDefault.java MvGridLayerGroup.java Added Files: MvLegendLayer.java Log Message: Index: MvGridLayerGroup.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvGridLayerGroup.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MvGridLayerGroup.java 5 May 2004 12:42:38 -0000 1.2 --- MvGridLayerGroup.java 1 Jun 2004 11:27:43 -0000 1.3 *************** *** 34,37 **** --- 34,41 ---- this(_maill, null); } + + public final EfGrid getGrid(){ + return mail_; + } public MvGridLayerGroup(EfGrid _maill, MvInfoDelegate _d) { --- NEW FILE: MvLegendLayer.java --- /** * @file MvLegendLayer.java * @creation 3 nov. 2003 * @modification $Date: 2004/06/01 11:27:43 $ * @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.BCalqueLegende; import org.fudaa.ebli.calque.ZSelectionListener; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; /** * @author deniger * @version $Id: MvLegendLayer.java,v 1.1 2004/06/01 11:27:43 deniger Exp $ */ public class MvLegendLayer extends BCalqueLegende implements MvLayer{ /** * */ public MvLegendLayer() { 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) {} } Index: MvNodeModelDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeModelDefault.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MvNodeModelDefault.java 31 Mar 2004 08:17:48 -0000 1.3 --- MvNodeModelDefault.java 1 Jun 2004 11:27:43 -0000 1.4 *************** *** 14,17 **** --- 14,18 ---- import org.fudaa.ebli.commun.EbliListeSelectionInterface; import org.fudaa.ebli.geometrie.GrBoite; + import org.fudaa.ebli.geometrie.GrDataBoite; import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; *************** *** 113,115 **** --- 114,125 ---- } + /** + * @see org.fudaa.ebli.calque.ZModeleDonnees#getDonneesBoite(org.fudaa.ebli.geometrie.GrDataBoite) + */ + public boolean getDonneesBoite(GrDataBoite _b) { + _b.setDataTime(false); + _b.setMax(grid_.getMaxPoint().getZ()); + _b.setMin(grid_.getMinPoint().getZ()); + return true; + } } \ No newline at end of file |
|
From: Frederic D. <de...@us...> - 2004-06-01 11:27:57
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/mascaret Modified Files: MascaretImplementation.java Log Message: Index: MascaretImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** MascaretImplementation.java 5 May 2004 12:42:46 -0000 1.25 --- MascaretImplementation.java 1 Jun 2004 11:27:47 -0000 1.26 *************** *** 105,108 **** --- 105,109 ---- import com.memoire.bu.BuPreferences; import com.memoire.bu.BuPreferencesFrame; + import com.memoire.bu.BuPreferencesEditorPanel; import com.memoire.bu.BuPrinter; import com.memoire.bu.BuResource; *************** *** 142,146 **** private DjaGridInteractive grille_; private int recent_count= 0; - private BuPreferencesFrame preferences_; private FudaaProjetInformationsFrame fProprietes_; Hydraulique1dIHMRepository ihmP_; --- 143,146 ---- *************** *** 208,212 **** //ts_=null; } - preferences_= null; BuInformationsSoftware infSoft= getInformationsSoftware(); getApp().setTitle("Mascaret"); --- 208,211 ---- *************** *** 1261,1266 **** return true; } ! protected void buildPreferences() { ! preferences_= new BuPreferencesFrame(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); --- 1260,1265 ---- return true; } ! protected BuPreferencesEditorPanel buildPreferences() { ! BuPreferencesEditorPanel preferences_= new BuPreferencesEditorPanel(); preferences_.addTab(new BuUserPreferencesPanel(this)); preferences_.addTab(new BuDesktopPreferencesPanel(this)); *************** *** 1268,1271 **** --- 1267,1271 ---- preferences_.addTab(new BuBrowserPreferencesPanel(this)); preferences_.addTab(new BuLanguagePreferencesPanel(this)); + return preferences_; } |
