From: Frederic D. <de...@us...> - 2004-03-19 17:50:43
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21714/src/org/fudaa/fudaa/meshviewer/layer Modified Files: MvNodeLayer.java MvInfoDelegateAbstract.java MvInfoDelegate.java MvNodeModelDefault.java Log Message: Correction bogue Index: MvNodeLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvNodeLayer.java 12 Feb 2004 16:27:40 -0000 1.1 --- MvNodeLayer.java 19 Mar 2004 17:40:23 -0000 1.2 *************** *** 8,23 **** */ package org.fudaa.fudaa.meshviewer.layer; - import org.fudaa.ctulu.CtuluLib; - - import org.fudaa.dodico.ef.EfGrid; - import org.fudaa.dodico.ef.EfNode; - import org.fudaa.ebli.calque.ZCalquePoint; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; - - import org.fudaa.fudaa.ressource.FudaaResource; - import org.fudaa.fudaa.tr.TrResource; - import org.fudaa.fudaa.tr.TrVisuPanel; /** * @author deniger --- 8,14 ---- *************** *** 32,36 **** } /** ! * */ public int[] getPtIdx() { --- 23,27 ---- } /** ! * @return les indices des points sélectionnés */ public int[] getPtIdx() { Index: MvInfoDelegateAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvInfoDelegateAbstract.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvInfoDelegateAbstract.java 12 Feb 2004 16:27:40 -0000 1.1 --- MvInfoDelegateAbstract.java 19 Mar 2004 17:40:23 -0000 1.2 *************** *** 45,49 **** --- 45,61 ---- } + /** + * @param _m + * @param _idx + */ public final void fillWithPointInfo(InfoData _m, int _idx) { + fillWithXYZPointInfo(_m,_idx); + } + + /** + * @param _m les donnees a mettre a jour + * @param _idx l'indices du point + */ + public final void fillWithXYZPointInfo(InfoData _m, int _idx) { int[] idx=new int[2]; int frGlob=getGrid().getFrontiers().getIdxOnFrontier(_idx, idx); *************** *** 51,54 **** --- 63,73 ---- } + /** + * @param _m + * @param _idxGlobal + * @param _idxGlobOnFr + * @param _frIdx + * @param _idxLocaloOnFr + */ public void fillWithPointInfo( InfoData _m, Index: MvNodeModelDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeModelDefault.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvNodeModelDefault.java 12 Feb 2004 16:27:40 -0000 1.1 --- MvNodeModelDefault.java 19 Mar 2004 17:40:23 -0000 1.2 *************** *** 9,25 **** package org.fudaa.fudaa.meshviewer.layer; - import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfNode; - import org.fudaa.ebli.calque.ZModeleDonnesAbstract; import org.fudaa.ebli.commun.EbliListeSelectionInterface; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; - import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; - import org.fudaa.fudaa.ressource.FudaaResource; public class MvNodeModelDefault extends ZModeleDonnesAbstract --- 9,24 ---- package org.fudaa.fudaa.meshviewer.layer; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfNode; import org.fudaa.ebli.calque.ZModeleDonnesAbstract; import org.fudaa.ebli.commun.EbliListeSelectionInterface; import org.fudaa.ebli.geometrie.GrBoite; import org.fudaa.ebli.geometrie.GrPoint; import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; + /** + * @author Fred Deniger + * @version $Id$ + */ public class MvNodeModelDefault extends ZModeleDonnesAbstract *************** *** 27,34 **** --- 26,40 ---- private EfGrid grid_; private MvInfoDelegate delegate_; + /** + * @param _g le maillage a afficher + */ public MvNodeModelDefault(EfGrid _g) { this(_g, null); } + /** + * @param _g le maillage a afficher et le delehue + * @param _d + */ public MvNodeModelDefault(EfGrid _g, MvInfoDelegate _d) { grid_= _g; *************** *** 36,39 **** --- 42,48 ---- } + /** + * @see org.fudaa.fudaa.meshviewer.layer.MvNodeModel#setGrid(org.fudaa.dodico.ef.EfGrid) + */ public void setGrid(EfGrid _g) { grid_= _g; *************** *** 41,45 **** /** ! * */ public MvInfoDelegate getDelegate() { --- 50,54 ---- /** ! * @return le delegue pour l'affichage de l'info */ public MvInfoDelegate getDelegate() { *************** *** 48,52 **** /** ! * */ public void setDelegate(MvInfoDelegate _delegate) { --- 57,61 ---- /** ! * @param _delegate le nouveau delegue */ public void setDelegate(MvInfoDelegate _delegate) { *************** *** 54,59 **** } /** ! * */ public boolean point(GrPoint _p, int _i) { --- 63,69 ---- } + /** ! * @see org.fudaa.ebli.calque.ZModelePoint#point(org.fudaa.ebli.geometrie.GrPoint, int) */ public boolean point(GrPoint _p, int _i) { *************** *** 64,69 **** return true; } /** ! * */ public GrBoite getDomaine() { --- 74,80 ---- return true; } + /** ! * @see org.fudaa.ebli.calque.ZModeleDonnees#getDomaine() */ public GrBoite getDomaine() { *************** *** 76,86 **** } /** ! * */ public int getNombre() { return grid_.getPtsNb(); } /** ! * */ public Object getObject(int _ind) { --- 87,98 ---- } /** ! * @see org.fudaa.ebli.calque.ZModeleDonnees#getNombre() */ public int getNombre() { return grid_.getPtsNb(); } + /** ! * @see org.fudaa.ebli.calque.ZModeleDonnees#getObject(int) */ public Object getObject(int _ind) { *************** *** 88,92 **** } /** ! * */ public void fillWithInfo( --- 100,104 ---- } /** ! * @see org.fudaa.fudaa.meshviewer.layer.MvNodeModel#fillWithInfo(org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData, org.fudaa.ebli.commun.EbliListeSelectionInterface) */ public void fillWithInfo( Index: MvInfoDelegate.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvInfoDelegate.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvInfoDelegate.java 12 Feb 2004 16:27:40 -0000 1.1 --- MvInfoDelegate.java 19 Mar 2004 17:40:23 -0000 1.2 *************** *** 16,20 **** --- 16,28 ---- */ public interface MvInfoDelegate { + /** + * @param _m + * @param _selection + */ public void fillWithPointInfo(MvPanelInfo.InfoData _m,EbliListeSelectionInterface _selection); + /** + * @param _m + * @param _selection + */ public void fillWithElementInfo(MvPanelInfo.InfoData _m,EbliListeSelectionInterface _selection); |