Menu
▾
▴
[Fudaa-svn-commit] SF.net SVN: fudaa:[9475] trunk/soft/fudaa-crue/ui-planimetry/src/main
|
From: <de...@us...> - 2016-12-05 22:43:12
|
Revision: 9475
http://sourceforge.net/p/fudaa/svn/9475
Author: deniger
Date: 2016-12-05 22:43:09 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
correction sur le parcours de listes
Modified Paths:
--------------
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
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/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java 2016-12-05 22:42:46 UTC (rev 9474)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryGisEditor.java 2016-12-05 22:43:09 UTC (rev 9475)
@@ -3,9 +3,13 @@
*/
package org.fudaa.fudaa.crue.planimetry;
+import com.memoire.bu.BuResource;
+import java.awt.event.ActionEvent;
import javax.swing.JComponent;
import org.fudaa.ebli.calque.ZEbliCalquesPanel;
import org.fudaa.ebli.calque.edition.ZCalqueEditable;
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.fudaa.commun.FudaaLib;
import org.fudaa.fudaa.crue.common.services.SysdocUrlBuilder;
import org.fudaa.fudaa.sig.layer.FSigEditor;
@@ -15,6 +19,8 @@
*/
public class PlanimetryGisEditor extends FSigEditor {
+ private EbliActionSimple exportWithNameAction;
+
public PlanimetryGisEditor(ZEbliCalquesPanel _panel) {
super(_panel, new PlanimetrySceneEditor(_panel.getScene(), _panel));
setExportWithId(true);
@@ -28,7 +34,42 @@
@Override
protected void configureEditorPanel(JComponent jc) {
super.configureEditorPanel(jc);
- SysdocUrlBuilder.installHelpShortcut(jc, SysdocUrlBuilder.getDialogHelpCtxId("bdlEditerDonneesGeolocalisation",null));
+ SysdocUrlBuilder.installHelpShortcut(jc, SysdocUrlBuilder.getDialogHelpCtxId("bdlEditerDonneesGeolocalisation", null));
}
+ /**
+ *
+ * @return une action qui utilise le nom de l'attribut dans l'export. Permet d'etre compatible avec les anciennes versions de GeoGama
+ */
+ public EbliActionSimple getExportWithNameAction() {
+ if (exportWithNameAction == null) {
+ exportWithNameAction = new ExportWithNameAction();
+ }
+ return exportWithNameAction;
+ }
+
+ private class ExportWithNameAction extends EbliActionSimple {
+
+ protected ExportWithNameAction() {
+ super(org.openide.util.NbBundle.getMessage(PlanimetryGisEditor.class, "exportLayerWithName.actionName"), BuResource.BU.getIcon("exporter"),
+ "GIS_NAME_EXPORT");
+ setDefaultToolTip(org.openide.util.NbBundle.getMessage(PlanimetryGisEditor.class, "exportLayerWithName.tooltip"));
+ }
+
+ @Override
+ public void actionPerformed(final ActionEvent _e) {
+ exportSelectedLayer(false);
+ }
+
+ @Override
+ public void updateStateBeforeShow() {
+ super.setEnabled(canExportSelectedLayer());
+ }
+
+ @Override
+ public String getEnableCondition() {
+ return FudaaLib.getS("Sélectionner un calque non vide");
+ }
+ }
+
}
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2016-12-05 22:42:46 UTC (rev 9474)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/PlanimetryVisuPanel.java 2016-12-05 22:43:09 UTC (rev 9475)
@@ -86,25 +86,6 @@
}
}
- private Action createAction(final String cmd, final KeyStroke ks) {
- Action action = new AbstractAction(cmd) {
- @Override
- public void actionPerformed(ActionEvent e) {
- PlanimetryVisuPanel.this.actionPerformed(new ActionEvent(PlanimetryVisuPanel.this, 0, cmd));
- }
- };
- action.putValue(Action.ACTION_COMMAND_KEY, cmd);
- action.putValue(Action.ACCELERATOR_KEY, ks);
- return action;
- }
-
- public final void installSelectionShortcuts() {
- Action selectAll = createAction("TOUTSELECTIONNER", KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK));
- Action invAction = createAction("INVERSESELECTION", KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_MASK));
- Action clearAction = createAction("CLEARSELECTION", KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
- EbliLib.updateMapKeyStroke(this, new Action[]{selectAll, invAction, clearAction});
- }
-
public static void addSelectionAction(final BuMenu _menu, final boolean _enable, ActionListener _l) {
BuMenuItem it = _menu.addMenuItem(BuResource.BU.getString("Tout sélectionner"), "TOUTSELECTIONNER", false, KeyEvent.VK_A);
it.setEnabled(_enable);
@@ -158,6 +139,30 @@
setAddNbSelectionInInfo(true);
}
+ private Action createAction(final String cmd, final KeyStroke ks) {
+ Action action = new AbstractAction(cmd) {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ PlanimetryVisuPanel.this.actionPerformed(new ActionEvent(PlanimetryVisuPanel.this, 0, cmd));
+ }
+ };
+ action.putValue(Action.ACTION_COMMAND_KEY, cmd);
+ action.putValue(Action.ACCELERATOR_KEY, ks);
+ return action;
+ }
+
+ @Override
+ public PlanimetryGisEditor getEditor() {
+ return (PlanimetryGisEditor) super.getEditor();
+ }
+
+ public final void installSelectionShortcuts() {
+ Action selectAll = createAction("TOUTSELECTIONNER", KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK));
+ Action invAction = createAction("INVERSESELECTION", KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.CTRL_MASK));
+ Action clearAction = createAction("CLEARSELECTION", KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK));
+ EbliLib.updateMapKeyStroke(this, new Action[]{selectAll, invAction, clearAction});
+ }
+
public PlanimetryVisuPanelConfigurer getConfigurer() {
return configurer;
}
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 2016-12-05 22:42:46 UTC (rev 9474)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerBrancheController.java 2016-12-05 22:43:09 UTC (rev 9475)
@@ -106,7 +106,9 @@
null,
res.getSigEditAction(),
null,
+ res.getEditor().getExportWithNameAction(),
res.getEditor().getExportAction(),
+ null,
helper.getController().getProjectEMHOnSIGAction(),
helper.getController().getTraceProfilAttachedToBrancheAction(),
null,
@@ -235,7 +237,6 @@
return brancheUpdatingFromPoint;
}
-
public void setBrancheUidUpdatingFromPoint() {
brancheUpdatingFromPoint = true;
}
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 2016-12-05 22:42:46 UTC (rev 9474)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerCasierController.java 2016-12-05 22:43:09 UTC (rev 9475)
@@ -48,6 +48,7 @@
null,
res.getSigEditAction(),
null,
+ res.getEditor().getExportWithNameAction(),
res.getEditor().getExportAction(),
null,
res.getEditor().getActionDelete(),
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 2016-12-05 22:42:46 UTC (rev 9474)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerNodeController.java 2016-12-05 22:43:09 UTC (rev 9475)
@@ -54,16 +54,16 @@
nodeController.layer.setName(PlanimetryController.NAME_CQ_NODE);
nodeController.layer.setTitle(NbBundle.getMessage(PlanimetryControllerBuilder.class, PlanimetryController.NAME_CQ_NODE));
nodeController.layer.setActions(new EbliActionInterface[]{
- new OpenEMHAction.Reopen(ctx),
- new OpenEMHAction.NewFrame(ctx),
- null,
- res.getSigEditAction(),
- res.getEditor().getExportAction(),
- null,
- res.getEditor().getActionDelete(),
- res.getPlanimetryVisuController().getDeleteCascade(),
- null,
- res.createFindAction(nodeController.layer)});
+ new OpenEMHAction.Reopen(ctx),
+ new OpenEMHAction.NewFrame(ctx),
+ null,
+ res.getSigEditAction(),
+ res.getEditor().getExportWithNameAction(), res.getEditor().getExportAction(),
+ null,
+ res.getEditor().getActionDelete(),
+ res.getPlanimetryVisuController().getDeleteCascade(),
+ null,
+ res.createFindAction(nodeController.layer)});
ctx.controllersByName.put(PlanimetryController.NAME_CQ_NODE, nodeController);
return nodeController;
}
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 2016-12-05 22:42:46 UTC (rev 9474)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/java/org/fudaa/fudaa/crue/planimetry/controller/LayerSectionController.java 2016-12-05 22:43:09 UTC (rev 9475)
@@ -1,20 +1,11 @@
package org.fudaa.fudaa.crue.planimetry.controller;
-import gnu.trove.TIntArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.fudaa.ctulu.gis.GISZoneCollectionGeometry;
import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
import org.fudaa.dodico.crue.common.transformer.ToStringInternationalizable;
import org.fudaa.dodico.crue.metier.emh.EMH;
-import org.fudaa.dodico.crue.metier.emh.EnumCatEMH;
-import org.fudaa.dodico.crue.metier.emh.EnumSectionType;
-import org.fudaa.dodico.crue.metier.emh.RelationEMHSectionDansBranche;
-import org.fudaa.dodico.crue.metier.helper.EMHHelper;
-import org.fudaa.ebli.calque.edition.ZModelePointEditable;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.fudaa.crue.planimetry.PlanimetryVisuPanel;
import org.fudaa.fudaa.crue.planimetry.action.OpenEMHAction;
@@ -46,6 +37,7 @@
new OpenEMHAction.NewFrame(ctx),
null,
res.getSigEditAction(),
+ res.getEditor().getExportWithNameAction(),
res.getEditor().getExportAction(),
null,
res.getEditor().getActionDelete(),
Modified: trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties
===================================================================
--- trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties 2016-12-05 22:42:46 UTC (rev 9474)
+++ trunk/soft/fudaa-crue/ui-planimetry/src/main/resources/org/fudaa/fudaa/crue/planimetry/Bundle.properties 2016-12-05 22:43:09 UTC (rev 9475)
@@ -23,3 +23,5 @@
accroche.casier=Accroche: Casier {0}, sommet {1}
accroche.section=Accroche: Section {0}
+exportLayerWithName.actionName=Exporter (Compatible GeoGama)
+exportLayerWithName.tooltip=Exporter les donn\u00e9es dans un format compatible avec GeoGama
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
