Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/ebli/src/org/fudaa/ebli/calque EbliFilleCalques.java,1.10,1.11 ZCalqueAffichageDonnees.java,1.9,1.10 ZCalqueAffichageDonneesAbstract.java,1.3,1.4 ZCalqueAffichageDonneesInterface.java,1.4,1.5 ZCalqueAffichageDonneesMultiSpecial.java,1.1,1.2 ZCalquePoint.java,1.10,1.11 ZCalqueRepereInteraction.java,1.3,1.4 ZCalqueSelectionInteraction.java,1.7,1.8 ZEbliFilleCalques.java,1.19,1.20
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque
In directory sc8-pr-cvs1:/tmp/cvs-serv15000/calque
Modified Files:
EbliFilleCalques.java ZCalqueAffichageDonnees.java
ZCalqueAffichageDonneesAbstract.java
ZCalqueAffichageDonneesInterface.java
ZCalqueAffichageDonneesMultiSpecial.java ZCalquePoint.java
ZCalqueRepereInteraction.java ZCalqueSelectionInteraction.java
ZEbliFilleCalques.java
Log Message:
Maj general
Index: EbliFilleCalques.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/EbliFilleCalques.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EbliFilleCalques.java 25 Nov 2003 10:06:37 -0000 1.10
--- EbliFilleCalques.java 21 Jan 2004 11:02:17 -0000 1.11
***************
*** 27,30 ****
--- 27,31 ----
import java.util.Hashtable;
import java.util.Vector;
+
import javax.swing.AbstractButton;
import javax.swing.JColorChooser;
***************
*** 38,52 ****
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
! import org.fudaa.ebli.geometrie.GrBoite;
! import org.fudaa.ebli.geometrie.VecteurGrContour;
! import org.fudaa.ebli.impression.EbliFilleImprimable;
! import org.fudaa.ebli.impression.EbliPrinter;
! import org.fudaa.ebli.palette.BSelecteurReduitFonte;
! import org.fudaa.ebli.palette.BSelecteurReduitPaletteCouleur;
! import org.fudaa.ebli.repere.BControleNavigation;
! import org.fudaa.ebli.repere.BControleRepereTexte;
! import org.fudaa.ebli.repere.RepereEvent;
! import org.fudaa.ebli.ressource.EbliResource;
! import org.fudaa.ebli.commun.EbliPreferences;
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
--- 39,43 ----
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
!
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuButton;
***************
*** 61,64 ****
--- 52,66 ----
import com.memoire.bu.BuToolButton;
import com.memoire.bu.BuVerticalLayout;
+
+ import org.fudaa.ebli.commun.EbliPreferences;
+ import org.fudaa.ebli.geometrie.GrBoite;
+ import org.fudaa.ebli.geometrie.VecteurGrContour;
+ import org.fudaa.ebli.impression.EbliFilleImprimable;
+ import org.fudaa.ebli.impression.EbliPrinter;
+ import org.fudaa.ebli.palette.BSelecteurReduitFonte;
+ import org.fudaa.ebli.palette.BSelecteurReduitPaletteCouleur;
+ import org.fudaa.ebli.repere.BControleNavigation;
+ import org.fudaa.ebli.repere.BControleRepereTexte;
+ import org.fudaa.ebli.ressource.EbliResource;
/**
* Fenetre d'affichage de calques contenant des services de base.
Index: ZCalqueAffichageDonnees.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ZCalqueAffichageDonnees.java 11 Dec 2003 12:41:51 -0000 1.9
--- ZCalqueAffichageDonnees.java 21 Jan 2004 11:02:18 -0000 1.10
***************
*** 45,53 ****
}
}
!
! public void setSelection(int[] _idx){
! if(selection_==null) selection_=creeSelection();
! else selection_.clear();
! for(int i=_idx.length-1;i>=0;i--){
selection_.add(_idx[i]);
}
--- 45,55 ----
}
}
!
! public void setSelection(int[] _idx) {
! if (selection_ == null)
! selection_= creeSelection();
! else
! selection_.clear();
! for (int i= _idx.length - 1; i >= 0; i--) {
selection_.add(_idx[i]);
}
Index: ZCalqueAffichageDonneesAbstract.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ZCalqueAffichageDonneesAbstract.java 11 Dec 2003 12:41:51 -0000 1.3
--- ZCalqueAffichageDonneesAbstract.java 21 Jan 2004 11:02:18 -0000 1.4
***************
*** 166,168 ****
--- 166,175 ----
}
+ /**
+ *
+ */
+ public boolean isSpecialSelectionAllowed() {
+ return false;
+ }
+
}
Index: ZCalqueAffichageDonneesInterface.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesInterface.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ZCalqueAffichageDonneesInterface.java 11 Dec 2003 12:41:51 -0000 1.4
--- ZCalqueAffichageDonneesInterface.java 21 Jan 2004 11:02:18 -0000 1.5
***************
*** 23,25 ****
--- 23,26 ----
public void removeSelectionListener(ZSelectionListener _l);
public String getName();
+ public boolean isSpecialSelectionAllowed();
}
Index: ZCalqueAffichageDonneesMultiSpecial.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMultiSpecial.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ZCalqueAffichageDonneesMultiSpecial.java 25 Nov 2003 10:06:38 -0000 1.1
--- ZCalqueAffichageDonneesMultiSpecial.java 21 Jan 2004 11:02:18 -0000 1.2
***************
*** 46,49 ****
--- 46,53 ----
}
}
+
+ public boolean isSpecialSelectionAllowed() {
+ return true;
+ }
/**
*
***************
*** 53,74 ****
int _tolerancePixel,
int _action) {
! if (_action != ZCalqueSelectionInteraction.ACTION_SPECIAL)
return super.changeSelection(_p, _tolerancePixel, _action);
! int i= selection_.isSelectionInOneBloc();
! if (i >= 0) {
! EbliListeSelection s= selection_.get(i);
! int old= s.getMaxIndex();
! EbliListeSelectionMulti newS= selection(_p, _tolerancePixel);
! int newi= newS.isSelectionInOneBloc();
! if (i == newi) {
! select(i, old, newS.getSelection(i).getMaxIndex());
! fireSelectionEvent();
! return true;
}
}
- return super.changeSelection(
- _p,
- _tolerancePixel,
- ZCalqueSelectionInteraction.ACTION_REPLACE);
}
}
--- 57,86 ----
int _tolerancePixel,
int _action) {
! //DEBUG TO REMOVE
! if (_action != ZCalqueSelectionInteraction.ACTION_SPECIAL){
return super.changeSelection(_p, _tolerancePixel, _action);
! }
!
! else {
! int i= selection_.isSelectionInOneBloc();
! if (i >= 0) {
! EbliListeSelectionMulti newS= selection(_p, _tolerancePixel);
! if (newS == null)
! return false;
! EbliListeSelection s= selection_.get(i);
! int old= s.getMaxIndex();
! int newi= newS.isSelectionInOneBloc();
! if (i == newi) {
! select(i, old, newS.getSelection(i).getMaxIndex());
! fireSelectionEvent();
! return true;
! }
}
+ return super.changeSelection(
+ _p,
+ _tolerancePixel,
+ ZCalqueSelectionInteraction.ACTION_ADD);
}
}
+
}
Index: ZCalquePoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalquePoint.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ZCalquePoint.java 11 Dec 2003 12:41:51 -0000 1.10
--- ZCalquePoint.java 21 Jan 2004 11:02:18 -0000 1.11
***************
*** 59,62 ****
--- 59,74 ----
return modele();
}
+
+ /**
+ * Si une couleur est spécifiée alors la palette est mise à nulle.
+ */
+ public void setForeground(Color c) {
+ super.setForeground(c);
+ if(c!=null) paletteCouleur_=null;
+ }
+
+
+
+
/**
* @param _g
***************
*** 79,87 ****
BPaletteIcone paletteIcone= getPaletteIcone();
Color foreground= getForeground();
- if (attenue)
- foreground= attenueCouleur(foreground);
Icon icone= getIcone();
! if (attenue)
icone= attenueIcone(icone);
GrPoint p= new GrPoint();
for (int i= nombre - 1; i >= 0; i--) {
--- 91,99 ----
BPaletteIcone paletteIcone= getPaletteIcone();
Color foreground= getForeground();
Icon icone= getIcone();
! if (attenue){
! foreground= attenueCouleur(foreground);
icone= attenueIcone(icone);
+ }
GrPoint p= new GrPoint();
for (int i= nombre - 1; i >= 0; i--) {
Index: ZCalqueRepereInteraction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueRepereInteraction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ZCalqueRepereInteraction.java 12 Dec 2003 10:32:08 -0000 1.3
--- ZCalqueRepereInteraction.java 21 Jan 2004 11:02:18 -0000 1.4
***************
*** 171,175 ****
if (_b != zoomMoins_) {
zoomMoins_= _b;
! firePropertyChange("state", null, null);
}
}
--- 171,175 ----
if (_b != zoomMoins_) {
zoomMoins_= _b;
! firePropertyChange("state", zoomMoins_?Boolean.FALSE:Boolean.TRUE, zoomMoins_?Boolean.TRUE:Boolean.FALSE);
}
}
Index: ZCalqueSelectionInteraction.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueSelectionInteraction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ZCalqueSelectionInteraction.java 25 Nov 2003 10:06:38 -0000 1.7
--- ZCalqueSelectionInteraction.java 21 Jan 2004 11:02:18 -0000 1.8
***************
*** 205,211 ****
--- 205,214 ----
zcalquesActifs_.add(_calque);
}
+
+ boolean special_;
public void setCalqueActif(ZCalqueAffichageDonneesInterface _calque) {
clearCalquesActifs();
addCalqueActif(_calque);
+ special_=_calque.isSpecialSelectionAllowed();
}
/**
***************
*** 345,359 ****
if ((isGele() || EbliLib.isPopupMouseEvent(_evt)))
return;
! modificateur_= ACTION_REPLACE;
! if (_evt.isShiftDown())
! modificateur_ |= ACTION_ADD;
! if (_evt.isControlDown())
! modificateur_ |= ACTION_DEL;
! if (_evt.isAltDown()
! && _evt.isControlDown()
! && !_evt.isShiftDown()
! && mode_ == PONCTUEL) {
! modificateur_= ACTION_SPECIAL;
! }
GrPoint ptSo= new GrPoint((double)_evt.getX(), (double)_evt.getY(), 0.);
// Saisie d'un seul point
--- 348,363 ----
if ((isGele() || EbliLib.isPopupMouseEvent(_evt)))
return;
! majControleDesc(_evt);
! // modificateur_= ACTION_REPLACE;
! // if (_evt.isShiftDown())
! // modificateur_ |= ACTION_ADD;
! // if (_evt.isControlDown())
! // modificateur_ |= ACTION_DEL;
! // if (_evt.isAltDown()
! // && _evt.isControlDown()
! // && !_evt.isShiftDown()
! // && mode_ == PONCTUEL) {
! // modificateur_= ACTION_SPECIAL;
! // }
GrPoint ptSo= new GrPoint((double)_evt.getX(), (double)_evt.getY(), 0.);
// Saisie d'un seul point
***************
*** 525,541 ****
private String controleDesc_;
private void majControleDesc(KeyEvent e) {
if (e.isShiftDown()) {
if (e.isControlDown()) {
controleDesc_= " (xor)";
! } else
controleDesc_= " (+)";
} else if (e.isControlDown()) {
! if (e.isAltDown() && mode_ == PONCTUEL) {
controleDesc_= " (special)";
! } else
controleDesc_= " (-)";
! } else
controleDesc_= null;
! firePropertyChange(ZEbliFilleCalques.STATE, null, null);
}
/**
--- 529,581 ----
private String controleDesc_;
private void majControleDesc(KeyEvent e) {
+ String old=controleDesc_;
if (e.isShiftDown()) {
if (e.isControlDown()) {
controleDesc_= " (xor)";
! modificateur_= ACTION_XOR;
! } else {
controleDesc_= " (+)";
+ modificateur_= ACTION_ADD;
+ }
} else if (e.isControlDown()) {
! if (special_ && (e.isAltDown()) && mode_ == PONCTUEL) {
controleDesc_= " (special)";
! modificateur_= ACTION_SPECIAL;
! } else {
controleDesc_= " (-)";
! modificateur_= ACTION_DEL;
! }
!
! } else {
controleDesc_= null;
! modificateur_= ACTION_REPLACE;
! }
! firePropertyChange(ZEbliFilleCalques.STATE, old, controleDesc_);
! }
!
! private void majControleDesc(MouseEvent e) {
! String old=controleDesc_;
! if (e.isShiftDown()) {
! if (e.isControlDown()) {
! controleDesc_= " (xor)";
! modificateur_= ACTION_XOR;
! } else {
! controleDesc_= " (+)";
! modificateur_= ACTION_ADD;
! }
! } else if (e.isControlDown()) {
! if (special_ && (e.isAltDown()) && mode_ == PONCTUEL) {
! controleDesc_= " (special)";
! modificateur_= ACTION_SPECIAL;
! } else {
! controleDesc_= " (-)";
! modificateur_= ACTION_DEL;
! }
!
! } else {
! controleDesc_= null;
! modificateur_= ACTION_REPLACE;
! }
! firePropertyChange(ZEbliFilleCalques.STATE, old, controleDesc_);
}
/**
Index: ZEbliFilleCalques.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZEbliFilleCalques.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ZEbliFilleCalques.java 12 Dec 2003 10:32:08 -0000 1.19
--- ZEbliFilleCalques.java 21 Jan 2004 11:02:18 -0000 1.20
***************
*** 566,570 ****
crt,
"CHANGE_REFERENCE");
- addVetoableChangeListener(plAction);
plAction.putValue(
Action.SHORT_DESCRIPTION,
--- 566,569 ----
***************
*** 582,586 ****
Action.SHORT_DESCRIPTION,
EbliResource.EBLI.getString("Outil de navigation"));
- addVetoableChangeListener(plAction);
navigationActionGroup_[i++]= plAction;
updateMapKeyStroke(navigationActionGroup_);
--- 581,584 ----
***************
*** 606,610 ****
"RECTANGLE_SELECTION",
ZCalqueSelectionInteraction.RECTANGLE);
! action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('r'));
selectedActionGroup_[i++]= action;
action=
--- 604,608 ----
"RECTANGLE_SELECTION",
ZCalqueSelectionInteraction.RECTANGLE);
! action.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('u'));
selectedActionGroup_[i++]= action;
action=
***************
*** 718,722 ****
_m
.addMenuItem(
! EbliResource.getS("Modifier l'affichage"),
"MODIFY_TOOLS_BUTTON",
true)
--- 716,720 ----
_m
.addMenuItem(
! EbliResource.getS("Modifier la barre d'outils"),
"MODIFY_TOOLS_BUTTON",
true)
***************
*** 741,744 ****
--- 739,744 ----
if ((cqInteractionActif_ != null)
&& (evt.getSource() == cqInteractionActif_)) {
+ if(CtuluLib.DEBUG)
+ CtuluLib.debug("ZEbliFilleCalques : Property change");
mode_.setText(cqInteractionActif_.getDescription());
}
|
