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: <de...@us...> - 2004-02-12 16:20:51
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/commun Modified Files: FudaaCommonImplementation.java FudaaImportCsvPanel.java FudaaPreferences.java Log Message: prepro 0.05 Index: FudaaCommonImplementation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaCommonImplementation.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** FudaaCommonImplementation.java 21 Jan 2004 11:07:28 -0000 1.14 --- FudaaCommonImplementation.java 12 Feb 2004 16:15:13 -0000 1.15 *************** *** 325,329 **** if (_opResult.getClosingException() != null) { CtuluLib.error( ! "FATAL :can't close " + _opResult.getAnalyze().getRessource()); } if (_opResult.getAnalyze() != null) { --- 325,329 ---- if (_opResult.getClosingException() != null) { CtuluLib.error( ! "FATAL :can't close " + _opResult.getAnalyze().getResource()); } if (_opResult.getAnalyze() != null) { *************** *** 392,400 **** return null; } ! public boolean manageAnalyzeAndIsFatal(DodicoAnalyze.Editor _analyze) { ! return _analyze == null ! ? false ! : manageAnalyzeAndIsFatal(_analyze.toAnalyze()); ! } /** * Renvoie true si fatal error. --- 392,396 ---- return null; } ! /** * Renvoie true si fatal error. Index: FudaaImportCsvPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaImportCsvPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FudaaImportCsvPanel.java 21 Jan 2004 11:07:28 -0000 1.2 --- FudaaImportCsvPanel.java 12 Feb 2004 16:15:19 -0000 1.3 *************** *** 97,100 **** --- 97,105 ---- br.addActionListener(l); pn.add(br); + br= new BuRadioButton(FudaaResource.getS("Tabulation")); + group.add(br); + br.setActionCommand("\t"); + br.addActionListener(l); + pn.add(br); br= new BuRadioButton(FudaaResource.getS("Autre")); group.add(br); Index: FudaaPreferences.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaPreferences.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FudaaPreferences.java 25 Nov 2003 10:13:28 -0000 1.6 --- FudaaPreferences.java 12 Feb 2004 16:15:19 -0000 1.7 *************** *** 27,34 **** //editor if (FuLib.isWindows()) { ! t= FudaaEditor.EXTERNE_EDITOR_PREFIXE + ".notepad."; ! defaultValues_.put(t + FudaaExec.NAME, "NotePad"); ! defaultValues_.put(t + FudaaExec.EXE, "notepad"); ! defaultValues_.put(FudaaEditor.DEFAULT_EDITOR_KEY, "notepad"); } else if (FuLib.isLinux()) { t= FudaaEditor.EXTERNE_EDITOR_PREFIXE + ".emacs."; --- 27,34 ---- //editor if (FuLib.isWindows()) { ! t= FudaaEditor.EXTERNE_EDITOR_PREFIXE + ".wordpad."; ! defaultValues_.put(t + FudaaExec.NAME, "Wordpad"); ! defaultValues_.put(t + FudaaExec.EXE, "wordpad"); ! defaultValues_.put(FudaaEditor.DEFAULT_EDITOR_KEY, "wordpad"); } else if (FuLib.isLinux()) { t= FudaaEditor.EXTERNE_EDITOR_PREFIXE + ".emacs."; |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/tr/reflux Modified Files: TrRefluxFilleProjet.java TrRefluxImplHelper.java TrRefluxInfoSenderDefault.java TrRefluxParametres.java TrRefluxProjectDispatcherListener.java TrRefluxProjectFactory.java TrRefluxProjet.java Added Files: TrRefluxVisuPanel.java Removed Files: TrRefluxBoundaryMiddleLayer.java TrRefluxFilleVisu.java Log Message: prepro 0.05 --- NEW FILE: TrRefluxVisuPanel.java --- /* * @file TrRefluxFilleVisu.java * @creation 21 nov. 2003 * @modification $Date: 2004/02/12 16:15:21 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.fudaa.tr.reflux; import java.awt.event.ActionEvent; import java.util.Map; import java.util.Set; import java.util.TreeMap; import javax.swing.Action; import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.h2d.H2dBcFrontierInterface; import org.fudaa.dodico.h2d.H2dBoundary; import org.fudaa.dodico.h2d.reflux.H2dRefluxBcListener; import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager; import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.ebli.calque.ZCalqueAffichageDonnees; import org.fudaa.ebli.calque.action.EbliActionInterface; import org.fudaa.ebli.calque.action.EbliSimpleAction; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.meshviewer.layer.MvNodeModelDefault; import org.fudaa.fudaa.tr.TrResource; import org.fudaa.fudaa.tr.TrVisuPanel; import org.fudaa.fudaa.tr.data.TrBcBoundaryLegendPanel; import org.fudaa.fudaa.tr.data.TrBcBoundaryMiddleLayer; import org.fudaa.fudaa.tr.data.TrBcBoundaryMiddleModel; import org.fudaa.fudaa.tr.data.TrBcBoundaryMiddleModelDefault; import org.fudaa.fudaa.tr.data.TrBcLayerGroup; import org.fudaa.fudaa.tr.data.TrBcPointLayer; import org.fudaa.fudaa.tr.data.TrBcPointModel; import org.fudaa.fudaa.tr.data.TrBcPointModelDefault; /** * @author deniger * @version $Id: TrRefluxVisuPanel.java,v 1.1 2004/02/12 16:15:21 deniger Exp $ */ public class TrRefluxVisuPanel extends TrVisuPanel { TrRefluxProjet proj_; TrRefluxInfoSenderDefault infoDelegate_; /** * @param _impl */ public TrRefluxVisuPanel( FudaaCommonImplementation _impl, TrRefluxProjet _proj) { super(_impl); proj_= _proj; infoDelegate_= new TrRefluxInfoSenderDefault(proj_.getH2dRefluxParametres()); addCqInfos(proj_.getH2dRefluxParametres().getMaillage()); TrBcBoundaryMiddleLayer cqBord= new TrBcBoundaryMiddleLayer(createBoundaryModel()); getCqLegend().ajoute( cqBord, new TrBcBoundaryLegendPanel( cqBord, _proj.getRefluxParametres().getH2dParametres().getBordList())); TrBcLayerGroup cl= new TrBcLayerGroup(); cl.addBcBoundaryLayer(cqBord); cl.addBcPointLayer(new TrBcPointLayer(createBoundaryPointModel())); addCqCL(cl); addCqMaillage( proj_.getRefluxParametres().getMaillage(),infoDelegate_); //Actions addCalqueActions(cqBord, this.buildBoundaryAction()); addCalqueActions(cl.getBcPointLayer(), this.buildBcPointAction()); addCalqueActions( getGridGroup().getPolygonLayer(), this.buildElementAction()); } public class TrRefluxBoundaryMiddleModel extends TrBcBoundaryMiddleModelDefault implements H2dRefluxBcListener { /** * @param _mng */ public TrRefluxBoundaryMiddleModel(H2dRefluxBcManager _mng) { super(_mng); _mng.addClListener(this); setDelegate(infoDelegate_); } /** * */ public void bcFrontierStructureChanged(H2dBcFrontierInterface _b) { fireChange(); } /** * */ public void bcParametersChanged(H2dBoundary _b, H2dVariableType _t) {} /** * */ public void bcPointsParametersChanged(H2dVariableType _t) {} /** * */ public void bcBoundaryTypeChanged(H2dBoundary b, H2dBoundaryType _old) { fireChange(); } /** * */ public void bcPointsNormalChanged() {} } public final TrBcBoundaryMiddleModel createBoundaryModel() { TrRefluxBoundaryMiddleModel r= new TrRefluxBoundaryMiddleModel( proj_.getRefluxParametres().getRefluxBcMng()); r.setDelegate(infoDelegate_); return r; } public final H2dRefluxBcManager getBcMng() { return proj_.getRefluxParametres().getRefluxBcMng(); } public final TrBcPointModel createBoundaryPointModel() { TrBcPointModelDefault r= new TrBcPointModelDefault(proj_.getRefluxParametres().getMaillage()); r.setDelegate(infoDelegate_); return r; } protected void editPtBcPointSegmentLayer() { TrBcPointLayer layer= getBcPointLayer(); int i= layer.isSelectionInUniqueBloc(); if (i < 0) return; int[] select= layer.getLayerSelection().getSelection(i).getSelectedIndex(); int idx= 0; int[] temp= new int[select.length]; for (int j= select.length - 1; j >= 0; j--) { if (select[j] % 2 == 1) { temp[idx++]= EfLib.getIdxMidFromIdx(select[j]); } } if (idx != temp.length) { select= new int[idx]; System.arraycopy(temp, 0, select, 0, idx); } else select= temp; editBoundaryFromMiddleIdx(i, select); } public void editBcPoint() { TrBcPointLayer layer= getBcPointLayer(); int i= layer.isSelectionInUniqueBloc(); if (i < 0) return; int[] select= layer.getLayerSelection().getSelection(i).getSelectedIndex(); H2dRefluxBcManager.RefluxMiddleFrontier frontier= getBcMng().getRefluxMiddleFrontier(i); H2dBoundaryType bd= frontier.getCommonBoundaryType(select); H2dVariableType[] vars= H2dRefluxBcManager.getClNodaleVariables(); Set varToEnableIfMixt= null; if (bd == H2dBoundaryType.MIXTE) { varToEnableIfMixt= frontier.getAvailablesVariables(select); } Map varValue= new TreeMap(); for (int j= vars.length - 1; j >= 0; j--) { varValue.put(vars[j], frontier.getCommonValue(select, vars[j])); } Double normal= frontier.getCommonNormal(select); TrRefluxBoundaryEditor editor= new TrRefluxBoundaryEditor( true, varToEnableIfMixt, varValue, normal, getBcMng().getBoundaryTypeComportMap(), bd, proj_.getRefluxParametres().getEvolMng(), false); if (EbliSimpleDialogPanel .isOkResponse( editor.afficheModale( getFrame(), TrResource.getS("Edition points sélectionnés")))) { getCmdMng().addCmd( frontier.setValuesForPoints( select, editor.getNewValues(), editor.getCommonNormalValue())); } } protected void editBoundaryMiddleLayer() { TrBcBoundaryMiddleLayer layer= (TrBcBoundaryMiddleLayer)getBcBoundaryLayer(); int i= layer.isSelectionInUniqueBloc(); if (i < 0) return; else editBoundaryFromMiddleIdx( i, layer.getLayerSelection().getSelection(i).getSelectedIndex()); } protected void editBoundaryFromMiddleIdx(int frontierIdx, int[] _midIdx) { H2dRefluxBcManager.RefluxMiddleFrontier frontier= getBcMng().getRefluxMiddleFrontier(frontierIdx); Set bdType= frontier.getSelectedBoundaryType(_midIdx); if (bdType == null) return; H2dBoundaryType[] bdTypeArray= new H2dBoundaryType[bdType.size()]; bdType.toArray(bdTypeArray); H2dVariableType[] vars= H2dRefluxBcManager.getClBordVariables(); Map varValue= new TreeMap(); for (int j= vars.length - 1; j >= 0; j--) { varValue.put( vars[j], frontier.getCommonValueFromMiddle(_midIdx, vars[j])); } H2dBoundaryType b= null; if ((bdType != null) && (bdTypeArray.length == 1)) { b= bdTypeArray[0]; } else { b= H2dBoundaryType.MIXTE; //vToSet= H2dRefluxBcManager.getCommonVariableAvailable(bdTypeArray); } Double normal= frontier.getCommonNormalFromMiddle(_midIdx); Set varToEnableIfMixt= null; if (b == H2dBoundaryType.MIXTE) { varToEnableIfMixt= H2dRefluxBcManager.getCommonVariableAvailable(bdTypeArray); } TrRefluxBoundaryEditor editor= new TrRefluxBoundaryEditor( false, varToEnableIfMixt, varValue, normal, getBcMng().getBoundaryTypeComportMap(), b, proj_.getRefluxParametres().getEvolMng()); if (EbliSimpleDialogPanel .isOkResponse( editor.afficheModale( getFrame(), TrResource.getS("Edition des bords")))) { getCmdMng().addCmd( frontier.setValues( _midIdx, editor.getSelectedBoundaryType(), editor.getNewValues(), editor.getCommonNormalValue())); } } public void editGridPoly() { ZCalqueAffichageDonnees cq= getGridGroup().getPolygonLayer(); if (!cq.isSelectionEmpty()) { int[] s= cq.getSelectedIndex(); Map m= proj_.getElementPropMng().getVariableCommonValues(s); TrRefluxPropEditor editor= new TrRefluxPropEditor(m, proj_.getRefluxParametres().getEvolMng()); if (editor .isOkResponse( editor.afficheModale( getFrame(), TrResource.getS("propriétés élémentaires")))) { getCmdMng().addCmd( proj_.getElementPropMng().setValues(s, editor.getNewValues())); } } } private EbliActionInterface[] buildBoundaryAction() { if (CtuluLib.DEBUG) CtuluLib.debug("build bcBoundaryLayer actions"); EbliActionInterface[] r= new EbliActionInterface[1]; r[0]= new EbliSimpleAction( TrResource.getS("Editer bords"), null, "FRONTIER_EDIT") { public void actionPerformed(ActionEvent arg0) { editBoundaryMiddleLayer(); } }; return r; } private EbliActionInterface[] buildBcPointAction() { if (CtuluLib.DEBUG) CtuluLib.debug("build bcPointLayer actions"); EbliActionInterface[] r= new EbliActionInterface[2]; r[0]= new EbliSimpleAction( TrResource.getS("Editer points"), null, "POINTS_EDIT") { public void actionPerformed(ActionEvent arg0) { editBcPoint(); } }; r[1]= new EbliSimpleAction( TrResource.getS("Editer bords"), null, "POINTS_SEGMENT_EDIT") { public void actionPerformed(ActionEvent arg0) { editPtBcPointSegmentLayer(); } }; r[1].putValue( Action.SHORT_DESCRIPTION, TrResource.getS( "Les segments dont les points milieux sont sélectionnés seront éditer")); return r; } private EbliActionInterface[] buildElementAction() { if (CtuluLib.DEBUG) CtuluLib.debug("build bcElement actions"); EbliActionInterface[] r= new EbliActionInterface[1]; r[0]= new EbliSimpleAction( TrResource.getS("propriétés élémentaires"), null, "ELEMENT_PROP_EDIT") { public void actionPerformed(ActionEvent arg0) { editGridPoly(); } }; return r; } /** * */ public void editGridPoint() {} public boolean isGridElementEditable() { return true; } } Index: TrRefluxFilleProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxFilleProjet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TrRefluxFilleProjet.java 12 Dec 2003 11:29:41 -0000 1.9 --- TrRefluxFilleProjet.java 12 Feb 2004 16:15:21 -0000 1.10 *************** *** 44,49 **** import org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer; import org.fudaa.fudaa.commun.undo.FudaaUndoPaneFille; ! import org.fudaa.fudaa.dico.FDicoEntitePanel; ! import org.fudaa.fudaa.dico.FDicoEntiteTableModel; import org.fudaa.fudaa.tr.TrResource; /** --- 44,49 ---- import org.fudaa.fudaa.commun.undo.FudaaUndoCmdMngContainer; import org.fudaa.fudaa.commun.undo.FudaaUndoPaneFille; ! import org.fudaa.fudaa.fdico.FDicoEntitePanel; ! import org.fudaa.fudaa.fdico.FDicoEntiteTableModel; import org.fudaa.fudaa.tr.TrResource; /** Index: TrRefluxImplHelper.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxImplHelper.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TrRefluxImplHelper.java 12 Dec 2003 11:29:41 -0000 1.10 --- TrRefluxImplHelper.java 12 Feb 2004 16:15:21 -0000 1.11 *************** *** 26,32 **** import org.fudaa.dodico.commun.DodicoPreferences; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.fichiers.FileFormat; import org.fudaa.dodico.fichiers.FileFormatSoftware; - import org.fudaa.dodico.h2d.H2dFileFormatMaillageVersion; import org.fudaa.dodico.h2d.type.H2dProjetType; import org.fudaa.dodico.reflux.io.INPFileFormat; --- 26,32 ---- import org.fudaa.dodico.commun.DodicoPreferences; import org.fudaa.dodico.commun.ProgressionInterface; + import org.fudaa.dodico.ef.FileFormatGridVersion; import org.fudaa.dodico.fichiers.FileFormat; import org.fudaa.dodico.fichiers.FileFormatSoftware; import org.fudaa.dodico.h2d.type.H2dProjetType; import org.fudaa.dodico.reflux.io.INPFileFormat; *************** *** 130,135 **** if (format == null) return null; ! H2dFileFormatMaillageVersion v= ! (H2dFileFormatMaillageVersion)format.getLastVersionInstance(); H2dProjetType t= openPn.getProjectType(); if (t == null) --- 130,135 ---- if (format == null) return null; ! FileFormatGridVersion v= ! (FileFormatGridVersion)format.getLastVersionInstance(); H2dProjetType t= openPn.getProjectType(); if (t == null) Index: TrRefluxInfoSenderDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxInfoSenderDefault.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrRefluxInfoSenderDefault.java 21 Jan 2004 11:07:29 -0000 1.3 --- TrRefluxInfoSenderDefault.java 12 Feb 2004 16:15:21 -0000 1.4 *************** *** 16,19 **** --- 16,20 ---- import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; + import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager; import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition; *************** *** 25,31 **** import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.fudaa.tr.TrResource; ! import org.fudaa.fudaa.tr.data.TrPanelInfoSenderDefault; ! import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData; /** --- 26,34 ---- import org.fudaa.dodico.h2d.type.H2dVariableType; + import org.fudaa.ebli.commun.EbliListeSelectionInterface; + + import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; import org.fudaa.fudaa.tr.TrResource; ! import org.fudaa.fudaa.tr.data.TrInfoSenderDelegate; /** *************** *** 33,73 **** * @version $Id$ */ ! public class TrRefluxInfoSenderDefault extends TrPanelInfoSenderDefault { /** * @param _params */ public TrRefluxInfoSenderDefault(H2dRefluxParameters _params) { ! super(_params); } ! /** ! * ! */ ! public void fillWithElementInfo(InfoData _receiver, int[] _idx) { ! super.fillWithElementInfo(_receiver, _idx); ! if ((_idx != null) && (_idx.length == 1)) { ! int eltIdx= _idx[0]; ! H2dRefluxElementPropertyMngAbstract eleMng= ! ((H2dRefluxParameters)params_).getElementPropMng(); ! DodicoPermanentList l= eleMng.getVarList(); ! int n= l.size(); ! for (int i= 0; i < n; i++) { ! H2dVariableType v= (H2dVariableType)l.get(i); ! H2dRefluxElementProperty prop= eleMng.getEltProp(v); ! H2dBcType type= prop.getTypeForEltIdx(eltIdx); ! if (type == H2dBcType.LIBRE) { ! _receiver.put(v.getNom(), type.getNom()); ! } else if (type == H2dBcType.PERMANENT) { ! _receiver.put( ! v.getNom(), ! type.getNom() + ": " + prop.getPermanentValueFor(eltIdx)); ! } else { ! _receiver.put( ! v.getNom(), ! type.getNom() + ": " + prop.getTransitoireEvol(eltIdx).getNom()); ! } ! } ! } } --- 36,51 ---- * @version $Id$ */ ! public class TrRefluxInfoSenderDefault extends TrInfoSenderDelegate { + H2dRefluxParameters params_; /** * @param _params */ public TrRefluxInfoSenderDefault(H2dRefluxParameters _params) { ! params_= _params; } ! public EfGrid getGrid() { ! return params_.getMaillage(); } *************** *** 75,118 **** * */ ! public void fillWithPointInfo(InfoData _receiver, int[] _idx) { ! super.fillWithPointInfo(_receiver, _idx); ! if ((_idx != null) && (_idx.length == 1)) { ! int ptIdx= _idx[0]; ! int[] temp= ! params_ ! .getMaillage() ! .getFrontiers() ! .getIdxFrontierIdxPtInFrontierFromGlobal( ! ptIdx); ! if (temp == null) ! return; ! H2dRefluxParameters ref= (H2dRefluxParameters)params_; ! H2dRefluxBcManager.RefluxMiddleFrontier fr= ! (H2dRefluxBcManager.RefluxMiddleFrontier)ref ! .getBcManager() ! .getMiddleFrontier( ! temp[0]); ! Set s= fr.getAvailablesVariables(temp[1]); ! H2dVariableType[] t= new H2dVariableType[s.size()]; ! s.toArray(t); ! Arrays.sort(t); ! H2dRefluxBoundaryCondition bc= fr.getRefluxBc(temp[1]); ! int n= t.length; ! H2dRefluxValue value= new H2dRefluxValue(); ! for (int i= 0; i < n; i++) { ! H2dVariableType v= t[i]; ! bc.fillWithValue(v, value); ! H2dBcType bcType= value.getType(); ! if (bcType == H2dBcType.LIBRE) { ! _receiver.put(v.getNom(), H2dBcType.LIBRE.getNom()); ! } else if (bcType == H2dBcType.PERMANENT) { ! _receiver.put( ! v.getNom(), ! H2dBcType.PERMANENT.getNom() + ": " + value.getValue()); ! } else { ! _receiver.put( ! v.getNom(), ! bcType.getNom() + ": " + value.getEvolution().getNom()); ! } } } --- 53,74 ---- * */ ! public void fillWithElementInfo(InfoData _receiver, int _idx) { ! H2dRefluxElementPropertyMngAbstract eleMng= params_.getElementPropMng(); ! DodicoPermanentList l= eleMng.getVarList(); ! int n= l.size(); ! for (int i= 0; i < n; i++) { ! H2dVariableType v= (H2dVariableType)l.get(i); ! H2dRefluxElementProperty prop= eleMng.getEltProp(v); ! H2dBcType type= prop.getTypeForEltIdx(_idx); ! if (type == H2dBcType.LIBRE) { ! _receiver.put(v.getNom(), type.getNom()); ! } else if (type == H2dBcType.PERMANENT) { ! _receiver.put( ! v.getNom(), ! type.getNom() + ": " + prop.getPermanentValueFor(_idx)); ! } else { ! _receiver.put( ! v.getNom(), ! type.getNom() + ": " + prop.getTransitoireEvol(_idx).getNom()); } } *************** *** 126,131 **** int _frIdx, int _idxOnFr) { ! H2dRefluxBcManager bcMng= ! ((H2dRefluxParameters)params_).getRefluxClManager(); H2dRefluxBcManager.RefluxMiddleFrontier fr= bcMng.getRefluxMiddleFrontier(_frIdx); --- 82,86 ---- int _frIdx, int _idxOnFr) { ! H2dRefluxBcManager bcMng=params_.getRefluxClManager(); H2dRefluxBcManager.RefluxMiddleFrontier fr= bcMng.getRefluxMiddleFrontier(_frIdx); *************** *** 137,157 **** _receiver.put( TrResource.getS("Index premier point"), ! fr.getRefluxBc(temp).getIndexPt() + " (" ! + CtuluLib.getString(temp) + ")"); temp= _idxOnFr; _receiver.put( TrResource.getS("Index point milieu"), ! fr.getRefluxBc(temp).getIndexPt() + " (" ! + CtuluLib.getString(temp) + ")"); temp= (_idxOnFr == fr.getNbPt() - 1 ? 0 : _idxOnFr + 1); _receiver.put( TrResource.getS("Index dernier point"), ! fr.getRefluxBc(temp).getIndexPt() + " (" ! + CtuluLib.getString(temp) + ")"); --- 92,112 ---- _receiver.put( TrResource.getS("Index premier point"), ! fr.getRefluxBc(temp).getIndexPt()+1 + " (" ! + CtuluLib.getString(temp+1) + ")"); temp= _idxOnFr; _receiver.put( TrResource.getS("Index point milieu"), ! fr.getRefluxBc(temp).getIndexPt()+1 + " (" ! + CtuluLib.getString(temp+1) + ")"); temp= (_idxOnFr == fr.getNbPt() - 1 ? 0 : _idxOnFr + 1); _receiver.put( TrResource.getS("Index dernier point"), ! fr.getRefluxBc(temp).getIndexPt()+1 + " (" ! + CtuluLib.getString(temp+1) + ")"); *************** *** 190,192 **** --- 145,187 ---- } + /** + * + */ + public void fillWithPointInfo( + InfoData _m, + int _idxGlobal, + int _idxGlobOnFr, + int _frIdx, + int _idxOnFr) { + super.fillWithPointInfo(_m, _idxGlobal, _idxGlobOnFr, _frIdx, _idxOnFr); + if(_idxGlobOnFr<0) return; + H2dRefluxBcManager.RefluxMiddleFrontier fr= + (H2dRefluxBcManager.RefluxMiddleFrontier)params_ + .getBcManager() + .getMiddleFrontier(_frIdx); + Set s= fr.getAvailablesVariables(_idxOnFr); + H2dVariableType[] t= new H2dVariableType[s.size()]; + s.toArray(t); + Arrays.sort(t); + H2dRefluxBoundaryCondition bc= fr.getRefluxBc(_idxOnFr); + int n= t.length; + H2dRefluxValue value= new H2dRefluxValue(); + for (int i= 0; i < n; i++) { + H2dVariableType v= t[i]; + bc.fillWithValue(v, value); + H2dBcType bcType= value.getType(); + if (bcType == H2dBcType.LIBRE) { + _m.put(v.getNom(), H2dBcType.LIBRE.getNom()); + } else if (bcType == H2dBcType.PERMANENT) { + _m.put( + v.getNom(), + H2dBcType.PERMANENT.getNom() + ": " + value.getValue()); + } else { + _m.put( + v.getNom(), + bcType.getNom() + ": " + value.getEvolution().getNom()); + } + } + } + } Index: TrRefluxParametres.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** TrRefluxParametres.java 19 Dec 2003 12:10:55 -0000 1.16 --- TrRefluxParametres.java 12 Feb 2004 16:15:21 -0000 1.17 *************** *** 21,26 **** import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dico.DicoParams; import org.fudaa.dodico.h2d.H2dEvolutionManager; - import org.fudaa.dodico.h2d.H2dGrid; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; import org.fudaa.dodico.h2d.H2dParameters; --- 21,28 ---- import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dico.DicoParams; + import org.fudaa.dodico.ef.EfGrid; + import org.fudaa.dodico.ef.EfGridSourcesAbstract; + import org.fudaa.dodico.fichiers.FileFormat; import org.fudaa.dodico.h2d.H2dEvolutionManager; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; import org.fudaa.dodico.h2d.H2dParameters; *************** *** 42,46 **** import org.fudaa.fudaa.tr.TrPreferences; import org.fudaa.fudaa.tr.TrResource; - import org.fudaa.fudaa.tr.data.TrPanelInfoSender; /** * @author deniger --- 44,47 ---- *************** *** 48,52 **** */ public class TrRefluxParametres implements TrParametres { ! private class TrInpInterface implements INPInterface { String[] fics_; H2dRefluxBordIndexGeneral[] bd_; --- 49,53 ---- */ public class TrRefluxParametres implements TrParametres { ! private class TrInpInterface extends EfGridSourcesAbstract implements INPInterface { String[] fics_; H2dRefluxBordIndexGeneral[] bd_; *************** *** 81,84 **** --- 82,87 ---- return bd_; } + + /** * *************** *** 108,112 **** * */ ! public H2dGrid getMaillage() { return params_.getMaillage(); } --- 111,115 ---- * */ ! public EfGrid getGrid() { return params_.getMaillage(); } *************** *** 148,156 **** } } private boolean fileIsProject_; File fINP_; H2dRefluxParameters params_; - TrPanelInfoSender infoSenderDelegate_; String title_; --- 151,165 ---- } + /** + * + */ + public FileFormat getFileFormat() { + return INPFileFormat.getInstance(); + } + } private boolean fileIsProject_; File fINP_; H2dRefluxParameters params_; String title_; *************** *** 280,284 **** * */ ! public H2dGrid getMaillage() { return params_.getMaillage(); } --- 289,293 ---- * */ ! public EfGrid getMaillage() { return params_.getMaillage(); } *************** *** 365,376 **** * */ - public TrPanelInfoSender getPanelInfoSender() { - if(infoSenderDelegate_==null) infoSenderDelegate_=new TrRefluxInfoSenderDefault(getH2dRefluxParametres()); - return infoSenderDelegate_; - } - - /** - * - */ public boolean canImportEvolution() { return true; --- 374,377 ---- Index: TrRefluxProjectDispatcherListener.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectDispatcherListener.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TrRefluxProjectDispatcherListener.java 19 Dec 2003 12:10:55 -0000 1.5 --- TrRefluxProjectDispatcherListener.java 12 Feb 2004 16:15:21 -0000 1.6 *************** *** 42,45 **** --- 42,46 ---- changedMainFrameState(proj_.isModified(), proj_.getImpl().getFrame()); } + majInfoSender(proj_); } /** Index: TrRefluxProjectFactory.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TrRefluxProjectFactory.java 12 Dec 2003 11:29:41 -0000 1.6 --- TrRefluxProjectFactory.java 12 Feb 2004 16:15:21 -0000 1.7 *************** *** 14,23 **** import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.fichiers.FileOperationSynthese; - import org.fudaa.dodico.h2d.H2dFileFormatMaillageVersion; - import org.fudaa.dodico.h2d.H2dGrid; import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters; - import org.fudaa.dodico.h2d.type.H2dElementType; import org.fudaa.dodico.h2d.type.H2dProjetType; import org.fudaa.dodico.olb.OLBExec; --- 14,24 ---- import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.ProgressionInterface; + import org.fudaa.dodico.ef.EfGrid; + import org.fudaa.dodico.ef.EfLib; + import org.fudaa.dodico.ef.EfElementType; + import org.fudaa.dodico.ef.FileFormatGridVersion; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters; import org.fudaa.dodico.h2d.type.H2dProjetType; import org.fudaa.dodico.olb.OLBExec; *************** *** 57,70 **** public static TrRefluxProjet createRefluxProjectFromGrid( File _f, ! H2dFileFormatMaillageVersion _ft, H2dProjetType _t, ProgressionInterface _op, TrImplementation _ui) { ! H2dGrid g= getValidGrid(_f, _ft, _ui, _op); if (g == null) return null; TrRefluxParametres r= new TrRefluxParametres(); r.ui_=_ui; ! DodicoAnalyze.Editor analyze= new DodicoAnalyze.Editor(); r.params_= H2dRefluxParameters.init( --- 58,71 ---- public static TrRefluxProjet createRefluxProjectFromGrid( File _f, ! FileFormatGridVersion _ft, H2dProjetType _t, ProgressionInterface _op, TrImplementation _ui) { ! EfGrid g= getValidGrid(_f, _ft, _ui, _op); if (g == null) return null; TrRefluxParametres r= new TrRefluxParametres(); r.ui_=_ui; ! DodicoAnalyze analyze= new DodicoAnalyze(); r.params_= H2dRefluxParameters.init( *************** *** 81,87 **** } ! public static H2dGrid getValidGrid( File _f, ! H2dFileFormatMaillageVersion _ft, TrImplementation _ui, ProgressionInterface _op) { --- 82,88 ---- } ! public static EfGrid getValidGrid( File _f, ! FileFormatGridVersion _ft, TrImplementation _ui, ProgressionInterface _op) { *************** *** 94,98 **** return null; } ! H2dGrid g= (H2dGrid)op.getSource(); if ((g.getPtsNb() == 0) || (g.getEltNb() == 0)) { _ui.error(TrResource.getS("Maillage vide")); --- 95,99 ---- return null; } ! EfGrid g= (EfGrid)op.getSource(); if ((g.getPtsNb() == 0) || (g.getEltNb() == 0)) { _ui.error(TrResource.getS("Maillage vide")); *************** *** 100,108 **** return null; } ! if (g.getEltType() == H2dElementType.T3) { _ui.setMainMessage(TrResource.getS("Transformation maillage en T6")); _ui.setMainProgression(30); ! g= g.maillageT3enT6(_op, null); ! } else if (g.getEltType() != H2dElementType.T6) { _ui.error(H2dResource.getS("Seuls les éléments T3 ou T6 sont acceptés")); _ui.unsetMainMessage(); --- 101,109 ---- return null; } ! if (g.getEltType() == EfElementType.T3) { _ui.setMainMessage(TrResource.getS("Transformation maillage en T6")); _ui.setMainProgression(30); ! g= EfLib.maillageT3enT6(g,_op, null); ! } else if (g.getEltType() != EfElementType.T6) { _ui.error(H2dResource.getS("Seuls les éléments T3 ou T6 sont acceptés")); _ui.unsetMainMessage(); *************** *** 111,115 **** _ui.setMainMessage(TrResource.getS("optimisation maillage")); _ui.setMainProgression(50); ! H2dGrid gOptimize= new OLBExec().computeGrid(g, _op, _ui); if ((gOptimize == null) || (gOptimize.getPtsNb() == 0) --- 112,116 ---- _ui.setMainMessage(TrResource.getS("optimisation maillage")); _ui.setMainProgression(50); ! EfGrid gOptimize= new OLBExec().computeGrid(g, _op, _ui); if ((gOptimize == null) || (gOptimize.getPtsNb() == 0) *************** *** 150,154 **** s= s.substring(0, i); r.title_= s; ! DodicoAnalyze.Editor analyze= new DodicoAnalyze.Editor(); analyze.setDesc( TrResource.getS("Analyse du fichier") --- 151,155 ---- s= s.substring(0, i); r.title_= s; ! DodicoAnalyze analyze= new DodicoAnalyze(); analyze.setDesc( TrResource.getS("Analyse du fichier") *************** *** 157,161 **** r.params_= H2dRefluxParameters.init(inter, _progress, _ft, analyze); if (_ui != null) { ! _ui.manageAnalyzeAndIsFatal(analyze.toAnalyze()); } return r; --- 158,162 ---- r.params_= H2dRefluxParameters.init(inter, _progress, _ft, analyze); if (_ui != null) { ! _ui.manageAnalyzeAndIsFatal(analyze); } return r; Index: TrRefluxProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** TrRefluxProjet.java 21 Jan 2004 11:07:29 -0000 1.17 --- TrRefluxProjet.java 12 Feb 2004 16:15:21 -0000 1.18 *************** *** 44,48 **** import org.fudaa.fudaa.commun.calcul.FudaaCalculAction; import org.fudaa.fudaa.commun.calcul.FudaaCalculOp; ! import org.fudaa.fudaa.dico.FDicoProjetInterface; import org.fudaa.fudaa.tr.TrExport; import org.fudaa.fudaa.tr.TrFilleVisu; --- 44,48 ---- import org.fudaa.fudaa.commun.calcul.FudaaCalculAction; import org.fudaa.fudaa.commun.calcul.FudaaCalculOp; ! import org.fudaa.fudaa.fdico.FDicoProjetInterface; import org.fudaa.fudaa.tr.TrExport; import org.fudaa.fudaa.tr.TrFilleVisu; *************** *** 164,167 **** --- 164,168 ---- if (fille_ == null) { fille_= new TrRefluxFilleProjet(this); + fille_.setClosable(false); getImpl().installContextHelp(fille_.getRootPane(), "reflux/p-reflux-general.html"); getImpl().addInternalFrame(fille_); *************** *** 179,183 **** private void activeVisu() { if (visu_ == null) { ! visu_= new TrRefluxFilleVisu(getImpl(), this); getImpl().installContextHelp(visu_.getRootPane(), "reflux/p-reflux-editeur2D.html"); visu_.pack(); --- 180,184 ---- private void activeVisu() { if (visu_ == null) { ! visu_= new TrFilleVisu(new TrRefluxVisuPanel(getImpl(), this)); getImpl().installContextHelp(visu_.getRootPane(), "reflux/p-reflux-editeur2D.html"); visu_.pack(); *************** *** 359,363 **** visuMenu_= true; addSeparator(); ! visu_.fillWithAllLayersAction(this); } } --- 360,364 ---- visuMenu_= true; addSeparator(); ! visu_.getVisuPanel().fillWithAllLayersAction(this); } } --- TrRefluxBoundaryMiddleLayer.java DELETED --- --- TrRefluxFilleVisu.java DELETED --- |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/tr/data Modified Files: TrBcBoundaryBlockLayer.java TrBcBoundaryBlockModel.java TrBcBoundaryBlockModelDefault.java TrBcBoundaryLayerAbstract.java TrBcBoundaryLegendLayer.java TrBcBoundaryLegendPanel.java TrBcBoundaryMiddleLayer.java TrBcBoundaryMiddleModel.java TrBcBoundaryMiddleModelDefault.java TrBcLayerGroup.java TrBcPointLayer.java TrBcPointModel.java TrBcPointModelDefault.java TrFindActionBcPoint.java TrFindActionDefault.java TrFindDialog.java Added Files: TrInfoSenderDelegate.java Removed Files: TrElementLayer.java TrElementNumberLayer.java TrElementNumberModel.java TrElementNumberModelDefault.java TrGridLayerGroup.java TrLayer.java TrLayerGroup.java TrModelePolygone.java TrPanelInfo.java TrPanelInfoSender.java TrPanelInfoSenderDefault.java TrPointLayer.java TrPointModel.java TrPointNumberLayer.java TrPointNumberModel.java TrPointNumberModelDefault.java Log Message: prepro 0.05 --- NEW FILE: TrInfoSenderDelegate.java --- (This appears to be a binary file; contents omitted.) Index: TrBcBoundaryBlockLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockLayer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrBcBoundaryBlockLayer.java 12 Dec 2003 11:29:41 -0000 1.4 --- TrBcBoundaryBlockLayer.java 12 Feb 2004 16:15:21 -0000 1.5 *************** *** 33,36 **** --- 33,38 ---- import org.fudaa.ebli.trace.TraceLigne; + import org.fudaa.fudaa.meshviewer.layer.*; + import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; import org.fudaa.fudaa.tr.TrResource; /** *************** *** 39,43 **** * @version $Id$ */ ! public abstract class TrBcBoundaryBlockLayer extends TrBcBoundaryLayerAbstract { protected TrBcBoundaryBlockModel m_; --- 41,45 ---- * @version $Id$ */ ! public class TrBcBoundaryBlockLayer extends TrBcBoundaryLayerAbstract { protected TrBcBoundaryBlockModel m_; *************** *** 49,52 **** --- 51,55 ---- public TrBcBoundaryBlockLayer(TrBcBoundaryBlockModel _m) { m_= _m; + m_.setListener(this); bdTlData_= new BordTraceLigneData(); } *************** *** 393,415 **** fireSelectionEvent(); } /** * */ ! public void fillWithInfo(TrPanelInfo.InfoData _m, TrPanelInfoSender _s) { ! if (!isSelectionEmpty()) { ! int i= isSelectionInUniqueBloc(); ! if (i >= 0) { ! EbliListeSelection l= selection_.get(i); ! if (l.getNbSelectedIndex() == 1) { ! _s.fillWithBoundaryBlockInfo(_m, i, l.getMaxIndex()); ! return; ! } ! } ! _m.put( ! TrResource.getS("Nombre de bords sélectionnés"), ! CtuluLib.getString(selection_.getNbSelectedItem())); ! ! } ! } --- 396,406 ---- fireSelectionEvent(); } + /** * */ ! public void fillWithInfo(InfoData _m) { ! if (!isSelectionEmpty()) ! m_.fillWithInfo(_m, selection_); } Index: TrBcBoundaryBlockModel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrBcBoundaryBlockModel.java 11 Dec 2003 12:50:55 -0000 1.3 --- TrBcBoundaryBlockModel.java 12 Feb 2004 16:15:21 -0000 1.4 *************** *** 8,19 **** */ package org.fudaa.fudaa.tr.data; - import org.fudaa.dodico.h2d.H2dBoundary; import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface; ! import org.fudaa.dodico.h2d.H2dBcManagerBlockInterface; ! import org.fudaa.dodico.h2d.H2dEvolutionManager; ! import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager; ! import org.fudaa.ebli.calque.ZModeleDonnees; import org.fudaa.ebli.calque.ZModeleDonneesMulti; import org.fudaa.ebli.geometrie.GrPoint; /** * @author deniger --- 8,18 ---- */ package org.fudaa.fudaa.tr.data; import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface; ! import org.fudaa.ebli.calque.ZModeleDonneesMulti; + import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface; import org.fudaa.ebli.geometrie.GrPoint; + + import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo; /** * @author deniger *************** *** 38,40 **** --- 37,41 ---- public int getIdxGlobal(int _idxFr,int _idxOnFr); + + public void fillWithInfo(MvPanelInfo.InfoData _m,EbliListeSelectionMultiInterface _s); } Index: TrBcBoundaryBlockModelDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockModelDefault.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrBcBoundaryBlockModelDefault.java 11 Dec 2003 12:50:55 -0000 1.3 --- TrBcBoundaryBlockModelDefault.java 12 Feb 2004 16:15:21 -0000 1.4 *************** *** 8,22 **** */ package org.fudaa.fudaa.tr.data; import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface; import org.fudaa.dodico.h2d.H2dBcManagerBlockInterface; ! import org.fudaa.dodico.h2d.H2dPoint; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; /** * @author deniger * @version $Id$ */ ! public class TrBcBoundaryBlockModelDefault implements TrBcBoundaryBlockModel { ! H2dBcManagerBlockInterface clMng_; public TrBcBoundaryBlockModelDefault(H2dBcManagerBlockInterface _clMng) { if (_clMng == null) --- 8,29 ---- */ package org.fudaa.fudaa.tr.data; + import org.fudaa.dodico.ef.EfGrid; + import org.fudaa.dodico.ef.EfNode; import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface; import org.fudaa.dodico.h2d.H2dBcManagerBlockInterface; ! ! import org.fudaa.ebli.calque.ZModeleDonnesAbstract; ! import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; + + import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; /** * @author deniger * @version $Id$ */ ! public class TrBcBoundaryBlockModelDefault extends ZModeleDonnesAbstract implements TrBcBoundaryBlockModel { ! protected H2dBcManagerBlockInterface clMng_; ! private TrInfoSenderDelegate delegate_; public TrBcBoundaryBlockModelDefault(H2dBcManagerBlockInterface _clMng) { if (_clMng == null) *************** *** 40,46 **** */ public void getPoint(GrPoint _p, int _idxFrontier, int idxOnFrontier) { ! H2dPoint p= clMng_.getGrid().getPt( ! clMng_.getGrid().getFrontiers().getIdxGlobal(_idxFrontier, idxOnFrontier)); _p.setCoordonnees(p.getX(), p.getY(), p.getZ()); } --- 47,55 ---- */ public void getPoint(GrPoint _p, int _idxFrontier, int idxOnFrontier) { ! EfNode p= clMng_.getGrid().getPt( ! clMng_.getGrid().getFrontiers().getIdxGlobal( ! _idxFrontier, ! idxOnFrontier)); _p.setCoordonnees(p.getX(), p.getY(), p.getZ()); } *************** *** 49,53 **** */ public GrBoite getDomaine() { ! return TrGridLayerGroup.getDomaine(clMng_.getGrid()); } /** --- 58,68 ---- */ public GrBoite getDomaine() { ! EfGrid f= clMng_.getGrid(); ! GrBoite b= new GrBoite(); ! EfNode pt= f.getMinPoint(); ! b.o= new GrPoint(pt.getX(), pt.getY(), pt.getZ()); ! pt= f.getMaxPoint(); ! b.e= new GrPoint(pt.getX(), pt.getY(), pt.getZ()); ! return b; } /** *************** *** 75,83 **** return clMng_.getGrid().getFrontiers().getNbTotalPt(); } ! ! public int getIdxGlobal(int _idxFr,int _idxOnFr){ return clMng_.getGrid().getFrontiers().getIdxGlobal(_idxFr, _idxOnFr); } } --- 90,119 ---- return clMng_.getGrid().getFrontiers().getNbTotalPt(); } ! ! public int getIdxGlobal(int _idxFr, int _idxOnFr) { return clMng_.getGrid().getFrontiers().getIdxGlobal(_idxFr, _idxOnFr); } + /** + * + */ + public TrInfoSenderDelegate getDelegate() { + return delegate_; + } + + /** + * + */ + public void setDelegate(TrInfoSenderDelegate _delegate) { + delegate_= _delegate; + } + + /** + * + */ + public void fillWithInfo(InfoData _m, EbliListeSelectionMultiInterface _s) { + if(delegate_!=null) delegate_.fillWithBoundaryBlockInfo(_m,_s); + } + } Index: TrBcBoundaryLayerAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryLayerAbstract.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrBcBoundaryLayerAbstract.java 21 Jan 2004 11:07:29 -0000 1.4 --- TrBcBoundaryLayerAbstract.java 12 Feb 2004 16:15:21 -0000 1.5 *************** *** 13,16 **** --- 13,18 ---- import org.fudaa.ebli.calque.ZCalqueAffichageDonneesMultiSpecial; import org.fudaa.ebli.trace.TraceLigne; + + import org.fudaa.fudaa.meshviewer.layer.*; import org.fudaa.fudaa.tr.TrResource; /** *************** *** 19,23 **** */ public abstract class TrBcBoundaryLayerAbstract ! extends TrLayerMulti implements TrLayer{ public class BordTraceLigneData { HashMap bdTypeTlDataMap_; --- 21,25 ---- */ public abstract class TrBcBoundaryLayerAbstract ! extends TrLayerMulti implements MvLayer{ public class BordTraceLigneData { HashMap bdTypeTlDataMap_; Index: TrBcBoundaryLegendLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryLegendLayer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrBcBoundaryLegendLayer.java 11 Dec 2003 12:50:55 -0000 1.3 --- TrBcBoundaryLegendLayer.java 12 Feb 2004 16:15:21 -0000 1.4 *************** *** 15,24 **** import org.fudaa.ebli.geometrie.GrBoite; ! import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData; /** * @author deniger * @version $Id$ */ ! public class TrBcBoundaryLegendLayer extends BCalqueLegende implements TrLayer{ /** * --- 15,25 ---- import org.fudaa.ebli.geometrie.GrBoite; ! import org.fudaa.fudaa.meshviewer.layer.*; ! import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; /** * @author deniger * @version $Id$ */ ! public class TrBcBoundaryLegendLayer extends BCalqueLegende implements MvLayer{ /** * *************** *** 68,80 **** public void addSelectionListener(ZSelectionListener _l) {} /** * */ ! public void fillWithInfo(TrPanelInfo.InfoData _m,TrPanelInfoSender _sender) {} /** * */ ! public void removeSelectionListener(ZSelectionListener _l) {} } --- 69,82 ---- public void addSelectionListener(ZSelectionListener _l) {} + /** * */ ! public void removeSelectionListener(ZSelectionListener _l) {} /** * */ ! public void fillWithInfo(InfoData _m) {} } Index: TrBcBoundaryLegendPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryLegendPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrBcBoundaryLegendPanel.java 25 Nov 2003 10:14:30 -0000 1.2 --- TrBcBoundaryLegendPanel.java 12 Feb 2004 16:15:21 -0000 1.3 *************** *** 17,21 **** import org.fudaa.ebli.palette.BSelecteurTraitComponent; import org.fudaa.fudaa.commun.FudaaLib; ! import org.fudaa.fudaa.dico.FdicoLib; import org.fudaa.fudaa.tr.TrLib; /** --- 17,21 ---- import org.fudaa.ebli.palette.BSelecteurTraitComponent; import org.fudaa.fudaa.commun.FudaaLib; ! import org.fudaa.fudaa.fdico.FdicoLib; import org.fudaa.fudaa.tr.TrLib; /** Index: TrBcBoundaryMiddleLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleLayer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrBcBoundaryMiddleLayer.java 12 Dec 2003 11:29:41 -0000 1.4 --- TrBcBoundaryMiddleLayer.java 12 Feb 2004 16:15:21 -0000 1.5 *************** *** 17,22 **** import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface; - import org.fudaa.dodico.h2d.H2dLib; import org.fudaa.dodico.h2d.type.H2dBoundaryType; --- 17,22 ---- import org.fudaa.ctulu.CtuluLib; + import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface; import org.fudaa.dodico.h2d.type.H2dBoundaryType; *************** *** 31,34 **** --- 31,35 ---- import org.fudaa.ebli.trace.TraceLigne; + import org.fudaa.fudaa.meshviewer.layer.*; import org.fudaa.fudaa.tr.TrResource; /** *************** *** 45,48 **** --- 46,50 ---- public TrBcBoundaryMiddleLayer(TrBcBoundaryMiddleModel _m) { m_= _m; + m_.setListener(this); } public void paintComponent(Graphics g) { *************** *** 125,129 **** for (int j= s.getMinIndex(); j <= max; j++) { if (s.isSelected(j)) { ! temp= H2dLib.getIdxFromIdxMid(j); m_.getPoint(seg.o, idxFr, temp - 1); m_.getPoint(seg.e, idxFr, (temp == n ? 0 : temp + 1)); --- 127,131 ---- for (int j= s.getMinIndex(); j <= max; j++) { if (s.isSelected(j)) { ! temp= EfLib.getIdxFromIdxMid(j); m_.getPoint(seg.o, idxFr, temp - 1); m_.getPoint(seg.e, idxFr, (temp == n ? 0 : temp + 1)); *************** *** 167,171 **** if (seg.estSelectionne(_tolerance, _pt)) { EbliListeSelectionMulti r= new EbliListeSelectionMulti(1); ! r.set(i, H2dLib.getIdxMidFromIdx(j)); return r; } --- 169,173 ---- if (seg.estSelectionne(_tolerance, _pt)) { EbliListeSelectionMulti r= new EbliListeSelectionMulti(1); ! r.set(i, EfLib.getIdxMidFromIdx(j)); return r; } *************** *** 179,183 **** if (seg.estSelectionne(_tolerance, _pt)) { EbliListeSelectionMulti r= new EbliListeSelectionMulti(1); ! r.set(i, H2dLib.getIdxMidFromIdx(j)); return r; } --- 181,185 ---- if (seg.estSelectionne(_tolerance, _pt)) { EbliListeSelectionMulti r= new EbliListeSelectionMulti(1); ! r.set(i, EfLib.getIdxMidFromIdx(j)); return r; } *************** *** 220,224 **** if (lBord == null) //divide by two lBord= new EbliListeSelection(nbPt >> 1); ! lBord.add(H2dLib.getIdxMidFromIdx(j)); } } --- 222,226 ---- if (lBord == null) //divide by two lBord= new EbliListeSelection(nbPt >> 1); ! lBord.add(EfLib.getIdxMidFromIdx(j)); } } *************** *** 256,260 **** for (int j= s.getMinIndex(); j <= max; j++) { if (s.isSelected(j)) { ! temp= H2dLib.getIdxFromIdxMid(j); r.add(m_.getGlobalIdx(idxFr, temp)); r.add(m_.getGlobalIdx(idxFr, temp - 1)); --- 258,262 ---- for (int j= s.getMinIndex(); j <= max; j++) { if (s.isSelected(j)) { ! temp= EfLib.getIdxFromIdxMid(j); r.add(m_.getGlobalIdx(idxFr, temp)); r.add(m_.getGlobalIdx(idxFr, temp - 1)); *************** *** 298,320 **** * */ ! public void fillWithInfo(TrPanelInfo.InfoData _m, TrPanelInfoSender _s) { ! if (isSelectionEmpty()) ! return; ! int i= isSelectionInUniqueBloc(); ! if (i >= 0) { ! EbliListeSelection l= selection_.get(i); ! if (l.isOnlyOnIndexSelected()) { ! _s.fillWithBoundaryMiddleInfo( ! _m, ! i, ! H2dLib.getIdxFromIdxMid(l.getMaxIndex())); ! return; ! } ! } ! _m.put( ! TrResource.getS("Nombre de bords sélectionnés"), ! CtuluLib.getString(selection_.getNbSelectedItem())); ! } } --- 300,309 ---- * */ ! public void fillWithInfo(MvPanelInfo.InfoData _m) { ! if (isSelectionEmpty())return; ! m_.fillWithInfo(_m, selection_); } + + } Index: TrBcBoundaryMiddleModel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrBcBoundaryMiddleModel.java 11 Dec 2003 12:50:55 -0000 1.3 --- TrBcBoundaryMiddleModel.java 12 Feb 2004 16:15:21 -0000 1.4 *************** *** 9,15 **** package org.fudaa.fudaa.tr.data; import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface; ! import org.fudaa.ebli.calque.ZModeleDonnees; import org.fudaa.ebli.calque.ZModeleDonneesMulti; import org.fudaa.ebli.geometrie.GrPoint; /** * @author deniger --- 9,18 ---- package org.fudaa.fudaa.tr.data; import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface; ! import org.fudaa.ebli.calque.ZModeleDonneesMulti; + import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface; import org.fudaa.ebli.geometrie.GrPoint; + + import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo; /** * @author deniger *************** *** 34,36 **** --- 37,41 ---- public int getGlobalIdx(int _idxFr,int _idxOnFrontier); + + public void fillWithInfo(MvPanelInfo.InfoData _m,EbliListeSelectionMultiInterface _s); } Index: TrBcBoundaryMiddleModelDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleModelDefault.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrBcBoundaryMiddleModelDefault.java 11 Dec 2003 12:50:55 -0000 1.3 --- TrBcBoundaryMiddleModelDefault.java 12 Feb 2004 16:15:21 -0000 1.4 *************** *** 8,26 **** */ package org.fudaa.fudaa.tr.data; import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface; import org.fudaa.dodico.h2d.H2dBcManagerMiddleInterface; ! import org.fudaa.dodico.h2d.H2dGrid; ! import org.fudaa.dodico.h2d.H2dLib; ! import org.fudaa.dodico.h2d.H2dPoint; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; /** * @author deniger * @version $Id$ */ ! public class TrBcBoundaryMiddleModelDefault implements TrBcBoundaryMiddleModel { ! H2dBcManagerMiddleInterface mng_; ! H2dGrid grid_; /** * --- 8,31 ---- */ package org.fudaa.fudaa.tr.data; + import org.fudaa.dodico.ef.EfGrid; + import org.fudaa.dodico.ef.EfLib; + import org.fudaa.dodico.ef.EfNode; import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface; import org.fudaa.dodico.h2d.H2dBcManagerMiddleInterface; ! ! import org.fudaa.ebli.calque.ZModeleDonnesAbstract; ! import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; + + import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; /** * @author deniger * @version $Id$ */ ! public class TrBcBoundaryMiddleModelDefault extends ZModeleDonnesAbstract implements TrBcBoundaryMiddleModel { ! protected H2dBcManagerMiddleInterface mng_; ! protected TrInfoSenderDelegate delegate_; /** * *************** *** 28,32 **** public TrBcBoundaryMiddleModelDefault(H2dBcManagerMiddleInterface _mng) { mng_= _mng; - grid_= _mng.getGrid(); } /** --- 33,36 ---- *************** *** 34,38 **** */ public int getNbFrontier() { ! return grid_.getFrontiers().getNbFrontier(); } /** --- 38,42 ---- */ public int getNbFrontier() { ! return mng_.getGrid().getFrontiers().getNbFrontier(); } /** *************** *** 46,51 **** */ public void getPoint(GrPoint _p, int _idxFr, int _idxPtOnFrontier) { ! H2dPoint p= ! grid_.getPt(grid_.getFrontiers().getIdxGlobal(_idxFr, _idxPtOnFrontier)); _p.setCoordonnees(p.getX(), p.getY(), p.getZ()); } --- 50,55 ---- */ public void getPoint(GrPoint _p, int _idxFr, int _idxPtOnFrontier) { ! EfNode p= ! mng_.getGrid().getPt(mng_.getGrid().getFrontiers().getIdxGlobal(_idxFr, _idxPtOnFrontier)); _p.setCoordonnees(p.getX(), p.getY(), p.getZ()); } *************** *** 54,58 **** */ public GrBoite getDomaine() { ! return TrGridLayerGroup.getDomaine(grid_); } /** --- 58,67 ---- */ public GrBoite getDomaine() { ! GrBoite b= new GrBoite(); ! EfNode pt= mng_.getGrid().getMinPoint(); ! b.o= new GrPoint(pt.getX(), pt.getY(), pt.getZ()); ! pt= mng_.getGrid().getMaxPoint(); ! b.e= new GrPoint(pt.getX(), pt.getY(), pt.getZ()); ! return b; } /** *************** *** 72,76 **** */ public int getNbElementIn(int _i) { ! return H2dLib.getNbMiddlePt(mng_.getMiddleFrontier(_i).getNbPt()); } /** --- 81,85 ---- */ public int getNbElementIn(int _i) { ! return EfLib.getNbMiddlePt(mng_.getMiddleFrontier(_i).getNbPt()); } /** *************** *** 78,82 **** */ public int getNbTotalPt() { ! return grid_.getFrontiers().getNbTotalPt(); } --- 87,91 ---- */ public int getNbTotalPt() { ! return mng_.getGrid().getFrontiers().getNbTotalPt(); } *************** *** 85,89 **** */ public int getGlobalIdx(int _idxFr, int _idxOnFrontier) { ! return grid_.getFrontiers().getIdxGlobal(_idxFr, _idxOnFrontier); } --- 94,120 ---- */ public int getGlobalIdx(int _idxFr, int _idxOnFrontier) { ! return mng_.getGrid().getFrontiers().getIdxGlobal(_idxFr, _idxOnFrontier); ! } ! ! /** ! * ! */ ! public TrInfoSenderDelegate getDelegate() { ! return delegate_; ! } ! ! /** ! * ! */ ! public void setDelegate(TrInfoSenderDelegate _delegate) { ! delegate_= _delegate; ! } ! ! ! /** ! * ! */ ! public final void fillWithInfo(InfoData _m, EbliListeSelectionMultiInterface _s) { ! if(delegate_!=null) delegate_.fillWithBoundaryMiddleInfo(_m, _s); } Index: TrBcLayerGroup.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcLayerGroup.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrBcLayerGroup.java 11 Dec 2003 12:50:55 -0000 1.3 --- TrBcLayerGroup.java 12 Feb 2004 16:15:21 -0000 1.4 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.fudaa.tr.data; import org.fudaa.ebli.calque.ContextuelDelegator; + + import org.fudaa.fudaa.meshviewer.layer.*; import org.fudaa.fudaa.tr.TrResource; /** *************** *** 14,18 **** * @version $Id$ */ ! public class TrBcLayerGroup extends TrLayerGroup { public TrBcLayerGroup() { setTitle(TrResource.getS("conditions limites")); --- 16,20 ---- * @version $Id$ */ ! public class TrBcLayerGroup extends MvLayerGroup { public TrBcLayerGroup() { setTitle(TrResource.getS("conditions limites")); Index: TrBcPointLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcPointLayer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrBcPointLayer.java 21 Jan 2004 11:07:29 -0000 1.4 --- TrBcPointLayer.java 12 Feb 2004 16:15:21 -0000 1.5 *************** *** 29,45 **** import org.fudaa.ebli.trace.TraceIcone; import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.tr.TrFilleVisu; import org.fudaa.fudaa.tr.TrResource; - import org.fudaa.fudaa.tr.data.TrPanelInfo.InfoData; /** * @author deniger * @version $Id$ */ ! public class TrBcPointLayer extends TrLayerMulti implements TrLayer { private TrBcPointModel m_; private boolean isT6_; TraceIcone mid; public TrBcPointLayer(TrBcPointModel _cl) { ! setTitle(TrResource.getS("Points de bords")); m_= _cl; isT6_= m_.isT6(); --- 29,46 ---- import org.fudaa.ebli.trace.TraceIcone; import org.fudaa.fudaa.commun.FudaaCommonImplementation; + import org.fudaa.fudaa.meshviewer.layer.*; + import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; import org.fudaa.fudaa.tr.TrFilleVisu; import org.fudaa.fudaa.tr.TrResource; /** * @author deniger * @version $Id$ */ ! public class TrBcPointLayer extends TrLayerMulti implements MvLayer { private TrBcPointModel m_; private boolean isT6_; TraceIcone mid; public TrBcPointLayer(TrBcPointModel _cl) { ! setTitle(TrResource.getS("Noeuds de bords")); m_= _cl; isT6_= m_.isT6(); *************** *** 294,299 **** * */ ! public void fillWithInfo(TrPanelInfo.InfoData _m, TrPanelInfoSender _s) { ! _s.fillWithPointInfo(_m, getPtIdx()); } --- 295,301 ---- * */ ! public void fillWithInfo(MvPanelInfo.InfoData _m) { ! if (!isSelectionEmpty()) ! m_.fillWithInfo(_m, selection_); } Index: TrBcPointModel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcPointModel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrBcPointModel.java 11 Dec 2003 12:50:55 -0000 1.3 --- TrBcPointModel.java 12 Feb 2004 16:15:21 -0000 1.4 *************** *** 8,16 **** */ package org.fudaa.fudaa.tr.data; - import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface; - import org.fudaa.dodico.h2d.H2dBcManagerBlockInterface; - import org.fudaa.ebli.calque.ZModeleDonnees; import org.fudaa.ebli.calque.ZModeleDonneesMulti; import org.fudaa.ebli.geometrie.GrPoint; /** * @author deniger --- 8,16 ---- */ package org.fudaa.fudaa.tr.data; import org.fudaa.ebli.calque.ZModeleDonneesMulti; + import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface; import org.fudaa.ebli.geometrie.GrPoint; + + import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo; /** * @author deniger *************** *** 26,29 **** --- 26,30 ---- public boolean getIdxFrIdxOnFrFromGeneral(int _generalIdx,int[] _idxFrIdxOn); public boolean getIdxFrIdxOnFrFromFrontier(int _frontierIdx,int[] _idxFrIdxOn); + public void fillWithInfo(MvPanelInfo.InfoData _m,EbliListeSelectionMultiInterface _s); } Index: TrBcPointModelDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcPointModelDefault.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrBcPointModelDefault.java 11 Dec 2003 12:50:55 -0000 1.3 --- TrBcPointModelDefault.java 12 Feb 2004 16:15:21 -0000 1.4 *************** *** 8,25 **** */ package org.fudaa.fudaa.tr.data; ! import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface; ! import org.fudaa.dodico.h2d.H2dBcManagerBlockInterface; ! import org.fudaa.dodico.h2d.H2dGrid; ! import org.fudaa.dodico.h2d.H2dPoint; ! import org.fudaa.dodico.h2d.type.H2dElementType; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; /** * @author deniger * @version $Id$ */ ! public class TrBcPointModelDefault implements TrBcPointModel { ! H2dGrid m_; ! public TrBcPointModelDefault(H2dGrid _m) { if (_m == null) throw new IllegalArgumentException("param null"); --- 8,29 ---- */ package org.fudaa.fudaa.tr.data; ! import org.fudaa.dodico.ef.EfElementType; ! import org.fudaa.dodico.ef.EfGrid; ! import org.fudaa.dodico.ef.EfNode; ! ! import org.fudaa.ebli.calque.ZModeleDonnesAbstract; ! import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; + + import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; /** * @author deniger * @version $Id$ */ ! public class TrBcPointModelDefault extends ZModeleDonnesAbstract implements TrBcPointModel { ! EfGrid m_; ! TrInfoSenderDelegate delegate_; ! public TrBcPointModelDefault(EfGrid _m) { if (_m == null) throw new IllegalArgumentException("param null"); *************** *** 33,37 **** */ public GrBoite getDomaine() { ! return TrGridLayerGroup.getDomaine(m_); } /** --- 37,46 ---- */ public GrBoite getDomaine() { ! GrBoite b= new GrBoite(); ! EfNode pt= m_.getMinPoint(); ! b.o= new GrPoint(pt.getX(), pt.getY(), pt.getZ()); ! pt= m_.getMaxPoint(); ! b.e= new GrPoint(pt.getX(), pt.getY(), pt.getZ()); ! return b; } /** *************** *** 57,61 **** */ public boolean point(GrPoint _p, int _idxFrontier, int idxPtOnFrontier) { ! H2dPoint p= m_.getPt(m_.getFrontiers().getIdxGlobal(_idxFrontier, idxPtOnFrontier)); _p.setCoordonnees(p.getX(), p.getY(), p.getZ()); --- 66,70 ---- */ public boolean point(GrPoint _p, int _idxFrontier, int idxPtOnFrontier) { ! EfNode p= m_.getPt(m_.getFrontiers().getIdxGlobal(_idxFrontier, idxPtOnFrontier)); _p.setCoordonnees(p.getX(), p.getY(), p.getZ()); *************** *** 66,70 **** */ public boolean isT6() { ! return m_.getEltType() == H2dElementType.T6; } /** --- 75,79 ---- */ public boolean isT6() { ! return m_.getEltType() == EfElementType.T6; } /** *************** *** 106,108 **** --- 115,138 ---- _idxFrIdxOn); } + /** + * + */ + public TrInfoSenderDelegate getDelegate() { + return delegate_; + } + + /** + * + */ + public void setDelegate(TrInfoSenderDelegate _delegate) { + delegate_= _delegate; + } + + /** + * + */ + public void fillWithInfo(InfoData _m, EbliListeSelectionMultiInterface _s) { + if(delegate_!=null) delegate_.fillWithBcPointInfo(_m, _s); + } + } Index: TrFindActionBcPoint.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrFindActionBcPoint.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrFindActionBcPoint.java 11 Dec 2003 12:50:55 -0000 1.1 --- TrFindActionBcPoint.java 12 Feb 2004 16:15:21 -0000 1.2 *************** *** 9,14 **** package org.fudaa.fudaa.tr.data; import org.fudaa.ebli.geometrie.GrBoite; ! import org.fudaa.fudaa.tr.TrFilleVisu; import org.fudaa.fudaa.tr.TrResource; /** * @author deniger --- 9,15 ---- package org.fudaa.fudaa.tr.data; import org.fudaa.ebli.geometrie.GrBoite; ! import org.fudaa.fudaa.tr.TrResource; + import org.fudaa.fudaa.tr.TrVisuPanel; /** * @author deniger *************** *** 17,25 **** public class TrFindActionBcPoint implements TrFindAction { TrBcPointLayer layer_; ! TrFilleVisu visu_; /** * */ ! public TrFindActionBcPoint(TrFilleVisu _visu, TrBcPointLayer _layer) { visu_= _visu; layer_= _layer; --- 18,26 ---- public class TrFindActionBcPoint implements TrFindAction { TrBcPointLayer layer_; ! TrVisuPanel visu_; /** * */ ! public TrFindActionBcPoint(TrVisuPanel _visu, TrBcPointLayer _layer) { visu_= _visu; layer_= _layer; Index: TrFindActionDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrFindActionDefault.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrFindActionDefault.java 11 Dec 2003 12:50:55 -0000 1.1 --- TrFindActionDefault.java 12 Feb 2004 16:15:21 -0000 1.2 *************** *** 15,20 **** --- 15,23 ---- import org.fudaa.ebli.geometrie.GrBoite; + import org.fudaa.fudaa.meshviewer.layer.*; import org.fudaa.fudaa.tr.TrFilleVisu; import org.fudaa.fudaa.tr.TrResource; + import org.fudaa.fudaa.tr.TrVisuPanel; + import sun.misc.Launcher; /** *************** *** 24,49 **** public class TrFindActionDefault implements TrFindAction { ZCalqueAffichageDonnees layer_; ! TrFilleVisu visu_; boolean point_; /** * */ ! public TrFindActionDefault( ! TrFilleVisu _visu, ! TrPointLayer _layer) { layer_= _layer; visu_= _visu; ! point_=true; } ! ! public TrFindActionDefault( ! TrFilleVisu _visu, ! TrElementLayer _layer) { ! layer_= _layer; ! visu_= _visu; ! point_=false; ! } ! ! public void find(String _idx) { visu_.clearSelections(); --- 27,47 ---- public class TrFindActionDefault implements TrFindAction { ZCalqueAffichageDonnees layer_; ! TrVisuPanel visu_; boolean point_; /** * */ ! public TrFindActionDefault(TrVisuPanel _visu, MvNodeLayer _layer) { layer_= _layer; visu_= _visu; ! point_= true; } ! ! public TrFindActionDefault(TrVisuPanel _visu, MvElementLayer _layer) { ! layer_= _layer; ! visu_= _visu; ! point_= false; ! } ! public void find(String _idx) { visu_.clearSelections(); *************** *** 87,91 **** */ public boolean isEditableEnable() { ! return point_?visu_.isGridPointEditable():visu_.isGridElementEditable(); } --- 85,89 ---- */ public boolean isEditableEnable() { ! return point_ ? visu_.isGridPointEditable() : visu_.isGridElementEditable(); } *************** *** 93,98 **** * */ ! public GrBoite getZoomOnSelected() { ! return ((TrLayer)layer_).getZoomOnSelected(); } --- 91,96 ---- * */ ! public GrBoite getZoomOnSelected() { ! return ((MvLayer)layer_).getZoomOnSelected(); } *************** *** 101,106 **** */ public void editSelected() { ! if(point_) visu_.editGridPoint(); ! else visu_.editGridPoly(); } --- 99,106 ---- */ public void editSelected() { ! if (point_) ! visu_.editGridPoint(); ! else ! visu_.editGridPoly(); } Index: TrFindDialog.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrFindDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrFindDialog.java 11 Dec 2003 12:50:55 -0000 1.1 --- TrFindDialog.java 12 Feb 2004 16:15:21 -0000 1.2 *************** *** 33,38 **** import org.fudaa.ebli.geometrie.GrBoite; - import org.fudaa.fudaa.tr.TrFilleVisu; import org.fudaa.fudaa.tr.TrResource; /** * @author deniger --- 33,38 ---- import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.fudaa.tr.TrResource; + import org.fudaa.fudaa.tr.TrVisuPanel; /** * @author deniger *************** *** 50,58 **** JCheckBox cbZoom_; JCheckBox cbEdit_; ! TrFilleVisu visu_; /** * */ ! public TrFindDialog(TrFilleVisu _visu,TrFindAction[] _act) { setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); visu_=_visu; --- 50,58 ---- JCheckBox cbZoom_; JCheckBox cbEdit_; ! TrVisuPanel visu_; /** * */ ! public TrFindDialog(TrVisuPanel _visu,TrFindAction[] _act) { setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); visu_=_visu; --- TrElementLayer.java DELETED --- --- TrElementNumberLayer.java DELETED --- --- TrElementNumberModel.java DELETED --- --- TrElementNumberModelDefault.java DELETED --- --- TrGridLayerGroup.java DELETED --- --- TrLayer.java DELETED --- --- TrLayerGroup.java DELETED --- --- TrModelePolygone.java DELETED --- --- TrPanelInfo.java DELETED --- --- TrPanelInfoSender.java DELETED --- --- TrPanelInfoSenderDefault.java DELETED --- --- TrPointLayer.java DELETED --- --- TrPointModel.java DELETED --- --- TrPointNumberLayer.java DELETED --- --- TrPointNumberModel.java DELETED --- --- TrPointNumberModelDefault.java DELETED --- |
|
From: <de...@us...> - 2004-02-12 16:20:24
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/ressource In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/ressource Modified Files: fudaa_en.fr_txt Log Message: prepro 0.05 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.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** fudaa_en.fr_txt 21 Jan 2004 11:07:28 -0000 1.11 --- fudaa_en.fr_txt 12 Feb 2004 16:15:20 -0000 1.12 *************** *** 186,190 **** Virgule=Comma Point-virgule=Semicolon ! Fichier csv:File csv Mise à jour=Update ! Editer le contenu du fichier=Edit the file \ No newline at end of file --- 186,210 ---- Virgule=Comma Point-virgule=Semicolon ! Fichier csv=File csv Mise à jour=Update ! Editer le contenu du fichier=Edit the file ! 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 ! Contröles=Controls \ No newline at end of file |
|
From: <de...@us...> - 2004-02-12 16:20:24
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/reflux Modified Files: RefluxFillePost.java RefluxMaillage.java RefluxModeleNoeud.java Log Message: prepro 0.05 Index: RefluxFillePost.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux/RefluxFillePost.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** RefluxFillePost.java 25 Nov 2003 10:14:06 -0000 1.9 --- RefluxFillePost.java 12 Feb 2004 16:15:20 -0000 1.10 *************** *** 46,50 **** public class RefluxFillePost extends ZEbliFilleCalques ! implements RefluxDataChangeListener, ZSelectionListener { /** Numéro de fenêtre, incrémenté à chaque création. Ce numéro ne sert que --- 46,50 ---- public class RefluxFillePost extends ZEbliFilleCalques ! implements RefluxDataChangeListener, ZSelectionListener,TreeSelectionListener { /** Numéro de fenêtre, incrémenté à chaque création. Ce numéro ne sert que *************** *** 108,112 **** cqLeg_.setForeground(Color.blue); // cqRoot.add(cqLeg_); ! addCalque(cqLeg_); // Calque des noeuds cqNds_= new ZCalquePoint(); --- 108,112 ---- cqLeg_.setForeground(Color.blue); // cqRoot.add(cqLeg_); ! pn_.addCalque(cqLeg_); // Calque des noeuds cqNds_= new ZCalquePoint(); *************** *** 137,140 **** --- 137,141 ---- _ac.setRootVisible(false); _ac.setModel(getArbreCalqueModel()); + _ac.addTreeSelectionListener(this); } /** *************** *** 269,273 **** public void ajouteResultat(int _type) { // BCalque cqRoot=getVueCalque().getCalque(); ! BCalque cqRoot= gcDonnees_; String nom= Definitions.resultToString(_type); if (cqRoot.getCalqueParTitre(nom) != null) --- 270,274 ---- public void ajouteResultat(int _type) { // BCalque cqRoot=getVueCalque().getCalque(); ! BCalque cqRoot= getDonneesCalque(); String nom= Definitions.resultToString(_type); if (cqRoot.getCalqueParTitre(nom) != null) *************** *** 300,304 **** public void ajouteVecteur() { // BCalque cqRoot=getVueCalque().getCalque(); ! BCalque cqRoot= gcDonnees_; String nom= "Vecteurs"; if (cqRoot.getCalqueParTitre(nom) != null) --- 301,305 ---- public void ajouteVecteur() { // BCalque cqRoot=getVueCalque().getCalque(); ! BCalque cqRoot= getDonneesCalque(); String nom= "Vecteurs"; if (cqRoot.getCalqueParTitre(nom) != null) *************** *** 356,360 **** */ public void valueChanged(TreeSelectionEvent _evt) { ! super.valueChanged(_evt); try { cqActif_= (BCalque)_evt.getNewLeadSelectionPath().getLastPathComponent(); --- 357,361 ---- */ public void valueChanged(TreeSelectionEvent _evt) { ! // super.valueChanged(_evt); try { cqActif_= (BCalque)_evt.getNewLeadSelectionPath().getLastPathComponent(); Index: RefluxMaillage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux/RefluxMaillage.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RefluxMaillage.java 25 Nov 2003 10:14:06 -0000 1.4 --- RefluxMaillage.java 12 Feb 2004 16:15:20 -0000 1.5 *************** *** 1,4 **** --- 1,5 ---- package org.fudaa.fudaa.reflux; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.calque.ZModeleDonneesListener; import org.fudaa.ebli.calque.ZModeleMaillage; import java.util.Hashtable; *************** *** 51,53 **** --- 52,59 ---- return conns; } + /** + * + */ + public void setListener(ZModeleDonneesListener _l) {} + } \ No newline at end of file Index: RefluxModeleNoeud.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/reflux/RefluxModeleNoeud.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RefluxModeleNoeud.java 25 Nov 2003 10:14:06 -0000 1.4 --- RefluxModeleNoeud.java 12 Feb 2004 16:15:20 -0000 1.5 *************** *** 39,41 **** --- 39,43 ---- } /// >>> ZModelePoint --------------------------------------------------------- + public void setListener(ZModeleDonneesListener _l) {} + } \ No newline at end of file |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/meshviewer Added Files: Mv.java MvAct.java MvActCheck.java MvActCheckDefault.java MvActClose.java MvActLoad.java MvActLoadDefault.java MvActModify.java MvActModifyDefault.java MvActSave.java MvActView.java MvActViewDefault.java MvControllerSrc.java MvFrameContentDefault.java MvItemAction.java MvItemActionUI.java MvItemActionsPanel.java MvPanelLayer.java MvPanelMain.java MvPanelViewer.java MvParentInterface.java MvProgressAdapter.java MvTask.java Log Message: prepro 0.05 --- NEW FILE: Mv.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvAct.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActCheck.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActCheckDefault.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActClose.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActLoad.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActLoadDefault.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActModify.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActModifyDefault.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActSave.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActView.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvActViewDefault.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvControllerSrc.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvFrameContentDefault.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvItemAction.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvItemActionUI.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvItemActionsPanel.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvPanelLayer.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvPanelMain.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvPanelViewer.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvParentInterface.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvProgressAdapter.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvTask.java --- (This appears to be a binary file; contents omitted.) |
|
From: <de...@us...> - 2004-02-12 16:20:24
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/test/tr Modified Files: TestTelemacCasViewer.java TestTrMaillage.java Log Message: prepro 0.05 Index: TestTelemacCasViewer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr/TestTelemacCasViewer.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TestTelemacCasViewer.java 25 Nov 2003 10:14:28 -0000 1.9 --- TestTelemacCasViewer.java 12 Feb 2004 16:15:20 -0000 1.10 *************** *** 16,21 **** import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.telemac.io.Telemac2dFileFormat; ! import org.fudaa.fudaa.dico.FDicoEntitePanel; ! import org.fudaa.fudaa.dico.FDicoEntiteTableModel; import org.fudaa.fudaa.tr.TrPreferences; import org.fudaa.fudaa.tr.telemac.TrTelemacProjectFactory; --- 16,21 ---- import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.telemac.io.Telemac2dFileFormat; ! import org.fudaa.fudaa.fdico.FDicoEntitePanel; ! import org.fudaa.fudaa.fdico.FDicoEntiteTableModel; import org.fudaa.fudaa.tr.TrPreferences; import org.fudaa.fudaa.tr.telemac.TrTelemacProjectFactory; Index: TestTrMaillage.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/test/tr/TestTrMaillage.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TestTrMaillage.java 25 Nov 2003 10:14:28 -0000 1.8 --- TestTrMaillage.java 12 Feb 2004 16:15:20 -0000 1.9 *************** *** 27,31 **** import org.fudaa.ebli.calque.ZEbliFilleCalques; import org.fudaa.ebli.trace.TracePoint; ! import org.fudaa.fudaa.tr.data.TrGridLayerGroup; /** * @author deniger --- 27,32 ---- import org.fudaa.ebli.calque.ZEbliFilleCalques; import org.fudaa.ebli.trace.TracePoint; ! ! import org.fudaa.fudaa.meshviewer.layer.MvGridLayerGroup; /** * @author deniger *************** *** 39,49 **** * */ ! public TestTrMaillage(TrGridLayerGroup _maillage) { BGroupeCalque gc= new BGroupeCalque(); gc.setTitle("Mailleur"); ! ZCalquePoint zpt= new ZCalquePoint(_maillage.getModelePoint()); ! ZCalquePolygone zpoly= new ZCalquePolygone(_maillage.getModelePolygone()); ! ZCalqueLongPolygone zlpoly= ! new ZCalqueLongPolygone(_maillage.getModeleBord()); zpt.setIcone(TracePoint.getIcone(TracePoint.POINT, 1, Color.black)); zpt.setName("cqPOINTMAILLEUR"); --- 40,48 ---- * */ ! public TestTrMaillage(MvGridLayerGroup _maillage) { BGroupeCalque gc= new BGroupeCalque(); gc.setTitle("Mailleur"); ! ZCalquePoint zpt= _maillage.getPointLayer(); ! ZCalquePolygone zpoly= _maillage.getPolygonLayer(); zpt.setIcone(TracePoint.getIcone(TracePoint.POINT, 1, Color.black)); zpt.setName("cqPOINTMAILLEUR"); *************** *** 51,55 **** gc.add(zpt); gc.add(zpoly); - gc.add(zlpoly); fc_= new ZEbliFilleCalques(gc); vue_= fc_.getVueCalque(); --- 50,53 ---- *************** *** 81,88 **** System.out.println("fin Lecture"); if (op.containsFatalError()) { ! op.getAnalyze().toAnalyze().printResume("!! "); System.exit(1); } else if (op.containsMessages()) { ! op.getAnalyze().toAnalyze().printResume(" "); } // TrMaillage maillage = --- 79,86 ---- System.out.println("fin Lecture"); if (op.containsFatalError()) { ! op.getAnalyze().printResume("!! "); System.exit(1); } else if (op.containsMessages()) { ! op.getAnalyze().printResume(" "); } // TrMaillage maillage = *************** *** 91,98 **** System.out.println(inter.getPtsFrontiere()[0]); long t1= System.currentTimeMillis(); ! inter.getMaillage().computeBord(null); long t2= System.currentTimeMillis(); System.out.println("temps " + (t2 - t1)); ! TrGridLayerGroup maillage= new TrGridLayerGroup(inter.getMaillage()); TestTrMaillage test= new TestTrMaillage(maillage); JFrame frame= new JFrame("Essai"); --- 89,96 ---- System.out.println(inter.getPtsFrontiere()[0]); long t1= System.currentTimeMillis(); ! inter.getGrid().computeBord(null); long t2= System.currentTimeMillis(); System.out.println("temps " + (t2 - t1)); ! MvGridLayerGroup maillage= new MvGridLayerGroup(inter.getGrid()); TestTrMaillage test= new TestTrMaillage(maillage); JFrame frame= new JFrame("Essai"); |
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/dico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31841/dico Removed Files: FDIcoFiltreChooserMode.java FDicoBooleanCellEditor.java FDicoCalculLocal.java FDicoChooserPanel.java FDicoComparator.java FDicoEditorInterface.java FDicoEntiteFile.java FDicoEntiteFileTableModelInterface.java FDicoEntitePanel.java FDicoEntiteTableModel.java FDicoFilleProjet.java FDicoFiltre.java FDicoFiltreChooserAbstract.java FDicoFiltreChooserListAbstract.java FDicoFiltreChooserModified.java FDicoFiltreChooserName.java FDicoFiltreChooserRubrique.java FDicoFiltreChooserSimple.java FDicoFiltreController.java FDicoFiltreEntiteList.java FDicoImplementation.java FDicoMultiEntiteViewer.java FDicoNewProjectPanel.java FDicoParams.java FDicoPreferences.java FDicoProjectPanel.java FDicoProjet.java FDicoProjetInterface.java FDicoResource.java FDicoTableColumn.java FDicoTableColumnIdentifier.java FDicoTableEditorChooser.java FDicoTableRendererChooser.java FDicoTableSortIndicator.java FdicoLib.java fdico_en.fr_txt Log Message: prepro 0.05 --- FDIcoFiltreChooserMode.java DELETED --- --- FDicoBooleanCellEditor.java DELETED --- --- FDicoCalculLocal.java DELETED --- --- FDicoChooserPanel.java DELETED --- --- FDicoComparator.java DELETED --- --- FDicoEditorInterface.java DELETED --- --- FDicoEntiteFile.java DELETED --- --- FDicoEntiteFileTableModelInterface.java DELETED --- --- FDicoEntitePanel.java DELETED --- --- FDicoEntiteTableModel.java DELETED --- --- FDicoFilleProjet.java DELETED --- --- FDicoFiltre.java DELETED --- --- FDicoFiltreChooserAbstract.java DELETED --- --- FDicoFiltreChooserListAbstract.java DELETED --- --- FDicoFiltreChooserModified.java DELETED --- --- FDicoFiltreChooserName.java DELETED --- --- FDicoFiltreChooserRubrique.java DELETED --- --- FDicoFiltreChooserSimple.java DELETED --- --- FDicoFiltreController.java DELETED --- --- FDicoFiltreEntiteList.java DELETED --- --- FDicoImplementation.java DELETED --- --- FDicoMultiEntiteViewer.java DELETED --- --- FDicoNewProjectPanel.java DELETED --- --- FDicoParams.java DELETED --- --- FDicoPreferences.java DELETED --- --- FDicoProjectPanel.java DELETED --- --- FDicoProjet.java DELETED --- --- FDicoProjetInterface.java DELETED --- --- FDicoResource.java DELETED --- --- FDicoTableColumn.java DELETED --- --- FDicoTableColumnIdentifier.java DELETED --- --- FDicoTableEditorChooser.java DELETED --- --- FDicoTableRendererChooser.java DELETED --- --- FDicoTableSortIndicator.java DELETED --- --- FdicoLib.java DELETED --- --- fdico_en.fr_txt DELETED --- |
|
From: <de...@us...> - 2004-02-12 16:13:13
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30669/fdico Log Message: Directory /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico added to the repository |
|
From: <de...@us...> - 2004-02-12 16:13:13
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30669/meshviewer Log Message: Directory /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer added to the repository |
|
From: <de...@us...> - 2004-02-12 16:04:27
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28655/test Modified Files: TestGr.java Log Message: Maj prepro 0.05 Index: TestGr.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/test/TestGr.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestGr.java 25 Nov 2003 10:06:47 -0000 1.4 --- TestGr.java 12 Feb 2004 15:58:52 -0000 1.5 *************** *** 8,15 **** --- 8,19 ---- */ package org.fudaa.ebli.test; + import org.fudaa.ctulu.CtuluGeometrie; + import org.fudaa.ebli.commun.EbliLib; import org.fudaa.ebli.commun.EbliListeSelection; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; + import org.fudaa.ebli.geometrie.GrPolygone; + import org.fudaa.ebli.geometrie.GrPolyligne; import org.fudaa.ebli.geometrie.GrSegment; import junit.framework.TestCase; *************** *** 102,108 **** public void testNorme() { GrPoint p= new GrPoint(1, 1, 1); ! GrPoint p1= new GrPoint(-1, 100, 11); ! assertEquals(p.distance(p1), p.distanceFast(p1), 1e-15); ! assertEquals(p.distanceXY(p1), p.distanceXYFast(p1), 1e-15); } } --- 106,145 ---- public void testNorme() { GrPoint p= new GrPoint(1, 1, 1); ! GrPoint p1= new GrPoint(101, 101, 1); ! assertEquals(Math.sqrt(20000),p.distance(p1), 1e-15); ! assertEquals(Math.sqrt(20000),p.distanceXY(p1), 1e-15); ! } ! ! public void testDistanceSegment() { ! GrPoint p= new GrPoint(0, 0, 0); ! GrPoint p1= new GrPoint(0, 5, 0); ! GrPoint p2= new GrPoint(5, 0, 0); ! GrSegment s= new GrSegment(p1, p2); ! assertEquals(Math.sqrt(2)*5d/2d,s.distanceXY(p), 1e-15); ! GrPoint pTest=new GrPoint(-5,10,0); ! assertEquals(Math.sqrt(50),s.distanceXY(pTest), 1e-15); ! pTest=new GrPoint(10,-5,0); ! assertEquals(Math.sqrt(50),s.distanceXY(pTest), 1e-15); ! GrPolygone poly= new GrPolygone(); ! poly.sommets.ajoute(p); ! poly.sommets.ajoute(p1); ! poly.sommets.ajoute(p2); ! GrPoint p4= new GrPoint(1, 1, 1); ! assertEquals(1d,poly.distanceXY(p4), 1e-15); ! p4= new GrPoint(5, 5, 1); ! assertEquals(Math.sqrt(2)*5d/2d,poly.distanceXY(p4), 1e-15); ! p4= new GrPoint(3, -1, 1); ! assertEquals(1,poly.distanceXY(p4), 1e-15); ! p4= new GrPoint(-2, 3, 1); ! assertEquals(2,poly.distanceXY(p4), 1e-15); ! GrPolyligne li=poly.toGrPolyligne(); ! p4= new GrPoint(5, 5, 1); ! assertEquals(Math.sqrt(2)*5d/2d,li.distanceXY(p4), 1e-15); ! p4= new GrPoint(-2, 3, 1); ! assertEquals(2,li.distanceXY(p4), 1e-15); ! p4= new GrPoint(3, -2, 1); ! assertEquals(Math.sqrt(8),li.distanceXY(p4), 1e-15); ! ! } } |
|
From: <de...@us...> - 2004-02-12 16:04:27
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/trace In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28655/trace Modified Files: TraceSurface.java Log Message: Maj prepro 0.05 Index: TraceSurface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/trace/TraceSurface.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TraceSurface.java 25 Nov 2003 10:06:48 -0000 1.4 --- TraceSurface.java 12 Feb 2004 15:58:52 -0000 1.5 *************** *** 84,87 **** --- 84,91 ---- couleurPremierPlan_= Color.black; } + + public final void setGraphics(Graphics2D _g){ + g_=_g; + } /** * Renvoie le texturePaint correspondant. |
|
From: <de...@us...> - 2004-02-12 16:04:08
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28655/impression Modified Files: EbliFilleImprimable.java Log Message: Maj prepro 0.05 Index: EbliFilleImprimable.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/impression/EbliFilleImprimable.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EbliFilleImprimable.java 25 Nov 2003 10:06:44 -0000 1.6 --- EbliFilleImprimable.java 12 Feb 2004 15:58:52 -0000 1.7 *************** *** 75,80 **** } public String[] getEnabledActions() { ! String[] r= new String[] { "IMPRIMER", "MISEENPAGE", "PREVISUALISER" }; ! return r; } public void setInformationsSoftware(BuInformationsSoftware _is) { --- 75,79 ---- } public String[] getEnabledActions() { ! return new String[] { "IMPRIMER", "MISEENPAGE", "PREVISUALISER" }; } public void setInformationsSoftware(BuInformationsSoftware _is) { |
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28655/geometrie Modified Files: GrBoite.java GrMaillageElement.java GrPoint.java GrPolygone.java GrPolyligne.java GrSegment.java Log Message: Maj prepro 0.05 Index: GrBoite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrBoite.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GrBoite.java 11 Dec 2003 12:41:52 -0000 1.6 --- GrBoite.java 12 Feb 2004 15:58:52 -0000 1.7 *************** *** 78,81 **** --- 78,91 ---- return (new GrSegment(o, e)).milieu(); } + + /** + * Calcul le barycentre en x,y et stocke les valeurs dans p. + * Ne fait aucun test sur les points. + */ + public final void barycentreXY(GrPoint p){ + p.x=(o.x+e.x)/2; + p.y=(o.y+e.y)/2; + } + public final double volume() { return Math.abs(o.x - e.x) * Math.abs(o.x - e.x) * Math.abs(o.x - e.x); Index: GrMaillageElement.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrMaillageElement.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GrMaillageElement.java 25 Nov 2003 10:06:41 -0000 1.5 --- GrMaillageElement.java 12 Feb 2004 15:58:52 -0000 1.6 *************** *** 10,13 **** --- 10,15 ---- import java.awt.*; import java.util.*; + + import org.fudaa.ebli.calque.ZModeleDonnesAbstract; import org.fudaa.ebli.commun.*; import org.fudaa.ebli.mathematiques.*; *************** *** 19,23 **** * @author Guillaume Desnoix */ ! public class GrMaillageElement extends GrObjet { private ListeGrNoeud noeuds_; private ListeGrElement elements_; --- 21,25 ---- * @author Guillaume Desnoix */ ! public class GrMaillageElement extends GrObjet { private ListeGrNoeud noeuds_; private ListeGrElement elements_; Index: GrPoint.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPoint.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GrPoint.java 25 Nov 2003 10:06:42 -0000 1.7 --- GrPoint.java 12 Feb 2004 15:58:52 -0000 1.8 *************** *** 73,86 **** } public final double distance(GrPoint p) { ! return soustraction(p).norme(); ! } ! public final double distanceFast(GrPoint p) { return Math.sqrt( (x - p.x) * (x - p.x) + (y - p.y) * (y - p.y) + (z - p.z) * (z - p.z)); } public final double distanceXY(GrPoint p) { ! return (new GrVecteur(x - p.x, y - p.y, 0.)).normeXY(); ! } ! public final double distanceXYFast(GrPoint p) { return Math.sqrt((x - p.x) * (x - p.x) + (y - p.y) * (y - p.y)); } --- 73,82 ---- } public final double distance(GrPoint p) { ! // return Math.sqrt( (x - p.x) * (x - p.x) + (y - p.y) * (y - p.y) + (z - p.z) * (z - p.z)); } public final double distanceXY(GrPoint p) { ! // return (new GrVecteur(x - p.x, y - p.y, 0.)).normeXY(); return Math.sqrt((x - p.x) * (x - p.x) + (y - p.y) * (y - p.y)); } *************** *** 118,121 **** --- 114,119 ---- return new Point((int)x, (int)y); } + + /** * Indique si l'objet est sélectionné pour un point donné. *************** *** 157,161 **** int _dist, GrPoint _pRef) { ! return _pTest.distanceXYFast(_pRef) < _dist; } } --- 155,159 ---- int _dist, GrPoint _pRef) { ! return _pTest.distanceXY(_pRef) < _dist; } } Index: GrPolygone.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPolygone.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GrPolygone.java 11 Dec 2003 12:41:52 -0000 1.7 --- GrPolygone.java 12 Feb 2004 15:58:52 -0000 1.8 *************** *** 10,13 **** --- 10,16 ---- import java.awt.*; import javax.swing.DefaultListSelectionModel; + + import org.fudaa.ctulu.CtuluGeometrie; + import org.fudaa.ebli.mathematiques.*; /** *************** *** 110,118 **** } public final GrPoint centre() { ! GrPoint r=new GrPoint(); centre(r); return r; } ! public final void centre(GrPoint _p) { double x= 0., y= 0., z= 0.; --- 113,121 ---- } public final GrPoint centre() { ! GrPoint r= new GrPoint(); centre(r); return r; } ! public final void centre(GrPoint _p) { double x= 0., y= 0., z= 0.; *************** *** 129,133 **** _p.setCoordonnees(x / qt, y / qt, z / qt); } ! public boolean estConvexe() { int n= nombre(); --- 132,136 ---- _p.setCoordonnees(x / qt, y / qt, z / qt); } ! public boolean estConvexe() { int n= nombre(); *************** *** 321,329 **** int _dist, GrPoint _pt) { ! GrPolygone p= applique(_ecran); ! if (p.contientXY(_pt)) ! return true; ! // Pour le controle de distance de tolérance autour du polygone. ! return toGrPolyligne().estSelectionne(_ecran, _dist, _pt); } public static final boolean estSelectionne( --- 324,328 ---- int _dist, GrPoint _pt) { ! return estSelectionne(applique(_ecran), _dist, _pt); } public static final boolean estSelectionne( *************** *** 337,348 **** } /** ! * Renvoie true si <code>_p</code> est ENTIEREMENT * dans le polygone de ref <code>_polyRef</code>. ! * @param _p le polygone a tester. */ public static final boolean estSelectionne( GrPolygone _poly, ! GrPolygone _polyolyRef) { ! GrBoite polyRefBoite= _polyolyRef.boite(); if (!polyRefBoite.contientXY(_poly.boite())) return false; --- 336,347 ---- } /** ! * Renvoie true si <code>_poly</code> est ENTIEREMENT * dans le polygone de ref <code>_polyRef</code>. ! * @param _poly le polygone a tester. */ public static final boolean estSelectionne( GrPolygone _poly, ! GrPolygone _polyRef) { ! GrBoite polyRefBoite= _polyRef.boite(); if (!polyRefBoite.contientXY(_poly.boite())) return false; *************** *** 354,361 **** if (p == null) continue; ! if (!_polyolyRef.contientXY(p)) return false; segment= _poly.cote(i); ! if (_polyolyRef.intersectionXY(segment) != null) return false; } --- 353,360 ---- if (p == null) continue; ! if (!_polyRef.contientXY(p)) return false; segment= _poly.cote(i); ! if (_polyRef.intersectionXY(segment) != null) return false; } *************** *** 413,420 **** */ public double distanceXY(GrPoint p) { ! double dmin= Double.MAX_VALUE; int n= nombre(); ! for (int i= 0; i < n - 1; i++) { ! double d= cote(i).distanceXY(p); if (d < dmin) { dmin= d; --- 412,452 ---- */ public double distanceXY(GrPoint p) { ! // double dmin= Double.MAX_VALUE; ! // int n= nombre(); ! // for (int i= 0; i < n; i++) { ! // double d= cote(i).distanceXY(p); ! // if (d < dmin) { ! // dmin= d; ! // if (dmin == 0.) ! // break; ! // } ! // } ! // return dmin; ! // } ! // ! // public double distanceXYFast(GrPoint p) { ! int n= nombre(); ! if (n == 0) ! return 0; ! double x= p.x; ! double y= p.y; ! double dmin= ! CtuluGeometrie.distanceFromSegment( ! sommet(0).x, ! sommet(0).y, ! sommet(n - 1).x, ! sommet(n - 1).y, ! x, ! y); ! double d; ! for (int i= n-1; i>0; i--) { ! d= CtuluGeometrie.distanceFromSegment( ! sommet(i).x, ! sommet(i).y, ! sommet(i - 1).x, ! sommet(i - 1).y, ! x, ! y); if (d < dmin) { dmin= d; *************** *** 425,428 **** --- 457,461 ---- return dmin; } + /** * Teste, en XY, si le point <code>(_x,_y)</code> est contenu dans ce polygone. Index: GrPolyligne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrPolyligne.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** GrPolyligne.java 25 Nov 2003 10:06:42 -0000 1.4 --- GrPolyligne.java 12 Feb 2004 15:58:52 -0000 1.5 *************** *** 10,13 **** --- 10,16 ---- import java.io.*; import javax.swing.DefaultListSelectionModel; + + import org.fudaa.ctulu.CtuluGeometrie; + import java.awt.Point; import java.awt.geom.*; *************** *** 222,227 **** double dmin= Double.MAX_VALUE; int n= nombre(); ! for (int i= 0; i < n - 1; i++) { ! double d= segment(i).distanceXY(p); if (d < dmin) { dmin= d; --- 225,241 ---- double dmin= Double.MAX_VALUE; int n= nombre(); ! double x= p.x; ! double y= p.y; ! for (int i= n-2; i>=0; i--) { ! double d= ! CtuluGeometrie.distanceFromSegment( ! sommet(i).x, ! sommet(i).y, ! sommet(i + 1).x, ! sommet(i + 1).y, ! x, ! y); ! ! // segment(i).distanceXY(p); if (d < dmin) { dmin= d; Index: GrSegment.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/geometrie/GrSegment.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GrSegment.java 25 Nov 2003 10:06:42 -0000 1.6 --- GrSegment.java 12 Feb 2004 15:58:52 -0000 1.7 *************** *** 10,13 **** --- 10,17 ---- import java.io.*; import java.awt.*; + + import org.fudaa.ctulu.CtuluGeometrie; + import org.fudaa.ctulu.CtuluLib; + import org.fudaa.ebli.mathematiques.*; /** *************** *** 73,92 **** return o.distance(e); } /** ! * Calcul de la distance d'un point au segment en 2D (plan x,y). Cherche le ! * point le plus proche sur le segment pour le calcul de cette distance. */ ! public final double distanceXY(GrPoint p) { ! /* ! double d=p.soustraction(o).projectionXY().division(vecteur().projectionXY()); ! ! if(d<=0.) ! return o.distanceXY(p); ! else if(d>=1.) ! return e.distanceXY(p); ! else ! return o.addition(vecteur().multiplication(d)).distanceXY(p); ! */ ! return pointPlusProcheXY(p).distanceXY(p); } /** --- 77,89 ---- return o.distance(e); } + + /** ! * Calcul la distance avec le point _p. ! * */ ! public final double distanceXY(GrPoint p){ ! // return pointPlusProcheXY(p).distanceXY(p); ! return CtuluGeometrie.distanceFromSegment(e.x, e.y, o.x, o.y, p.x, p.y); } /** |
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/commun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28655/commun Modified Files: EbliListeSelection.java EbliListeSelectionInterface.java EbliListeSelectionMultiInterface.java Log Message: Maj prepro 0.05 Index: EbliListeSelection.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliListeSelection.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EbliListeSelection.java 25 Nov 2003 10:06:39 -0000 1.9 --- EbliListeSelection.java 12 Feb 2004 15:58:51 -0000 1.10 *************** *** 345,357 **** */ public int length() { ! if (index_.length() == 0) ! return 0; ! int m= getMaxIndex(); ! int r= 0; ! for (int i= getMinIndex(); i <= m; i++) { ! if (index_.get(i)) ! r++; ! } ! return r; } public boolean isOnlyOnIndexSelected() { --- 345,349 ---- */ public int length() { ! return getNbSelectedIndex(); } public boolean isOnlyOnIndexSelected() { Index: EbliListeSelectionInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliListeSelectionInterface.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EbliListeSelectionInterface.java 25 Nov 2003 10:06:40 -0000 1.3 --- EbliListeSelectionInterface.java 12 Feb 2004 15:58:51 -0000 1.4 *************** *** 18,22 **** public int getMaxIndex(); public int[] getSelectedIndex(); ! public int length(); public boolean isOnlyOnIndexSelected(); } --- 18,22 ---- public int getMaxIndex(); public int[] getSelectedIndex(); ! public int getNbSelectedIndex(); public boolean isOnlyOnIndexSelected(); } Index: EbliListeSelectionMultiInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/commun/EbliListeSelectionMultiInterface.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliListeSelectionMultiInterface.java 25 Nov 2003 10:06:40 -0000 1.2 --- EbliListeSelectionMultiInterface.java 12 Feb 2004 15:58:51 -0000 1.3 *************** *** 17,19 **** --- 17,21 ---- public int[] getIdxSelected(); public boolean isEmpty(); + public int isSelectionInOneBloc(); + public int getNbSelectedItem(); } |
|
From: <de...@us...> - 2004-02-12 16:04:08
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28655/calque/action Modified Files: EbliComponentFactory.java Added Files: EbliShowPanelAction.java Log Message: Maj prepro 0.05 --- NEW FILE: EbliShowPanelAction.java --- (This appears to be a binary file; contents omitted.) Index: EbliComponentFactory.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/action/EbliComponentFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EbliComponentFactory.java 21 Jan 2004 11:02:18 -0000 1.3 --- EbliComponentFactory.java 12 Feb 2004 15:58:51 -0000 1.4 *************** *** 9,18 **** package org.fudaa.ebli.calque.action; import java.awt.Insets; import javax.swing.AbstractButton; - import javax.swing.Action; import javax.swing.JButton; import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JToggleButton; import com.memoire.bu.BuButton; import com.memoire.bu.BuCheckBoxMenuItem; --- 9,20 ---- package org.fudaa.ebli.calque.action; import java.awt.Insets; + import javax.swing.AbstractButton; import javax.swing.JButton; import javax.swing.JMenu; import javax.swing.JMenuItem; + import javax.swing.JPopupMenu; import javax.swing.JToggleButton; + import com.memoire.bu.BuButton; import com.memoire.bu.BuCheckBoxMenuItem; *************** *** 89,91 **** --- 91,102 ---- } } + + public void addActionsToMenu(EbliActionInterface[] _acs, JPopupMenu _dest) { + if ((_acs != null) && (_dest != null)) { + int n= _acs.length; + for (int i= 0; i < n; i++) { + _dest.add(_acs[i].buildMenuItem(this)); + } + } + } } |
|
From: <de...@us...> - 2004-02-12 16:03:55
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28655/dialog Modified Files: EbliSimpleDialogPanel.java Log Message: Maj prepro 0.05 Index: EbliSimpleDialogPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/EbliSimpleDialogPanel.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** EbliSimpleDialogPanel.java 21 Jan 2004 11:02:19 -0000 1.13 --- EbliSimpleDialogPanel.java 12 Feb 2004 15:58:52 -0000 1.14 *************** *** 357,361 **** * le label est ajoute a ce panel. */ ! protected JTextField addLabelFileChooserPanel( String _label, boolean _labelInSamePanel) { --- 357,361 ---- * le label est ajoute a ce panel. */ ! public JTextField addLabelFileChooserPanel( String _label, boolean _labelInSamePanel) { *************** *** 367,376 **** _labelInSamePanel); } ! protected JTextField addLabelFileChooserPanel( String _label, String _initValue) { return addLabelFileChooserPanel(this, _label, _initValue, false, false); } ! protected JTextField addLabelFileChooserPanel( String _label, String _initValue, --- 367,376 ---- _labelInSamePanel); } ! public JTextField addLabelFileChooserPanel( String _label, String _initValue) { return addLabelFileChooserPanel(this, _label, _initValue, false, false); } ! public JTextField addLabelFileChooserPanel( String _label, String _initValue, *************** *** 402,406 **** * le label est ajoute en premier au container <code>_c</code>. */ ! protected JTextField addLabelFileChooserPanel( Container _c, String _label, --- 402,406 ---- * le label est ajoute en premier au container <code>_c</code>. */ ! public JTextField addLabelFileChooserPanel( Container _c, String _label, |
|
From: <de...@us...> - 2004-02-12 15:50:34
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/trigrid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25002 Added Files: TrigridFileFormat.java TrigridReader.java TrigridWriter.java Log Message: Ajout de trigrid --- NEW FILE: TrigridFileFormat.java --- /* * @file TrFileFormatCorEleBth.java * @creation 13 mars 2003 * @modification $Date: 2004/02/12 15:45:32 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.trigrid; import java.io.File; import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.ef.FileFormatGridVersion; import org.fudaa.dodico.fichiers.FileFormat; import org.fudaa.dodico.fichiers.FileFormatSoftware; import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** * * @author deniger * @version $Id: TrigridFileFormat.java,v 1.1 2004/02/12 15:45:32 deniger Exp $ */ public class TrigridFileFormat extends FileFormat { public static int NB_FILE= 1; private static final TrigridFileFormat INSTANCE= new TrigridFileFormat(); public static final TrigridFileFormat getInstance() { return INSTANCE; } protected TrigridFileFormat() { super(NB_FILE); extensions_= new String[] { "ngh" }; ID_= "TRIGRID"; nom_= "Trigrid (ngh)"; description_= CtuluLib.EMPTY_STRING; mode_= MODE_ASCII; software_= FileFormatSoftware.TELEMAC_IS; type_= H2dFileFormatType.MAILLAGE.getId(); } public FileFormatVersion getLastVersionInstance() { return getLastVersionImpl(); } public class TrigridVersion extends FileFormatVersion implements FileFormatGridVersion { public TrigridVersion(String _version) { super(getInstance(), _version); } public TrigridReader createTrigridReader() { return new TrigridReader(this); } public TrigridWriter createTrigridWriter() { return new TrigridWriter(this); } public FileOperationSynthese write( File _f, EfGrid _inter, ProgressionInterface _prog) { TrigridWriter w= createTrigridWriter(); w.setFile(_f); w.setProgressReceiver(_prog); return w.write(_inter); } /** * */ public FileReadOperationAbstract createReader() { return createTrigridReader(); } /** * */ public FileWriteOperationAbstract createWriter() { return createTrigridWriter(); } /** * */ public FileOperationSynthese writeGrid( File _f, EfGridSource _m, ProgressionInterface _prog) { return write(_f, _m.getGrid(), _prog); } public FileOperationSynthese writeGrid( File _f, EfGrid _m, ProgressionInterface _prog) { return write(_f, _m, _prog); } /** * */ public FileOperationSynthese readGrid( File _f, ProgressionInterface _prog) { return read(_f, _prog); } /** * */ public FileOperationSynthese readListPoint( File _f, ProgressionInterface _prog) { FileOperationSynthese s= readGrid(_f, _prog); s.setSource(((EfGridSource)s.getSource()).getGrid()); return s; } /** * */ public boolean canWriteOnlyGrid() { return true; } } /** * */ public String getLastVersion() { return "1.0"; } public TrigridVersion getLastVersionImpl() { return new TrigridVersion(getLastVersion()); } /** * */ public boolean containsGrid() { return true; } } --- NEW FILE: TrigridReader.java --- /* * @file TrigridReader.java * @creation 27 janv. 2004 * @modification $Date: 2004/02/12 15:45:32 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.trigrid; import java.io.EOFException; import java.io.IOException; import java.util.ArrayList; import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.ef.EfElement; import org.fudaa.dodico.ef.EfElementType; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfGridMutable; import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.ef.EfGridSourceDefaut; import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.ef.EfNode; import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; /** * Un lecteur de fichier trigrid ngh. Ce lecteur se base sur les sources du projet telemac. * Le maillage lu, n'est pas forcément supervalide : il faut vérifier par exemple * que les elements soient bien orienter,etc,... * @author deniger * @version $Id: TrigridReader.java,v 1.1 2004/02/12 15:45:32 deniger Exp $ */ public class TrigridReader extends FileOpReadCharSimpleAbstract { private TrigridFileFormat.TrigridVersion version_; public TrigridReader(TrigridFileFormat.TrigridVersion _version) { version_= _version; } /** * */ protected Object _read() { return readGrid(); } private EfGridSource readGrid() { in_.setJumpBlankLine(true); in_.setCommentInOneField("!"); in_.setJumpCommentLine(true); EfNode[] pts= null; EfElement[] elt= null; try { //Premiere ligne donne le nombre de points in_.readFields(); int nbPoint= in_.intField(0); if (CtuluLib.DEBUG) CtuluLib.debug("Nb points= " + nbPoint); pts= new EfNode[nbPoint]; //2 eme ligne : le nombre max de connexion par points in_.readFields(); int nbMaxVoisin= in_.intField(0); //3 eme ligne : xmax,ymax,xmin,xmin //ignore pour l'instant in_.readFields(); //Ensuite il y nbPoint ligne de la forme //Num_du_point X Y CODE Z V1 V2 ....V(nbMaxVoisin) //m stocke pour chaque points, les voisins int[][] m= new int[nbPoint][nbMaxVoisin]; for (int i= 0; i < nbPoint; i++) { in_.readFields(); pts[i]= new EfNode( in_.doubleField(1), in_.doubleField(2), in_.doubleField(4)); for (int j= 0; j < nbMaxVoisin; j++){ m[i][j]= in_.intField(5 + j) - 1; } } //Nous allons retrouver les triangles, en suivant le fichier //fortran ngh2tri.f // NTR=0 // DO N=1,NP1 ArrayList eltList= new ArrayList(nbPoint); for (int i= 0; i < nbPoint; i++) { // DO J=1,NF1 for (int j= 0; j < nbMaxVoisin; j++) { // IF (M1(N,J).gt.N) THEN if (m[i][j] > i) { // DO K=J+1,NF1 for (int k= j; k < nbMaxVoisin; k++) { // IF (M1(N,K).gt.N) THEN // marq2=.false. // marq1=.false. if (m[i][k] > i) { boolean marq1= false; boolean marq2= false; // DO i=1,NF1 // IF (N.eq.M1(M1(N,J),i)) marq1=.true. // IF (M1(N,K).eq.M1(M1(N,J),i)) marq2=.true. // ENDDO for (int id= 0; id < nbMaxVoisin; id++) { if (i == m[m[i][j]][id]) marq1= true; if (m[i][k] == m[m[i][j]][id]) marq2= true; } // marqa=(marq1.and.marq2) // marq2=.false. // marq1=.false. boolean marqa= marq1 && marq2; marq1= false; marq2= false; //DO i=1,NF1 //IF (N.eq.M1(M1(N,K),i)) marq1=.true. //IF (M1(N,J).eq.M1(M1(N,K),i)) marq2=.true. //ENDDO for (int id= 0; id < nbMaxVoisin; id++) { if (i == m[m[i][k]][id]) marq1= true; if (m[i][j] == m[m[i][k]][id]) marq2= true; } boolean marqb= marq1 && marq2; // IF (marqa.and.marqb) THEN // NTR=NTR+1 // IKLE(NTR,1)=N // IKLE(NTR,2)=M1(N,J) // IKLE(NTR,3)=M1(N,K) if (marqa && marqb) { eltList.add( new EfElement(new int[] { i, m[i][j], m[i][k] })); } } } } } } elt=new EfElement[eltList.size()]; eltList.toArray(elt); } catch (EOFException e) { if (CtuluLib.DEBUG) CtuluLib.debug("NGH Read end"); } catch (NumberFormatException fe) { analyze_.manageException(fe, in_); } catch (IOException _e) { analyze_.manageException(_e); } if (pts != null) { EfGridMutable r=new EfGridMutable(pts, elt); r.setTypeElt(EfElementType.T3); EfLib.orienteGrid(r, progress_, true, analyze_); return new EfGridSourceDefaut(r,TrigridFileFormat.getInstance()); } return null; } /** * */ public FileFormatVersion getVersion() { return version_; } } --- NEW FILE: TrigridWriter.java --- /* * @file TrigridWriter.java * @creation 27 janv. 2004 * @modification $Date: 2004/02/12 15:45:32 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.trigrid; import java.io.IOException; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.NumberFormat; import java.util.Locale; import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.commun.ProgressionUpdater; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpWriterCharSimpleAbstract; import org.fudaa.dodico.fortran.FortranLib; import org.fudaa.dodico.fortran.FortranWriter; import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger * @version $Id: TrigridWriter.java,v 1.1 2004/02/12 15:45:32 deniger Exp $ */ public class TrigridWriter extends FileOpWriterCharSimpleAbstract { private TrigridFileFormat.TrigridVersion version_; public TrigridWriter(TrigridFileFormat.TrigridVersion _version) { version_= _version; } /** * Ecriture de l'objet _o qui doit etre un maillage EfGrid */ protected void _write(Object _o) { if (_o instanceof EfGridSource) { writeEfGrid(((EfGridSource)_o).getGrid()); } if (_o instanceof EfGrid) { writeEfGrid((EfGrid)_o); } else { analyze_.addFatalError(DodicoResource.getS("Données invalides")); } } private void writeEfGrid(EfGrid _f) { //Test sur les objets a ecrire //les donnees sont nulles if (_f == null) { analyze_.addFatalError(H2dResource.getS("Les données sont nulles")); return; } //le flux de sortie est nul if (out_ == null) { analyze_.addFatalError(DodicoResource.getS("Le flux de sortie est nul")); return; } //recherche des connexion if (progress_ != null) progress_.setDesc(DodicoResource.getS("Recherche des connexions")); int[][] connexion= EfLib.getConnexionFor(_f, progress_, analyze_); if (!analyze_.isEmpty()) { analyze_.addFatalError( DodicoResource.getS("Impossible de trouver les connexions")); return; } int max= 0; //recherche du nombre de connexion max for (int i= connexion.length - 1; i >= 0; i--) { if (connexion[i].length > max) max= connexion[i].length; } if (CtuluLib.DEBUG) CtuluLib.debug("Trigrif nb connection max= " + max); //Recherche des frontiere si necessaire if (_f.getFrontiers() == null) { if (progress_ != null) progress_.setDesc(DodicoResource.getS("Recherche des frontières")); _f.computeBord(progress_); } DecimalFormat doubleFormat= new DecimalFormat("0.000"); doubleFormat.setDecimalFormatSymbols( new DecimalFormatSymbols(Locale.ENGLISH)); if (progress_ != null) progress_.setDesc(DodicoResource.getS("Ecriture")); try { writeln(CtuluLib.getString(_f.getPtsNb())); writeln(CtuluLib.getString(max)); // 3 eme ligne : xmax,ymax,xmin,xmin writeln( doubleFormat.format(_f.getMaxPoint().getX()) + CtuluLib.ESPACE + doubleFormat.format(_f.getMaxPoint().getY()) + CtuluLib.ESPACE + doubleFormat.format(_f.getMinPoint().getX()) + CtuluLib.ESPACE + doubleFormat.format(_f.getMinPoint().getY())); int nbPt= _f.getPtsNb(); int indexMaxLength= CtuluLib.getString(nbPt).length(); int doubleMaxLength= 12; ProgressionUpdater pu= new ProgressionUpdater(progress_); pu.setValue(4, nbPt); pu.majProgessionStateOnly(); String temp; StringBuffer b= new StringBuffer(100); String zero= CtuluLib.ESPACE + FortranWriter.addSpacesBefore(indexMaxLength, CtuluLib.ZERO); for (int i= 0; i < nbPt; i++) { b.append( FortranWriter.addSpacesBefore( indexMaxLength, CtuluLib.getString(i + 1))); b.append(CtuluLib.ESPACE); temp= doubleFormat.format(_f.getPt(i).getX()); b.append(FortranWriter.addSpacesBefore(doubleMaxLength, temp)); b.append(CtuluLib.ESPACE); temp= doubleFormat.format(_f.getPt(i).getY()); b.append( FortranWriter.addSpacesBefore(doubleMaxLength, temp) + CtuluLib.ESPACE); b.append(CtuluLib.ESPACE); b.append( (_f.getFrontiers().isFrontierPoint(i) ? CtuluLib.UN : CtuluLib.ZERO) + CtuluLib.ESPACE); temp= doubleFormat.format(_f.getPt(i).getZ()); b.append(CtuluLib.ESPACE); b.append( FortranWriter.addSpacesBefore(doubleMaxLength, temp) + CtuluLib.ESPACE); for (int j= connexion[i].length - 1; j >= 0; j--) { b.append(CtuluLib.ESPACE); b.append( FortranWriter.addSpacesBefore( indexMaxLength, CtuluLib.getString(connexion[i][j] + 1))); } for (int j= max - connexion[i].length; j > 0; j--) { b.append(zero); } //Mise a jour du buffer writeln(b); pu.majAvancement(); } } catch (IOException _e) { analyze_.manageException(_e); } } /** * */ public FileFormatVersion getVersion() { return version_; } } |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20934/mnt Modified Files: MNTEntite.java MNTEntiteAbstraite.java MNTPoint.java MNTZone.java Added Files: FileFormatListMNTPoint.java ListMNTPoint.java ListMNTPointDefault.java MNTCsvFileFormat.java MNTCsvReader.java MNTCsvWriter.java MNTLib.java MNTListPointContainer.java MNTPointMutable.java Removed Files: MNTReaderInterface.java Log Message: Maj version 0.05 prepro --- NEW FILE: FileFormatListMNTPoint.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ListMNTPoint.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ListMNTPointDefault.java --- /* * @file VecteurDoubleMNTPoint.java * @creation 2002-06-25 * @modification $Date: 2004/02/12 15:32:46 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.mnt; import gnu.trove.TDoubleArrayList; /** * vecteur de MNTPoint. * * @version $Id: ListMNTPointDefault.java,v 1.1 2004/02/12 15:32:46 deniger Exp $ * @author Fred Deniger */ public final class ListMNTPointDefault implements ListMNTPoint, MNTListPointContainer { private TDoubleArrayList vecteur_; public ListMNTPointDefault() { this(11); } public ListMNTPointDefault(int _size) { vecteur_= new TDoubleArrayList(_size * 3); } public void ajoute(double _x, double _y, double _z) { vecteur_.add(_x); vecteur_.add(_y); vecteur_.add(_z); } public void ajoute(ListMNTPoint _v) { ensureCapacity(_v.nombre() * 3); MNTPointMutable m= new MNTPointMutable(); for (int i= _v.nombre() - 1; i >= 0; i--) { _v.renvoie(m, i); ajouteCoord(m); } } public void ajouteCoord(MNTPoint _p) { ajoute(_p.getX(), _p.getY(), _p.getZ()); } public boolean renvoie(MNTPointMutable _p, int _i) { int i= 3 * _i; if ((i < 0) || (i > vecteur_.size() - 3)) { return false; } _p.setLocation( vecteur_.getQuick(i), vecteur_.getQuick(i + 1), vecteur_.getQuick(i + 2)); return true; } public void ensureCapacity(int _i) { vecteur_.ensureCapacity(_i * 3); } public MNTPointMutable renvoie(int _i) { MNTPointMutable r= new MNTPointMutable(); renvoie(r, _i); return r; } public double renvoieX(int _i) { return vecteur_.getQuick(3 * _i); } public double renvoieY(int _i) { return vecteur_.getQuick(3 * _i + 1); } public double renvoieZ(int _i) { return vecteur_.getQuick(3 * _i + 2); } public boolean enleve(int _i) { int i= 3 * _i; if ((i < 0) || (i > vecteur_.size() - 3)) { return false; } vecteur_.remove(i); vecteur_.remove(i); vecteur_.remove(i); return true; } public void insere(MNTPoint _p, int _i) { insere(_p.getX(), _p.getY(), _p.getZ(), _i); } public boolean insere(double _x, double _y, double _z, int _i) { int i= 3 * _i; if ((i < 0) || (i > vecteur_.size() - 3)) { return false; } vecteur_.insert(i, _z); vecteur_.insert(i, _y); vecteur_.insert(i, _x); return true; } public void remplace(MNTPoint _p, int _i) { remplace(_p.getX(), _p.getY(), _p.getZ(), _i); } public boolean remplace(double _x, double _y, double _z, int _i) { int i= 3 * _i; if ((i < 0) || (i > vecteur_.size() - 3)) { return false; } vecteur_.set(i, _x); vecteur_.set(i + 1, _y); vecteur_.set(i + 2, _z); return true; } public int nombre() { return (int) (vecteur_.size() / 3); } public void capacite(int _i) { vecteur_.ensureCapacity(_i * 3); } public void vide() { vecteur_.clear(); } public boolean contient(double _x, double _y, double _z) { int index= 0; int indexF= vecteur_.size() - 2; for (int i= index; i < indexF; i += 3) { if ((_x == vecteur_.getQuick(i)) && (_y == vecteur_.getQuick(i + 1)) && (_z == vecteur_.getQuick(i + 2))) return true; } return false; } /** * */ public boolean fillListWithPoint(ListMNTPoint _listToFill) { if (_listToFill == null) return false; int n= nombre(); _listToFill.ensureCapacity(n); for (int i= 0; i < n; i++) { _listToFill.ajoute(renvoieX(i), renvoieY(i), renvoieZ(i)); } return true; } } --- NEW FILE: MNTCsvFileFormat.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MNTCsvReader.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MNTCsvWriter.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MNTLib.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MNTListPointContainer.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MNTPointMutable.java --- /* * @file H2dPointMutable.java * @creation 25 juin 2003 * @modification $Date: 2004/02/12 15:32:46 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.mnt; import org.fudaa.dodico.ef.EfNode; import org.fudaa.dodico.mnt.*; import org.fudaa.dodico.mnt.*; /** * @author deniger * @version $Id: MNTPointMutable.java,v 1.1 2004/02/12 15:32:46 deniger Exp $ */ public class MNTPointMutable extends EfNode { /** * @param _x * @param _y * @param _z */ public MNTPointMutable() { super(); } public MNTPointMutable(EfNode _pt) { x_= _pt.x_; y_= _pt.y_; z_= _pt.z_; } public MNTPointMutable(double _x,double _y,double _z){ super(_x,_y,_z); } public void setX(double x) { x_= x; } public void setY(double y) { y_= y; } public void setZ(double z) { z_= z; } public void setLocation(double _x,double _y,double _z){ x_=_x; y_=_y; z_=_z; } } Index: MNTEntite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/MNTEntite.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MNTEntite.java 25 Nov 2003 10:11:44 -0000 1.5 --- MNTEntite.java 12 Feb 2004 15:32:46 -0000 1.6 *************** *** 8,11 **** --- 8,14 ---- */ package org.fudaa.dodico.mnt; + + import org.fudaa.dodico.ef.*; + /** * Interface de base pour les objets composant un modele numerique de terrain. *************** *** 14,25 **** * @author Fred Deniger */ ! public interface MNTEntite { public String getNom(); public void setNom(String _s); public void ajoutePoint(double _x, double _y, double _z); public MNTPoint getPoint(int _i); ! public boolean getPoint(MNTPoint _p, int i); ! public void getPointNE(MNTPoint _p); ! public void getPointSO(MNTPoint _p); public double getX(int i); public double getY(int i); --- 17,28 ---- * @author Fred Deniger */ ! public interface MNTEntite extends MNTListPointContainer{ public String getNom(); public void setNom(String _s); public void ajoutePoint(double _x, double _y, double _z); public MNTPoint getPoint(int _i); ! public boolean getPoint(MNTPointMutable _p, int i); ! public void getPointNE(MNTPointMutable _p); ! public void getPointSO(MNTPointMutable _p); public double getX(int i); public double getY(int i); Index: MNTEntiteAbstraite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/MNTEntiteAbstraite.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MNTEntiteAbstraite.java 25 Nov 2003 10:11:44 -0000 1.4 --- MNTEntiteAbstraite.java 12 Feb 2004 15:32:46 -0000 1.5 *************** *** 8,11 **** --- 8,14 ---- */ package org.fudaa.dodico.mnt; + + import org.fudaa.dodico.ef.*; + /** * Classe abstraite de base *************** *** 14,18 **** * @author Fred Deniger */ ! public abstract class MNTEntiteAbstraite implements MNTEntite { /** */ boolean limitesAjustees_; --- 17,21 ---- * @author Fred Deniger */ ! public abstract class MNTEntiteAbstraite implements MNTEntite,MNTListPointContainer { /** */ boolean limitesAjustees_; *************** *** 20,24 **** protected String nom_; /** */ ! protected VecteurDoubleMNTPoint points_; private double xmin_; private double xmax_; --- 23,27 ---- protected String nom_; /** */ ! protected ListMNTPointDefault points_; private double xmin_; private double xmax_; *************** *** 29,33 **** /** */ public MNTEntiteAbstraite() { ! points_= new VecteurDoubleMNTPoint(30); } public void setNom(String _nom) { --- 32,36 ---- /** */ public MNTEntiteAbstraite() { ! points_= new ListMNTPointDefault(30); } public void setNom(String _nom) { *************** *** 64,68 **** public void ajoutePoints(MNTEntiteAbstraite _e) { if (points_ == null) ! points_= new VecteurDoubleMNTPoint(_e.points_.nombre() + 15); points_.ajoute(_e.points_); limitesAjustees_= false; --- 67,71 ---- public void ajoutePoints(MNTEntiteAbstraite _e) { if (points_ == null) ! points_= new ListMNTPointDefault(_e.points_.nombre() + 15); points_.ajoute(_e.points_); limitesAjustees_= false; *************** *** 71,87 **** * @param _v */ ! public void ajoutePoints(VecteurDoubleMNTPoint _v) { points_.ensureCapacity(_v.nombre() + 15); points_.ajoute(_v); limitesAjustees_= false; } ! /** ! * @param _v ! */ ! public void ajoutePoints(double[] _v) { ! points_.ensureCapacity(_v.length + 15); ! points_.ajoute(_v); ! limitesAjustees_= false; ! } /** * @param i --- 74,91 ---- * @param _v */ ! public void ajoutePoints(ListMNTPointDefault _v) { points_.ensureCapacity(_v.nombre() + 15); points_.ajoute(_v); limitesAjustees_= false; } ! ! // /** ! // * @param _v ! // */ ! // public void ajoutePoints(double[] _v) { ! // points_.ensureCapacity(_v.length + 15); ! // points_.ajoute(_v); ! // limitesAjustees_= false; ! // } /** * @param i *************** *** 89,93 **** */ public MNTPoint getPoint(int i) { ! MNTPoint r= new MNTPoint(); if (getPoint(r, i)) return r; --- 93,97 ---- */ public MNTPoint getPoint(int i) { ! MNTPointMutable r= new MNTPointMutable(); if (getPoint(r, i)) return r; *************** *** 100,104 **** * @return */ ! public boolean getPoint(MNTPoint _p, int i) { if (points_.renvoie(_p, i)) return true; --- 104,108 ---- * @return */ ! public boolean getPoint(MNTPointMutable _p, int i) { if (points_.renvoie(_p, i)) return true; *************** *** 176,180 **** * @param _p */ ! public void getPointSO(MNTPoint _p) { if (!limitesAjustees_) calculeLimites(); --- 180,184 ---- * @param _p */ ! public void getPointSO(MNTPointMutable _p) { if (!limitesAjustees_) calculeLimites(); *************** *** 184,189 **** * @return */ ! public MNTPoint getPointSO() { ! MNTPoint r= new MNTPoint(); getPointSO(r); return r; --- 188,193 ---- * @return */ ! public MNTPointMutable getPointSO() { ! MNTPointMutable r= new MNTPointMutable(); getPointSO(r); return r; *************** *** 194,203 **** * @param _p */ ! public void getPointNE(MNTPoint _p) { if (!limitesAjustees_) calculeLimites(); _p.setLocation(xmax_, ymax_, zmax_); } ! public void getPointNESO(MNTPoint _ne, MNTPoint _so) { getPointNE(_ne); getPointSO(_so); --- 198,207 ---- * @param _p */ ! public void getPointNE(MNTPointMutable _p) { if (!limitesAjustees_) calculeLimites(); _p.setLocation(xmax_, ymax_, zmax_); } ! public void getPointNESO(MNTPointMutable _ne, MNTPointMutable _so) { getPointNE(_ne); getPointSO(_so); *************** *** 206,211 **** * @return */ ! public MNTPoint getPointNE() { ! MNTPoint r= new MNTPoint(); getPointNE(r); return r; --- 210,215 ---- * @return */ ! public MNTPointMutable getPointNE() { ! MNTPointMutable r= new MNTPointMutable(); getPointNE(r); return r; *************** *** 304,306 **** --- 308,318 ---- limitesAjustees_= true; } + + /** + * + */ + public boolean fillListWithPoint(ListMNTPoint _listToFill) { + return points_.fillListWithPoint(_listToFill); + } + } Index: MNTPoint.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/MNTPoint.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MNTPoint.java 25 Nov 2003 10:11:44 -0000 1.4 --- MNTPoint.java 12 Feb 2004 15:32:46 -0000 1.5 *************** *** 1,32 **** /* ! * @file MNTPoint.java ! * @creation 2002-11-22 ! * @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.dodico.mnt; /** ! * Une classe definissant un point mnt 3D :temporaire avant passage corba. ! * @version $Id$ ! * @author Fred Deniger */ public class MNTPoint { ! private double x_; ! private double y_; ! private double z_; ! /** ! * initialise avec x=y=z=0; ! */ ! public MNTPoint() { ! this(0, 0, 0); ! } /** ! * initialise avec z=0; */ - public MNTPoint(double _x, double _y) { - this(_x, _y, 0); - } public MNTPoint(double _x, double _y, double _z) { x_= _x; --- 1,24 ---- /* ! * @file H2dPoint.java ! * @creation 25 juin 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.dodico.mnt; + + import org.fudaa.ctulu.CtuluGeometrie; + /** ! * @author deniger ! * @version $Id$ */ public class MNTPoint { ! protected double x_, y_, z_; ! public MNTPoint() {} /** ! * */ public MNTPoint(double _x, double _y, double _z) { x_= _x; *************** *** 34,50 **** z_= _z; } ! public double getX() { return x_; } ! public double getY() { return y_; } ! public double getZ() { ! return z_; } ! public void setLocation(double _x, double _y, double _z) { x_= _x; y_= _y; z_= _z; } } --- 26,127 ---- z_= _z; } ! public MNTPoint(MNTPoint _p) { ! x_= _p.x_; ! y_= _p.y_; ! z_= _p.z_; ! } ! /** ! * ! */ ! public final double getX() { return x_; } ! /** ! * ! */ ! public final double getY() { return y_; } ! ! protected void setXYZ(double _x, double _y, double _z) { ! x_= _x; ! y_= _y; ! z_= _z; } ! ! protected void setX(double _x) { x_= _x; + } + + protected void setY(double _y) { y_= _y; + } + + public final double distanceXYFromSeg(MNTPoint _seg1, MNTPoint _seg2) { + return CtuluGeometrie.distanceFromSegment( + _seg1.getX(), + _seg1.getY(), + _seg2.getX(), + _seg2.getY(), + x_, + y_); + } + + public double getDistanceXY(MNTPoint _p) { + return CtuluGeometrie.getDistance(x_, y_, _p.x_, _p.y_); + } + /** + * + */ + public final double getZ() { + return z_; + } + protected void setZ(double _z) { z_= _z; } + + /** + * Comparaison stricte des coordonnees : a eviter normalement. + */ + public boolean isSame(MNTPoint _p) { + return isSame(_p, 0); + } + + /** + * Compare les coordonnees x,y,z avec une marge _eps. + */ + public boolean isSame(MNTPoint _p, double _eps) { + return (Math.abs(x_ - _p.x_) <= _eps) + && (Math.abs(y_ - _p.y_) <= _eps) + && (Math.abs(z_ - _p.z_) <= _eps); + } + /** + * Compare les coordonnees X,Y des points avec une marge + * de <code>0</code>. + * @see #isSameXY(EfPoint, double) + */ + + public boolean isSameXY(MNTPoint _p) { + return isSameXY(_p, 0d); + } + /** + * Compare les coordonnees X,Y des points avec une marge + * de <code>_eps</code> + */ + public boolean isSameXY(MNTPoint _p, double _eps) { + return (Math.abs(x_ - _p.x_) <= _eps) && (Math.abs(y_ - _p.y_) <= _eps); + } + + public static MNTPoint createMilieu(MNTPoint _p1, MNTPoint _p2) { + return new MNTPoint( + (_p1.x_ + _p2.x_) / 2, + (_p1.y_ + _p2.y_) / 2, + (_p1.z_ + _p2.z_) / 2); + } + /** + * + */ + public String toString() { + return "H2Point(" + x_ + "," + y_ + "," + z_ + ")"; + } } Index: MNTZone.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/MNTZone.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MNTZone.java 25 Nov 2003 10:11:44 -0000 1.5 --- MNTZone.java 12 Feb 2004 15:32:46 -0000 1.6 *************** *** 8,12 **** --- 8,14 ---- */ package org.fudaa.dodico.mnt; + import java.util.List; import java.util.Vector; + /** * *************** *** 14,19 **** * @author Fred Deniger */ ! public class MNTZone //extends MNTEntiteAbstraite ! { String nom_; private MNTSemis semis_; --- 16,20 ---- * @author Fred Deniger */ ! public class MNTZone implements MNTListPointContainer { String nom_; private MNTSemis semis_; *************** *** 91,97 **** * Renvoie le nombre total d'entites avec les points. */ ! public int getNbTotalEntites() { return getNbEntites() + getNbPointsSemis(); } public boolean estVide() { return getNbTotalEntites() <= 0; --- 92,125 ---- * Renvoie le nombre total d'entites avec les points. */ ! private int getNbTotalEntites() { return getNbEntites() + getNbPointsSemis(); } + + public int getNbTotalPoint() { + return getNbPoint(polygones_) + + getNbPoint(polylignes_) + + getNbPoint(profils_) + + (semis_ == null ? 0 : semis_.getNbPoints()); + } + + public static int getNbTotalPoint(MNTZone[] _zs) { + int r= 0; + if (_zs != null) { + for (int i= _zs.length - 1; i >= 0; i--) { + r += _zs[i].getNbTotalPoint(); + } + } + return r; + } + + private static int getNbPoint(List _l) { + int r= 0; + if (_l != null) { + for (int i= _l.size() - 1; i >= 0; i--) { + r += ((MNTEntite)_l.get(i)).getNbPoints(); + } + } + return r; + } public boolean estVide() { return getNbTotalEntites() <= 0; *************** *** 102,114 **** polylignes_.add(_e); } ! public void ajoutePolyligne(double[] _d) { ! if (polylignes_ == null) ! polylignes_= new Vector(); ! if (_d == null) ! return; ! MNTPolyligne t= new MNTPolyligne(); ! t.ajoutePoints(_d); ! polylignes_.add(t); ! } private final MNTSemis creeSemis() { return new MNTSemis(); --- 130,143 ---- polylignes_.add(_e); } ! ! // public void ajoutePolyligne(double[] _d) { ! // if (polylignes_ == null) ! // polylignes_= new Vector(); ! // if (_d == null) ! // return; ! // MNTPolyligne t= new MNTPolyligne(); ! // t.ajoutePoints(_d); ! // polylignes_.add(t); ! // } private final MNTSemis creeSemis() { return new MNTSemis(); *************** *** 265,267 **** --- 294,344 ---- } } + + public static MNTListPointContainer createContainerAdapter(MNTZone[] _z) { + return new EfListPointAdapter(_z); + } + + private static class EfListPointAdapter implements MNTListPointContainer { + MNTZone[] z_; + public EfListPointAdapter(MNTZone[] _z) { + z_= _z; + } + + /** + * + */ + public boolean fillListWithPoint(ListMNTPoint _listToFill) { + if ((_listToFill == null) || (z_ == null)) + return false; + int n= z_.length; + for (int i= 0; i < n; i++) { + z_[i].fillListWithPoint(_listToFill); + } + return true; + } + + } + + private final void fillListWithCollection(List l, ListMNTPoint _listToFill) { + if (l != null) { + int n= l.size(); + for (int i= 0; i < n; i++) { + ((MNTEntite)l.get(i)).fillListWithPoint(_listToFill); + } + } + } + /** + * + */ + public boolean fillListWithPoint(ListMNTPoint _listToFill) { + if (_listToFill == null) + return false; + if (semis_ != null) + semis_.fillListWithPoint(_listToFill); + fillListWithCollection(polygones_, _listToFill); + fillListWithCollection(polylignes_, _listToFill); + fillListWithCollection(profils_, _listToFill); + return true; + } + } --- MNTReaderInterface.java DELETED --- |
|
From: <de...@us...> - 2004-02-12 15:38:18
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20934/h2d/type Modified Files: H2dBcType.java H2dBoundaryType.java H2dFileFormatType.java H2dProjetType.java H2dRefluxImpressionType.java H2dResolutionMethodType.java H2dResolutionSchemaType.java H2dVariableType.java Removed Files: H2dElementType.java H2dEnumType.java Log Message: Maj version 0.05 prepro Index: H2dBcType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBcType.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** H2dBcType.java 25 Nov 2003 10:11:37 -0000 1.2 --- H2dBcType.java 12 Feb 2004 15:32:45 -0000 1.3 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.h2d.type; + import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.h2d.H2dResource; *************** *** 14,18 **** * @version $Id$ */ ! public class H2dBcType extends H2dEnumType { public static H2dBcType MIXTE= new H2dBcType(0, H2dResource.getS("Mixte")); public static H2dBcType LIBRE= new H2dBcType(1, H2dResource.getS("Libre")); --- 15,19 ---- * @version $Id$ */ ! public class H2dBcType extends DodicoEnumType { public static H2dBcType MIXTE= new H2dBcType(0, H2dResource.getS("Mixte")); public static H2dBcType LIBRE= new H2dBcType(1, H2dResource.getS("Libre")); Index: H2dBoundaryType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBoundaryType.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** H2dBoundaryType.java 25 Nov 2003 10:11:37 -0000 1.2 --- H2dBoundaryType.java 12 Feb 2004 15:32:45 -0000 1.3 *************** *** 8,11 **** --- 8,12 ---- */ package org.fudaa.dodico.h2d.type; + import org.fudaa.dodico.commun.*; import org.fudaa.dodico.h2d.H2dResource; /** *************** *** 13,17 **** * @version $Id$ */ ! public class H2dBoundaryType extends H2dEnumType { public static H2dBoundaryType MIXTE= new H2dBoundaryType(0, H2dResource.getS("Mixte"), true); --- 14,18 ---- * @version $Id$ */ ! public class H2dBoundaryType extends DodicoEnumType { public static H2dBoundaryType MIXTE= new H2dBoundaryType(0, H2dResource.getS("Mixte"), true); *************** *** 52,56 **** } public boolean equals(H2dBoundaryType _t) { ! return _t == null ? false : (id_ == _t.id_); } } --- 53,57 ---- } public boolean equals(H2dBoundaryType _t) { ! return _t == null ? false : (getId() == _t.getId()); } } Index: H2dFileFormatType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dFileFormatType.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** H2dFileFormatType.java 21 Jan 2004 10:59:10 -0000 1.7 --- H2dFileFormatType.java 12 Feb 2004 15:32:45 -0000 1.8 *************** *** 9,12 **** --- 9,14 ---- package org.fudaa.dodico.h2d.type; import java.util.List; + + import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; *************** *** 16,20 **** * @version $Id$ */ ! public class H2dFileFormatType extends H2dEnumType { public static final H2dFileFormatType PROJET= new H2dFileFormatType(0, H2dResource.getS("Projet")); --- 18,22 ---- * @version $Id$ */ ! public class H2dFileFormatType extends DodicoEnumType { public static final H2dFileFormatType PROJET= new H2dFileFormatType(0, H2dResource.getS("Projet")); *************** *** 46,50 **** } public boolean equals(H2dFileFormatType _t) { ! return _t == null ? false : (id_ == _t.id_); } } --- 48,52 ---- } public boolean equals(H2dFileFormatType _t) { ! return _t == null ? false : (getId() == _t.getId()); } } Index: H2dProjetType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dProjetType.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** H2dProjetType.java 25 Nov 2003 10:11:37 -0000 1.5 --- H2dProjetType.java 12 Feb 2004 15:32:45 -0000 1.6 *************** *** 10,13 **** --- 10,15 ---- import java.util.Iterator; import java.util.List; + + import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; *************** *** 17,21 **** * @version $Id$ */ ! public class H2dProjetType extends H2dEnumType { public static final H2dProjetType COURANTOLOGIE_2D= new H2dProjetType(1, H2dResource.getS("Courantologie 2D"), "VIT_NU_CON"); --- 19,23 ---- * @version $Id$ */ ! public class H2dProjetType extends DodicoEnumType { public static final H2dProjetType COURANTOLOGIE_2D= new H2dProjetType(1, H2dResource.getS("Courantologie 2D"), "VIT_NU_CON"); Index: H2dRefluxImpressionType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRefluxImpressionType.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dRefluxImpressionType.java 25 Nov 2003 10:11:37 -0000 1.3 --- H2dRefluxImpressionType.java 12 Feb 2004 15:32:45 -0000 1.4 *************** *** 11,14 **** --- 11,16 ---- import java.util.Iterator; import java.util.List; + + import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; *************** *** 17,21 **** * @version $Id$ */ ! public class H2dRefluxImpressionType extends H2dEnumType { public static final H2dRefluxImpressionType DONNEES= new H2dRefluxImpressionType(1, "DONNEES"); --- 19,23 ---- * @version $Id$ */ ! public class H2dRefluxImpressionType extends DodicoEnumType { public static final H2dRefluxImpressionType DONNEES= new H2dRefluxImpressionType(1, "DONNEES"); *************** *** 53,57 **** for (Iterator it= LIST.iterator(); it.hasNext();) { t= (H2dRefluxImpressionType)it.next(); ! if (t.nom_.equals(_id)) return t; } --- 55,59 ---- for (Iterator it= LIST.iterator(); it.hasNext();) { t= (H2dRefluxImpressionType)it.next(); ! if (t.getNom().equals(_id)) return t; } Index: H2dResolutionMethodType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dResolutionMethodType.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dResolutionMethodType.java 11 Dec 2003 12:41:27 -0000 1.3 --- H2dResolutionMethodType.java 12 Feb 2004 15:32:45 -0000 1.4 *************** *** 12,15 **** --- 12,16 ---- import java.util.List; + import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; *************** *** 19,23 **** * @version $Id$ */ ! public class H2dResolutionMethodType extends H2dEnumType { public static H2dResolutionMethodType LINEAIRE= new H2dResolutionMethodType( --- 20,24 ---- * @version $Id$ */ ! public class H2dResolutionMethodType extends DodicoEnumType { public static H2dResolutionMethodType LINEAIRE= new H2dResolutionMethodType( Index: H2dResolutionSchemaType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dResolutionSchemaType.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dResolutionSchemaType.java 11 Dec 2003 12:41:27 -0000 1.3 --- H2dResolutionSchemaType.java 12 Feb 2004 15:32:45 -0000 1.4 *************** *** 11,14 **** --- 11,16 ---- import java.util.Iterator; import java.util.List; + + import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; *************** *** 18,22 **** * @version $Id$ */ ! public class H2dResolutionSchemaType extends H2dEnumType { public static DodicoPermanentList TRANSITOIRE_VAR= new DodicoPermanentList( --- 20,24 ---- * @version $Id$ */ ! public class H2dResolutionSchemaType extends DodicoEnumType { public static DodicoPermanentList TRANSITOIRE_VAR= new DodicoPermanentList( Index: H2dVariableType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableType.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** H2dVariableType.java 12 Dec 2003 10:30:54 -0000 1.8 --- H2dVariableType.java 12 Feb 2004 15:32:45 -0000 1.9 *************** *** 10,13 **** --- 10,14 ---- import org.fudaa.ctulu.CtuluLib; + import org.fudaa.dodico.commun.*; import org.fudaa.dodico.h2d.H2dResource; /** *************** *** 15,19 **** * @version $Id$ */ ! public abstract class H2dVariableType extends H2dEnumType { public static final H2dVariableType DEBIT= new H2dVariableType(1, H2dResource.getS("Débit"), "Q") { --- 16,20 ---- * @version $Id$ */ ! public abstract class H2dVariableType extends DodicoEnumType { public static final H2dVariableType DEBIT= new H2dVariableType(1, H2dResource.getS("Débit"), "Q") { *************** *** 215,219 **** } public boolean equalsVariable(H2dVariableType _o) { ! return _o == null ? false : (_o.id_ == id_); } --- 216,220 ---- } public boolean equalsVariable(H2dVariableType _o) { ! return _o == null ? false : (_o.getId() == getId()); } --- H2dElementType.java DELETED --- --- H2dEnumType.java DELETED --- |
|
From: <de...@us...> - 2004-02-12 15:38:18
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20934/mesure Modified Files: EvolutionReader.java Log Message: Maj version 0.05 prepro Index: EvolutionReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/EvolutionReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EvolutionReader.java 21 Jan 2004 10:59:10 -0000 1.2 --- EvolutionReader.java 12 Feb 2004 15:32:46 -0000 1.3 *************** *** 134,138 **** } } catch (IOException _io) { ! DodicoAnalyze.manageException(_io, analyze_); } return r; --- 134,138 ---- } } catch (IOException _io) { ! analyze_.manageException(_io); } return r; *************** *** 280,284 **** firstSec_[0]= _f; firstSec_[1]= _s; - vals_= new double[1]; } --- 280,283 ---- *************** *** 298,301 **** --- 297,301 ---- reader_.setJumpBlankLine(true); hasNext= true; + vals_= new double[1]; } *************** *** 349,353 **** */ public void setFile(File _file) { ! analyze_= new DodicoAnalyze.Editor(); file_= _file; if (!file_.exists()) --- 349,353 ---- */ public void setFile(File _file) { ! analyze_= new DodicoAnalyze(); file_= _file; if (!file_.exists()) |
|
From: <de...@us...> - 2004-02-12 15:38:18
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/olb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20934/olb Modified Files: OLBExec.java Log Message: Maj version 0.05 prepro Index: OLBExec.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/olb/OLBExec.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OLBExec.java 19 Dec 2003 12:10:37 -0000 1.2 --- OLBExec.java 12 Feb 2004 15:32:46 -0000 1.3 *************** *** 19,24 **** import org.fudaa.dodico.dunes.io.DunesInterface; import org.fudaa.dodico.dunes.io.DunesWriter; import org.fudaa.dodico.fichiers.FileOperationSynthese; - import org.fudaa.dodico.h2d.H2dGrid; import org.fudaa.dodico.objet.CExec; --- 19,24 ---- import org.fudaa.dodico.dunes.io.DunesInterface; import org.fudaa.dodico.dunes.io.DunesWriter; + import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.objet.CExec; *************** *** 40,45 **** } ! public H2dGrid computeGrid( ! H2dGrid _init, ProgressionInterface _prog, DodicoUI _ui) { --- 40,45 ---- } ! public EfGrid computeGrid( ! EfGrid _init, ProgressionInterface _prog, DodicoUI _ui) { *************** *** 103,107 **** if(outFile!=null) outFile.delete(); DunesInterface r=(DunesInterface)op.getSource(); ! if(r!=null) return r.getMaillage(); return null; } --- 103,107 ---- if(outFile!=null) outFile.delete(); DunesInterface r=(DunesInterface)op.getSource(); ! if(r!=null) return r.getGrid(); return null; } |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20934/h2d/telemac Modified Files: H2dTelemacBcManager.java H2dTelemacDicoParams.java H2dTelemacParameters.java Log Message: Maj version 0.05 prepro Index: H2dTelemacBcManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcManager.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** H2dTelemacBcManager.java 19 Dec 2003 12:10:36 -0000 1.5 --- H2dTelemacBcManager.java 12 Feb 2004 15:32:45 -0000 1.6 *************** *** 29,32 **** --- 29,34 ---- import org.fudaa.dodico.dico.DicoParams; import org.fudaa.dodico.dico.DicoParamsListener; + import org.fudaa.dodico.ef.EfFrontier; + import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.h2d.H2dBcFrontierBlockAbstract; import org.fudaa.dodico.h2d.H2dBcFrontierBlockInterface; *************** *** 37,43 **** import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquide; - import org.fudaa.dodico.h2d.H2dFrontier; - import org.fudaa.dodico.h2d.H2dGrid; - import org.fudaa.dodico.h2d.H2dLib; import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dBcType; --- 39,42 ---- *************** *** 56,60 **** PrescribedParameters[] prescribedParameters_; PrescribedParameters[] prescribedOptions_; ! private H2dTelemacBcManager(H2dGrid _m) { super(_m); } --- 55,59 ---- PrescribedParameters[] prescribedParameters_; PrescribedParameters[] prescribedOptions_; ! private H2dTelemacBcManager(EfGrid _m) { super(_m); } *************** *** 387,391 **** public void setDicoParams( DicoParams _p, ! DodicoAnalyze.Editor _analyze) { //same params if (_p == dico_) return; //remove old listener --- 386,390 ---- public void setDicoParams( DicoParams _p, ! DodicoAnalyze _analyze) { //same params if (_p == dico_) return; //remove old listener *************** *** 740,748 **** */ public static H2dTelemacBcManager init( ! H2dGrid _maillage, H2dTelemacCLSourceInterface _clSource, ! DodicoAnalyze.Editor _analyze, ProgressionInterface _inter) { ! H2dFrontier frontiere= _maillage.getFrontiers(); int nbPtFrontiere= frontiere.getNbTotalPt(); if (_clSource.getNbLines() != nbPtFrontiere) { --- 739,747 ---- */ public static H2dTelemacBcManager init( ! EfGrid _maillage, H2dTelemacCLSourceInterface _clSource, ! DodicoAnalyze _analyze, ProgressionInterface _inter) { ! EfFrontier frontiere= _maillage.getFrontiers(); int nbPtFrontiere= frontiere.getNbTotalPt(); if (_clSource.getNbLines() != nbPtFrontiere) { *************** *** 764,768 **** _inter.setProgression(pourc); } ! int step= H2dLib.getStep(n); int pas= (int) (n / step); int pMax= pas; --- 763,767 ---- _inter.setProgression(pourc); } ! int step= DodicoLib.getStep(n); int pas= (int) (n / step); int pMax= pas; *************** *** 774,778 **** //boolean hTypeIsConstant= true; H2dTelemacCLElementSource clEltSource= new H2dTelemacCLElementSource(); ! H2dFrontier.FrontiereIdxIterator it= frontiere.getFrontierIterator(); int globalIdx, boundaryIdx; for (int i= 0; i < n; i++) { --- 773,777 ---- //boolean hTypeIsConstant= true; H2dTelemacCLElementSource clEltSource= new H2dTelemacCLElementSource(); ! EfFrontier.FrontiereIdxIterator it= frontiere.getFrontierIterator(); int globalIdx, boundaryIdx; for (int i= 0; i < n; i++) { *************** *** 819,823 **** tracerTypeIsConstant= false; bordEnCours.setTracerType(H2dBcType.LIBRE); ! _analyze.addInfo( H2dResource.getS( "Le traceur n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords)", --- 818,822 ---- tracerTypeIsConstant= false; bordEnCours.setTracerType(H2dBcType.LIBRE); ! _analyze.getInfoCanal().addMessage( H2dResource.getS( "Le traceur n'est pas homogène sur le même bord (point {0} dans la numérotation des points de bords)", *************** *** 845,849 **** "Par la suite, u et v seront supposées fixes pour le bord de type {0}.", bordType.toString())); ! _analyze.addError(err.toString()); } else if (bordType == H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE) { bordEnCours.setUVType(false, false); --- 844,848 ---- "Par la suite, u et v seront supposées fixes pour le bord de type {0}.", bordType.toString())); ! _analyze.getErrorCanal().addMessage(err.toString()); } else if (bordType == H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE) { bordEnCours.setUVType(false, false); *************** *** 852,856 **** "Par la suite, u et v seront supposées libres pour le bord de type {0}.", bordType.toString())); ! _analyze.addError(err.toString()); } } --- 851,855 ---- "Par la suite, u et v seront supposées libres pour le bord de type {0}.", bordType.toString())); ! _analyze.getErrorCanal().addMessage(err.toString()); } } *************** *** 876,880 **** "Par la suite, u et v seront supposées fixes pour le bord de type {0}.", bordType.toString())); ! _analyze.addError(err.toString()); } else if (bordType == H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE) { bordEnCours.setUVType(false, false); --- 875,879 ---- "Par la suite, u et v seront supposées fixes pour le bord de type {0}.", bordType.toString())); ! _analyze.getErrorCanal().addMessage(err.toString()); } else if (bordType == H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE) { bordEnCours.setUVType(false, false); *************** *** 883,887 **** "Par la suite, u et v seront supposées libres pour le bord de type {0}.", bordType.toString())); ! _analyze.addError(err.toString()); } } --- 882,886 ---- "Par la suite, u et v seront supposées libres pour le bord de type {0}.", bordType.toString())); ! _analyze.getErrorCanal().addMessage(err.toString()); } } *************** *** 952,956 **** if ((nBords > 1) && (b.getIdxDeb() == b.getIdxFin())) { if (_analyze != null) ! _analyze.addWarning( H2dResource.getS("Des conditions limites sont isolées"), -1); --- 951,955 ---- if ((nBords > 1) && (b.getIdxDeb() == b.getIdxFin())) { if (_analyze != null) ! _analyze.getWarnCanal().addMessage( H2dResource.getS("Des conditions limites sont isolées"), -1); *************** *** 970,975 **** return r; } ! public static H2dTelemacBcManager init(H2dGrid _maillage) { ! H2dFrontier frontiere= _maillage.getFrontiers(); TelemacBordParFrontiere[] bordByFrontier= new TelemacBordParFrontiere[frontiere.getNbFrontier()]; --- 969,974 ---- return r; } ! public static H2dTelemacBcManager init(EfGrid _maillage) { ! EfFrontier frontiere= _maillage.getFrontiers(); TelemacBordParFrontiere[] bordByFrontier= new TelemacBordParFrontiere[frontiere.getNbFrontier()]; *************** *** 992,996 **** H2dTelemacBoundaryConditionMutable[] clInit= new H2dTelemacBoundaryConditionMutable[frontiere.getNbTotalPt()]; ! for (H2dFrontier.FrontiereIdxIterator it= frontiere.getFrontierIterator(); it.hasNext(); ) { --- 991,995 ---- H2dTelemacBoundaryConditionMutable[] clInit= new H2dTelemacBoundaryConditionMutable[frontiere.getNbTotalPt()]; ! for (EfFrontier.FrontiereIdxIterator it= frontiere.getFrontierIterator(); it.hasNext(); ) { Index: H2dTelemacDicoParams.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacDicoParams.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** H2dTelemacDicoParams.java 25 Nov 2003 10:11:37 -0000 1.2 --- H2dTelemacDicoParams.java 12 Feb 2004 15:32:45 -0000 1.3 *************** *** 9,13 **** package org.fudaa.dodico.h2d.telemac; import java.util.Map; ! import org.fudaa.dodico.dico.DicoCasFileFormatVersionAbstract; import org.fudaa.dodico.dico.DicoParams; /** --- 9,14 ---- package org.fudaa.dodico.h2d.telemac; import java.util.Map; ! ! import org.fudaa.dodico.dico.DicoCasInterface; import org.fudaa.dodico.dico.DicoParams; /** *************** *** 21,28 **** */ public H2dTelemacDicoParams( ! Map _inits, H2dTelemacDicoFileFormatVersion _dico) { ! super(_inits, _dico); } public H2dTelemacDicoFileFormatVersion getTelemacDicoFileFormatVersion() { return (H2dTelemacDicoFileFormatVersion)getDicoFileFormatVersion(); --- 22,36 ---- */ public H2dTelemacDicoParams( ! DicoCasInterface _i, H2dTelemacDicoFileFormatVersion _dico) { ! super(_i, _dico); } + + public H2dTelemacDicoParams( + Map _keysValue,Map _keysCommentaire, + H2dTelemacDicoFileFormatVersion _dico) { + super(_keysValue,_keysCommentaire, _dico); + } + public H2dTelemacDicoFileFormatVersion getTelemacDicoFileFormatVersion() { return (H2dTelemacDicoFileFormatVersion)getDicoFileFormatVersion(); Index: H2dTelemacParameters.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** H2dTelemacParameters.java 21 Jan 2004 10:59:09 -0000 1.5 --- H2dTelemacParameters.java 12 Feb 2004 15:32:45 -0000 1.6 *************** *** 137,141 **** H2dTelemacCLSourceInterface _cls, ProgressionInterface _inter, ! DodicoAnalyze.Editor _analyze) { if (getMaillage() == null) { if (_analyze != null) --- 137,141 ---- H2dTelemacCLSourceInterface _cls, ProgressionInterface _inter, ! DodicoAnalyze _analyze) { if (getMaillage() == null) { if (_analyze != null) *************** *** 152,156 **** } } ! public void setNoCL(DodicoAnalyze.Editor _analyze) { setClManager(H2dTelemacBcManager.init(getMaillage())); clMng_.setDicoParams(getDicoParams(),_analyze); --- 152,156 ---- } } ! public void setNoCL(DodicoAnalyze _analyze) { setClManager(H2dTelemacBcManager.init(getMaillage())); clMng_.setDicoParams(getDicoParams(),_analyze); |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20934/h2d Modified Files: H2dBcManagerAbstract.java H2dBcManagerBlockAbstract.java H2dBcManagerBlockInterface.java H2dBcManagerMiddleInterface.java H2dBoundary.java H2dParameters.java h2d_en.fr_txt Removed Files: H2dElement.java H2dFileFormatMaillageVersion.java H2dFrontier.java H2dGrid.java H2dGridMutable.java H2dLib.java H2dPoint.java H2dPointMutable.java H2dSegment.java Log Message: Maj version 0.05 prepro Index: H2dBcManagerAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerAbstract.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dBcManagerAbstract.java 11 Dec 2003 12:41:27 -0000 1.3 --- H2dBcManagerAbstract.java 12 Feb 2004 15:32:44 -0000 1.4 *************** *** 10,15 **** --- 10,18 ---- import java.util.ArrayList; import java.util.Iterator; + + import org.fudaa.dodico.ef.*; import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.dodico.h2d.type.H2dVariableType; + import org.fudaa.dodico.mnt.*; /** * @author deniger *************** *** 17,31 **** */ public class H2dBcManagerAbstract { ! protected H2dGrid maillage_; protected ArrayList listeners_; /** * */ ! public H2dBcManagerAbstract(H2dGrid _m) { maillage_= _m; if (maillage_ == null) new Throwable("grid is null").printStackTrace(); } ! public final H2dGrid getGrid() { return maillage_; } --- 20,34 ---- */ public class H2dBcManagerAbstract { ! protected EfGrid maillage_; protected ArrayList listeners_; /** * */ ! public H2dBcManagerAbstract(EfGrid _m) { maillage_= _m; if (maillage_ == null) new Throwable("grid is null").printStackTrace(); } ! public final EfGrid getGrid() { return maillage_; } *************** *** 33,37 **** * */ ! public final H2dPoint getPoint(int _idxFrontiere, int _idxPtSurFrontiere) { return maillage_.getPt( maillage_.getFrontiers().getIdxGlobal(_idxFrontiere, _idxPtSurFrontiere)); --- 36,40 ---- * */ ! public final MNTPoint getPoint(int _idxFrontiere, int _idxPtSurFrontiere) { return maillage_.getPt( maillage_.getFrontiers().getIdxGlobal(_idxFrontiere, _idxPtSurFrontiere)); Index: H2dBcManagerBlockAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerBlockAbstract.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dBcManagerBlockAbstract.java 11 Dec 2003 12:41:27 -0000 1.3 --- H2dBcManagerBlockAbstract.java 12 Feb 2004 15:32:44 -0000 1.4 *************** *** 10,13 **** --- 10,15 ---- import java.util.ArrayList; import java.util.Iterator; + + import org.fudaa.dodico.ef.*; import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.dodico.h2d.type.H2dVariableType; *************** *** 20,28 **** implements H2dBcManagerBlockInterface { protected H2dBcFrontierBlockInterface[] bordByFrontier_; ! protected H2dBcManagerBlockAbstract(H2dGrid _m) { super(_m); } protected H2dBcManagerBlockAbstract( ! H2dGrid _m, H2dBcFrontierBlockInterface[] _borders) { super(_m); --- 22,30 ---- implements H2dBcManagerBlockInterface { protected H2dBcFrontierBlockInterface[] bordByFrontier_; ! protected H2dBcManagerBlockAbstract(EfGrid _m) { super(_m); } protected H2dBcManagerBlockAbstract( ! EfGrid _m, H2dBcFrontierBlockInterface[] _borders) { super(_m); Index: H2dBcManagerBlockInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerBlockInterface.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** H2dBcManagerBlockInterface.java 25 Nov 2003 10:11:36 -0000 1.2 --- H2dBcManagerBlockInterface.java 12 Feb 2004 15:32:44 -0000 1.3 *************** *** 9,12 **** --- 9,13 ---- package org.fudaa.dodico.h2d; import org.fudaa.dodico.commun.DodicoPermanentList; + import org.fudaa.dodico.ef.*; /** * @author deniger *************** *** 18,21 **** */ public H2dBcFrontierBlockInterface getBlockFrontier(int _idxFrontiere); ! public H2dGrid getGrid(); } --- 19,22 ---- */ public H2dBcFrontierBlockInterface getBlockFrontier(int _idxFrontiere); ! public EfGrid getGrid(); } Index: H2dBcManagerMiddleInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBcManagerMiddleInterface.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** H2dBcManagerMiddleInterface.java 25 Nov 2003 10:11:36 -0000 1.2 --- H2dBcManagerMiddleInterface.java 12 Feb 2004 15:32:44 -0000 1.3 *************** *** 8,11 **** --- 8,15 ---- */ package org.fudaa.dodico.h2d; + + import org.fudaa.dodico.ef.*; + import org.fudaa.dodico.ef.*; + /** * @author deniger *************** *** 17,20 **** */ public H2dBcFrontierMiddleInterface getMiddleFrontier(int _idxFrontier); ! public H2dGrid getGrid(); } --- 21,24 ---- */ public H2dBcFrontierMiddleInterface getMiddleFrontier(int _idxFrontier); ! public EfGrid getGrid(); } Index: H2dBoundary.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundary.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** H2dBoundary.java 12 Dec 2003 10:30:53 -0000 1.4 --- H2dBoundary.java 12 Feb 2004 15:32:44 -0000 1.5 *************** *** 72,85 **** if (isUnique()) return INTERSECT_INCLUDE_IN_BORD; //liquid>solid ! int deb= idxDeb_; ! int fin= idxFin_; ! if (!getType().isLiquide()) { ! deb++; ! fin--; ! } ! if (((idxDeb_ > idxFin_) && (deb < fin)) ! || ((idxDeb_ < idxFin_) && (deb > fin))) ! new Throwable().printStackTrace(); // liquid>solid FIN return isBordIntersectBy(idxDeb_, idxFin_, _min, _max, _nbPt); --- 72,86 ---- if (isUnique()) return INTERSECT_INCLUDE_IN_BORD; + //A VOIR S'IL FAUT LAISSER //liquid>solid ! // int deb= idxDeb_; ! // int fin= idxFin_; ! // if (!getType().isLiquide()) { ! // deb++; ! // fin--; ! // } ! // if (((idxDeb_ > idxFin_) && (deb < fin)) ! // || ((idxDeb_ < idxFin_) && (deb > fin))) ! // new Throwable().printStackTrace(); // liquid>solid FIN return isBordIntersectBy(idxDeb_, idxFin_, _min, _max, _nbPt); Index: H2dParameters.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParameters.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dParameters.java 11 Dec 2003 12:41:27 -0000 1.3 --- H2dParameters.java 12 Feb 2004 15:32:45 -0000 1.4 *************** *** 14,17 **** --- 14,18 ---- import org.fudaa.dodico.dico.DicoCasFileFormatVersionAbstract; import org.fudaa.dodico.dico.DicoParams; + import org.fudaa.dodico.ef.*; /** * *************** *** 20,24 **** */ public abstract class H2dParameters { ! protected H2dGrid maillage_; protected DicoParams dicoParams_; protected H2dEvolutionManager evolMng_; --- 21,25 ---- */ public abstract class H2dParameters { ! protected EfGrid maillage_; protected DicoParams dicoParams_; protected H2dEvolutionManager evolMng_; *************** *** 26,36 **** dicoParams_= _dico; } ! public final H2dGrid getMaillage() { return maillage_; } public final void setMaillage( ! H2dGrid _m, ProgressionInterface _inter, ! DodicoAnalyze.Editor _analyze) { if (maillage_ != null) { if (_analyze != null) --- 27,37 ---- dicoParams_= _dico; } ! public final EfGrid getMaillage() { return maillage_; } public final void setMaillage( ! EfGrid _m, ProgressionInterface _inter, ! DodicoAnalyze _analyze) { if (maillage_ != null) { if (_analyze != null) Index: h2d_en.fr_txt =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/h2d_en.fr_txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** h2d_en.fr_txt 21 Jan 2004 10:59:09 -0000 1.10 --- h2d_en.fr_txt 12 Feb 2004 15:32:45 -0000 1.11 *************** *** 101,110 **** Courbes temporelles=Time curves Fond=Bottom - Recherche des arêtes de contour=Boundary edges search - Tri des arêtes du contour=Boundary edges sort - Orientation des bords=Boundary edges orientation - transformation T3->T6=T3->T6 transformation - transformation T6->T3=T6->T3 transformation - transformation T6 en 4 T3=T6->4 T3 transformation Linéaire=Linear Courantologie 2D=2D hydrodynamic --- 101,104 ---- --- H2dElement.java DELETED --- --- H2dFileFormatMaillageVersion.java DELETED --- --- H2dFrontier.java DELETED --- --- H2dGrid.java DELETED --- --- H2dGridMutable.java DELETED --- --- H2dLib.java DELETED --- --- H2dPoint.java DELETED --- --- H2dPointMutable.java DELETED --- --- H2dSegment.java DELETED --- |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20934/h2d/reflux Modified Files: H2dRefluxBcManager.java H2dRefluxParameters.java H2dRefluxSourceInterface.java Log Message: Maj version 0.05 prepro Index: H2dRefluxBcManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxBcManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** H2dRefluxBcManager.java 21 Jan 2004 10:59:09 -0000 1.6 --- H2dRefluxBcManager.java 12 Feb 2004 15:32:45 -0000 1.7 *************** *** 27,33 **** import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoCommand; - import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.commun.DodicoPermanentTreeMap; import org.fudaa.dodico.h2d.H2dBcFrontierInterface; import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface; --- 27,35 ---- import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoCommand; import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.commun.DodicoPermanentTreeMap; + import org.fudaa.dodico.ef.EfFrontier; + import org.fudaa.dodico.ef.EfGrid; + import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.h2d.H2dBcFrontierInterface; import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface; *************** *** 36,42 **** import org.fudaa.dodico.h2d.H2dBoundary; import org.fudaa.dodico.h2d.H2dBoundaryCondition; - import org.fudaa.dodico.h2d.H2dFrontier; - import org.fudaa.dodico.h2d.H2dGrid; - import org.fudaa.dodico.h2d.H2dLib; import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dBcType; --- 38,41 ---- *************** *** 278,282 **** * */ ! protected H2dRefluxBcManager(H2dGrid _m) { super(_m); } --- 277,281 ---- * */ ! protected H2dRefluxBcManager(EfGrid _m) { super(_m); } *************** *** 443,450 **** public static H2dRefluxBcManager init( H2dRefluxSourceInterface _s, ! DodicoAnalyze.Editor _analyze) { ! H2dFrontier frontieres= _s.getMaillage().getFrontiers(); int ptIdxGlobal; ! H2dRefluxBcManager r= new H2dRefluxBcManager(_s.getMaillage()); //le nb de frontiere int n= frontieres.getNbFrontier(); --- 442,449 ---- public static H2dRefluxBcManager init( H2dRefluxSourceInterface _s, ! DodicoAnalyze _analyze) { ! EfFrontier frontieres= _s.getGrid().getFrontiers(); int ptIdxGlobal; ! H2dRefluxBcManager r= new H2dRefluxBcManager(_s.getGrid()); //le nb de frontiere int n= frontieres.getNbFrontier(); *************** *** 463,467 **** if (cl == null) { if (_analyze != null) ! _analyze.addError( H2dResource.getS( "Pas de cl pour le point de bord {0}", --- 462,466 ---- if (cl == null) { if (_analyze != null) ! _analyze.getErrorCanal().addMessage( H2dResource.getS( "Pas de cl pour le point de bord {0}", *************** *** 481,485 **** if (cl == null) { if (_analyze != null) ! _analyze.addError( H2dResource.getS( "Pas de cl pour le point de bord {0}", --- 480,484 ---- if (cl == null) { if (_analyze != null) ! _analyze.getErrorCanal().addMessage( H2dResource.getS( "Pas de cl pour le point de bord {0}", *************** *** 507,511 **** if (cl == null) { if (_analyze != null) ! _analyze.addError( H2dResource.getS( "Pas de cl pour le point de bord {0}", --- 506,510 ---- if (cl == null) { if (_analyze != null) ! _analyze.getErrorCanal().addMessage( H2dResource.getS( "Pas de cl pour le point de bord {0}", *************** *** 550,554 **** if (cl == null) { if (_analyze != null) ! _analyze.addError( H2dResource.getS( "Pas de cl pour le point de bord {0}", --- 549,553 ---- if (cl == null) { if (_analyze != null) ! _analyze.getErrorCanal().addMessage( H2dResource.getS( "Pas de cl pour le point de bord {0}", *************** *** 565,569 **** if (cl == null) { if (_analyze != null) ! _analyze.addError( H2dResource.getS( "Pas de cl pour le point de bord {0}", --- 564,568 ---- if (cl == null) { if (_analyze != null) ! _analyze.getErrorCanal().addMessage( H2dResource.getS( "Pas de cl pour le point de bord {0}", *************** *** 581,586 **** return r; } ! public static H2dRefluxBcManager init(H2dGrid _m) { ! H2dFrontier frontieres= _m.getFrontiers(); int n= frontieres.getNbFrontier(); H2dRefluxBcManager.RefluxMiddleFrontier[] bordByFrontier= --- 580,585 ---- return r; } ! public static H2dRefluxBcManager init(EfGrid _m) { ! EfFrontier frontieres= _m.getFrontiers(); int n= frontieres.getNbFrontier(); H2dRefluxBcManager.RefluxMiddleFrontier[] bordByFrontier= *************** *** 957,961 **** //the middle bc hasToBeSaved= false; ! idxMid= H2dLib.getIdxFromIdxMid(_ptMidIdxOnFrontier[i]); bc= bcArray_[idxMid]; oldBc= bc.createCopy(); --- 956,960 ---- //the middle bc hasToBeSaved= false; ! idxMid= EfLib.getIdxFromIdxMid(_ptMidIdxOnFrontier[i]); bc= bcArray_[idxMid]; oldBc= bc.createCopy(); *************** *** 1047,1051 **** int middleIdx; for (int i= _idxMiddleSelected.length - 1; i >= 0; i--) { ! middleIdx= H2dLib.getIdxFromIdxMid(_idxMiddleSelected[i]); if (middleIdx < bcArray_.length) r.add(bcArray_[middleIdx].getMiddle().getBoundaryType()); --- 1046,1050 ---- int middleIdx; for (int i= _idxMiddleSelected.length - 1; i >= 0; i--) { ! middleIdx= EfLib.getIdxFromIdxMid(_idxMiddleSelected[i]); if (middleIdx < bcArray_.length) r.add(bcArray_[middleIdx].getMiddle().getBoundaryType()); *************** *** 1055,1062 **** public List getRefluxIndexGeneralBords() { ArrayList l= new ArrayList(); ! H2dGrid m= getGrid(); H2dRefluxBordIndexGeneral bidxGene; int[] idx; ! H2dFrontier frontieres= m.getFrontiers(); int n= bcArray_.length; H2dRefluxBoundaryConditionMiddle cl; --- 1054,1061 ---- public List getRefluxIndexGeneralBords() { ArrayList l= new ArrayList(); ! EfGrid m= getGrid(); H2dRefluxBordIndexGeneral bidxGene; int[] idx; ! EfFrontier frontieres= m.getFrontiers(); int n= bcArray_.length; H2dRefluxBoundaryConditionMiddle cl; *************** *** 1099,1103 **** H2dRefluxValue temp= null; for (int i= _idx.length - 1; i >= 0; i--) { ! midIdx= H2dLib.getIdxFromIdxMid(_idx[i]); if (bcArray_[midIdx].isMiddleWithFriction()) { if (r == null) { --- 1098,1102 ---- H2dRefluxValue temp= null; for (int i= _idx.length - 1; i >= 0; i--) { ! midIdx= EfLib.getIdxFromIdxMid(_idx[i]); if (bcArray_[midIdx].isMiddleWithFriction()) { if (r == null) { *************** *** 1153,1157 **** double temp= 0d; for (int i= _idx.length - 1; i >= 0; i--) { ! idx= H2dLib.getIdxFromIdxMid(_idx[i]); temp= bcArray_[idx].getNormale(); if (bcArray_[idx - 1].getNormale() != temp) --- 1152,1156 ---- double temp= 0d; for (int i= _idx.length - 1; i >= 0; i--) { ! idx= EfLib.getIdxFromIdxMid(_idx[i]); temp= bcArray_[idx].getNormale(); if (bcArray_[idx - 1].getNormale() != temp) *************** *** 1193,1197 **** int idx; for (int i= _middleIdx.length - 1; i >= 0; i--) { ! idx= H2dLib.getIdxFromIdxMid(_middleIdx[i]); if (r == null) { r= new H2dRefluxValue(); --- 1192,1196 ---- int idx; for (int i= _middleIdx.length - 1; i >= 0; i--) { ! idx= EfLib.getIdxFromIdxMid(_middleIdx[i]); if (r == null) { r= new H2dRefluxValue(); Index: H2dRefluxParameters.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxParameters.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** H2dRefluxParameters.java 19 Dec 2003 12:10:36 -0000 1.4 --- H2dRefluxParameters.java 12 Feb 2004 15:32:45 -0000 1.5 *************** *** 24,31 **** import org.fudaa.dodico.dico.DicoCasFileFormatVersionAbstract; import org.fudaa.dodico.dico.DicoParams; import org.fudaa.dodico.h2d.H2dBcManagerMiddleInterface; import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dEvolutionManager; - import org.fudaa.dodico.h2d.H2dGrid; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; import org.fudaa.dodico.h2d.H2dParameters; --- 24,31 ---- import org.fudaa.dodico.dico.DicoCasFileFormatVersionAbstract; import org.fudaa.dodico.dico.DicoParams; + import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.h2d.H2dBcManagerMiddleInterface; import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dEvolutionManager; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; import org.fudaa.dodico.h2d.H2dParameters; *************** *** 219,227 **** public static H2dRefluxParameters init( ! H2dGrid _inter, H2dProjetType _type, ProgressionInterface _prog, INPFileFormat.INPVersion _ft, ! DodicoAnalyze.Editor _analyze) { DicoParams params= new DicoParams(null, _ft); H2dRefluxParameters r= new H2dRefluxParameters(params, _type); --- 219,227 ---- public static H2dRefluxParameters init( ! EfGrid _inter, H2dProjetType _type, ProgressionInterface _prog, INPFileFormat.INPVersion _ft, ! DodicoAnalyze _analyze) { DicoParams params= new DicoParams(null, _ft); H2dRefluxParameters r= new H2dRefluxParameters(params, _type); *************** *** 242,246 **** ProgressionInterface _prog, INPFileFormat.INPVersion _ft, ! DodicoAnalyze.Editor _analyze) { if (_prog != null) { _prog.setDesc(H2dResource.getS("Analyse données")); --- 242,246 ---- ProgressionInterface _prog, INPFileFormat.INPVersion _ft, ! DodicoAnalyze _analyze) { if (_prog != null) { _prog.setDesc(H2dResource.getS("Analyse données")); *************** *** 251,258 **** return null; } ! DicoParams params= new DicoParams(_inter.getEntiteValue(), _ft); H2dRefluxParameters r= new H2dRefluxParameters(params, _inter.getTypeProjet()); ! r.setMaillage(_inter.getMaillage(), _prog, _analyze); if (r.getMaillage() == null) { _analyze.addFatalError(H2dResource.getS("Maillage non spécifié")); --- 251,258 ---- return null; } ! DicoParams params= new DicoParams(_inter.getEntiteValue(),null, _ft); H2dRefluxParameters r= new H2dRefluxParameters(params, _inter.getTypeProjet()); ! r.setMaillage(_inter.getGrid(), _prog, _analyze); if (r.getMaillage() == null) { _analyze.addFatalError(H2dResource.getS("Maillage non spécifié")); Index: H2dRefluxSourceInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/reflux/H2dRefluxSourceInterface.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** H2dRefluxSourceInterface.java 19 Dec 2003 12:10:36 -0000 1.8 --- H2dRefluxSourceInterface.java 12 Feb 2004 15:32:45 -0000 1.9 *************** *** 9,14 **** package org.fudaa.dodico.h2d.reflux; import java.util.Map; import org.fudaa.dodico.h2d.H2dTimeStepGroup; - import org.fudaa.dodico.h2d.H2dGrid; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; import org.fudaa.dodico.h2d.type.H2dProjetType; --- 9,16 ---- package org.fudaa.dodico.h2d.reflux; import java.util.Map; + + import org.fudaa.dodico.ef.EfGrid; + import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.h2d.H2dTimeStepGroup; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; import org.fudaa.dodico.h2d.type.H2dProjetType; *************** *** 17,21 **** * @version $Id$ */ ! public interface H2dRefluxSourceInterface { /** */ --- 19,23 ---- * @version $Id$ */ ! public interface H2dRefluxSourceInterface extends EfGridSource{ /** */ *************** *** 53,57 **** * */ ! public H2dGrid getMaillage(); /** * --- 55,59 ---- * */ ! public EfGrid getGrid(); /** * |
