|
From: <bma...@us...> - 2008-06-12 13:38:40
|
Revision: 3639
http://fudaa.svn.sourceforge.net/fudaa/?rev=3639&view=rev
Author: bmarchan
Date: 2008-06-12 06:38:48 -0700 (Thu, 12 Jun 2008)
Log Message:
-----------
Bug#21 : Correction CTRL-A sur les calques invisibles.
Modified Paths:
--------------
branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMultiSpecial.java
branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java
branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueMultiPoint.java
branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirLayer.java
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java 2008-06-12 13:36:36 UTC (rev 3638)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonnees.java 2008-06-12 13:38:48 UTC (rev 3639)
@@ -205,6 +205,7 @@
}
public void selectAll() {
+ if (!isVisible()) return;
initSelection();
selection_.addInterval(0, modeleDonnees().getNombre() - 1);
fireSelectionEvent();
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java 2008-06-12 13:36:36 UTC (rev 3638)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesAbstract.java 2008-06-12 13:38:48 UTC (rev 3639)
@@ -616,4 +616,14 @@
public boolean isAntialiasing() {
return antialiasing_;
}
+
+ /**
+ * Efface la selection si le calque est rendu invisible.
+ */
+ public void setVisible(boolean _b) {
+ if (isVisible()!=_b) {
+ super.setVisible(_b);
+ if (!_b) clearSelection();
+ }
+ }
}
\ No newline at end of file
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMultiSpecial.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMultiSpecial.java 2008-06-12 13:36:36 UTC (rev 3638)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueAffichageDonneesMultiSpecial.java 2008-06-12 13:38:48 UTC (rev 3639)
@@ -47,6 +47,8 @@
}
public void selectAll(){
+ if (!isVisible()) return;
+
initSelection();
final ZModeleDonneesMulti m = getModeleMulti();
for (int i = m.getNombre() - 1; i >= 0; i--) {
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java 2008-06-12 13:36:36 UTC (rev 3638)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueLigneBrisee.java 2008-06-12 13:38:48 UTC (rev 3639)
@@ -662,6 +662,8 @@
}
public void selectAll() {
+ if (!isVisible()) return;
+
if (!isAtomicMode_) {
super.selectAll();
return;
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueMultiPoint.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueMultiPoint.java 2008-06-12 13:36:36 UTC (rev 3638)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/ebli/src/org/fudaa/ebli/calque/ZCalqueMultiPoint.java 2008-06-12 13:38:48 UTC (rev 3639)
@@ -512,6 +512,8 @@
}
public void selectAll() {
+ if (!isVisible()) return;
+
if (!isAtomicMode_) {
super.selectAll();
return;
Modified: branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirLayer.java
===================================================================
--- branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirLayer.java 2008-06-12 13:36:36 UTC (rev 3638)
+++ branches/Br_FudaaModeleur_TF/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/telemac/TrTelemacWeirLayer.java 2008-06-12 13:38:48 UTC (rev 3639)
@@ -653,6 +653,8 @@
}
public void selectAll() {
+ if (!isVisible()) return;
+
if (getM().isWorkOnFrontierPt()) {
super.selectAll();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|