From: <de...@us...> - 2003-09-02 08:56:40
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque In directory sc8-pr-cvs1:/tmp/cvs-serv11587/org/fudaa/ebli/calque Modified Files: BArbreCalque.java BCalque.java ZCalqueAffichageDonnees.java ZCalqueLongPolygone.java ZCalquePolygone.java ZCalquePolyligne.java ZEbliFilleCalques.java Log Message: Modif... Index: BArbreCalque.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BArbreCalque.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BArbreCalque.java 18 Mar 2003 16:04:05 -0000 1.2 --- BArbreCalque.java 2 Sep 2003 08:56:17 -0000 1.3 *************** *** 36,43 **** public class BArbreCalque extends JTree ! implements MouseListener, PropertyChangeListener ! { ! public BArbreCalque() ! { setRequestFocusEnabled(false); setShowsRootHandles(true); --- 36,41 ---- public class BArbreCalque [...1004 lines suppressed...] ! BCalque[] c= ((BCalque)_node).getCalques(); ! r= (c.length == 0); } return r; } ! public void addTreeModelListener(TreeModelListener _l) { ! if (listeners_ == null) ! listeners_= new Vector(); listeners_.addElement(_l); } ! public void removeTreeModelListener(TreeModelListener _l) { ! if (listeners_ == null) ! return; listeners_.removeElement(_l); } ! public void valueForPathChanged(TreePath _path, Object _newValue) {} } Index: BCalque.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/BCalque.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BCalque.java 30 Jan 2003 10:56:50 -0000 1.1 --- BCalque.java 2 Sep 2003 08:56:17 -0000 1.2 *************** *** 422,426 **** // Proprietes ! private boolean rapide_; /** --- 422,426 ---- // Proprietes ! protected boolean rapide_; /** Index: ZCalqueAffichageDonnees.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ZCalqueAffichageDonnees.java 22 Aug 2003 15:55:31 -0000 1.3 --- ZCalqueAffichageDonnees.java 2 Sep 2003 08:56:17 -0000 1.4 *************** *** 107,115 **** public void listeSelectionChanged(EbliListeSelectionEvent _e) { - System.out.println("event selection"); if(selection_==null) return; if (selection_.equals(_e.getSource())) { - System.err.println("event selecion ok !!!"); fireSelectionEvent(); repaint(); --- 107,113 ---- Index: ZCalqueLongPolygone.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLongPolygone.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ZCalqueLongPolygone.java 4 Jul 2003 14:32:48 -0000 1.1 --- ZCalqueLongPolygone.java 2 Sep 2003 08:56:17 -0000 1.2 *************** *** 87,91 **** GrMorphisme versEcran = getVersEcran(); boolean attenue = isAttenue(); - boolean rapide = isRapide(); // BPaletteCouleur paletteCouleur = getPaletteCouleur(); --- 87,90 ---- *************** *** 95,98 **** --- 94,98 ---- if (attenue) foreground = attenueCouleur(foreground); + boolean rapide=isRapide(); Icon icone = getIcone(); *************** *** 101,105 **** GrBoite bPoly; - int incrementPt = 1; if (tl_ == null) tl_ = new TraceLigne((Graphics2D) _g); --- 101,104 ---- *************** *** 116,123 **** if (nbPoints <= 0) continue; - if ((rapide) && (nbPoints > 15)) - incrementPt = 3; - else - incrementPt = 1; //QUESTION: a rajouter /* double z = 0.; --- 115,118 ---- *************** *** 147,151 **** ptOri.autoApplique(versEcran); GrPoint ptDest = new GrPoint(); ! for (int j = nbPoints - 1; j >= 0; j -= incrementPt) { //le point de dest est initialise --- 142,146 ---- ptOri.autoApplique(versEcran); GrPoint ptDest = new GrPoint(); ! for (int j = nbPoints - 1; j >= 0; j --) { //le point de dest est initialise Index: ZCalquePolygone.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePolygone.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ZCalquePolygone.java 4 Jul 2003 14:32:48 -0000 1.3 --- ZCalquePolygone.java 2 Sep 2003 08:56:17 -0000 1.4 *************** *** 88,92 **** if(!domaine.intersectXY(clip)) { - System.out.println("polygones non affiches"); return ; } --- 88,91 ---- Index: ZCalquePolyligne.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePolyligne.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ZCalquePolyligne.java 4 Jul 2003 14:32:48 -0000 1.3 --- ZCalquePolyligne.java 2 Sep 2003 08:56:17 -0000 1.4 *************** *** 172,176 **** { - System.out.println("dessin selection"); if(tlSelection_==null) tlSelection_=new TraceLigne((Graphics2D)_g); else tlSelection_.graphics((Graphics2D)_g); --- 172,175 ---- *************** *** 184,188 **** ic=attenueIcone(ic); } ! _g.setColor(cs); tlSelection_.setCouleur(cs); //tlSelection_.setEpaisseur(2f); --- 183,187 ---- ic=attenueIcone(ic); } ! //_g.setColor(cs); tlSelection_.setCouleur(cs); //tlSelection_.setEpaisseur(2f); *************** *** 191,195 **** { if(!selection_.isSelected(i)) continue; - System.out.println("polyligne tracee"); modele_.polyligne(p,i); if(clip.intersectXY(p.boite())) --- 190,193 ---- *************** *** 203,207 **** //le point de dest est initialise ptDest=p.sommets.renvoie(j); - System.out.println("dessine le point "+ptDest); ic.paintIcon(this, _g, (int)ptDest.x, (int)ptDest.y); if(ptOri!=null) --- 201,204 ---- Index: ZEbliFilleCalques.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliFilleCalques.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ZEbliFilleCalques.java 22 Aug 2003 15:55:31 -0000 1.6 --- ZEbliFilleCalques.java 2 Sep 2003 08:56:17 -0000 1.7 *************** *** 134,137 **** --- 134,139 ---- /** */ protected BArbreCalque arbre_; + + protected BGroupeCalque gcDonnees_; /* Variable stockant les specifics tools*/ *************** *** 238,242 **** gc.setTitle(EbliResource.EBLI.getString("Calques")); gc.setDestructible(false); ! arbre_.setCalque(gc); arbre_.addTreeSelectionListener(this); //Calque d'administration --- 240,246 ---- gc.setTitle(EbliResource.EBLI.getString("Calques")); gc.setDestructible(false); ! gcDonnees_=new BGroupeCalque(); ! gcDonnees_.setName("cqDonnees"); ! arbre_.setCalque(gcDonnees_); arbre_.addTreeSelectionListener(this); //Calque d'administration *************** *** 246,249 **** --- 250,254 ---- cqAdmin_.setDestructible(false); gc.add(cqAdmin_); + gc.add(gcDonnees_); if (vc_.getCalque() == null) *************** *** 308,312 **** cqAdmin_.add(cqDepVueI_); ! arbre_.refresh(); // Column tools --- 313,317 ---- cqAdmin_.add(cqDepVueI_); ! // arbre_.refresh(); // Column tools *************** *** 400,417 **** } - protected void setCalqueAdminVisible(boolean _b) - { - if(_b) - { - vc_.getCalque().add(cqAdmin_); - cqAdmin_.enPremier(); - } - else - { - vc_.getCalque().remove(cqAdmin_); - } - arbre_.refresh(); - vc_.revalidate(); - } protected synchronized AbstractButton getButton(String _actionCommand) --- 405,408 ---- *************** *** 719,725 **** public void setSelected(boolean b) throws java.beans.PropertyVetoException { ! if (b) { ! arbre_.setCalque(vc_.getCalque()); arbre_.refresh(); // if(btRepere.getDesktop() == null) --- 710,716 ---- public void setSelected(boolean b) throws java.beans.PropertyVetoException { ! if ((b) && (arbre_.getCalque()!=gcDonnees_)) { ! arbre_.setCalque(gcDonnees_); arbre_.refresh(); // if(btRepere.getDesktop() == null) *************** *** 728,731 **** --- 719,728 ---- super.setSelected(b); } + + protected void addCalque(BCalque _b,boolean _enPremier){ + gcDonnees_.add(_b); + if(_enPremier) _b.enPremier(); + } + /** *************** *** 754,758 **** protected void showViewPreferences() { ! if(EbliLib.DEBUG) System.out.println("ViewPreferences ok"); if(specificToolsPrefView_==null) { --- 751,755 ---- protected void showViewPreferences() { ! if(EbliLib.DEBUG) System.out.println("ViewPreferences ok"); if(specificToolsPrefView_==null) { *************** *** 773,776 **** --- 770,774 ---- { String com = _ae.getActionCommand(); + if(EbliLib.DEBUG) System.out.println(com); if (enr.equals(com)) *************** *** 1453,1457 **** public void cancel() { - System.out.println("cancel"); JComponent ab; Object o; --- 1451,1454 ---- *************** *** 1473,1477 **** public void ok() { - if(EbliLib.DEBUG) System.out.println("ViewPreferences ok"); EbliPreferences.EBLI.writeIniFile(); } --- 1470,1473 ---- *************** *** 1482,1486 **** public void closeDialog() { - if(EbliLib.DEBUG) System.out.println("ViewPreferences close"); ZEbliFilleCalques.this.specificToolsPrefView_=null; } --- 1478,1481 ---- *************** *** 1498,1502 **** boolean b=((Boolean)_h.get(ab)).booleanValue(); String pref=ZEbliFilleCalques.this.getPreferencesVisibleKey(ab); - System.out.println("enre de " +pref); EbliPreferences.EBLI.putBooleanProperty(pref,b); ab.setVisible(b); --- 1493,1496 ---- *************** *** 1718,1723 **** public void hierarchyChanged(HierarchyEvent e) { - AbstractButton ab=(AbstractButton)e.getSource(); - System.out.println(ab.getActionCommand()); } --- 1712,1715 ---- |