Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data TrRubarAreteEditor.java,NONE,1.1 TrBcBoundaryLayer.java,NONE,1.1 MvFindComponentBcPoint.java,1.1,1.2 TrBcBoundaryLegendPanel.java,1.4,1.5 TrSolutionInitModelDefault.java,1.2,1.3 TrBcBoundaryMiddleModel.java,1.4,1.5 TrBcBoundaryMiddleModelDefault.java,1.4,1.5 TrSolutionInitLayer.java,1.2,1.3 TrBcBoundaryBlockModelDefault.java,1.4,1.5 TrBcBoundaryLayerAbstract.java,1.6,1.7 TrSiPlanLayer.java,1.3,1.4 TrVisuPanel.java,1.2,1.3 TrBcBoundaryMiddleLayer.java,1.6,1.7 TrBcPointLayer.java,1.7,1.8 TrBcBoundaryBlockModel.java,1.4,1.5 TrBcBoundaryBlockLayer.java,1.6,1.7
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7396/src/org/fudaa/fudaa/tr/data Modified Files: MvFindComponentBcPoint.java TrBcBoundaryLegendPanel.java TrSolutionInitModelDefault.java TrBcBoundaryMiddleModel.java TrBcBoundaryMiddleModelDefault.java TrSolutionInitLayer.java TrBcBoundaryBlockModelDefault.java TrBcBoundaryLayerAbstract.java TrSiPlanLayer.java TrVisuPanel.java TrBcBoundaryMiddleLayer.java TrBcPointLayer.java TrBcBoundaryBlockModel.java TrBcBoundaryBlockLayer.java Added Files: TrRubarAreteEditor.java TrBcBoundaryLayer.java Log Message: Ajout de rubar Index: TrSolutionInitModelDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSolutionInitModelDefault.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrSolutionInitModelDefault.java 31 Mar 2004 08:17:47 -0000 1.2 --- TrSolutionInitModelDefault.java 11 Jun 2004 16:40:38 -0000 1.3 *************** *** 15,19 **** import org.fudaa.dodico.h2d.reflux.H2dRefluxSolutionInitialeInterface; import org.fudaa.dodico.h2d.type.H2dVariableType; - import org.fudaa.ebli.calque.ZModeleDonneesListener; import org.fudaa.ebli.commun.EbliListeSelectionInterface; import org.fudaa.ebli.geometrie.GrBoite; --- 15,18 ---- *************** *** 131,139 **** } - /** - * @see org.fudaa.ebli.calque.ZModeleDonnees#setListener(org.fudaa.ebli.calque.ZModeleDonneesListener) - */ - public void setListener(ZModeleDonneesListener _l) { - } /** --- 130,133 ---- Index: TrBcBoundaryMiddleLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleLayer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TrBcBoundaryMiddleLayer.java 5 May 2004 12:42:39 -0000 1.6 --- TrBcBoundaryMiddleLayer.java 11 Jun 2004 16:40:38 -0000 1.7 *************** *** 1,4 **** ! /* ! * @file TrBoundaryLayer.java * @creation 21 nov. 2003 * @modification $Date$ --- 1,3 ---- ! /** * @creation 21 nov. 2003 * @modification $Date$ *************** *** 14,17 **** --- 13,17 ---- import java.awt.Graphics; import java.awt.Graphics2D; + import java.util.List; import org.fudaa.ctulu.CtuluLib; *************** *** 46,50 **** public TrBcBoundaryMiddleLayer(TrBcBoundaryMiddleModel _m) { m_= _m; ! m_.setListener(this); } public void paintComponent(Graphics g) { --- 46,56 ---- public TrBcBoundaryMiddleLayer(TrBcBoundaryMiddleModel _m) { m_= _m; ! } ! ! public List getUsedBoundaryType() { ! return m_.getUsedBoundaryType(); ! } ! public int getNbBoundaryType() { ! return m_.getNbBoundaryType(); } public void paintComponent(Graphics g) { *************** *** 245,249 **** * */ ! public int[] getPtIdx() { if (!isSelectionEmpty()) { TIntObjectIterator itIntObj= selection_.getIterator(); --- 251,255 ---- * */ ! public int[] getSelectedPtIdx() { if (!isSelectionEmpty()) { TIntObjectIterator itIntObj= selection_.getIterator(); *************** *** 272,276 **** * */ ! public int[] getElementIdx() { return null; } --- 278,282 ---- * */ ! public int[] getSelectedElementIdx() { return null; } Index: TrBcBoundaryMiddleModel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleModel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrBcBoundaryMiddleModel.java 12 Feb 2004 16:15:21 -0000 1.4 --- TrBcBoundaryMiddleModel.java 11 Jun 2004 16:40:38 -0000 1.5 *************** *** 8,11 **** --- 8,13 ---- */ package org.fudaa.fudaa.tr.data; + import java.util.List; + import org.fudaa.dodico.h2d.H2dBcFrontierMiddleInterface; *************** *** 28,31 **** --- 30,44 ---- */ public H2dBcFrontierMiddleInterface getFrontier(int _idxFrontier); + + + /** + * @return la liste des bords utilises. + */ + public List getUsedBoundaryType(); + + /** + * @return le nombre de type de bords geree + */ + public int getNbBoundaryType(); /** * Initialise <code>_p</code> a partir des donnees du point --- NEW FILE: TrBcBoundaryLayer.java --- /** * @creation 10 juin 2004 * @modification $Date: 2004/06/11 16:40:38 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.fudaa.tr.data; import java.util.List; import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.ebli.trace.TraceLigne; /** * @author Fred Deniger * @version $Id: TrBcBoundaryLayer.java,v 1.1 2004/06/11 16:40:38 deniger Exp $ */ public interface TrBcBoundaryLayer { /** * @param _t le type de bord a considerer * @return le type de ligne a utiliser pour le type de bord */ public TraceLigne.Data getTlData(H2dBoundaryType _t); /** * @return la liste des bords utilises par le modele */ public List getUsedBoundaryType(); /** * @return le titre */ public String getTitle(); } Index: TrBcBoundaryLegendPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryLegendPanel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrBcBoundaryLegendPanel.java 5 May 2004 12:42:39 -0000 1.4 --- TrBcBoundaryLegendPanel.java 11 Jun 2004 16:40:38 -0000 1.5 *************** *** 1,3 **** ! /* * @file TrBordLegendePanel.java * @creation 8 oct. 2003 --- 1,3 ---- ! /** * @file TrBordLegendePanel.java * @creation 8 oct. 2003 *************** *** 8,22 **** */ package org.fudaa.fudaa.tr.data; ! import java.awt.LayoutManager; import java.util.Iterator; ! import java.util.List; ! import com.memoire.bu.BuGridLayout; ! import com.memoire.bu.BuLabel; ! import com.memoire.bu.BuPanel; import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.ebli.palette.BSelecteurTraitComponent; - import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.fdico.FdicoLib; ! import org.fudaa.fudaa.tr.common.TrLib; /** * @author deniger --- 8,27 ---- */ package org.fudaa.fudaa.tr.data; ! import java.awt.BorderLayout; ! import java.awt.Color; import java.util.Iterator; ! ! import javax.swing.BorderFactory; ! import javax.swing.JLabel; ! import javax.swing.SwingConstants; ! import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.ebli.palette.BSelecteurTraitComponent; import org.fudaa.fudaa.fdico.FdicoLib; ! ! import com.memoire.bu.BuBorderLayout; ! import com.memoire.bu.BuGridLayout; ! import com.memoire.bu.BuLabel; ! import com.memoire.bu.BuPanel; /** * @author deniger *************** *** 25,47 **** public class TrBcBoundaryLegendPanel extends BuPanel { /** ! * */ public TrBcBoundaryLegendPanel( ! TrBcBoundaryLayerAbstract _cqBord, ! List _bord) { ! init(_cqBord, _bord); ! setOpaque(false); } ! public void init(TrBcBoundaryLayerAbstract _cqBord, List _bord) { removeAll(); ! setLayout(new BuGridLayout(2, 5, 2)); ! for (Iterator it= _bord.iterator(); it.hasNext();) { H2dBoundaryType b= (H2dBoundaryType)it.next(); BuLabel lb= new BuLabel(b.getNom()); lb.setOpaque(false); lb.setFont(FdicoLib.FONT_DIALOG); ! add(lb); ! add(new BSelecteurTraitComponent(_cqBord.getTlData(b))); } } } --- 30,61 ---- public class TrBcBoundaryLegendPanel extends BuPanel { /** ! * @param _cqBord le bord en question */ public TrBcBoundaryLegendPanel( ! TrBcBoundaryLayer _cqBord) { ! init(_cqBord); } ! /** ! * @param _cqBord ! */ ! public final void init(TrBcBoundaryLayer _cqBord) { removeAll(); ! setBorder(BorderFactory.createEmptyBorder(3,3,1,3)); ! setLayout(new BuBorderLayout()); ! JLabel l=new JLabel(_cqBord.getTitle()); ! l.setHorizontalAlignment(SwingConstants.CENTER); ! add(l,BuBorderLayout.NORTH); ! BuPanel p=new BuPanel(); ! p.setOpaque(false); ! p.setLayout(new BuGridLayout(2, 5, 2)); ! for (Iterator it= _cqBord.getUsedBoundaryType().iterator(); it.hasNext();) { H2dBoundaryType b= (H2dBoundaryType)it.next(); BuLabel lb= new BuLabel(b.getNom()); lb.setOpaque(false); lb.setFont(FdicoLib.FONT_DIALOG); ! p.add(lb); ! p.add(new BSelecteurTraitComponent(_cqBord.getTlData(b))); } + add(p,BuBorderLayout.CENTER); } } Index: TrBcBoundaryBlockModelDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockModelDefault.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrBcBoundaryBlockModelDefault.java 12 Feb 2004 16:15:21 -0000 1.4 --- TrBcBoundaryBlockModelDefault.java 11 Jun 2004 16:40:38 -0000 1.5 *************** *** 8,11 **** --- 8,13 ---- */ package org.fudaa.fudaa.tr.data; + import java.util.List; + import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfNode; *************** *** 117,119 **** --- 119,127 ---- } + public int getNbBoundaryType() { + return clMng_.getNbBoundaryType(); + } + public List getUsedBoundaryType() { + return clMng_.getUsedBoundaryType(); + } } Index: TrVisuPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrVisuPanel.java 1 Jun 2004 11:27:43 -0000 1.2 --- TrVisuPanel.java 11 Jun 2004 16:40:38 -0000 1.3 *************** *** 78,81 **** --- 78,86 ---- */ public abstract void editBcPoint(); + + /** + * @return true si les points sont editables + */ + public abstract boolean isBcPointEditable(); /** * Doit renvoyer true si les points du maillage sont editables Index: TrSiPlanLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiPlanLayer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrSiPlanLayer.java 1 Jun 2004 11:27:43 -0000 1.3 --- TrSiPlanLayer.java 11 Jun 2004 16:40:38 -0000 1.4 *************** *** 58,71 **** /** ! * @see org.fudaa.fudaa.meshviewer.layer.MvLayer#getElementIdx() */ ! public int[] getElementIdx() { return null; } /** ! * @see org.fudaa.fudaa.meshviewer.layer.MvLayer#getPtIdx() */ ! public int[] getPtIdx() { if (isSelectionEmpty()) return null; --- 58,71 ---- /** ! * @see org.fudaa.fudaa.meshviewer.layer.MvLayer#getSelectedElementIdx() */ ! public int[] getSelectedElementIdx() { return null; } /** ! * @see org.fudaa.fudaa.meshviewer.layer.MvLayer#getSelectedPtIdx() */ ! public int[] getSelectedPtIdx() { if (isSelectionEmpty()) return null; Index: TrBcPointLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcPointLayer.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TrBcPointLayer.java 5 May 2004 12:42:39 -0000 1.7 --- TrBcPointLayer.java 11 Jun 2004 16:40:38 -0000 1.8 *************** *** 219,223 **** * */ ! public int[] getPtIdx() { if (!isSelectionEmpty()) { TIntObjectIterator it= selection_.getIterator(); --- 219,223 ---- * */ ! public int[] getSelectedPtIdx() { if (!isSelectionEmpty()) { TIntObjectIterator it= selection_.getIterator(); *************** *** 241,245 **** * */ ! public int[] getElementIdx() { return null; } --- 241,245 ---- * */ ! public int[] getSelectedElementIdx() { return null; } Index: TrSolutionInitLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSolutionInitLayer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrSolutionInitLayer.java 31 Mar 2004 08:17:47 -0000 1.2 --- TrSolutionInitLayer.java 11 Jun 2004 16:40:38 -0000 1.3 *************** *** 18,22 **** import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer; - /** * @author Fred Deniger --- 18,21 ---- *************** *** 25,32 **** public class TrSolutionInitLayer extends MvNodeLayer { ! boolean paintInonde_; private TrPalierSurface surfPainter_; - /** * @param _m le modele du calque --- 24,30 ---- public class TrSolutionInitLayer extends MvNodeLayer { ! boolean paintInonde_; private TrPalierSurface surfPainter_; /** * @param _m le modele du calque *************** *** 37,56 **** surfPainter_ = new TrPalierSurface(); surfPainter_.setPalier(0.001); ! setForeground(new Color(204,204,255)); } - /** * @see javax.swing.JComponent#paintComponent(java.awt.Graphics) */ ! public void paintComponent(Graphics _g) { if (!isVisible()) return; ! if ((modele_ == null) || (modele_.getNombre() <= 0)) ! return; GrBoite clip = getClipReel(_g); GrBoite domaine = modele_.getDomaine(); ! if (!domaine.intersectXY(clip)) { ! return; ! } GrMorphisme versEcran = getVersEcran(); boolean attenue = isAttenue(); --- 35,50 ---- surfPainter_ = new TrPalierSurface(); surfPainter_.setPalier(0.001); ! setForeground(new Color(204, 204, 255)); } /** * @see javax.swing.JComponent#paintComponent(java.awt.Graphics) */ ! public void paintDonnees(Graphics _g) { if (!isVisible()) return; ! if ((modele_ == null) || (modele_.getNombre() <= 0)) return; GrBoite clip = getClipReel(_g); GrBoite domaine = modele_.getDomaine(); ! if (!domaine.intersectXY(clip)) { return; } GrMorphisme versEcran = getVersEcran(); boolean attenue = isAttenue(); *************** *** 60,65 **** Color foreground = getForeground(); ! if (attenue) ! foreground = attenueCouleur(foreground); if (!rapide && paintInonde_) { GrPolygone p = new GrPolygone(); --- 54,58 ---- Color foreground = getForeground(); ! if (attenue) foreground = attenueCouleur(foreground); if (!rapide && paintInonde_) { GrPolygone p = new GrPolygone(); *************** *** 67,71 **** double[] cote = new double[3]; TrSolutionInitModel m = (TrSolutionInitModel) modele_; ! for (int i = m.getEltNb()-1; i >=0; i--) { m.polygone(p, i); p.boite(bPoly); --- 60,64 ---- double[] cote = new double[3]; TrSolutionInitModel m = (TrSolutionInitModel) modele_; ! for (int i = m.getEltNb() - 1; i >= 0; i--) { m.polygone(p, i); p.boite(bPoly); *************** *** 74,83 **** m.getCote(cote, i); surfPainter_.paint((Graphics2D) _g, p.sommets.renvoie(0), p.sommets.renvoie(1), p.sommets ! .renvoie(2), cote[0], cote[1], cote[2],foreground,Color.white); } } } ! //on ne dessine que les selections ! super.paintSpecificComponent(_g, true); } ! } --- 67,75 ---- m.getCote(cote, i); surfPainter_.paint((Graphics2D) _g, p.sommets.renvoie(0), p.sommets.renvoie(1), p.sommets ! .renvoie(2), cote[0], cote[1], cote[2], foreground, Color.white); } } } ! } ! } \ No newline at end of file --- NEW FILE: TrRubarAreteEditor.java --- /** * @creation 11 juin 2004 * @modification $Date: 2004/06/11 16:40:38 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.fudaa.tr.data; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.swing.BorderFactory; import org.fudaa.dodico.commun.DodicoCommandManager; import org.fudaa.dodico.h2d.rubar.H2dRubarArete; import org.fudaa.dodico.h2d.rubar.H2dRubarBcTypeList; import org.fudaa.dodico.h2d.rubar.H2dRubarBoundaryType; import org.fudaa.dodico.h2d.rubar.H2dRubarParameters; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.tr.common.TrResource; import com.memoire.bu.BuComboBox; import com.memoire.bu.BuGridLayout; /** * @author Fred Deniger * @version $Id: TrRubarAreteEditor.java,v 1.1 2004/06/11 16:40:38 deniger Exp $ */ public class TrRubarAreteEditor extends EbliSimpleDialogPanel { private BuComboBox cb_; private H2dRubarParameters parameters_; private DodicoCommandManager cmdMng_; H2dRubarArete[] ar_; /** * @param _ar les aretes a editer * @param _bord la liste des bords possibles * @param _mng :le */ public TrRubarAreteEditor(H2dRubarArete[] _ar, H2dRubarParameters _mng, DodicoCommandManager _cmdMng) { super(false); ar_ = _ar; parameters_ = _mng; cmdMng_ = _cmdMng; setLayout(new BuGridLayout(2, 5, 5)); setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); H2dRubarBoundaryType common = H2dRubarArete.getCommonType(_ar); Object[] bord = null; if (common == H2dRubarBcTypeList.MIXTE) { List bordL = new ArrayList(parameters_.getBordList()); bordL.add(H2dRubarBcTypeList.MIXTE); bord = bordL.toArray(); Arrays.sort(bord); } else bord = parameters_.getBordList().toArray(); if (common != null) { addLabel(TrResource.getS("Type du bord")); cb_ = new BuComboBox(bord); add(cb_); cb_.setSelectedItem(common); } } /** * @see org.fudaa.ebli.dialog.EbliSimpleDialogPanel#apply() */ public void apply() { if (cb_ != null) { H2dRubarBoundaryType t = (H2dRubarBoundaryType) cb_.getSelectedItem(); if(!t.equals(H2dRubarBcTypeList.MIXTE)) cmdMng_.addCmd(parameters_.modifyArete(ar_, t)); } } } Index: TrBcBoundaryMiddleModelDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleModelDefault.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrBcBoundaryMiddleModelDefault.java 12 Feb 2004 16:15:21 -0000 1.4 --- TrBcBoundaryMiddleModelDefault.java 11 Jun 2004 16:40:38 -0000 1.5 *************** *** 1,4 **** ! /* ! * @file TrBcBoundaryMiddleModelDefault.java * @creation 21 nov. 2003 * @modification $Date$ --- 1,3 ---- ! /** * @creation 21 nov. 2003 * @modification $Date$ *************** *** 8,22 **** */ 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; /** --- 7,20 ---- */ package org.fudaa.fudaa.tr.data; ! import java.util.List; ! 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; /** *************** *** 26,56 **** public class TrBcBoundaryMiddleModelDefault extends ZModeleDonnesAbstract implements TrBcBoundaryMiddleModel { - protected H2dBcManagerMiddleInterface mng_; protected TrInfoSenderDelegate delegate_; /** ! * */ public TrBcBoundaryMiddleModelDefault(H2dBcManagerMiddleInterface _mng) { mng_= _mng; } /** * */ ! public int getNbFrontier() { ! return mng_.getGrid().getFrontiers().getNbFrontier(); ! } ! /** ! * ! */ ! public H2dBcFrontierMiddleInterface getFrontier(int _idxFrontier) { ! return mng_.getMiddleFrontier(_idxFrontier); } /** * */ ! 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()); } /** --- 24,49 ---- public class TrBcBoundaryMiddleModelDefault extends ZModeleDonnesAbstract implements TrBcBoundaryMiddleModel { protected TrInfoSenderDelegate delegate_; + protected H2dBcManagerMiddleInterface mng_; /** ! * @param _mng le manager de bord */ public TrBcBoundaryMiddleModelDefault(H2dBcManagerMiddleInterface _mng) { mng_= _mng; } + + /** * */ ! public final void fillWithInfo(InfoData _m, EbliListeSelectionMultiInterface _s) { ! if(delegate_!=null) delegate_.fillWithBoundaryMiddleInfo(_m, _s); } + /** * */ ! public TrInfoSenderDelegate getDelegate() { ! return delegate_; } /** *************** *** 68,79 **** * */ ! public int getNombre() { ! return getNbFrontier(); } /** * */ ! public Object getObject(int _ind) { ! return null; } /** --- 61,76 ---- * */ ! public H2dBcFrontierMiddleInterface getFrontier(int _idxFrontier) { ! return mng_.getMiddleFrontier(_idxFrontier); } + /** * */ ! public int getGlobalIdx(int _idxFr, int _idxOnFrontier) { ! return mng_.getGrid().getFrontiers().getIdxGlobal(_idxFr, _idxOnFrontier); ! } ! public int getNbBoundaryType() { ! return mng_.getNbBoundaryType(); } /** *************** *** 86,120 **** * */ public int getNbTotalPt() { return mng_.getGrid().getFrontiers().getNbTotalPt(); } - /** * */ ! 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); } --- 83,124 ---- * */ + public int getNbFrontier() { + return mng_.getGrid().getFrontiers().getNbFrontier(); + } + /** + * + */ public int getNbTotalPt() { return mng_.getGrid().getFrontiers().getNbTotalPt(); } /** * */ ! public int getNombre() { ! return getNbFrontier(); } /** * */ ! public Object getObject(int _ind) { ! return null; } /** * */ ! 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()); ! } ! public List getUsedBoundaryType() { ! return mng_.getUsedBoundaryType(); } /** * */ ! public void setDelegate(TrInfoSenderDelegate _delegate) { ! delegate_= _delegate; } Index: TrBcBoundaryLayerAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryLayerAbstract.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TrBcBoundaryLayerAbstract.java 5 May 2004 12:42:39 -0000 1.6 --- TrBcBoundaryLayerAbstract.java 11 Jun 2004 16:40:38 -0000 1.7 *************** *** 1,4 **** ! /* ! * @file TrCalqueBordAbstract.java * @creation 20 nov. 2003 * @modification $Date$ --- 1,3 ---- ! /** * @creation 20 nov. 2003 * @modification $Date$ *************** *** 8,18 **** */ package org.fudaa.fudaa.tr.data; import java.awt.Color; import java.util.HashMap; import org.fudaa.dodico.h2d.type.H2dBoundaryType; ! import org.fudaa.ebli.calque.ZCalqueAffichageDonneesMultiSpecial; import org.fudaa.ebli.trace.TraceLigne; ! ! import org.fudaa.fudaa.meshviewer.layer.*; import org.fudaa.fudaa.tr.common.TrResource; /** --- 7,19 ---- */ package org.fudaa.fudaa.tr.data; + import java.awt.Color; import java.util.HashMap; + import org.fudaa.dodico.h2d.type.H2dBoundaryType; ! import org.fudaa.ebli.calque.BCalqueLegende; ! import org.fudaa.ebli.palette.BPalettePlage; import org.fudaa.ebli.trace.TraceLigne; ! import org.fudaa.fudaa.meshviewer.layer.MvLayer; import org.fudaa.fudaa.tr.common.TrResource; /** *************** *** 20,64 **** * @version $Id$ */ ! public abstract class TrBcBoundaryLayerAbstract ! extends TrLayerMulti implements MvLayer{ public class BordTraceLigneData { HashMap bdTypeTlDataMap_; public BordTraceLigneData() {} public TraceLigne.Data getTlData(H2dBoundaryType _bd) { ! if (bdTypeTlDataMap_ == null) ! bdTypeTlDataMap_= new HashMap(6); ! TraceLigne.Data r= (TraceLigne.Data)bdTypeTlDataMap_.get(_bd); if (r == null) { ! r= initBordTraceLigneData(_bd); bdTypeTlDataMap_.put(_bd, r); } return r; } ! protected TraceLigne.Data initBordTraceLigneData(H2dBoundaryType _t) { ! if (_t == H2dBoundaryType.SOLIDE_FROTTEMENT) ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, Color.orange); ! else if (_t == H2dBoundaryType.SOLIDE) ! return new TraceLigne.Data( ! TraceLigne.LISSE, ! 1f, ! new Color(164, 95, 30)); ! else if (_t == H2dBoundaryType.LIQUIDE_DEBIT_IMPOSE) ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, Color.red); ! else if (_t == H2dBoundaryType.LIQUIDE_ONDE_INCIDENCE) ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, Color.magenta); ! else if (_t == H2dBoundaryType.LIQUIDE_HAUTEUR_VITESSES_IMPOSEES) ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, Color.orange); ! else if (_t == H2dBoundaryType.LIQUIDE_HAUTEUR_IMPOSEE) ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, Color.green); ! else if (_t == H2dBoundaryType.LIQUIDE_VITESSES_IMPOSEES) ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, Color.yellow); ! //liquid ! else if (_t.isLiquide()) ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, Color.cyan); ! else ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, Color.black); } } protected BordTraceLigneData bdTlData_; /** * --- 21,61 ---- * @version $Id$ */ ! public abstract class TrBcBoundaryLayerAbstract extends TrLayerMulti implements MvLayer, ! TrBcBoundaryLayer { ! ! public class BordTraceLigneData { + HashMap bdTypeTlDataMap_; + public BordTraceLigneData() {} + public TraceLigne.Data getTlData(H2dBoundaryType _bd) { ! if (bdTypeTlDataMap_ == null) bdTypeTlDataMap_ = new HashMap(6); ! TraceLigne.Data r = (TraceLigne.Data) bdTypeTlDataMap_.get(_bd); if (r == null) { ! r = initBordTraceLigneData(_bd); bdTypeTlDataMap_.put(_bd, r); } return r; } ! } ! ! /** ! * Met a jour la legende en fonction des bords utilises ! */ ! public void updateLegende(){ ! BCalqueLegende l=getLegende(); ! if(l!=null){ ! TrBcBoundaryLegendPanel p=(TrBcBoundaryLegendPanel)l.getLegende(this); ! p.init(this); ! l.revalidate(); } } + protected BordTraceLigneData bdTlData_; + + private int idxColor_; + /** * *************** *** 67,75 **** setTitle(TrResource.getS("Bords")); } public TraceLigne.Data getTlData(H2dBoundaryType _t) { ! if (bdTlData_ == null) ! bdTlData_= new BordTraceLigneData(); return bdTlData_.getTlData(_t); } ! ! } --- 64,85 ---- setTitle(TrResource.getS("Bords")); } + + public abstract int getNbBoundaryType(); + public TraceLigne.Data getTlData(H2dBoundaryType _t) { ! if (bdTlData_ == null) bdTlData_ = new BordTraceLigneData(); return bdTlData_.getTlData(_t); } ! ! protected TraceLigne.Data initBordTraceLigneData(H2dBoundaryType _t) { ! if (_t == H2dBoundaryType.SOLIDE_FROTTEMENT) return new TraceLigne.Data(TraceLigne.LISSE, 1f, ! Color.orange); ! else if (_t == H2dBoundaryType.SOLIDE) ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, new Color(164, 95, 30)); ! Color c = BPalettePlage.getCouleur(Color.red, Color.green, ((double) idxColor_) ! / ((double) getNbBoundaryType())); ! idxColor_++; ! return new TraceLigne.Data(TraceLigne.LISSE, 1f, c); ! } ! ! } \ No newline at end of file Index: MvFindComponentBcPoint.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/MvFindComponentBcPoint.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvFindComponentBcPoint.java 1 Jun 2004 11:27:43 -0000 1.1 --- MvFindComponentBcPoint.java 11 Jun 2004 16:40:38 -0000 1.2 *************** *** 9,23 **** package org.fudaa.fudaa.tr.data; import javax.swing.ButtonGroup; - import javax.swing.JComponent; import javax.swing.JRadioButton; - import javax.swing.JTextField; import org.fudaa.ctulu.CtuluLib; import com.memoire.bu.BuLabel; - import com.memoire.bu.BuPanel; - import org.fudaa.dodico.commun.DodicoLib; - import org.fudaa.fudaa.meshviewer.MvFindComponentDefault; - import org.fudaa.fudaa.tr.common.TrResource; /** * @author deniger --- 9,19 ---- package org.fudaa.fudaa.tr.data; import javax.swing.ButtonGroup; import javax.swing.JRadioButton; import org.fudaa.ctulu.CtuluLib; + import org.fudaa.fudaa.meshviewer.MvFindComponentDefault; + import org.fudaa.fudaa.meshviewer.MvResource; import com.memoire.bu.BuLabel; /** * @author deniger *************** *** 32,37 **** super(_l); JRadioButton bt1= ! new JRadioButton(TrResource.getS("Index(s) sur les frontières")); ! generalData_= new JRadioButton(TrResource.getS("Index(s) généraux")); bt1.setMnemonic('f'); if (bt1.getText().indexOf('f') < 0) --- 28,33 ---- super(_l); JRadioButton bt1= ! new JRadioButton(MvResource.getS("Index(s) sur les frontières")); ! generalData_= new JRadioButton(MvResource.getS("Index(s) généraux")); bt1.setMnemonic('f'); if (bt1.getText().indexOf('f') < 0) Index: TrBcBoundaryBlockLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockLayer.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TrBcBoundaryBlockLayer.java 5 May 2004 12:42:39 -0000 1.6 --- TrBcBoundaryBlockLayer.java 11 Jun 2004 16:40:38 -0000 1.7 *************** *** 15,18 **** --- 15,19 ---- import java.awt.Graphics; import java.awt.Graphics2D; + import java.util.List; import javax.swing.Icon; *************** *** 43,46 **** --- 44,50 ---- public class TrBcBoundaryBlockLayer extends TrBcBoundaryLayerAbstract { + public void modeleDonneesChanged(ZModeleDonnees _d) { + updateLegende(); + } protected TrBcBoundaryBlockModel m_; protected TraceLigne tl_; *************** *** 51,57 **** public TrBcBoundaryBlockLayer(TrBcBoundaryBlockModel _m) { m_= _m; - m_.setListener(this); bdTlData_= new BordTraceLigneData(); } /** * --- 55,65 ---- public TrBcBoundaryBlockLayer(TrBcBoundaryBlockModel _m) { m_= _m; bdTlData_= new BordTraceLigneData(); } + public List getUsedBoundaryType() { + return m_.getUsedBoundaryType(); + } + + /** * *************** *** 295,299 **** * */ ! public int[] getPtIdx() { if (!isSelectionEmpty()) { TIntHashSet r= new TIntHashSet(m_.getNbTotalPt()); --- 303,307 ---- * */ ! public int[] getSelectedPtIdx() { if (!isSelectionEmpty()) { TIntHashSet r= new TIntHashSet(m_.getNbTotalPt()); *************** *** 324,328 **** * */ ! public int[] getElementIdx() { return null; } --- 332,336 ---- * */ ! public int[] getSelectedElementIdx() { return null; } *************** *** 405,407 **** --- 413,418 ---- } + public int getNbBoundaryType() { + return m_.getNbBoundaryType(); + } } Index: TrBcBoundaryBlockModel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockModel.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrBcBoundaryBlockModel.java 12 Feb 2004 16:15:21 -0000 1.4 --- TrBcBoundaryBlockModel.java 11 Jun 2004 16:40:38 -0000 1.5 *************** *** 8,17 **** */ 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; /** --- 8,17 ---- */ package org.fudaa.fudaa.tr.data; ! import java.util.List; + 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; /** *************** *** 24,27 **** --- 24,29 ---- */ public int getNbFrontier(); + + public int getNbBoundaryType(); /** * Renvoie les bords de la frontiere _i *************** *** 39,41 **** --- 41,48 ---- public void fillWithInfo(MvPanelInfo.InfoData _m,EbliListeSelectionMultiInterface _s); + + /** + * @return la liste des listes utilisees< + */ + public List getUsedBoundaryType(); } |