Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[8618] trunk/soft/fudaa-crue
|
From: <de...@us...> - 2014-02-14 08:34:11
|
Revision: 8618
http://sourceforge.net/p/fudaa/svn/8618
Author: deniger
Date: 2014-02-14 08:34:06 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java
trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -190,9 +190,6 @@
}
public boolean setSelectedEMHs(List<EMH> selectedEMH) {
- if (!layer.isVisible()) {
- return false;
- }
List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.BRANCHE);
TIntArrayList positions = new TIntArrayList();
for (EMH emh : selectEMHS) {
@@ -206,9 +203,6 @@
}
public boolean setSelectedEMHUids(Collection<Long> selectedUid) {
- if (!layer.isVisible()) {
- return false;
- }
TIntArrayList positions = new TIntArrayList();
for (Long uid : selectedUid) {
int nodePosition = getBranchePosition(uid);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -127,9 +127,6 @@
}
public boolean setSelectedEMHs(List<EMH> selectedEMH) {
- if (!layer.isVisible()) {
- return false;
- }
List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.CASIER);
TIntArrayList positions = new TIntArrayList();
for (EMH emh : selectEMHS) {
@@ -143,9 +140,6 @@
}
public boolean setSelectedEMHUids(Collection<Long> selectedUids) {
- if (!layer.isVisible()) {
- return false;
- }
TIntArrayList positions = new TIntArrayList();
for (Long uid : selectedUids) {
int nodePosition = getCasierPosition(uid);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -151,9 +151,6 @@
}
public boolean setSelectedEMHs(List<EMH> selectedEMH) {
- if (!layer.isVisible()) {
- return false;
- }
List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.NOEUD);
TIntArrayList positions = new TIntArrayList();
for (EMH emh : selectEMHS) {
@@ -167,9 +164,6 @@
}
public boolean setSelectedEMHUids(Collection<Long> selectedEMHUids) {
- if (!layer.isVisible()) {
- return false;
- }
TIntArrayList positions = new TIntArrayList();
for (Long uid : selectedEMHUids) {
int nodePosition = getNodePosition(uid);
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -101,9 +101,6 @@
}
public boolean setSelectedEMHs(List<EMH> selectedEMH) {
- if (!layer.isVisible()) {
- return false;
- }
List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.SECTION);
TIntArrayList positions = new TIntArrayList();
if (!selectEMHS.isEmpty()) {
@@ -126,9 +123,6 @@
}
public boolean setSelectedEMHUids(Collection<Long> uids) {
- if (!layer.isVisible()) {
- return false;
- }
TIntArrayList positions = new TIntArrayList();
if (!uids.isEmpty()) {
GISZoneCollectionPoint gisCollection = getGISCollection();
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerTraceController.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -105,9 +105,6 @@
}
public boolean setSelectedEMHs(List<EMH> selectedEMH) {
- if (!layer.isVisible()) {
- return false;
- }
List<EMH> selectEMHS = EMHHelper.selectEMHS(selectedEMH, EnumCatEMH.SECTION);
TIntArrayList positions = new TIntArrayList();
if (!selectEMHS.isEmpty()) {
@@ -130,9 +127,6 @@
}
public boolean setSelectedEMHUids(Collection<Long> uids) {
- if (!layer.isVisible()) {
- return false;
- }
TIntArrayList positions = new TIntArrayList();
if (!uids.isEmpty()) {
GISZoneCollectionLigneBrisee gisCollection = getGISCollection();
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryVisuPanelController.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -48,16 +48,27 @@
@Override
public void setView(final ZEbliCalquesPanel view) {
super.setView(view);
- view.getVueCalque().removeKeyListener(cqCatchI_);
- removeCalqueInteraction(cqCatchI_);
+// view.getVueCalque().removeKeyListener(cqCatchI_);
+// removeCalqueInteraction(cqCatchI_);
+ cqCatchI_.setGele(true);
view.getVueCalque().addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) {
super.keyPressed(e);
if (e.getKeyCode() == KeyEvent.VK_ESCAPE) {
getCqSelectionI().setGele(false);
+ } else if (e.getKeyCode() == KeyEvent.VK_A) {
+ cqCatchI_.setGele(false);
}
}
+
+ @Override
+ public void keyReleased(KeyEvent e) {
+ if (e.getKeyCode() == KeyEvent.VK_A) {
+ cqCatchI_.setGele(true);
+ }
+ }
+
});
new PlanimetryAccrocheController((PlanimetryVisuPanel) view).install();
SelectionMoveInteraction selection = (SelectionMoveInteraction) getCalqueInteraction("cqSELECTION");
@@ -85,7 +96,6 @@
}
DeleteEMHCascadeAction deleteCascadeAction;
-
public DeleteEMHCascadeAction getDeleteCascade() {
if (deleteCascadeAction == null) {
deleteCascadeAction = new DeleteEMHCascadeAction(getVisuPanel().getEditor());
@@ -149,11 +159,11 @@
EbliActionPaletteAbstract ebliActionPaletteAbstract = new EbliActionPaletteAbstract(EbliLib.getS("Légende"),
EbliResource.EBLI.getToolIcon("legend"),
"EDIT_LEGEND", true) {
- @Override
- public JComponent buildContentPane() {
- return new BCalqueLegendeCustomizer(getView().getCqLegend());
- }
- };
+ @Override
+ public JComponent buildContentPane() {
+ return new BCalqueLegendeCustomizer(getView().getCqLegend());
+ }
+ };
ebliActionPaletteAbstract.setParent(pn_);
l.add(ebliActionPaletteAbstract);
standardActionGroup_ = new EbliActionInterface[l.size()];
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryBrancheLayer.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -105,11 +105,40 @@
return layerConfiguration.getFlecheSize();
}
+ private boolean userVisible = true;
+
@Override
+ public boolean isUserVisible() {
+ return userVisible;
+ }
+
+ @Override
+ public void setUserVisible(boolean userVisible) {
+ if (this.userVisible != userVisible) {
+ super.setUserVisible(userVisible);
+ this.userVisible = userVisible;
+ clearCacheAndRepaint();
+ }
+ }
+
+ @Override
+ public boolean isVisible() {
+ return !isSelectionEmpty() || isUserVisible();
+ }
+
+ @Override
+ protected boolean clearSelectionIfLayerNonVisible() {
+ return false;
+ }
+
+ @Override
protected boolean isPainted(int idx, GrMorphisme _versEcran) {
if (isSelected(idx)) {
return true;
}
+ if (!isUserVisible()) {
+ return false;
+ }
boolean res = super.isPainted(idx, _versEcran);
if (!res) {
return false;
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryCasierLayer.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -119,6 +119,9 @@
if (isSelected(idx)) {
return true;
}
+ if (!isUserVisible()) {
+ return false;
+ }
CatEMHCasier casier = getCasierController().getEMHFromPositionInModel(idx);
PlanimetryControllerHelper helper = getCasierController().getHelper();
if (!helper.isVisible(casier)) {
@@ -130,7 +133,28 @@
return true;
}
+ private boolean userVisible = true;
+
@Override
+ public boolean isUserVisible() {
+ return userVisible;
+ }
+
+ @Override
+ public void setUserVisible(boolean userVisible) {
+ if (this.userVisible != userVisible) {
+ super.setUserVisible(userVisible);
+ this.userVisible = userVisible;
+ clearCacheAndRepaint();
+ }
+ }
+
+ @Override
+ public boolean isVisible() {
+ return !isSelectionEmpty() || isUserVisible();
+ }
+
+ @Override
protected boolean isPainted(int idx, GrMorphisme _versEcran) {
return isActivityPainted(idx) && isPaintedAsPolyligne(idx, _versEcran);
}
@@ -168,6 +192,11 @@
LabelPainter labelPainter = new LabelPainter();
@Override
+ protected boolean clearSelectionIfLayerNonVisible() {
+ return false;
+ }
+
+ @Override
protected Color getSurfaceSpecColor(int i, Color initColor) {
CatEMHCasier casier = getCasierController().getCasier(i);
Color res = layerConfiguration.getFond(casier, modeleDonnees());
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryNodeLayer.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -2,9 +2,11 @@
import com.memoire.bu.BuPopupMenu;
import java.awt.Graphics2D;
+import org.fudaa.ctulu.CtuluListSelection;
import org.fudaa.dodico.crue.metier.emh.CatEMHNoeud;
import org.fudaa.dodico.crue.metier.emh.EMH;
import org.fudaa.ebli.calque.dessin.DeForme;
+import org.fudaa.ebli.controle.BSelecteurCheckBox;
import org.fudaa.ebli.find.EbliFindActionInterface;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrPoint;
@@ -56,6 +58,32 @@
}
@Override
+ protected boolean clearSelectionIfLayerNonVisible() {
+ return false;
+ }
+
+ private boolean userVisible = true;
+
+ @Override
+ public boolean isUserVisible() {
+ return userVisible;
+ }
+
+ @Override
+ public void setUserVisible(boolean userVisible) {
+ if (this.userVisible != userVisible) {
+ super.setUserVisible(userVisible);
+ this.userVisible = userVisible;
+ clearCacheAndRepaint();
+ }
+ }
+
+ @Override
+ public boolean isVisible() {
+ return !isSelectionEmpty() || isUserVisible();
+ }
+
+ @Override
public boolean isMovable() {
return false;
}
@@ -96,6 +124,9 @@
if (getLayerSelection().isSelected(idx)) {
return true;
}
+ if (!isUserVisible()) {
+ return false;
+ }
CatEMHNoeud noeud = getNoeudController().getEMHFromPositionInModel(idx);
PlanimetryControllerHelper helper = getNoeudController().getHelper();
if (!helper.isVisible(noeud)) {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetrySectionLayer.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -94,10 +94,18 @@
}
@Override
+ protected boolean clearSelectionIfLayerNonVisible() {
+ return false;
+ }
+
+ @Override
protected boolean isPainted(int idx) {
if (getLayerSelection().isSelected(idx)) {
return true;
}
+ if (!isUserVisible()) {
+ return false;
+ }
boolean res = super.isPainted(idx);
CatEMHSection section = getController().getEMHFromPositionInModel(idx);
PlanimetryControllerHelper helper = getLayerController().getHelper();
@@ -110,7 +118,28 @@
return res;
}
+ private boolean userVisible = true;
+
@Override
+ public boolean isUserVisible() {
+ return userVisible;
+ }
+
+ @Override
+ public void setUserVisible(boolean userVisible) {
+ if (this.userVisible != userVisible) {
+ super.setUserVisible(userVisible);
+ this.userVisible = userVisible;
+ clearCacheAndRepaint();
+ }
+ }
+
+ @Override
+ public boolean isVisible() {
+ return !isSelectionEmpty() || isUserVisible();
+ }
+
+ @Override
public void paintDonnees(Graphics2D _g, GrMorphisme _versEcran, GrMorphisme _versReel, GrBoite _clipReel) {
if (!isVisible()) {
return;
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryTraceLayer.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -10,6 +10,7 @@
import javax.swing.SwingConstants;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
+import org.fudaa.ctulu.CtuluListSelection;
import org.fudaa.ctulu.gis.GISPolyligne;
import org.fudaa.ctulu.gis.GisAbscCurviligneToCoordinate;
import org.fudaa.dodico.crue.config.comparator.XtComparator;
@@ -20,6 +21,8 @@
import org.fudaa.dodico.crue.metier.emh.LitNumerote;
import org.fudaa.dodico.crue.metier.emh.PtProfil;
import org.fudaa.dodico.crue.metier.helper.EMHHelper;
+import org.fudaa.ebli.commun.EbliListeSelectionMultiInterface;
+import org.fudaa.ebli.controle.BSelecteurCheckBox;
import org.fudaa.ebli.find.EbliFindActionInterface;
import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.geometrie.GrMorphisme;
@@ -38,7 +41,8 @@
*
* @author deniger ( genesis)
*/
-public class PlanimetryTraceLayer extends PlanimetryLigneBriseeLayer<TraceConfiguration> implements LayerWithCascadeDeleteAction, PlanimetryLayerWithEMHContrat {
+public class PlanimetryTraceLayer extends PlanimetryLigneBriseeLayer<TraceConfiguration> implements LayerWithCascadeDeleteAction,
+ PlanimetryLayerWithEMHContrat {
public PlanimetryTraceLayer(PlanimetryTraceLayerModel _modele, FSigEditor _editor) {
super(_modele, _editor);
@@ -60,6 +64,32 @@
}
@Override
+ protected boolean clearSelectionIfLayerNonVisible() {
+ return false;
+ }
+
+ private boolean userVisible = true;
+
+ @Override
+ public boolean isUserVisible() {
+ return userVisible;
+ }
+
+ @Override
+ public void setUserVisible(boolean userVisible) {
+ if (this.userVisible != userVisible) {
+ super.setUserVisible(userVisible);
+ this.userVisible = userVisible;
+ clearCacheAndRepaint();
+ }
+ }
+
+ @Override
+ public boolean isVisible() {
+ return !isSelectionEmpty() || isUserVisible();
+ }
+
+ @Override
public String editSelected() {
getActions()[0].actionPerformed(null);
return null;
@@ -82,10 +112,13 @@
@Override
protected boolean isPainted(int idx, GrMorphisme _versEcran) {
- boolean res = super.isPainted(idx, _versEcran);
if (isSelected(idx)) {
return true;
}
+ if (!isUserVisible()) {
+ return false;
+ }
+ boolean res = super.isPainted(idx, _versEcran);
if (!res) {
return false;
}
@@ -155,7 +188,6 @@
double xmax = LayerTraceGisBuilder.findXmaxLit(profilSection.getLitNumerote(), false);
double length = xmax - xmin;
-
super.layerConfiguration.initTraceIconLimiteLitOrEtiquette(iconEtiquette.getModel(), i);
//les limites de lits
TreeSet<Double> done = new TreeSet<Double>(xtComparator);
@@ -271,7 +303,8 @@
}
if (_clipReel.contientXY(pt)) {
pt.autoApplique(_versEcran);
- labelPainter.paintLabels(_g, pt, layerConfiguration.getDisplayName(profilSection, modeleDonnees(), isSelected(i)), layerConfiguration.getSectionLabelConfiguration(), alpha_);
+ labelPainter.paintLabels(_g, pt, layerConfiguration.getDisplayName(profilSection, modeleDonnees(), isSelected(i)), layerConfiguration.
+ getSectionLabelConfiguration(), alpha_);
}
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportLayersTreeComponent.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -118,7 +118,7 @@
this.revalidate();
List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers();
for (BCalque bCalque : mainLayers) {
- bCalque.addPropertyChangeListener(BSelecteurCheckBox.PROP_VISIBLE, this);
+ bCalque.addPropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this);
}
panel.getPlanimetryController().getGroupExternController().addObserver(this);
@@ -149,7 +149,7 @@
if (panel != null) {
List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers();
for (BCalque bCalque : mainLayers) {
- bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_VISIBLE, this);
+ bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this);
}
panel.getPlanimetryController().getGroupExternController().deleteObserver(this);
}
Modified: trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java
===================================================================
--- trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2014-02-14 08:28:37 UTC (rev 8617)
+++ trunk/soft/fudaa-crue/ui-report/src/main/java/org/fudaa/fudaa/crue/report/ReportVisualTopComponent.java 2014-02-14 08:34:06 UTC (rev 8618)
@@ -283,7 +283,7 @@
panel = reportVisuService.getPlanimetryVisuPanel();
List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers();
for (BCalque bCalque : mainLayers) {
- bCalque.addPropertyChangeListener(BSelecteurCheckBox.PROP_VISIBLE, this);
+ bCalque.addPropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this);
}
initConfiguration = panel.getPlanimetryController().getVisuConfiguration().deepClone();
restoreDefaultConfigurationData();
@@ -424,7 +424,7 @@
panel.getScene().removeSelectionListener(selectionListener);
List<BCalque> mainLayers = panel.getPlanimetryController().getMainLayers();
for (BCalque bCalque : mainLayers) {
- bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_VISIBLE, this);
+ bCalque.removePropertyChangeListener(BSelecteurCheckBox.PROP_USER_VISIBLE, this);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
