Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9161] trunk/soft/fudaa-crue/ui-planimetry/src/main
|
From: <de...@us...> - 2015-09-09 21:59:57
|
Revision: 9161
http://sourceforge.net/p/fudaa/svn/9161
Author: deniger
Date: 2015-09-09 21:59:55 +0000 (Wed, 09 Sep 2015)
Log Message:
-----------
CRUE-668: sauvegardes des param?\195?\168tres de visibilit?\195?\169 des calques TraceProfils et TraceCasiers
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LayerVisibilityInfo.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/GroupExterneMainController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryHydraulicGroup.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaverHdydaulicAndVisibility.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/configuration/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LayerVisibilityInfo.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LayerVisibilityInfo.java 2015-09-09 21:58:34 UTC (rev 9160)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/configuration/LayerVisibilityInfo.java 2015-09-09 21:59:55 UTC (rev 9161)
@@ -17,10 +17,34 @@
public final static String VISIBILITY_GROUP_DESSIN = "groupeDessin";
public final static String VISIBILITY_GROUP_SIG_FILE = "groupeFichierSIG";
public final static String VISIBILITY_GROUP_IMAGE_FILE = "groupeImage";
+ public final static String VISIBILITY_GROUP_TRACE_PROFILS = "groupeTraceProfils";
+ public final static String VISIBILITY_GROUP_TRACE_PROFILS_CASIERS = "groupeProfilsCasier";
+ public static Node.Property createGrTraceProfilsProperty(LayerVisibility in) {
+ try {
+ Reflection create = ConfigurationInfoHelper.create("traceProfilsVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
+ create.setName(VISIBILITY_GROUP_TRACE_PROFILS + ".visible");
+ return create;
+ } catch (NoSuchMethodException noSuchMethodException) {
+ Exceptions.printStackTrace(noSuchMethodException);
+ }
+ return null;
+ }
+
+ public static Node.Property createGrTraceProfilsPropertyCasiers(LayerVisibility in) {
+ try {
+ Reflection create = ConfigurationInfoHelper.create("traceCasiersVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
+ create.setName(VISIBILITY_GROUP_TRACE_PROFILS_CASIERS + ".visible");
+ return create;
+ } catch (NoSuchMethodException noSuchMethodException) {
+ Exceptions.printStackTrace(noSuchMethodException);
+ }
+ return null;
+ }
+
public static Node.Property createGrHydraulicProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("grHydraulicVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("grHydraulicVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(VISIBILITY_GROUP_HYDRAULIC + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -31,7 +55,7 @@
public static Node.Property createGrOtherProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("grOtherObjectVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("grOtherObjectVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(VISIBILITY_GROUP_OTHER + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -42,7 +66,7 @@
public static Node.Property createGrDessinProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("grDrawVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("grDrawVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(VISIBILITY_GROUP_DESSIN + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -53,7 +77,7 @@
public static Node.Property createGrSIGFIleProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("grSIGFileVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("grSIGFileVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(VISIBILITY_GROUP_SIG_FILE + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -64,7 +88,7 @@
public static Node.Property createGrImageProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("grImagesVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("grImagesVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(VISIBILITY_GROUP_IMAGE_FILE + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -75,7 +99,7 @@
public static Node.Property createTraceProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("traceVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("traceVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(TraceConfigurationInfo.PREFIX_TRACES + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -86,7 +110,7 @@
public static Node.Property createSectionProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("sectionVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("sectionVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(SectionConfigurationInfo.PREFIX_SECTIONS + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -97,7 +121,7 @@
public static Node.Property createNodeProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("nodeVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("nodeVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(NodeConfigurationInfo.PREFIX_NODES + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -108,7 +132,7 @@
public static Node.Property createBrancheProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("brancheVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("brancheVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(BrancheConfigurationInfo.PREFIX_BRANCHES + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -119,7 +143,7 @@
public static Node.Property createCasierProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("casierVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("casierVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(CasierConfigurationInfo.PREFIX_CASIERS + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
@@ -130,7 +154,7 @@
public static Node.Property createcondLimiteProperty(LayerVisibility in) {
try {
- Reflection create = ConfigurationInfoHelper.create("condLimitVisible", Boolean.TYPE, in, VisuConfigurationInfo.class);
+ Reflection create = ConfigurationInfoHelper.create("condLimitVisible", Boolean.TYPE, in, LayerVisibilityInfo.class);
create.setName(CondLimitConfigurationInfo.PREFIX_CONDLIMITE + ".visible");
return create;
} catch (NoSuchMethodException noSuchMethodException) {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java 2015-09-09 21:58:34 UTC (rev 9160)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/AbstractGroupExternController.java 2015-09-09 21:59:55 UTC (rev 9161)
@@ -24,7 +24,8 @@
*
* @author Frederic Deniger
*/
-public abstract class AbstractGroupExternController<T extends AbstractPlanimetryExternLayerGroup> extends Observable implements LayerController {
+public abstract class AbstractGroupExternController<T extends AbstractPlanimetryExternLayerGroup> extends Observable implements LayerController,
+ PropertyChangeListener {
public static final String PROPERTY_LAYER_ADDED = "LayerAdded";
public static final String PROPERTY_LAYER_REMOVED = "LayerRemoved";
@@ -139,6 +140,7 @@
calquesListener = new CalqueAddRemoveListener();
getGroupLayer().addContainerListener(calquesListener);
}
+ getGroupLayer().addPropertyChangeListener(this);
}
public void setArbreEditable(boolean editable) {
@@ -191,25 +193,25 @@
}
- private class CalqueAddRemoveListener implements ContainerListener, PropertyChangeListener {
+ @Override
+ public void propertyChange(PropertyChangeEvent evt) {
+ if (initializing) {
+ return;
+ }
+ AbstractGroupExternController.this.setChanged();
+ AbstractGroupExternController.this.notifyObservers(evt.getPropertyName());
+ }
+ private class CalqueAddRemoveListener implements ContainerListener {
+
public CalqueAddRemoveListener() {
}
@Override
- public void propertyChange(PropertyChangeEvent evt) {
- if (initializing) {
- return;
- }
- AbstractGroupExternController.this.setChanged();
- AbstractGroupExternController.this.notifyObservers(evt.getPropertyName());
- }
-
- @Override
public void componentAdded(ContainerEvent e) {
final BCalque c = (BCalque) e.getChild();
- c.addPropertyChangeListener(this);
+ c.addPropertyChangeListener(AbstractGroupExternController.this);
controller.calqueAdded(c);
if (initializing) {
return;
@@ -222,7 +224,7 @@
public void componentRemoved(ContainerEvent e) {
final BCalque c = (BCalque) e.getChild();
- c.removePropertyChangeListener(this);
+ c.removePropertyChangeListener(AbstractGroupExternController.this);
controller.calqueRemoved(c);
if (initializing) {
return;
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/GroupExterneMainController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/GroupExterneMainController.java 2015-09-09 21:58:34 UTC (rev 9160)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/GroupExterneMainController.java 2015-09-09 21:59:55 UTC (rev 9161)
@@ -66,7 +66,6 @@
controller.groupExternController = groupController;
controller.controllersByName.put(PlanimetryController.NAME_GC_EXTERN, groupController);
-
return groupController;
}
@@ -224,8 +223,10 @@
void apply(LayerVisibility layerVisibility) {
getGroupExtern().setVisible(layerVisibility.isGrOtherObjectVisible());
getSubController(PlanimetryController.NAME_GC_EXTERN_SIG).getGroupLayer().setVisible(layerVisibility.isGrSIGFileVisible());
- getSubController(PlanimetryController.NAME_GC_EXTERN_DRAW).getGroupLayer().setVisible(layerVisibility.isGrImagesVisible());
+ getSubController(PlanimetryController.NAME_GC_EXTERN_DRAW).getGroupLayer().setVisible(layerVisibility.isGrDrawVisible());
getSubController(PlanimetryController.NAME_GC_EXTERN_IMAGES).getGroupLayer().setVisible(layerVisibility.isGrImagesVisible());
+ getSubController(PlanimetryController.NAME_GC_EXTERN_TRACES).getGroupLayer().setVisible(layerVisibility.isTraceProfilsVisible());
+ getSubController(PlanimetryController.NAME_GC_EXTERN_TRACES_CASIERS).getGroupLayer().setVisible(layerVisibility.isTraceCasiersVisible());
}
void fill(LayerVisibility res) {
@@ -233,6 +234,8 @@
res.setGrSIGFileVisible(getSubController(PlanimetryController.NAME_GC_EXTERN_SIG).getGroupLayer().isVisible());
res.setGrDrawVisible(getSubController(PlanimetryController.NAME_GC_EXTERN_DRAW).getGroupLayer().isVisible());
res.setGrImagesVisible(getSubController(PlanimetryController.NAME_GC_EXTERN_IMAGES).getGroupLayer().isVisible());
+ res.setTraceProfilsVisible(getSubController(PlanimetryController.NAME_GC_EXTERN_TRACES).getGroupLayer().isVisible());
+ res.setTraceCasiersVisible(getSubController(PlanimetryController.NAME_GC_EXTERN_TRACES_CASIERS).getGroupLayer().isVisible());
}
Map<String, Boolean> getVisibilityForExternLayer() {
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java 2015-09-09 21:58:34 UTC (rev 9160)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/PlanimetryController.java 2015-09-09 21:59:55 UTC (rev 9161)
@@ -424,25 +424,23 @@
public LayerVisibility getLayerVisibility() {
LayerVisibility res = new LayerVisibility();
- res.setBrancheVisible(getBrancheController().getLayer().isVisible());
- res.setCasierVisible(getCasierController().getLayer().isVisible());
- res.setNodeVisible(getNodeController().getLayer().isVisible());
- res.setSectionVisible(getSectionController().getLayer().isVisible());
- res.setTraceVisible(getTraceController().getLayer().isVisible());
- res.setCondLimitVisible(getcondLimiteController().getLayer().isVisible());
- res.setGrHydraulicVisible(getGroupHydraulicController().groupHydraulic.isVisible());
+ res.setBrancheVisible(getBrancheController().getLayer().isUserVisible());
+ res.setCasierVisible(getCasierController().getLayer().isUserVisible());
+ res.setNodeVisible(getNodeController().getLayer().isUserVisible());
+ res.setSectionVisible(getSectionController().getLayer().isUserVisible());
+ res.setTraceVisible(getTraceController().getLayer().isUserVisible());
+ res.setCondLimitVisible(getcondLimiteController().getLayer().isUserVisible());
getGroupExternController().fill(res);
return res;
}
public void apply(LayerVisibility layerVisibility) {
- getBrancheController().getLayer().setVisible(layerVisibility.isBrancheVisible());
- getCasierController().getLayer().setVisible(layerVisibility.isCasierVisible());
- getNodeController().getLayer().setVisible(layerVisibility.isNodeVisible());
- getSectionController().getLayer().setVisible(layerVisibility.isSectionVisible());
- getTraceController().getLayer().setVisible(layerVisibility.isTraceVisible());
- getcondLimiteController().getLayer().setVisible(layerVisibility.isCondLimitVisible());
- getGroupHydraulicController().groupHydraulic.setVisible(layerVisibility.isGrHydraulicVisible());
+ getBrancheController().getLayer().setUserVisible(layerVisibility.isBrancheVisible());
+ getCasierController().getLayer().setUserVisible(layerVisibility.isCasierVisible());
+ getNodeController().getLayer().setUserVisible(layerVisibility.isNodeVisible());
+ getSectionController().getLayer().setUserVisible(layerVisibility.isSectionVisible());
+ getTraceController().getLayer().setUserVisible(layerVisibility.isTraceVisible());
+ getcondLimiteController().getLayer().setUserVisible(layerVisibility.isCondLimitVisible());
getGroupExternController().apply(layerVisibility);
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryHydraulicGroup.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryHydraulicGroup.java 2015-09-09 21:58:34 UTC (rev 9160)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/layer/PlanimetryHydraulicGroup.java 2015-09-09 21:59:55 UTC (rev 9161)
@@ -38,4 +38,14 @@
return true;
}
+
+ @Override
+ public void setUserVisible(boolean _b) {
+ super.setUserVisible(_b);
+
+ final BCalque[] c = getCalques();
+ for (int i = 0; i < c.length; i++) {
+ c[i].setUserVisible(_b);
+ }
+ }
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaverHdydaulicAndVisibility.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaverHdydaulicAndVisibility.java 2015-09-09 21:58:34 UTC (rev 9160)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/save/ConfigSaverHdydaulicAndVisibility.java 2015-09-09 21:59:55 UTC (rev 9161)
@@ -59,8 +59,9 @@
ConfigSaverHelper.addVisibility(res, LayerVisibilityInfo.createGrImageProperty(visibility));
ConfigSaverHelper.addVisibility(res, LayerVisibilityInfo.createGrOtherProperty(visibility));
ConfigSaverHelper.addVisibility(res, LayerVisibilityInfo.createGrSIGFIleProperty(visibility));
+ ConfigSaverHelper.addVisibility(res, LayerVisibilityInfo.createGrTraceProfilsProperty(visibility));
+ ConfigSaverHelper.addVisibility(res, LayerVisibilityInfo.createGrTraceProfilsPropertyCasiers(visibility));
-
return res;
}
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/configuration/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/configuration/Bundle.properties 2015-09-09 21:58:34 UTC (rev 9160)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/configuration/Bundle.properties 2015-09-09 21:59:55 UTC (rev 9161)
@@ -126,3 +126,7 @@
grImagesVisible.ShortDescription=Images visibles
grHydraulicVisible.DisplayName=Objets hydrauliques visibles
grHydraulicVisible.ShortDescription=Objets hydrauliques visibles
+traceCasiersVisible.DisplayName=TraceCasiers visibles
+traceCasiersVisible.ShortDescription=TraceCasiers visibles
+traceProfilsVisible.DisplayName=TraceProfils visibles
+traceProfilsVisible.ShortDescription=TraceProfils visibles
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
